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

[Ashod Nakashian (via logerrit)]

 loleaflet/src/control/Control.MobileWizard.js |   21 ++---
 loleaflet/src/control/Control.Toolbar.js  |   14 +-
 loleaflet/src/layer/tile/TileLayer.js |6 +++---
 loleaflet/src/map/Map.js  |6 +-
 4 files changed, 35 insertions(+), 12 deletions(-)

New commits:
commit f11946bf40ab48317acbdc8af7495688f9a28979
Author: Ashod Nakashian 
AuthorDate: Thu Dec 12 01:32:48 2019 -0500
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 09:11:25 2019 +0100

leaflet: improved sidebar wizard handling

Now the Hamburger works and the sidebar updates
are more accurate.

Change-Id: I2f8df05801297d8ec29bf1d966624f06df685d31
Reviewed-on: https://gerrit.libreoffice.org/85010
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 4715f0694..912c4602d 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -26,7 +26,7 @@ L.Control.MobileWizard = L.Control.extend({
this.map = map;
map.on('mobilewizard', this._onMobileWizard, this);
map.on('closemobilewizard', this._hideWizard, this);
-   map.on('showmobilewizard', this._showWizard, this);
+   map.on('showwizardsidebar', this._showWizardSidebar, this);
 
this._setupBackButton();
},
@@ -60,6 +60,12 @@ L.Control.MobileWizard = L.Control.extend({
$('#toolbar-down').hide();
},
 
+   _showWizardSidebar: function() {
+   this.map.showSidebar = true;
+   this._refreshSidebar();
+   this._showWizard();
+   },
+
_hideWizard: function() {
$('#mobile-wizard').hide();
$('#mobile-wizard-content').empty();
@@ -67,6 +73,7 @@ L.Control.MobileWizard = L.Control.extend({
$('#toolbar-down').show();
}
 
+   this.map.showSidebar = false;
this._isActive = false;
this._currentPath = [];
if (window.mobileWizard === true) {
@@ -228,8 +235,10 @@ L.Control.MobileWizard = L.Control.extend({
if (data) {
var isSidebar = data.id !== 'menubar' && data.id !== 
'insertshape' && data.id !== 'funclist';
 
-   if (!this._isActive && isSidebar)
-   this._refreshSidebar();
+   if (!this._isActive && isSidebar) {
+   if (this.map.showSidebar == false)
+   return;
+   }
 
this._isActive = true;
var currentPath = null;
@@ -242,10 +251,8 @@ L.Control.MobileWizard = L.Control.extend({
 
this._reset();
 
-   if (window.mobileWizard) {
-   this._showWizard();
-   this._hideKeyboard();
-   }
+   this._showWizard();
+   this._hideKeyboard();
 
// We can change the sidebar as we want here
if (data.id === '') { // sidebar indicator
diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 4e8c1943e..a068c3af9 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -346,7 +346,19 @@ function onClick(e, id, item, subItem) {
if (window.insertionMobileWizard)
this.onClick(null, 'insertion_mobile_wizard');
window.mobileWizard = true;
-   map.fire('showmobilewizard');
+   if (!map._sidebarVisible) {
+   map._sidebarVisible = true;
+   map.sendUnoCommand('.uno:Sidebar');
+   } else {
+   // As the sidebar LOKWindowId can and does 
change,
+   // esp. between chart and other elements, we 
apparently
+   // lose track, and there is currently no 
reliable way to
+   // recover it (which is needed to request 
updates).
+   // The following disable and enable the sidebar 
to get it.
+   map.sendUnoCommand('.uno:Sidebar');
+   map.sendUnoCommand('.uno:Sidebar');
+   }
+   map.fire('showwizardsidebar');
toolbar.check(id);
}
}
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index d6e406884..491d14731 100644
--- 

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

[Andrea Gelmini (via logerrit)]

 svx/source/svdraw/svdoashp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19733236a91cfb7ce38da8ce9b72f8804ff14b0d
Author: Andrea Gelmini 
AuthorDate: Thu Dec 12 09:06:46 2019 +0100
Commit: Julien Nabet 
CommitDate: Thu Dec 12 09:10:23 2019 +0100

Fix typo

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

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 7d78963ea192..0fb5876d9aca 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2982,7 +2982,7 @@ void SdrObjCustomShape::AdjustToMaxRect(const 
tools::Rectangle& rMaxRect, bool b
 
 // Now use TRSetBaseGeometry to actually perform scale, shear, rotate and 
translate
 // on the shape. That considers gluepoints, interaction handles and text 
area, and includes
-// setting rectangles dirty and broadcoast.
+// setting rectangles dirty and broadcast.
 TRSetBaseGeometry(aMatrix, aPolyPolygon);
 }
 
___
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.2' - sfx2/source

[Ashod Nakashian (via logerrit)]

 sfx2/source/sidebar/SidebarDockingWindow.cxx |   37 +--
 1 file changed, 18 insertions(+), 19 deletions(-)

New commits:
commit 50af967b731495be6645f065fd11b9ad832a654a
Author: Ashod Nakashian 
AuthorDate: Thu Dec 12 01:38:02 2019 -0500
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 09:10:48 2019 +0100

sfx2: sidebar: publish created notification on Mobile too

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

diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx 
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index ed9340db5550..cba9e50fb2b4 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -74,28 +74,27 @@ public:
 
pMobileNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, 
message.c_str());
 }
 }
-else
-{
-// On desktop use the classic notifications.
-const Point pos = Point(m_rSidebarDockingWin.GetOutOffXPixel(),
-
m_rSidebarDockingWin.GetOutOffYPixel());
-const OString posMessage = pos.toString();
-const OString sizeMessage = 
m_rSidebarDockingWin.GetSizePixel().toString();
 
-const std::string message = OString(posMessage + 
sizeMessage).getStr();
-const vcl::LOKWindowId lokWindowId = 
m_rSidebarDockingWin.GetLOKWindowId();
+// Notify the sidebar is created, and its LOKWindowId, which
+// is needed on both Mobile and Desktop.
+const Point pos = Point(m_rSidebarDockingWin.GetOutOffXPixel(),
+m_rSidebarDockingWin.GetOutOffYPixel());
+const OString posMessage = pos.toString();
+const OString sizeMessage = 
m_rSidebarDockingWin.GetSizePixel().toString();
 
-if (lokWindowId != m_LastLOKWindowId || message != 
m_LastNotificationMessage)
-{
-m_LastLOKWindowId = lokWindowId;
-m_LastNotificationMessage = message;
+const std::string message = OString(posMessage + 
sizeMessage).getStr();
+const vcl::LOKWindowId lokWindowId = 
m_rSidebarDockingWin.GetLOKWindowId();
 
-std::vector aItems;
-aItems.emplace_back("type", "deck");
-aItems.emplace_back("position", posMessage);
-aItems.emplace_back("size", sizeMessage);
-pNotifier->notifyWindow(lokWindowId, "created", aItems);
-}
+if (lokWindowId != m_LastLOKWindowId || message != 
m_LastNotificationMessage)
+{
+m_LastLOKWindowId = lokWindowId;
+m_LastNotificationMessage = message;
+
+std::vector aItems;
+aItems.emplace_back("type", "deck");
+aItems.emplace_back("position", posMessage);
+aItems.emplace_back("size", sizeMessage);
+pNotifier->notifyWindow(lokWindowId, "created", aItems);
 }
 }
 catch (boost::property_tree::json_parser::json_parser_error& rError)
___
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' - svx/source

[Gabor Kelemen (via logerrit)]

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit baa365141e8b3c619c7de0b01612ffe0cc3885c7
Author: Gabor Kelemen 
AuthorDate: Tue Nov 26 22:50:25 2019 +0100
Commit: László Németh 
CommitDate: Thu Dec 12 09:24:07 2019 +0100

tdf#111922 Fix Position&Size sidebar Height/Width order of magnitude

Change-Id: Ib279199cdca58911b989a146d60ce764742e5008
Reviewed-on: https://gerrit.libreoffice.org/83843
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit a573829438bf4a3dc43e8774bfe4e29989e2e352)
Reviewed-on: https://gerrit.libreoffice.org/83980
Reviewed-by: László Németh 

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index ab09d90f8062..148d8e696be7 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -1069,12 +1069,12 @@ void PosSizePropertyPanel::SetPosSizeMinMax()
 mpMtrPosY->SetMax(basegfx::fround64(fBottom));
 mpMtrPosY->SetLast(basegfx::fround64(fBottom));
 
-double fMaxWidth = maWorkArea.getWidth() - (maRect.getMinX() - fLeft);
-double fMaxHeight = maWorkArea.getHeight() - (maRect.getMinY() - fTop);
-mpMtrWidth->SetMax(basegfx::fround64(fMaxWidth));
-mpMtrWidth->SetLast(basegfx::fround64(fMaxWidth));
-mpMtrHeight->SetMax(basegfx::fround64(fMaxHeight));
-mpMtrHeight->SetLast(basegfx::fround64(fMaxHeight));
+double fMaxWidth = maWorkArea.getWidth() - (maRect.getWidth() - fLeft);
+double fMaxHeight = maWorkArea.getHeight() - (maRect.getHeight() - fTop);
+mpMtrWidth->SetMax(basegfx::fround64(fMaxWidth*100));
+mpMtrWidth->SetLast(basegfx::fround64(fMaxWidth*100));
+mpMtrHeight->SetMax(basegfx::fround64(fMaxHeight*100));
+mpMtrHeight->SetLast(basegfx::fround64(fMaxHeight*100));
 }
 
 void PosSizePropertyPanel::UpdateUIScale()
___
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-0' - 6 commits - loleaflet/src loolkitconfig.xcu

[Andras Timar (via logerrit)]

 loleaflet/src/control/Control.ContextMenu.js  |2 -
 loleaflet/src/control/Control.LokDialog.js|4 ++-
 loleaflet/src/control/Control.MobileWizard.js |8 ---
 loleaflet/src/control/Control.Toolbar.js  |3 --
 loleaflet/src/layer/tile/CalcTileLayer.js |5 
 loleaflet/src/layer/tile/GridLayer.js |   29 +++---
 loleaflet/src/layer/tile/ImpressTileLayer.js  |5 
 loleaflet/src/layer/tile/TileLayer.js |   12 +++---
 loleaflet/src/layer/tile/WriterTileLayer.js   |1 
 loleaflet/src/map/Map.js  |   13 ---
 loolkitconfig.xcu |7 --
 11 files changed, 45 insertions(+), 44 deletions(-)

New commits:
commit 5a2ec4ce5c329a15ec8989649b38fda1579a4f38
Author: Andras Timar 
AuthorDate: Thu Dec 12 09:30:38 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 12 09:30:38 2019 +0100

[cp] Use the collabora_svg theme and large icons for the sidebar

Change-Id: I8b58c5e3ebe737abfac1f2c124e00bc717c862df

diff --git a/loolkitconfig.xcu b/loolkitconfig.xcu
index 30feb7f17..afad642f3 100644
--- a/loolkitconfig.xcu
+++ b/loolkitconfig.xcu
@@ -25,7 +25,10 @@
 
 true
 
-
-colibre_svg
+
+collabora_svg
+
+
+2
 
 
commit 24812b90dbdeccb34a46a204c94b38f2a5106d8c
Author: Ashod Nakashian 
AuthorDate: Wed Dec 11 13:12:03 2019 -0500
Commit: Andras Timar 
CommitDate: Wed Dec 11 21:20:23 2019 +0100

leaflet: sidebar is now always active for mobile but visible on demand

Because we can't control the sidebar when in Chart edit
mode, we must have it active before we start Chart editing.
Besides that, on mobile we show/hide the sidebar quite
frequently, and there is no point in activating/deactivating
the sidebar on every tap.

So we have the sidebar enabled in the background at all times.
We then track whether it's visible or not (window.mobileWizard)
and show/hide it. Furthermore, we now handle the sidebar
close notification from Core, which we don't expect, really,
now that we don't close it. However, we need to have a way
to re-activate the sidebar when it is closed. Something
we don't do right now, and we need to tack the Core
sidebar state as we can only toggle the sidebar.

Change-Id: Id7774b84cd0604055c708eb0912e17988f5823d2
Reviewed-on: https://gerrit.libreoffice.org/84974
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 0a17ac6bf..4715f0694 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -26,6 +26,7 @@ L.Control.MobileWizard = L.Control.extend({
this.map = map;
map.on('mobilewizard', this._onMobileWizard, this);
map.on('closemobilewizard', this._hideWizard, this);
+   map.on('showmobilewizard', this._showWizard, this);
 
this._setupBackButton();
},
@@ -72,7 +73,6 @@ L.Control.MobileWizard = L.Control.extend({
var toolbar = w2ui['actionbar'];
if (toolbar && toolbar.get('mobile_wizard').checked)
toolbar.uncheck('mobile_wizard');
-   this.map.sendUnoCommand('.uno:Sidebar');
window.mobileWizard = false;
}
 
@@ -242,8 +242,10 @@ L.Control.MobileWizard = L.Control.extend({
 
this._reset();
 
-   this._showWizard();
-   this._hideKeyboard();
+   if (window.mobileWizard) {
+   this._showWizard();
+   this._hideKeyboard();
+   }
 
// We can change the sidebar as we want here
if (data.id === '') { // sidebar indicator
diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 1537062ce..dc6365822 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -339,7 +339,6 @@ function onClick(e, id, item, subItem) {
else if (id === 'mobile_wizard') {
if (window.mobileWizard) {
window.mobileWizard = false;
-   map.sendUnoCommand('.uno:Sidebar');
map.fire('closemobilewizard');
toolbar.uncheck(id);
}
@@ -347,7 +346,7 @@ function onClick(e, id, item, subItem) {
if (window.insertionMobileWizard)
this.onClick(null, 'insertion_mobile_wizard');
window.mobileWizard = true;
-   map.sendUnoCommand('.uno:Sidebar');
+   map.fire('showmobilewizard');
  

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

[Mike Kaganski (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 3fb00763c6b52dd0b63eb572eba206513300ae88
Author: Mike Kaganski 
AuthorDate: Thu Dec 12 08:44:08 2019 +0100
Commit: Mike Kaganski 
CommitDate: Thu Dec 12 09:38:33 2019 +0100

Use structured binding

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 33a64a0878b2..88b985bcfc0b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4598,13 +4598,11 @@ void DomainMapper_Impl::CloseFieldCommand()
 {
 uno::Reference< uno::XInterface > xFieldInterface;
 
-std::tuple, std::vector 
> const
-field(splitFieldCommand(pContext->GetCommand()));
-OUString const sFirstParam(std::get<1>(field).empty()
-? OUString() : std::get<1>(field).front());
+const auto& [sType, vArguments, vSwitches]{ 
splitFieldCommand(pContext->GetCommand()) };
+(void)vSwitches;
+OUString const sFirstParam(vArguments.empty() ? OUString() : 
vArguments.front());
 
-FieldConversionMap_t::const_iterator const aIt =
-aFieldConversionMap.find(std::get<0>(field));
+FieldConversionMap_t::const_iterator const aIt = 
aFieldConversionMap.find(sType);
 if (aIt != aFieldConversionMap.end()
 && (!m_bForceGenericFields
 // these need to convert ffData to properties...
@@ -4676,7 +4674,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 {
 const FieldConversionMap_t& 
aEnhancedFieldConversionMap = lcl_GetEnhancedFieldConversion();
 FieldConversionMap_t::const_iterator aEnhancedIt =
-
aEnhancedFieldConversionMap.find(std::get<0>(field));
+aEnhancedFieldConversionMap.find(sType);
 if ( aEnhancedIt != aEnhancedFieldConversionMap.end())
 sServiceName += 
OUString::createFromAscii(aEnhancedIt->second.cFieldServiceName );
 }
@@ -5336,7 +5334,7 @@ void DomainMapper_Impl::CloseFieldCommand()
  */
 OUString aCode( pContext->GetCommand().trim() );
 // Don't waste resources on wrapping shapes inside a fieldmark.
-if (std::get<0>(field) != "SHAPE" && m_xTextFactory.is() && 
!m_aTextAppendStack.empty())
+if (sType != "SHAPE" && m_xTextFactory.is() && 
!m_aTextAppendStack.empty())
 {
 xFieldInterface = 
m_xTextFactory->createInstance("com.sun.star.text.Fieldmark");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp

[Jan Holesovsky (via logerrit)]

 wsd/DocumentBroker.cpp |2 ++
 wsd/DocumentBroker.hpp |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 863111c952300efd3a3b13b9dcc4d41c8dc85405
Author: Jan Holesovsky 
AuthorDate: Thu Dec 12 09:56:43 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 09:57:44 2019 +0100

mobile: Fix build.

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

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 700a56fbf..77204dd69 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -2207,6 +2207,7 @@ ConvertToBroker::ConvertToBroker(const std::string& uri,
 _limitLifeSeconds = limit_convert_secs;
 }
 
+#if !MOBILEAPP
 bool ConvertToBroker::startConversion(SocketDisposition &disposition, const 
std::string &id)
 {
 std::shared_ptr docBroker = 
std::static_pointer_cast(shared_from_this());
@@ -2252,6 +2253,7 @@ bool ConvertToBroker::startConversion(SocketDisposition 
&disposition, const std:
 });
 return true;
 }
+#endif
 
 void ConvertToBroker::dispose()
 {
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 5632c56b6..07f967579 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -532,8 +532,10 @@ public:
 const std::string& sOptions);
 virtual ~ConvertToBroker();
 
+#if !MOBILEAPP
 /// Move socket to this broker for response & do conversion
 bool startConversion(SocketDisposition &disposition, const std::string 
&id);
+#endif
 
 /// Called when removed from the DocBrokers list
 void dispose() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: android/lib

[Jan Holesovsky (via logerrit)]

 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c2385112acd9fe14c3859b21c8b757af3af2779c
Author: Jan Holesovsky 
AuthorDate: Thu Dec 12 10:14:34 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 10:17:16 2019 +0100

android: Make all the .uno: commands work again.

Was a problem introduced by c6f36965cfc1bd68fdb88b01d493163b5d176bcc.

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

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 bae078ab9..e1efc01f9 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -605,6 +605,7 @@ public class LOActivity extends AppCompatActivity {
 break;
 }
 }
+break;
 case "DIM_SCREEN": {
 mainHandler.post(new Runnable() {
 @Override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.MobileWizard.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b7e835da99b1a32fb74d301a24cfd50076ce3846
Author: Szymon Kłos 
AuthorDate: Thu Dec 12 10:17:44 2019 +0100
Commit: Szymon Kłos 
CommitDate: Thu Dec 12 10:18:07 2019 +0100

jsdialog: request update on mobile wizard show

Change-Id: Ib3f90dfa23107f4f2299d05fbf227870156c54d9

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 912c4602d..2bf3ffc1f 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -58,6 +58,7 @@ L.Control.MobileWizard = L.Control.extend({
_showWizard: function() {
$('#mobile-wizard').show();
$('#toolbar-down').hide();
+   this._refreshSidebar();
},
 
_showWizardSidebar: function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 include/comphelper/propertysequence.hxx |   27 ---
 1 file changed, 12 insertions(+), 15 deletions(-)

New commits:
commit 4a8d3b80283cec4a93dd697eab70afcb82f04f4f
Author: Mike Kaganski 
AuthorDate: Thu Dec 12 09:24:25 2019 +0100
Commit: Mike Kaganski 
CommitDate: Thu Dec 12 10:21:37 2019 +0100

Use std::transform instead of for loop

This simplifies the functions, and avoids repeated non-const operator[] on
sequences, which has significant overhead.

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

diff --git a/include/comphelper/propertysequence.hxx 
b/include/comphelper/propertysequence.hxx
index c384edb2848d..3f9838f9ab8f 100644
--- a/include/comphelper/propertysequence.hxx
+++ b/include/comphelper/propertysequence.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_COMPHELPER_PROPERTYSEQUENCE_HXX
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -23,15 +24,11 @@ namespace comphelper
 ::std::initializer_list< ::std::pair< OUString, css::uno::Any > > 
vInit)
 {
 css::uno::Sequence< css::beans::PropertyValue> 
vResult{static_cast(vInit.size())};
-size_t nCount{0};
-for(const auto& aEntry : vInit)
-{
-vResult[nCount].Name = aEntry.first;
-vResult[nCount].Handle = -1;
-vResult[nCount].Value = aEntry.second;
-// State is default-initialized to DIRECT_VALUE
-++nCount;
-}
+std::transform(vInit.begin(), vInit.end(), vResult.begin(),
+   [](const std::pair& rInit) {
+   return css::beans::PropertyValue(rInit.first, -1, 
rInit.second,
+
css::beans::PropertyState_DIRECT_VALUE);
+   });
 return vResult;
 }
 
@@ -43,12 +40,12 @@ namespace comphelper
 ::std::initializer_list< ::std::pair< OUString, css::uno::Any > > 
vInit)
 {
 css::uno::Sequence 
vResult{static_cast(vInit.size())};
-size_t nCount{0};
-for(const auto& aEntry : vInit)
-{
-vResult[nCount] <<= css::beans::PropertyValue(aEntry.first, -1, 
aEntry.second, css::beans::PropertyState_DIRECT_VALUE);
-++nCount;
-}
+std::transform(vInit.begin(), vInit.end(), vResult.begin(),
+   [](const std::pair& rInit) {
+   return css::uno::Any(
+   css::beans::PropertyValue(rInit.first, -1, 
rInit.second,
+ 
css::beans::PropertyState_DIRECT_VALUE));
+   });
 return vResult;
 }
 }   // namespace comphelper
___
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-0' - 35 commits - android/app android/lib android/README loleaflet/css loleaflet/js loleaflet/Makefile.am loleaflet/src loleaflet/util

[Jan Holesovsky (via logerrit)]

 android/README 
   |5 
 android/app/build.gradle   
   |   15 
 
android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java
  |5 
 android/app/src/main/java/org/libreoffice/androidapp/LocaleHelper.java 
   |   67 -
 android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java 
   |3 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
 |3 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/IDocumentProvider.java
   |2 
 android/app/src/main/java/org/libreoffice/androidapp/storage/IFile.java
   |4 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExternalFile.java
   |   28 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExtsdDocumentsProvider.java
 |5 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/OTGDocumentsProvider.java
   |5 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/local/LocalFile.java
 |2 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
   |   54 -
 
android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudProvider.java
   |8 
 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
|  102 +-
 android/app/src/main/locale/template.pot   
   |  444 ++
 android/app/src/main/res/menu/navigation_menu.xml  
   |6 
 android/app/src/main/res/values-es/strings.xml 
   |  143 +++
 android/app/src/main/res/values-pt-rBR/strings.xml 
   |  143 +++
 android/app/src/main/res/values-tr/strings.xml 
   |  120 ++
 android/app/src/main/res/values/arrays.xml 
   |8 
 android/app/src/main/res/values/strings.xml
   |   26 
 android/app/src/main/res/xml/libreoffice_preferences.xml   
   |9 
 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java   
   |  111 +-
 android/lib/src/main/res/values-es/strings.xml 
   |   10 
 android/lib/src/main/res/values-pt-rBR/strings.xml 
   |   10 
 loleaflet/Makefile.am  
   |8 
 loleaflet/css/leaflet.css  
   |   32 
 loleaflet/js/global.js 
   |9 
 loleaflet/src/control/Control.MobileWizard.js  
   |   21 
 loleaflet/src/control/Control.Scroll.js
   |   16 
 loleaflet/src/control/Control.Toolbar.js   
   |   21 
 loleaflet/src/control/Ruler.js 
   |  180 +++-
 loleaflet/src/layer/tile/TileLayer.js  
   |6 
 loleaflet/src/map/Map.js   
   |6 
 loleaflet/util/create-l10n-all-js.pl   
   |2 
 loolwsd.xml.in 
   |1 
 test/data/convert-to.xlsx  
   |binary
 test/integration-http-server.cpp   
   |   40 
 wsd/DocumentBroker.cpp 
   |   98 ++
 wsd/DocumentBroker.hpp 
   |   21 
 wsd/LOOLWSD.cpp
   |   64 -
 42 files changed, 1513 insertions(+), 350 deletions(-)

New commits:
commit d29504df9b48ff2485559f9ae7d23aa2a4b42412
Author: Jan Holesovsky 
AuthorDate: Thu Dec 12 10:14:34 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 10:18:24 2019 +0100

android: Make all the .uno: commands work again.

Was a problem introduced by c6f36965cfc1bd68fdb88b01d493163b5d176bcc.

Change-Id: I8fbc722e

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

[Tünde Tóth (via logerrit)]

 chart2/qa/extras/chart2import.cxx|   15 ++
 chart2/qa/extras/data/xlsx/deleted_legend_entry.xlsx |binary
 oox/inc/drawingml/chart/titlecontext.hxx |   12 +
 oox/inc/drawingml/chart/titleconverter.hxx   |3 +
 oox/inc/drawingml/chart/titlemodel.hxx   |   17 ++-
 oox/source/drawingml/chart/titlecontext.cxx  |   28 
 oox/source/drawingml/chart/titleconverter.cxx|   44 +++
 oox/source/drawingml/chart/titlemodel.cxx|   10 
 oox/source/token/properties.txt  |1 
 9 files changed, 127 insertions(+), 3 deletions(-)

New commits:
commit cea1ae2a4f7abdcfc3874d714bdafef801910c1c
Author: Tünde Tóth 
AuthorDate: Wed Dec 4 16:17:09 2019 +0100
Commit: László Németh 
CommitDate: Thu Dec 12 10:40:52 2019 +0100

tdf#121991 Chart OOXML import: fix deleted legend entries

The legend showed deleted legend entries too.

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

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index f4bfb53fbf34..be010f3b309f 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -148,6 +148,7 @@ public:
 void testXaxisValues();
 void testTdf123504();
 void testTdf122765();
+void testTdf121991();
 
 CPPUNIT_TEST_SUITE(Chart2ImportTest);
 CPPUNIT_TEST(Fdo60083);
@@ -245,6 +246,7 @@ public:
 CPPUNIT_TEST(testXaxisValues);
 CPPUNIT_TEST(testTdf123504);
 CPPUNIT_TEST(testTdf122765);
+CPPUNIT_TEST(testTdf121991);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2281,6 +2283,19 @@ void Chart2ImportTest::testTdf122765()
 CPPUNIT_ASSERT_GREATER(sal_Int32(7000), aSlicePosition.X);
 }
 
+void Chart2ImportTest::testTdf121991()
+{
+load("/chart2/qa/extras/data/xlsx/", "deleted_legend_entry.xlsx");
+Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, 
mxComponent);
+CPPUNIT_ASSERT(xChartDoc.is());
+Reference xDataSeries(getDataSeriesFromDoc(xChartDoc, 
1));
+CPPUNIT_ASSERT(xDataSeries.is());
+Reference xPropertySet(xDataSeries, 
uno::UNO_QUERY_THROW);
+bool bShowLegendEntry = true;
+CPPUNIT_ASSERT(xPropertySet->getPropertyValue("ShowLegendEntry") >>= 
bShowLegendEntry);
+CPPUNIT_ASSERT(!bShowLegendEntry);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/deleted_legend_entry.xlsx 
b/chart2/qa/extras/data/xlsx/deleted_legend_entry.xlsx
new file mode 100644
index ..06a052646f1e
Binary files /dev/null and 
b/chart2/qa/extras/data/xlsx/deleted_legend_entry.xlsx differ
diff --git a/oox/inc/drawingml/chart/titlecontext.hxx 
b/oox/inc/drawingml/chart/titlecontext.hxx
index 2d52720ef7a4..8538d5ce2e56 100644
--- a/oox/inc/drawingml/chart/titlecontext.hxx
+++ b/oox/inc/drawingml/chart/titlecontext.hxx
@@ -55,6 +55,18 @@ public:
 virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 
nElement, const AttributeList& rAttribs ) override;
 };
 
+struct LegendEntryModel;
+
+/** Handler for a chart legend entry context (c:legendEntry element).
+ */
+class LegendEntryContext : public ContextBase< LegendEntryModel >
+{
+public:
+explicitLegendEntryContext( 
::oox::core::ContextHandler2Helper& rParent, LegendEntryModel& rModel );
+virtual ~LegendEntryContext() override;
+
+virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 
nElement, const AttributeList& rAttribs ) override;
+};
 
 struct LegendModel;
 
diff --git a/oox/inc/drawingml/chart/titleconverter.hxx 
b/oox/inc/drawingml/chart/titleconverter.hxx
index 10f2f000d4aa..40b95d25d193 100644
--- a/oox/inc/drawingml/chart/titleconverter.hxx
+++ b/oox/inc/drawingml/chart/titleconverter.hxx
@@ -90,6 +90,9 @@ public:
 /** Creates a legend object and attaches it at the passed diagram. */
 voidconvertFromModel(
 const css::uno::Reference< css::chart2::XDiagram 
>& rxDiagram );
+
+private:
+voidlegendEntriesFormatting(const 
css::uno::Reference& rxDiagram);
 };
 
 
diff --git a/oox/inc/drawingml/chart/titlemodel.hxx 
b/oox/inc/drawingml/chart/titlemodel.hxx
index dde078443869..f069c7697a60 100644
--- a/oox/inc/drawingml/chart/titlemodel.hxx
+++ b/oox/inc/drawingml/chart/titlemodel.hxx
@@ -57,12 +57,23 @@ struct TitleModel
 ~TitleModel();
 };
 
+struct LegendEntryModel
+{
+sal_Int32   mnLegendEntryIdx;   /// Legend entry index.
+boolmbLabelDeleted; /// True = legend label deleted.
+
+LegendEntryModel();
+~LegendEntryModel();
+};
+
 struct LegendModel
 {
-typedef ModelRef< Shape >   ShapeRef;
-typedef 

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

[Kelemen Gábor (via logerrit)]

 chart2/source/tools/DiagramHelper.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6cdab5c92cecf90090ba72dfa6c22edf0d41028f
Author: Kelemen Gábor 
AuthorDate: Fri Dec 6 11:03:29 2019 +0100
Commit: László Németh 
CommitDate: Thu Dec 12 10:53:51 2019 +0100

tdf#34517 Bring forward/backward in chart series switched

Turns out bringing a data series forward means its index
is increased while bringing backwards means decreasing it.

Since the bool MOVE_SERIES_FORWARD is defined as true in
ControllerCommandDispatch.cxx the condition here meant that
bringing forward decreased the index and MOVE_SERIES_BACKWARD
as false meant that bringing backward increased the index.

Now the commands do the expected series order change.

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

diff --git a/chart2/source/tools/DiagramHelper.cxx 
b/chart2/source/tools/DiagramHelper.cxx
index 22ddfb27acd5..14d8126625ae 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1328,7 +1328,8 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed(
 {
 sal_Int32 nNewSeriesIndex = nS;
 
-if( bForward )
+// tdf#34517 Bringing forward means 
increasing, backwards means decreasing series position
+if( !bForward )
 nNewSeriesIndex--;
 else
 nNewSeriesIndex++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 sfx2/source/view/lokhelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d32be257ca011316281edf2752564a421e3747a3
Author: Szymon Kłos 
AuthorDate: Thu Dec 12 09:34:54 2019 +0100
Commit: Szymon Kłos 
CommitDate: Thu Dec 12 10:58:49 2019 +0100

Use INVALID_POOL_ITEM instead of magic number

Change-Id: I44fdc602563164944bee40848b13de0c0c62e4f7
Reviewed-on: https://gerrit.libreoffice.org/85019
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 181d0b385cae..4670bd098663 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -212,7 +212,7 @@ namespace {
 
 void SfxLokHelper::sendUnoStatus(const SfxViewShell* pShell, const 
SfxPoolItem* pItem)
 {
-if (!pShell || !pItem || pItem == reinterpret_cast(-1))
+if (!pShell || !pItem || pItem == INVALID_POOL_ITEM)
 return;
 
 boost::property_tree::ptree aItem = pItem->dumpAsJSON();
___
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-0' - .gitreview

[Jan Holesovsky (via logerrit)]

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

New commits:
commit b41fc7f23ecf12e194faab05795ee267e1728359
Author: Jan Holesovsky 
AuthorDate: Thu Dec 12 10:59:51 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 11:01:42 2019 +0100

[cp] Update the .gitreview for this branch.

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

diff --git a/.gitreview b/.gitreview
index 6907d1470..4272a7279 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
 port=29418
 project=online
 defaultremote=logerrit
-defaultbranch=master
+defaultbranch=distro/collabora/co-4-2-0
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/skia vcl/skia

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

 download.lst|4 
 external/skia/Library_skia.mk   |9 
 external/skia/README|4 
 external/skia/UnpackedTarball_skia.mk   |4 
 external/skia/fix-alpha-difference-copy.patch.1 |6 
 external/skia/fix-msvc.patch.1  |   22 +
 external/skia/fix-pch.patch.1   |  120 ---
 external/skia/fix-shader-locale.patch.1 |   40 --
 external/skia/inc/pch/precompiled_skia.hxx  |   16 
 external/skia/share-grcontext.patch.1   |  387 
 vcl/skia/gdiimpl.cxx|   12 
 11 files changed, 317 insertions(+), 307 deletions(-)

New commits:
commit 23b3de0b9a6cb69ed258905effa096ce5d5f1f13
Author: Luboš Luňák 
AuthorDate: Fri Dec 6 12:26:00 2019 +0100
Commit: Luboš Luňák 
CommitDate: Thu Dec 12 11:01:41 2019 +0100

update Skia to chrome/m80

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

diff --git a/download.lst b/download.lst
index 000e349ee3f8..fdd0b866c373 100644
--- a/download.lst
+++ b/download.lst
@@ -229,8 +229,8 @@ export RHINO_SHA256SUM := 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 export SERF_SHA256SUM := 
6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
 export SERF_TARBALL := serf-1.2.1.tar.bz2
-export SKIA_SHA256SUM := 
160cd0275fc47b3374ed998fe30aa9e97e032eeb7cded53f57c5b80165e3f657
-export SKIA_TARBALL := skia-m79-0df7697235b4a02cd6dd6fa2a783345add40cbad.tar.xz
+export SKIA_SHA256SUM := 
f1b3be9d9468c20a84fa21aea44b19daa48bca8fd2c7f9ea6fe76d6e31f54530
+export SKIA_TARBALL := skia-m80-0af13b3caf0384981f50e073ebc7bd0f3f751711.tar.xz
 export STAROFFICE_SHA256SUM := 
6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4
 export STAROFFICE_VERSION_MICRO := 6
 export STAROFFICE_TARBALL := 
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 2fe24876b499..ecebc4a4fe14 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -90,7 +90,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/codec/SkCodecImageGenerator \
 UnpackedTarball/skia/src/codec/SkColorTable \
 UnpackedTarball/skia/src/codec/SkEncodedInfo \
-UnpackedTarball/skia/src/codec/SkGifCodec \
 UnpackedTarball/skia/src/codec/SkIcoCodec \
 UnpackedTarball/skia/src/codec/SkJpegCodec \
 UnpackedTarball/skia/src/codec/SkJpegDecoderMgr \
@@ -167,6 +166,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkExecutor \
 UnpackedTarball/skia/src/core/SkFlattenable \
 UnpackedTarball/skia/src/core/SkFont \
+UnpackedTarball/skia/src/core/SkFont_serial \
 UnpackedTarball/skia/src/core/SkFontDescriptor \
 UnpackedTarball/skia/src/core/SkFontLCDConfig \
 UnpackedTarball/skia/src/core/SkFontMgr \
@@ -190,6 +190,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkLatticeIter \
 UnpackedTarball/skia/src/core/SkLineClipper \
 UnpackedTarball/skia/src/core/SkLocalMatrixImageFilter \
+UnpackedTarball/skia/src/core/SkMalloc \
 UnpackedTarball/skia/src/core/SkMallocPixelRef \
 UnpackedTarball/skia/src/core/SkMaskBlurFilter \
 UnpackedTarball/skia/src/core/SkMaskCache \
@@ -204,7 +205,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkMiniRecorder \
 UnpackedTarball/skia/src/core/SkMipMap \
 UnpackedTarball/skia/src/core/SkModeColorFilter \
-UnpackedTarball/skia/src/core/SkMultiPictureDraw \
 UnpackedTarball/skia/src/core/SkNormalFlatSource \
 UnpackedTarball/skia/src/core/SkNormalMapSource \
 UnpackedTarball/skia/src/core/SkNormalSource \
@@ -277,6 +277,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkSwizzle \
 UnpackedTarball/skia/src/core/SkTaskGroup \
 UnpackedTarball/skia/src/core/SkTextBlob \
+UnpackedTarball/skia/src/core/SkTextBlobTrace \
 UnpackedTarball/skia/src/core/SkThreadID \
 UnpackedTarball/skia/src/core/SkTime \
 UnpackedTarball/skia/src/core/SkTLS \
@@ -520,12 +521,14 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/gpu/effects/generated/GrConfigConversionEffect \
 UnpackedTarball/skia/src/gpu/effects/generated/GrConstColorProcessor \
 UnpackedTarball/skia/src/gpu/effects/generated/GrEllipseEffect \
+UnpackedTarball/skia/src/gpu/effects/generated/GrHSLToRGBFilterEffect \
 UnpackedTarball/skia/src/gpu/effects/generated/GrLumaColorFilterEffect \
 UnpackedTarball/skia/sr

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

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

 vcl/inc/opengl/win/gdiimpl.hxx |6 ++--
 vcl/inc/skia/utils.hxx |6 ++--
 vcl/inc/skia/win/gdiimpl.hxx   |7 ++---
 vcl/inc/win/salgdi.h   |2 -
 vcl/opengl/win/gdiimpl.cxx |6 ++--
 vcl/skia/win/gdiimpl.cxx   |   55 -
 6 files changed, 63 insertions(+), 19 deletions(-)

New commits:
commit e2c34ce3feac29e12ff47957eb8efcb6ad303709
Author: Luboš Luňák 
AuthorDate: Wed Dec 11 14:18:00 2019 +0100
Commit: Luboš Luňák 
CommitDate: Thu Dec 12 11:02:04 2019 +0100

make Skia Windows widget drawing use correct alpha (tdf#129074)

The OpenGL code made the widget drawing use two variants drawn
on black and on white, for reasons not explained
in 3149cc341b1866d215110f0783227549a99b5920 (probably the Windows
API doesn't handle alpha completely correctly or whatever).
This means that getting the actual alpha requires a custom
algorithm that needs to be implemented manually for Skia use.

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

diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index 91e55a2ca28f..dff47ef7e550 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -26,12 +26,12 @@ class OpenGLCompatibleDC : public CompatibleDC
 public:
 OpenGLCompatibleDC(SalGraphics &rGraphics, int x, int y, int width, int 
height);
 
-virtual std::unique_ptr getAsMaskTexture() override;
+virtual std::unique_ptr getAsMaskTexture() const override;
 // caller must delete
-OpenGLTexture* getOpenGLTexture();
+OpenGLTexture* getOpenGLTexture() const;
 
 /// Copy bitmap data to the texture. Texture must be initialized and the 
correct size to hold the bitmap.
-bool copyToTexture(Texture& aTexture);
+bool copyToTexture(Texture& aTexture) const;
 
 struct Texture;
 };
diff --git a/vcl/inc/skia/utils.hxx b/vcl/inc/skia/utils.hxx
index 27ca2b1f0b72..6fd61afd0a05 100644
--- a/vcl/inc/skia/utils.hxx
+++ b/vcl/inc/skia/utils.hxx
@@ -44,9 +44,9 @@ inline sk_sp createSkSurface(const Size& size, 
SkColorType type = kN3
 
 #ifdef DBG_UTIL
 void prefillSurface(sk_sp& surface);
-void dump(const SkBitmap& bitmap, const char* file);
-void dump(const sk_sp& image, const char* file);
-void dump(const sk_sp& surface, const char* file);
+VCL_DLLPUBLIC void dump(const SkBitmap& bitmap, const char* file);
+VCL_DLLPUBLIC void dump(const sk_sp& image, const char* file);
+VCL_DLLPUBLIC void dump(const sk_sp& surface, const char* file);
 #endif
 
 } // namespace
diff --git a/vcl/inc/skia/win/gdiimpl.hxx b/vcl/inc/skia/win/gdiimpl.hxx
index 003fac2cc65b..dabd56ad04a3 100644
--- a/vcl/inc/skia/win/gdiimpl.hxx
+++ b/vcl/inc/skia/win/gdiimpl.hxx
@@ -27,12 +27,13 @@ class SkiaCompatibleDC : public CompatibleDC
 public:
 SkiaCompatibleDC(SalGraphics& rGraphics, int x, int y, int width, int 
height);
 
-virtual std::unique_ptr getAsMaskTexture() override;
+virtual std::unique_ptr getAsMaskTexture() const override;
 
 virtual bool wantsTextColorWhite() const override { return true; }
 
-sk_sp getAsImage();
-sk_sp getAsMaskImage();
+sk_sp getAsImage() const;
+sk_sp getAsMaskImage() const;
+sk_sp getAsImageDiff(const SkiaCompatibleDC& other) const;
 
 struct Texture;
 };
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index eb0d428cc77f..15866800b8f4 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -140,7 +140,7 @@ public:
 struct Texture;
 
 /// Obtain the texture in format for 
WinSalGraphicsImplBase::DrawTextMask().
-virtual std::unique_ptr getAsMaskTexture() { abort(); };
+virtual std::unique_ptr getAsMaskTexture() const { abort(); };
 
 /// Return true if text glyphs should be drawn as white instead of black.
 virtual bool wantsTextColorWhite() const { return false; }
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index d736cfc08972..eabfe8a090b3 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -769,7 +769,7 @@ OpenGLCompatibleDC::OpenGLCompatibleDC(SalGraphics 
&rGraphics, int x, int y, int
 {
 }
 
-OpenGLTexture* OpenGLCompatibleDC::getOpenGLTexture()
+OpenGLTexture* OpenGLCompatibleDC::getOpenGLTexture() const
 {
 if (!mpImpl)
 return nullptr;
@@ -778,14 +778,14 @@ OpenGLTexture* OpenGLCompatibleDC::getOpenGLTexture()
 return new OpenGLTexture(maRects.mnSrcWidth, maRects.mnSrcHeight, GL_BGRA, 
GL_UNSIGNED_BYTE, mpData);
 }
 
-std::unique_ptr OpenGLCompatibleDC::getAsMaskTexture()
+std::unique_ptr OpenGLCompatibleDC::getAsMaskTexture() 
const
 {
 auto ret = std::make_unique();
 ret->texture = OpenGLTexture(maRects.mnSrcWidth, maRects.mnSrcHeight, 
GL_BGRA, GL_UNSIGNED_BYTE, mpData);
 return ret;
 }
 
-bool OpenGLCompatibleDC::copyToTexture(CompatibleDC::Texture& aTexture

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.MobileWizard.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 05ae02cde9c2643e13f5f5b6ef2d00b457094cb5
Author: Szymon Kłos 
AuthorDate: Thu Dec 12 10:17:44 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 11:03:56 2019 +0100

jsdialog: request update on mobile wizard show

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

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 912c4602d..2bf3ffc1f 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -58,6 +58,7 @@ L.Control.MobileWizard = L.Control.extend({
_showWizard: function() {
$('#mobile-wizard').show();
$('#toolbar-down').hide();
+   this._refreshSidebar();
},
 
_showWizardSidebar: function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti (via logerrit)]

 loleaflet/src/core/Socket.js |   52 ++-
 1 file changed, 51 insertions(+), 1 deletion(-)

New commits:
commit c4d27a2b8d5f7ebaacb701f18ac5278e0ce5ca14
Author: Marco Cecchetti 
AuthorDate: Thu Dec 12 10:50:19 2019 +0100
Commit: Marco Cecchetti 
CommitDate: Thu Dec 12 11:09:19 2019 +0100

try to delay incoming messages when the js bundle is not yet loaded

Incoming message are stored and handled as soon as the js bundle is
loaded and the ui is ready.
At present this solution has been selectively enabled for the
following types of incoming messages: 'window', 'statechanged',
'celladdress'.

Change-Id: I22e98ff11c67140deb639295273be9533560536b
Reviewed-on: https://gerrit.libreoffice.org/85028
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index cdeeefe16..38c175d57 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -22,6 +22,8 @@ L.Socket = L.Class.extend({
console.debug('socket.initialize:');
this._map = map;
this._msgQueue = [];
+   this._delayedMessages = [];
+   this._handlingDelayedMessages = false;
},
 
getWebSocketBaseURI: function(map) {
@@ -817,11 +819,59 @@ L.Socket = L.Class.extend({
return;
}
 
-   if (this._map._docLayer) {
+   var msgDelayed = false;
+   if (!this._isReady() || this._delayedMessages.length || 
this._handlingDelayedMessages) {
+   msgDelayed = this._tryToDelayMessage(textMsg);
+   }
+
+   if (this._map._docLayer && !msgDelayed) {
this._map._docLayer._onMessage(textMsg, img);
}
},
 
+   _tryToDelayMessage: function(textMsg) {
+   var delayed = false;
+   if (textMsg.startsWith('window:') ||
+   textMsg.startsWith('celladdress:') ||
+   textMsg.startsWith('statechanged:')) {
+   //console.log('_tryToDelayMessage: textMsg: ' + 
textMsg);
+   var message = {msg: textMsg};
+   this._delayedMessages.push(message);
+   delayed  = true;
+   }
+
+   if (delayed && !this._delayedMsgHandlerTimeoutId) {
+   this._handleDelayedMessages();
+   }
+   return delayed;
+   },
+
+   _handleDelayedMessages: function() {
+   if (!this._isReady() || this._handlingDelayedMessages) {
+   var that = this;
+   // Retry in a bit.
+   this._delayedMsgHandlerTimeoutId = 
setTimeout(function() {
+   that._handleDelayedMessages();
+   }, 100);
+   return;
+   }
+   var messages = [];
+   for (var i = 0; i < this._delayedMessages.length; ++i) {
+   var message = this._delayedMessages[i];
+   if (message)
+   messages.push(message.msg);
+   }
+   this._delayedMessages = [];
+   this._delayedMsgHandlerTimeoutId = null;
+   this._handlingDelayedMessages = true;
+   if (this._map._docLayer) {
+   for (var k = 0; k < messages.length; ++k) {
+   this._map._docLayer._onMessage(messages[k]);
+   }
+   }
+   this._handlingDelayedMessages = false;
+   },
+
_delayedFitToScreen: function(height) {
if (this._map.getSize().y > 0) {
// If we have a presentation document and the zoom 
level has not been set
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti (via logerrit)]

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

New commits:
commit f65a76f2cfd74a5b3e8cfb4edb24bc271600d7c5
Author: Marco Cecchetti 
AuthorDate: Thu Dec 12 10:55:28 2019 +0100
Commit: Marco Cecchetti 
CommitDate: Thu Dec 12 11:09:36 2019 +0100

calc: tunneled formula bar: skip painting when width is wrong.

In the hope of minimizing flikering effects we skip to paint the
formula bar when the size is not the expected one, on the contrary we
send a resize request with the correct width to the lok core.

We also skip to adjust/resize the formula bar when a sidebar resize
not really change the sidebar width.

Change-Id: I11d343b2ba722f96d3cdba6a2dfb66d85a071c5f
Reviewed-on: https://gerrit.libreoffice.org/85029
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 997fb9aac..7ac61c241 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -945,7 +945,6 @@ L.Control.LokDialog = L.Control.extend({
},
 
_paintDialog: function(parentId, rectangle, imgData) {
-
var strId = this._toStrId(parentId);
var canvas = document.getElementById(strId + '-canvas');
if (!canvas)
@@ -967,6 +966,7 @@ L.Control.LokDialog = L.Control.extend({
 
// Sidebars find out their size and become visible on 
first paint.
if (that._isSidebar(parentId)) {
+   //console.log('_paintDialog: side-bar: width: ' 
+ that._currentDeck.width);
that._resizeSidebar(strId, 
that._currentDeck.width);
 
// Update the underlying canvas.
@@ -974,38 +974,42 @@ L.Control.LokDialog = L.Control.extend({
that._setCanvasWidthHeight(panelCanvas, 
that._currentDeck.width, that._currentDeck.height);
}
 
+   // calc input bar find out their size on first paint 
call
var isCalcInputBar = that._isCalcInputBar(parentId);
-   if (isCalcInputBar) {
-   var canvas = 
L.DomUtil.get(that._calcInputBar.strId + '-canvas');
-   that._setCanvasWidthHeight(canvas, 
that._calcInputBar.width, that._calcInputBar.height);
-   }
-
-   ctx.drawImage(img, x, y);
-
-   // if dialog is hidden, show it
var container = L.DomUtil.get(strId);
-   if (container)
-   $(container).parent().show();
-   if (parentId in that._dialogs) {
-   // We might have closed the dialog by the time 
we render.
-   that.focus(parentId);
-   that._dialogs[parentId].isPainting = false;
-   }
-
if (isCalcInputBar && container) {
+   //console.log('_paintDialog: calc input bar: 
width: ' + that._calcInputBar.width);
+   var canvas = 
L.DomUtil.get(that._calcInputBar.strId + '-canvas');
+   that._setCanvasWidthHeight(canvas, 
that._calcInputBar.width, that._calcInputBar.height);
+   $(container).parent().show(); // show or width 
is 0
var deckOffset = 0;
if (that._currentDeck) {
var sidebar = 
L.DomUtil.get(that._currentDeck.strId);
if (sidebar) {
-   deckOffset = sidebar.width;
+   deckOffset = 
sidebar.clientWidth;
}
}
var correctWidth = container.clientWidth - 
deckOffset;
+   // resize the input bar to the correct size
+   // the input bar is rendered only if when the 
size is the expected one
if (that._calcInputBar.width !== correctWidth) {
console.log('_paintDialog: correct 
width: ' + correctWidth + ', _calcInputBar width: ' + that._calcInputBar.width);
+   that._dialogs[parentId].isPainting = 
false;

that._map._socket.sendMessage('resizewindow ' + parentId + ' size=' + 
correctWidth + ',' + that._calcInputBar.height);
+   return;
}
   

Re: Help with a great Application

[Ilmari Lauhakangas]

Mike Sydwest kirjoitti 11.12.2019 klo 7.04:

Hi LibreOffice

  I am not trying to get free advertising here, actually we are in lot 
of trouble because our developer has run off and left us in a mess.


  The Application we have built is based on LibreOffice open source code.

The App is called Enriched Digital Writer - Windows, 
https://www.enriched.online/template-category/products/software-applications/


The application is for many user, as we are trying to help user with 
small PC skill to record their life history and many other things, I 
have put two years of my time into this great project.


The code is in Gitlab - we can give anyone access at any time, this is 
where dev suggested to keep it.


What we desperately need is help to get back on track, not advertising.

Please advise and hopefully show some interest in this industry of 
Ancestry and family recording and Genealogy


If you want me to push the code to somewhere else I can try to do this.

I look forward to your help if at all possible -

Michael Wilkinson

PS I am not a technical person please try to understand that.


I suggest you

1) make the GitLab instance public, so there is no need to give people 
access upon request
2) link to the GitLab instance on your website, so your users understand 
the source code is available as it should be
3) contract a certified developer to work on your product: 
https://www.documentfoundation.org/gethelp/developers/


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

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

[Marco Cecchetti (via logerrit)]

 loleaflet/src/core/Socket.js |   52 ++-
 1 file changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 43807db18001cdd92dedce4f735e19bf53316b78
Author: Marco Cecchetti 
AuthorDate: Thu Dec 12 10:50:19 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 11:28:44 2019 +0100

try to delay incoming messages when the js bundle is not yet loaded

Incoming message are stored and handled as soon as the js bundle is
loaded and the ui is ready.
At present this solution has been selectively enabled for the
following types of incoming messages: 'window', 'statechanged',
'celladdress'.

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

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index cdeeefe16..38c175d57 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -22,6 +22,8 @@ L.Socket = L.Class.extend({
console.debug('socket.initialize:');
this._map = map;
this._msgQueue = [];
+   this._delayedMessages = [];
+   this._handlingDelayedMessages = false;
},
 
getWebSocketBaseURI: function(map) {
@@ -817,11 +819,59 @@ L.Socket = L.Class.extend({
return;
}
 
-   if (this._map._docLayer) {
+   var msgDelayed = false;
+   if (!this._isReady() || this._delayedMessages.length || 
this._handlingDelayedMessages) {
+   msgDelayed = this._tryToDelayMessage(textMsg);
+   }
+
+   if (this._map._docLayer && !msgDelayed) {
this._map._docLayer._onMessage(textMsg, img);
}
},
 
+   _tryToDelayMessage: function(textMsg) {
+   var delayed = false;
+   if (textMsg.startsWith('window:') ||
+   textMsg.startsWith('celladdress:') ||
+   textMsg.startsWith('statechanged:')) {
+   //console.log('_tryToDelayMessage: textMsg: ' + 
textMsg);
+   var message = {msg: textMsg};
+   this._delayedMessages.push(message);
+   delayed  = true;
+   }
+
+   if (delayed && !this._delayedMsgHandlerTimeoutId) {
+   this._handleDelayedMessages();
+   }
+   return delayed;
+   },
+
+   _handleDelayedMessages: function() {
+   if (!this._isReady() || this._handlingDelayedMessages) {
+   var that = this;
+   // Retry in a bit.
+   this._delayedMsgHandlerTimeoutId = 
setTimeout(function() {
+   that._handleDelayedMessages();
+   }, 100);
+   return;
+   }
+   var messages = [];
+   for (var i = 0; i < this._delayedMessages.length; ++i) {
+   var message = this._delayedMessages[i];
+   if (message)
+   messages.push(message.msg);
+   }
+   this._delayedMessages = [];
+   this._delayedMsgHandlerTimeoutId = null;
+   this._handlingDelayedMessages = true;
+   if (this._map._docLayer) {
+   for (var k = 0; k < messages.length; ++k) {
+   this._map._docLayer._onMessage(messages[k]);
+   }
+   }
+   this._handlingDelayedMessages = false;
+   },
+
_delayedFitToScreen: function(height) {
if (this._map.getSize().y > 0) {
// If we have a presentation document and the zoom 
level has not been set
___
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-0' - loleaflet/src

[Marco Cecchetti (via logerrit)]

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

New commits:
commit a63c016215be2bdb87b3fb40be7f357eb883e2a5
Author: Marco Cecchetti 
AuthorDate: Thu Dec 12 10:55:28 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 11:31:50 2019 +0100

calc: tunneled formula bar: skip painting when width is wrong.

In the hope of minimizing flikering effects we skip to paint the
formula bar when the size is not the expected one, on the contrary we
send a resize request with the correct width to the lok core.

We also skip to adjust/resize the formula bar when a sidebar resize
not really change the sidebar width.

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

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 997fb9aac..7ac61c241 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -945,7 +945,6 @@ L.Control.LokDialog = L.Control.extend({
},
 
_paintDialog: function(parentId, rectangle, imgData) {
-
var strId = this._toStrId(parentId);
var canvas = document.getElementById(strId + '-canvas');
if (!canvas)
@@ -967,6 +966,7 @@ L.Control.LokDialog = L.Control.extend({
 
// Sidebars find out their size and become visible on 
first paint.
if (that._isSidebar(parentId)) {
+   //console.log('_paintDialog: side-bar: width: ' 
+ that._currentDeck.width);
that._resizeSidebar(strId, 
that._currentDeck.width);
 
// Update the underlying canvas.
@@ -974,38 +974,42 @@ L.Control.LokDialog = L.Control.extend({
that._setCanvasWidthHeight(panelCanvas, 
that._currentDeck.width, that._currentDeck.height);
}
 
+   // calc input bar find out their size on first paint 
call
var isCalcInputBar = that._isCalcInputBar(parentId);
-   if (isCalcInputBar) {
-   var canvas = 
L.DomUtil.get(that._calcInputBar.strId + '-canvas');
-   that._setCanvasWidthHeight(canvas, 
that._calcInputBar.width, that._calcInputBar.height);
-   }
-
-   ctx.drawImage(img, x, y);
-
-   // if dialog is hidden, show it
var container = L.DomUtil.get(strId);
-   if (container)
-   $(container).parent().show();
-   if (parentId in that._dialogs) {
-   // We might have closed the dialog by the time 
we render.
-   that.focus(parentId);
-   that._dialogs[parentId].isPainting = false;
-   }
-
if (isCalcInputBar && container) {
+   //console.log('_paintDialog: calc input bar: 
width: ' + that._calcInputBar.width);
+   var canvas = 
L.DomUtil.get(that._calcInputBar.strId + '-canvas');
+   that._setCanvasWidthHeight(canvas, 
that._calcInputBar.width, that._calcInputBar.height);
+   $(container).parent().show(); // show or width 
is 0
var deckOffset = 0;
if (that._currentDeck) {
var sidebar = 
L.DomUtil.get(that._currentDeck.strId);
if (sidebar) {
-   deckOffset = sidebar.width;
+   deckOffset = 
sidebar.clientWidth;
}
}
var correctWidth = container.clientWidth - 
deckOffset;
+   // resize the input bar to the correct size
+   // the input bar is rendered only if when the 
size is the expected one
if (that._calcInputBar.width !== correctWidth) {
console.log('_paintDialog: correct 
width: ' + correctWidth + ', _calcInputBar width: ' + that._calcInputBar.width);
+   that._dialogs[parentId].isPainting = 
false;

that._map._socket.sendMessage('resizewindow ' + parentId + ' size=' + 
correctWidth + ',' + that._calcInputBar.height);
+   return;
}
  

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/map/handler/Map.Mouse.js |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2da5586a360a4068c385a5c3edc4dc28fa2d06b9
Author: Szymon Kłos 
AuthorDate: Thu Dec 12 11:32:12 2019 +0100
Commit: Szymon Kłos 
CommitDate: Thu Dec 12 11:35:07 2019 +0100

Prevent fake doubleclick detection on Background color applying

When selecting the highlight for a text only some attempts
were successful because of detection the mouseup event two times
in a short period of time (0-1 ms).

Change-Id: Iafba078edbc4442921dc00b58829c5dbf4c2ed74

diff --git a/loleaflet/src/map/handler/Map.Mouse.js 
b/loleaflet/src/map/handler/Map.Mouse.js
index e18fc6ad5..21b884366 100644
--- a/loleaflet/src/map/handler/Map.Mouse.js
+++ b/loleaflet/src/map/handler/Map.Mouse.js
@@ -117,7 +117,8 @@ L.Map.Mouse = L.Handler.extend({
}
clearTimeout(this._holdMouseEvent);
this._holdMouseEvent = null;
-   if (this._clickTime && Date.now() - this._clickTime <= 
250) {
+   var timeDiff = Date.now() - this._clickTime;
+   if (this._clickTime && timeDiff > 1 && timeDiff <= 250) 
{
// double click, a click was sent already
this._mouseEventsQueue = [];
this._clickCount++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2export.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit c0e035647a7178d642f6c19ef279bdd29bd423db
Author: Balazs Varga 
AuthorDate: Wed Dec 11 21:17:14 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 11:54:22 2019 +0100

Unit test clean-up for testAxisTitlePositionDOCX

Related commit: 9ff954d5f780cae5df6942e97b713cfc19449145
(tdf#127908 tdf#128193 Chart OOXML: Fix Custom Y axis title position)

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 1645c1c1d1ae..181645b437e3 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -2023,18 +2023,19 @@ void Chart2ExportTest::testAxisTitlePositionDOCX()
 // test X Axis title position
 OUString aXVal = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:title/c:layout/c:manualLayout/c:x", 
"val");
 double nX = aXVal.toDouble();
-CPPUNIT_ASSERT(nX > 0.698208 && nX < 0.698209);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(0.698208543867708, nX, 1e-7);
 OUString aYVal = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:title/c:layout/c:manualLayout/c:y", 
"val");
 double nY = aYVal.toDouble();
-CPPUNIT_ASSERT(nY > 0.805152 && nY < 0.805153);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(0.805152435594555, nY, 1e-7);
 
 // test Y Axis title position
 aXVal = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:layout/c:manualLayout/c:x", 
"val");
 nX = aXVal.toDouble();
-CPPUNIT_ASSERT(nX > 0.025395 && nX < 0.025396);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0253953671500755, nX, 1e-7);
 aYVal = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:layout/c:manualLayout/c:y", 
"val");
 nY = aYVal.toDouble();
-CPPUNIT_ASSERT(nY > 0.384407 && nY < 0.384408);
+// just test the first two decimal digits because it is not perfect in 
docx yet.
+CPPUNIT_ASSERT_DOUBLES_EQUAL(0.384070199122511, nY, 1e-2);
 }
 
 void Chart2ExportTest::testAxisCrossBetweenXSLX()
___
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' - filter/source

[Jan-Marek Glogowski (via logerrit)]

 filter/source/pdf/impdialog.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0d1d0e1a68ce2a48efb7b318e8e01c92361d6b78
Author: Jan-Marek Glogowski 
AuthorDate: Wed Dec 11 19:14:31 2019 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Dec 12 12:15:21 2019 +0100

tdf#127493 store ExportFormFields checkbox value

... and also correctly set the initial frames sensitivity.

The commit removed the no longer needed UserSelection variant of
mbExportFormFields but forgit to actually set it now.

Regression from my commit 76fcd878da1624e73f1eb9d9405485d4faf66edf.

Change-Id: Ia5fcc1c37e2e4b4a330b59a492f817d2db8d7347
Reviewed-on: https://gerrit.libreoffice.org/84975
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit b06cba8f13e0b71346cb884cf827751f2086fd8e)
Reviewed-on: https://gerrit.libreoffice.org/85036
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 1b0e8c327964..60495f90ec65 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -574,6 +574,7 @@ void 
ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
 
 mxLbFormsFormat->set_active(static_cast(pParent->mnFormsType));
 mxCbAllowDuplicateFieldNames->set_active( 
pParent->mbAllowDuplicateFieldNames );
+mxFormsFrame->set_sensitive(pParent->mbExportFormFields);
 
 mxCbExportBookmarks->set_active( pParent->mbExportBookmarks );
 
@@ -688,6 +689,7 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( 
ImpPDFTabDialog* pParent )
 else
 mbUseTaggedPDFUserSelection = pParent->mbUseTaggedPDF;
 pParent->mbUseTaggedPDFUserSelection = mbUseTaggedPDFUserSelection;
+pParent->mbExportFormFields = mxCbExportFormFields->get_active();
 
 if( mxCbWatermark->get_active() )
 pParent->maWatermarkText = mxEdWatermark->get_text();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

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

New commits:
commit 6fe5ac162c76a252fa385cea1418f102007d64a4
Author: Szymon Kłos 
AuthorDate: Thu Dec 12 12:27:01 2019 +0100
Commit: Szymon Kłos 
CommitDate: Thu Dec 12 12:27:03 2019 +0100

jsdialog: double Sidebar call in Inplace mode

To activate Sidebar in Chart activated context.

Change-Id: I4579f01e45d0b56bdee32f649498820c404cd5a9

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index a068c3af9..7c5586c3f 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -349,6 +349,8 @@ function onClick(e, id, item, subItem) {
if (!map._sidebarVisible) {
map._sidebarVisible = true;
map.sendUnoCommand('.uno:Sidebar');
+   if (map.hasObjectFocusDarkOverlay())
+   map.sendUnoCommand('.uno:Sidebar');
} else {
// As the sidebar LOKWindowId can and does 
change,
// esp. between chart and other elements, we 
apparently
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: android/app

[Andras Timar (via logerrit)]

 android/app/src/main/locale/template.pot |  444 ---
 1 file changed, 444 deletions(-)

New commits:
commit 859c75037ea9534dd525476615ffbf737df82bea
Author: Andras Timar 
AuthorDate: Thu Dec 12 12:49:08 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 12 12:49:54 2019 +0100

Revert "android: add pot file for localization"

We'll use Weblate and it handles strings.xml directly

This reverts commit d6e55afc4b1238a8f2baf0f80c6d827ffccfe634.

Change-Id: I44ced10d7da37feffdd222a9a63a33545362b306

diff --git a/android/app/src/main/locale/template.pot 
b/android/app/src/main/locale/template.pot
deleted file mode 100644
index 336305881..0
--- a/android/app/src/main/locale/template.pot
+++ /dev/null
@@ -1,444 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2019.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-11 11:07+\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.7.0\n"
-
-#. string name="app_name" definition is deliberately missing here, it is filled
-#. in in build.gradle.
-msgctxt "app_name_settings"
-msgid "Settings"
-msgstr ""
-
-#, c-format
-msgctxt "app_version"
-msgid "Version: %1$s, Build ID: %2$s"
-msgstr ""
-
-msgctxt "app_description"
-msgid ""
-"$APP_NAME is a modern, easy-to-use, open source productivity suite for "
-"word processing, spreadsheets, presentations and more."
-msgstr ""
-
-msgctxt "app_vendor"
-msgid "This release was supplied by $VENDOR."
-msgstr ""
-
-msgctxt "no_recent_items"
-msgid "No recent items"
-msgstr ""
-
-msgctxt "no_items"
-msgid "No items"
-msgstr ""
-
-msgctxt "temp_file_saving_disabled"
-msgid "This file is read-only, saving is disabled."
-msgstr ""
-
-msgctxt "file_exists_warning"
-msgid "A file with this name already exists, and will be overwritten."
-msgstr ""
-
-msgctxt "file_creation_failed"
-msgid "File creation failed"
-msgstr ""
-
-msgctxt "storage_permission_required"
-msgid "Storage permission is required"
-msgstr ""
-
-msgctxt "failed_to_load_file"
-msgid "Failed to determine the file to load"
-msgstr ""
-
-msgctxt "list_view"
-msgid "List"
-msgstr ""
-
-msgctxt "grid_view"
-msgid "Grid"
-msgstr ""
-
-msgctxt "pref_category_explorer"
-msgid "File Explorer Settings"
-msgstr ""
-
-msgctxt "pref_show_hidden_files"
-msgid "Hidden Files/Folders"
-msgstr ""
-
-msgctxt "pref_show_hidden_files_summary"
-msgid "Enable to show hidden files/folders"
-msgstr ""
-
-msgctxt "pref_sort_summary"
-msgid "Select how to order files: A-Z, by size or by date."
-msgstr ""
-
-msgctxt "pref_viewmode_summary"
-msgid "View files as a grid or in a list."
-msgstr ""
-
-msgctxt "pref_file_explorer_title"
-msgid "File explorer layout"
-msgstr ""
-
-msgctxt "pref_sort_title"
-msgid "File Order"
-msgstr ""
-
-msgctxt "pref_filter_title"
-msgid "Default File Filter"
-msgstr ""
-
-msgctxt "pref_filter_summary"
-msgid "Set which file filter should be used by default."
-msgstr ""
-
-msgctxt "display_language"
-msgid "Display Language"
-msgstr ""
-
-msgctxt "display_language_summary"
-msgid "Set the default display language"
-msgstr ""
-
-msgctxt "pref_show_debug_info"
-msgid "Show Debug Info"
-msgstr ""
-
-msgctxt "pref_show_debug_info_summary"
-msgid "Enable to show debug information in document viewer"
-msgstr ""
-
-msgctxt "about_license"
-msgid "Show License"
-msgstr ""
-
-msgctxt "about_notice"
-msgid "Show Notice"
-msgstr ""
-
-msgctxt "about_moreinfo"
-msgid "More Info"
-msgstr ""
-
-msgctxt "new_textdocument"
-msgid "New Text Document"
-msgstr ""
-
-msgctxt "new_presentation"
-msgid "New Presentation"
-msgstr ""
-
-msgctxt "new_spreadsheet"
-msgid "New Spreadsheet"
-msgstr ""
-
-msgctxt "new_drawing"
-msgid "New Drawing"
-msgstr ""
-
-msgctxt "default_document_name"
-msgid "untitled"
-msgstr ""
-
-msgctxt "filter"
-msgid "Filter by"
-msgstr ""
-
-msgctxt "sort"
-msgid "Sort by"
-msgstr ""
-
-msgctxt "sort_smallest"
-msgid "Smallest first"
-msgstr ""
-
-msgctxt "sort_largest"
-msgid "Largest first"
-msgstr ""
-
-msgctxt "sort_az"
-msgid "A-Z"
-msgstr ""
-
-msgctxt "sort_za"
-msgid "Z-A"
-msgstr ""
-
-msgctxt "sort_oldest"
-msgid "Oldest first"
-msgstr ""
-
-msgctxt "sort_newest"
-msgid "Newest first"
-msgstr ""
-
-msgctxt "file_icon_desc"
-msgid "fileicon"
-msgstr ""
-
-msgctxt "title_recents"
-msgid "Recent files"
-msgstr ""
-
-msgctxt "title_browser"
-msgid "All files"
-msgstr ""
-
-#. Pref keys as resources ; Not currently used
-msgctxt "action_about"
-msgid "About"
-msgstr ""
-
-msgctxt "action_settings"
-msgid "Settings"
-msgstr ""
-
-msgctxt "open"
-msgid "Open"
-msgstr ""
-
-msgctxt "share"
-ms

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

[Caolán McNamara (via logerrit)]

 sc/inc/scitems.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5194b93c8dffe4a2194c35e91949ed5b88b567e2
Author: Caolán McNamara 
AuthorDate: Thu Dec 12 09:06:43 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 12 12:49:06 2019 +0100

ATTR_SHRINKTOFIT is ScShrinkToFitCell

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

diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index 9e22a0415aeb..1ec7dd019f8a 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -126,7 +126,7 @@ class SvxSizeItem;
 #define ATTR_VERTICAL_ASIAN TypedWhichId(137)
 #define ATTR_WRITINGDIR TypedWhichId(138)
 #define ATTR_LINEBREAK  TypedWhichId(139)
-#define ATTR_SHRINKTOFITTypedWhichId(140)
+#define ATTR_SHRINKTOFITTypedWhichId(140)
 #define ATTR_BORDER_TLBRTypedWhichId(141)
 #define ATTR_BORDER_BLTRTypedWhichId(142)
 #define ATTR_MARGIN TypedWhichId(143)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.MobileWizard.js |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a8cc95f8f21e117b542e93292d19ff88e8d270b4
Author: Szymon Kłos 
AuthorDate: Thu Dec 12 13:01:02 2019 +0100
Commit: Szymon Kłos 
CommitDate: Thu Dec 12 13:01:24 2019 +0100

jsdialog: fix insert menu

Change-Id: I97b21e3358f078d12c99718623303d3f096a8d46

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 2bf3ffc1f..4b8982d50 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -58,7 +58,6 @@ L.Control.MobileWizard = L.Control.extend({
_showWizard: function() {
$('#mobile-wizard').show();
$('#toolbar-down').hide();
-   this._refreshSidebar();
},
 
_showWizardSidebar: function() {
@@ -234,11 +233,14 @@ L.Control.MobileWizard = L.Control.extend({
 
_onMobileWizard: function(data) {
if (data) {
-   var isSidebar = data.id !== 'menubar' && data.id !== 
'insertshape' && data.id !== 'funclist';
+   var isSidebar = data.id !== 'insert' && data.id !== 
'menubar'
+   && data.id !== 'insertshape' && data.id !== 
'funclist';
 
if (!this._isActive && isSidebar) {
if (this.map.showSidebar == false)
return;
+   else
+   this._refreshSidebar();
}
 
this._isActive = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.Toolbar.js |2 ++
 loleaflet/src/map/handler/Map.Mouse.js   |3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c054059fc0cdeca8dbe4ee28d628d3f944dc45d4
Author: Szymon Kłos 
AuthorDate: Thu Dec 12 12:27:01 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 12 13:04:30 2019 +0100

jsdialog: double Sidebar call in Inplace mode

To activate Sidebar in Chart activated context.

Change-Id: I4579f01e45d0b56bdee32f649498820c404cd5a9

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index a068c3af9..7c5586c3f 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -349,6 +349,8 @@ function onClick(e, id, item, subItem) {
if (!map._sidebarVisible) {
map._sidebarVisible = true;
map.sendUnoCommand('.uno:Sidebar');
+   if (map.hasObjectFocusDarkOverlay())
+   map.sendUnoCommand('.uno:Sidebar');
} else {
// As the sidebar LOKWindowId can and does 
change,
// esp. between chart and other elements, we 
apparently
commit ccc1c54b18703368eefa78beed8f13da39b2e034
Author: Szymon Kłos 
AuthorDate: Thu Dec 12 11:32:12 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 12 13:04:25 2019 +0100

Prevent fake doubleclick detection on Background color applying

When selecting the highlight for a text only some attempts
were successful because of detection the mouseup event two times
in a short period of time (0-1 ms).

Change-Id: Iafba078edbc4442921dc00b58829c5dbf4c2ed74

diff --git a/loleaflet/src/map/handler/Map.Mouse.js 
b/loleaflet/src/map/handler/Map.Mouse.js
index e18fc6ad5..21b884366 100644
--- a/loleaflet/src/map/handler/Map.Mouse.js
+++ b/loleaflet/src/map/handler/Map.Mouse.js
@@ -117,7 +117,8 @@ L.Map.Mouse = L.Handler.extend({
}
clearTimeout(this._holdMouseEvent);
this._holdMouseEvent = null;
-   if (this._clickTime && Date.now() - this._clickTime <= 
250) {
+   var timeDiff = Date.now() - this._clickTime;
+   if (this._clickTime && timeDiff > 1 && timeDiff <= 250) 
{
// double click, a click was sent already
this._mouseEventsQueue = [];
this._clickCount++;
___
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-0' - loleaflet/src

[Jan Holesovsky (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit ddf0612e2f361af1f9284125a0dee98844ef7832
Author: Jan Holesovsky 
AuthorDate: Thu Dec 12 13:00:13 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 13:05:41 2019 +0100

android: Translate the style names in the mobile wizard.

Change-Id: Idda5f05866aea203ba30646a2b4d4109be3f46e2
Reviewed-on: https://gerrit.libreoffice.org/85046
Reviewed-by: Szymon Kłos 
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 6d788bcac..4b329c40e 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1037,6 +1037,11 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
}
title = builder._cleanText(title);
+
+   // FIXME find out why Android needs this & fix
+   if (window.ThisIsTheAndroidApp)
+   title = _(title);
+
data.text = title;
 
var entries = [];
@@ -1099,7 +1104,13 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
_comboboxEntry: function(parentContainer, data, builder) {
var fixedtext = L.DomUtil.create('p', 'mobile-wizard', 
parentContainer);
-   fixedtext.innerHTML = builder._cleanText(data.text);
+
+   // FIXME find out why Android needs this & fix
+   if (window.ThisIsTheAndroidApp)
+   fixedtext.innerHTML = _(builder._cleanText(data.text));
+   else
+   fixedtext.innerHTML = builder._cleanText(data.text);
+
fixedtext.parent = data.parent;
 
if (data.style && data.style.length)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang include/linguistic include/svx include/vcl sc/inc vcl/inc

[Noel Grandin (via logerrit)]

 compilerplugins/clang/finalclasses.py |   18 ++
 include/linguistic/lngprophelp.hxx|   14 ++
 include/svx/polygn3d.hxx  |3 +--
 include/svx/rulritem.hxx  |4 ++--
 include/svx/sdr/table/tablecontroller.hxx |4 ++--
 include/vcl/threadex.hxx  |2 +-
 include/vcl/toolkit/fixedhyper.hxx|3 +--
 include/vcl/toolkit/spin.hxx  |2 +-
 sc/inc/refhint.hxx|2 +-
 vcl/inc/iconview.hxx  |2 +-
 vcl/inc/opengl/x11/cairotextrender.hxx|2 +-
 vcl/inc/skia/salbmp.hxx   |2 +-
 vcl/inc/skia/x11/cairotextrender.hxx  |2 +-
 vcl/inc/skia/x11/gdiimpl.hxx  |5 +++--
 vcl/inc/svimpbox.hxx  |2 +-
 15 files changed, 41 insertions(+), 26 deletions(-)

New commits:
commit 36b90e6c23fc846c9a8b4ddbd74688b2b5cc4705
Author: Noel Grandin 
AuthorDate: Wed Dec 11 12:11:44 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 12 13:11:16 2019 +0100

loplugin:finalclasses

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

diff --git a/compilerplugins/clang/finalclasses.py 
b/compilerplugins/clang/finalclasses.py
index f6c15ca2c87d..ea027f9a48b4 100755
--- a/compilerplugins/clang/finalclasses.py
+++ b/compilerplugins/clang/finalclasses.py
@@ -40,6 +40,24 @@ for clazz in sorted(definitionSet - inheritFromSet):
 # ignore test and external code
 if ("/qa/" in file): continue
 if (file.startswith("workdir/")): continue
+# We are only realling interested in classes that are shared between 
linkage units, where the compiler
+# is not able to figure out for itself that classes are final.
+if not(file.startswith("include/") or file.startswith("sw/inc/") or 
file.startswith("sc/inc/") or file.startswith("vcl/inc/")): continue
+# Exclude URE
+if file.startswith("include/com/"): continue
+if file.startswith("include/cppu/"): continue
+if file.startswith("include/cppuhelper/"): continue
+if file.startswith("include/osl/"): continue
+if file.startswith("include/rtl/"): continue
+if file.startswith("include/sal/"): continue
+if file.startswith("include/salhelper/"): continue
+if file.startswith("include/systools/"): continue
+if file.startswith("include/typelib/"): continue
+if file.startswith("include/uno/"): continue
+# some kind of template noise
+if file.startswith("include/unotest/"): continue
+# no point optimising test code
+if file.startswith("include/test/"): continue
 tmpset.add((clazz, file))
 
 # sort the results using a "natural order" so sequences like 
[item1,item2,item10] sort nicely
diff --git a/include/linguistic/lngprophelp.hxx 
b/include/linguistic/lngprophelp.hxx
index f05481019704..19cbe1f969ac 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -57,7 +57,7 @@ typedef cppu::WeakImplHelper
 css::linguistic2::XLinguServiceEventBroadcaster
 > PropertyChgHelperBase;
 
-class PropertyChgHelper :
+class LNG_DLLPUBLIC PropertyChgHelper :
 public PropertyChgHelperBase
 {
 css::uno::Sequence< OUString >  aPropNames;
@@ -118,8 +118,8 @@ public:
 const css::uno::Reference< 
css::linguistic2::XLinguServiceEventListener >& rxListener ) override;
 
 // non-UNO functions
-voidLNG_DLLPUBLIC AddAsPropListener();
-voidLNG_DLLPUBLIC RemoveAsPropListener();
+voidAddAsPropListener();
+voidRemoveAsPropListener();
 voidLaunchEvent( const css::linguistic2::LinguServiceEvent& rEvt );
 
 const css::uno::Sequence< OUString > &
@@ -131,7 +131,7 @@ public:
 };
 
 
-class PropertyHelper_Thes :
+class PropertyHelper_Thes final :
 public PropertyChgHelper
 {
 PropertyHelper_Thes( const PropertyHelper_Thes & ) = delete;
@@ -167,7 +167,7 @@ public:
 };
 
 
-class LNG_DLLPUBLIC PropertyHelper_Spell :
+class LNG_DLLPUBLIC PropertyHelper_Spell final :
 public PropertyChgHelper
 {
 // default values
@@ -183,7 +183,6 @@ class LNG_DLLPUBLIC PropertyHelper_Spell :
 PropertyHelper_Spell( const PropertyHelper_Spell & ) = delete;
 PropertyHelper_Spell & operator = ( const PropertyHelper_Spell & ) = 
delete;
 
-protected:
 // PropertyChgHelper
 virtual voidSetDefaultValues() override;
 virtual voidGetCurrentValues() override;
@@ -237,7 +236,7 @@ public:
 };
 
 
-class PropertyHelper_Hyphen :
+class PropertyHelper_Hyphen final :
 public PropertyChgHelper
 {
 // default values
@@ -255,7 +254,6 @@ class PropertyHelper_Hyphen :
 PropertyHelper_Hyphen( const PropertyHelper_Hyphen & ) = delete;
 PropertyHelper_Hyphen & operator = ( const PropertyHelper_Hyphen & ) = 
delete;
 
-protected:
 // PropertyChgHelper
 virtual void

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

[Michael Meeks (via logerrit)]

 vcl/android/androidinst.cxx |   17 +
 vcl/inc/android/androidinst.hxx |3 +++
 vcl/inc/salinst.hxx |3 +++
 vcl/source/app/svapp.cxx|5 +
 4 files changed, 28 insertions(+)

New commits:
commit af35dfb2e31c24dd1a43d9ae3e0f393b75108228
Author: Michael Meeks 
AuthorDate: Wed Dec 11 14:38:43 2019 +
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 13:11:51 2019 +0100

android: add abstraction to allow us to DetachThread sensibly.

If we fail to do this after runLoop - some Android VMs can get really
upset if we quit a thread without doing this, also ensure that we
AttachThread to new polling loop threads as we come in for good
measure - duplicate Attach's are NOPs.

Change-Id: I32454773af4e02c97df0b6c02f61b1dc74df80b0
Reviewed-on: https://gerrit.libreoffice.org/84956
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 7241382ccc0a028c5f08304090a6344e582db068)
Reviewed-on: https://gerrit.libreoffice.org/84969
Tested-by: Jenkins

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index d8f234ccc7f5..ddc6e92d55f3 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -57,10 +57,12 @@ AndroidSalInstance *AndroidSalInstance::getInstance()
 AndroidSalInstance::AndroidSalInstance( std::unique_ptr pMutex )
 : SvpSalInstance( std::move(pMutex) )
 {
+// FIXME: remove when uniPoll & runLoop is the only android entry poit.
 int res = (lo_get_javavm())->AttachCurrentThread(&m_pJNIEnv, NULL);
 LOGI("AttachCurrentThread res=%d env=%p", res, m_pJNIEnv);
 }
 
+// This is never called on Android until app exit.
 AndroidSalInstance::~AndroidSalInstance()
 {
 int res = (lo_get_javavm())->DetachCurrentThread();
@@ -78,6 +80,21 @@ bool AndroidSalInstance::AnyInput( VclInputFlags nType )
 return SvpSalInstance::s_pDefaultInstance->HasUserEvents();
 }
 
+void AndroidSalInstance::updateMainThread()
+{
+int res = (lo_get_javavm())->AttachCurrentThread(&m_pJNIEnv, NULL);
+LOGI("updateMainThread AttachCurrentThread res=%d env=%p", res, m_pJNIEnv);
+SvpSalInstance::updateMainThread();
+}
+
+void AndroidSalInstance::releaseMainThread()
+{
+int res = (lo_get_javavm())->DetachCurrentThread();
+LOGI("releaseMainThread DetachCurrentThread res=%d", res);
+
+SvpSalInstance::releaseMainThread();
+}
+
 class AndroidSalSystem : public SvpSalSystem {
 public:
 AndroidSalSystem() : SvpSalSystem() {}
diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx
index 49758f3efd70..526174b14951 100644
--- a/vcl/inc/android/androidinst.hxx
+++ b/vcl/inc/android/androidinst.hxx
@@ -38,6 +38,9 @@ public:
 
 // mainloop pieces
 virtual bool AnyInput( VclInputFlags nType );
+
+virtual void updateMainThread();
+virtual void releaseMainThread();
 };
 
 #endif // INCLUDED_VCL_INC_ANDROID_ANDROIDINST_HXX
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 0f8af0b200d3..dbbbda2c2f42 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -196,7 +196,10 @@ public:
 virtual voidjobStartedPrinterUpdate() {}
 virtual voidjobEndedPrinterUpdate() {}
 
+/// Set the app's (somewhat) magic/main-thread to this one.
 virtual voidupdateMainThread() {}
+/// Disconnect that - good for detatching from the JavaVM on Android.
+virtual voidreleaseMainThread() {}
 
 /// get information about underlying versions
 virtual OUStringgetOSVersion() { return "-"; }
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index df57b56ac327..3ed02d8b7f46 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1660,6 +1660,11 @@ void unregisterPollCallbacks()
 ImplSVData * pSVData = ImplGetSVData();
 if (pSVData)
 {
+// Not hyper-elegant - but in the case of Android & unipoll we need to 
detach
+// this thread from the JVM's clutches to avoid a crash closing 
document
+if (pSVData->mpPollClosure && pSVData->mpDefInst)
+pSVData->mpDefInst->releaseMainThread();
+
 // Just set mpPollClosure to null as that is what calling this means, 
that the callback data
 // points to an object that no longer exists. In particular, don't set
 // pSVData->mpPollCallback to nullptr as that is used to detect 
whether Unipoll is in use in
___
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-0' - loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.MobileWizard.js |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 7e42d75fbf8267d069df1522e14fd7f21bb089c6
Author: Szymon Kłos 
AuthorDate: Thu Dec 12 13:01:02 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 13:14:29 2019 +0100

jsdialog: fix insert menu

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

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 2bf3ffc1f..4b8982d50 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -58,7 +58,6 @@ L.Control.MobileWizard = L.Control.extend({
_showWizard: function() {
$('#mobile-wizard').show();
$('#toolbar-down').hide();
-   this._refreshSidebar();
},
 
_showWizardSidebar: function() {
@@ -234,11 +233,14 @@ L.Control.MobileWizard = L.Control.extend({
 
_onMobileWizard: function(data) {
if (data) {
-   var isSidebar = data.id !== 'menubar' && data.id !== 
'insertshape' && data.id !== 'funclist';
+   var isSidebar = data.id !== 'insert' && data.id !== 
'menubar'
+   && data.id !== 'insertshape' && data.id !== 
'funclist';
 
if (!this._isActive && isSidebar) {
if (this.map.showSidebar == false)
return;
+   else
+   this._refreshSidebar();
}
 
this._isActive = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 include/tools/stream.hxx|2 
 tools/source/stream/strmunx.cxx |  105 +++-
 tools/source/stream/strmwnt.cxx |   44 +---
 3 files changed, 34 insertions(+), 117 deletions(-)

New commits:
commit 2bf22c8d2642e30fdedab69b7437ae83deaec014
Author: Stephan Bergmann 
AuthorDate: Thu Dec 12 11:18:31 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 13:19:10 2019 +0100

SvFileStream::Lock/UnlockRange are only called from within SvFileStream 
itself

...and only for whole-file locking, so simplify the implementations in
strmunx.cx and strmwnt.cxx accordingly

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

diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 33b2e986b573..0f17c37c4958 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -582,8 +582,6 @@ private:
 SvFileStream (const SvFileStream&) = delete;
 SvFileStream & operator= (const SvFileStream&) = delete;
 
-bool LockRange( sal_uInt64 nByteOffset, std::size_t nBytes );
-bool UnlockRange( sal_uInt64 nByteOffset, std::size_t nBytes );
 bool LockFile();
 void UnlockFile();
 
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 1b02435db0a3..a0cfd7c09d74 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -17,13 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
 #include 
 #include 
 #include 
 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -41,51 +40,9 @@ namespace {
 
 struct LockMutex : public rtl::Static< osl::Mutex, LockMutex > {};
 
-struct InternalStreamLock
-{
-sal_uInt64 m_nStartPos;
-sal_uInt64 m_nEndPos;
-SvFileStream*  m_pStream;
-osl::DirectoryItem m_aItem;
-
-InternalStreamLock( sal_uInt64, sal_uInt64, SvFileStream* );
-~InternalStreamLock();
-};
-
-struct LockList : public rtl::Static< std::vector, 
LockList > {};
-
-InternalStreamLock::InternalStreamLock(
-sal_uInt64 const nStart,
-sal_uInt64 const nEnd,
-SvFileStream* pStream ) :
-m_nStartPos( nStart ),
-m_nEndPos( nEnd ),
-m_pStream( pStream )
-{
-(void)osl::DirectoryItem::get( m_pStream->GetFileName(), m_aItem );
-#if OSL_DEBUG_LEVEL > 1
-OString aFileName(OUStringToOString(m_pStream->GetFileName(),
-  
osl_getThreadTextEncoding()));
-fprintf( stderr, "locked %s", aFileName.getStr() );
-if( m_nStartPos || m_nEndPos )
-fprintf(stderr, " [ %ld ... %ld ]", m_nStartPos, m_nEndPos );
-fprintf( stderr, "\n" );
-#endif
-}
-
-InternalStreamLock::~InternalStreamLock()
-{
-#if OSL_DEBUG_LEVEL > 1
-OString aFileName(OUStringToOString(m_pStream->GetFileName(),
-  
osl_getThreadTextEncoding()));
-fprintf( stderr, "unlocked %s", aFileName.getStr() );
-if( m_nStartPos || m_nEndPos )
-fprintf(stderr, " [ %ld ... %ld ]", m_nStartPos, m_nEndPos );
-fprintf( stderr, "\n" );
-#endif
-}
+struct Locks : public rtl::Static< std::map, Locks > {};
 
-bool lockFile( sal_uInt64 const nStart, sal_uInt64 const nEnd, SvFileStream* 
pStream )
+bool lockFile( SvFileStream* pStream )
 {
 osl::DirectoryItem aItem;
 if (osl::DirectoryItem::get( pStream->GetFileName(), aItem) != 
osl::FileBase::E_None )
@@ -104,12 +61,12 @@ bool lockFile( sal_uInt64 const nStart, sal_uInt64 const 
nEnd, SvFileStream* pSt
 return true;
 
 osl::MutexGuard aGuard( LockMutex::get() );
-std::vector &rLockList = LockList::get();
-for( const auto& rLock : rLockList )
+auto &rLocks = Locks::get();
+for( const auto& [rLockStream, rLockItem] : rLocks )
 {
-if( aItem.isIdenticalTo( rLock.m_aItem ) )
+if( aItem.isIdenticalTo( rLockItem ) )
 {
-StreamMode nLockMode = rLock.m_pStream->GetStreamMode();
+StreamMode nLockMode = rLockStream->GetStreamMode();
 StreamMode nNewMode = pStream->GetStreamMode();
 bool bDenyByOptions = (nLockMode & StreamMode::SHARE_DENYALL) ||
 ( (nLockMode & StreamMode::SHARE_DENYWRITE) && (nNewMode & 
StreamMode::WRITE) ) ||
@@ -117,31 +74,19 @@ bool lockFile( sal_uInt64 const nStart, sal_uInt64 const 
nEnd, SvFileStream* pSt
 
 if( bDenyByOptions )
 {
-if( rLock.m_nStartPos == 0 && rLock.m_nEndPos == 0 ) // whole 
file is already locked
-return false;
-if( nStart == 0 && nEnd == 0) // cannot lock whole file
-return false;
-
-if( ( nStart < rLock.m_nStartPos && nEnd > rLock.m_nStartPos ) 
||
-( nStart < rLock.m_nEndPos && nEnd > rLock.m_nEndPos ) )
-

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

[Ashod Nakashian (via logerrit)]

 loleaflet/src/control/Control.MobileWizard.js |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7a2efacc11cbb1084a5e86782acf0a0d0440fddb
Author: Ashod Nakashian 
AuthorDate: Thu Dec 12 07:19:02 2019 -0500
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 13:23:33 2019 +0100

leaflet: menu mobileWizard calls are not sidebar

This fixes long-press context-menus on mobile.

Change-Id: I63df610a12a075753a277a4257d6e7c785473107
Reviewed-on: https://gerrit.libreoffice.org/85048
Reviewed-by: Szymon Kłos 
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 4b8982d50..f5aa7c767 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -234,7 +234,8 @@ L.Control.MobileWizard = L.Control.extend({
_onMobileWizard: function(data) {
if (data) {
var isSidebar = data.id !== 'insert' && data.id !== 
'menubar'
-   && data.id !== 'insertshape' && data.id !== 
'funclist';
+   && data.id !== 'insertshape' && data.id !== 
'funclist'
+   && data.executionType !== 'menu';
 
if (!this._isActive && isSidebar) {
if (this.map.showSidebar == false)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian (via logerrit)]

 loleaflet/src/control/Control.MobileWizard.js |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d4903eca646120e3590c7f60c4d02963d99c238d
Author: Ashod Nakashian 
AuthorDate: Thu Dec 12 07:19:02 2019 -0500
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 13:24:43 2019 +0100

leaflet: menu mobileWizard calls are not sidebar

This fixes long-press context-menus on mobile.

Change-Id: I63df610a12a075753a277a4257d6e7c785473107
Reviewed-on: https://gerrit.libreoffice.org/85048
Reviewed-by: Szymon Kłos 
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 7a2efacc11cbb1084a5e86782acf0a0d0440fddb)
Reviewed-on: https://gerrit.libreoffice.org/85049

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 4b8982d50..f5aa7c767 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -234,7 +234,8 @@ L.Control.MobileWizard = L.Control.extend({
_onMobileWizard: function(data) {
if (data) {
var isSidebar = data.id !== 'insert' && data.id !== 
'menubar'
-   && data.id !== 'insertshape' && data.id !== 
'funclist';
+   && data.id !== 'insertshape' && data.id !== 
'funclist'
+   && data.executionType !== 'menu';
 
if (!this._isActive && isSidebar) {
if (this.map.showSidebar == false)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 include/drawinglayer/primitive2d/borderlineprimitive2d.hxx |5 +
 sc/inc/dpdimsave.hxx   |5 +
 2 files changed, 10 insertions(+)

New commits:
commit 1336a02a736b7927814701df84fa4671e8c4bcb2
Author: Stephan Bergmann 
AuthorDate: Thu Dec 12 11:27:49 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 13:33:14 2019 +0100

Silence some Clang 10 trunk -Wdeprecated-copy-dtor

...by explicitly defaulting the copy/move functions in cases where the user-
provided dtor is trivial (so could theoretically be replaced with an 
implicit
one, cf.  "Remove some redundant
user-provided dtors") but is probably defined out-of-class because the 
class is
DLLPUBLIC

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

diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx 
b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 1e0b1e2215f5..d3be9c8d4068 100644
--- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -68,6 +68,11 @@ namespace drawinglayer
 
 ~BorderLine();
 
+BorderLine(BorderLine const &) = default;
+BorderLine(BorderLine &&) = default;
+BorderLine & operator =(BorderLine const &) = default;
+BorderLine & operator =(BorderLine &&) = default;
+
 const drawinglayer::attribute::LineAttribute& getLineAttribute() 
const { return maLineAttribute; }
 double getStartLeft() const { return mfStartLeft; }
 double getStartRight() const { return mfStartRight; }
diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx
index c49f2d33f969..124239cc1bd4 100644
--- a/sc/inc/dpdimsave.hxx
+++ b/sc/inc/dpdimsave.hxx
@@ -50,6 +50,11 @@ public:
 ScDPSaveGroupItem( const OUString& rName );
 ~ScDPSaveGroupItem();
 
+ScDPSaveGroupItem(ScDPSaveGroupItem const &) = default;
+ScDPSaveGroupItem(ScDPSaveGroupItem &&) = default;
+ScDPSaveGroupItem & operator =(ScDPSaveGroupItem const &) = default;
+ScDPSaveGroupItem & operator =(ScDPSaveGroupItem &&) = default;
+
 void AddToData(ScDPGroupDimension& rDataDim) const;
 
 voidAddElement( const OUString& rName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - svx/source

[Ilhan Yesil (via logerrit)]

Rebased ref, commits from common ancestor:
commit 12b4efb1216fc494443795b06e9ad92bcad2c306
Author: Ilhan Yesil 
AuthorDate: Tue Nov 13 11:20:15 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Dec 12 13:40:21 2019 +0100

tdf#116051 Right border visible after hiding neighbour column

Added an else statement to take into account that a hidden column
has a neighboured left column with a right border.

Reviewed-on: https://gerrit.libreoffice.org/63326
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 392729c735bb82eecf29bae5527ec786ca293f34)
Reviewed-on: https://gerrit.libreoffice.org/67054
Reviewed-by: Ilhan Yesil 
Tested-by: Ilhan Yesil 
(cherry picked from commit efc741c41483b2402378391b7fba36377c886a8e)
Reviewed-on: https://gerrit.libreoffice.org/84857
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

Change-Id: Ia415d422dd2fa305604e48cce55661408b835ea6

diff --git a/svx/source/dialog/framelinkarray.cxx 
b/svx/source/dialog/framelinkarray.cxx
index f0934c48dd7c..9e14810261b9 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -1103,28 +1103,30 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 basegfx::B2DVector aX(basegfx::utils::getColumn(aCoordinateSystem, 
0));
 basegfx::B2DVector aY(basegfx::utils::getColumn(aCoordinateSystem, 
1));
 
+// get needed local values
+basegfx::B2DPoint 
aOrigin(basegfx::utils::getColumn(aCoordinateSystem, 2));
+const bool bOverlapX(rCell.mbOverlapX);
+const bool bFirstCol(nCol == nFirstCol);
+
+// handle rotation: If cell is rotated, handle lower/right edge 
inside
+// this local geometry due to the created CoordinateSystem already 
representing
+// the needed transformations.
+const bool bRotated(rCell.IsRotated());
+
+// Additionally avoid double-handling by suppressing handling when 
self not rotated,
+// but above/left is rotated and thus already handled. Two 
directly connected
+// rotated will paint/create both edges, they might be rotated 
differently.
+const bool bSupressLeft(!bRotated && nCol > nFirstCol && CELL(nCol 
- 1, nRow).IsRotated());
+const bool bSuppressAbove(!bRotated && nRow > nFirstRow && 
CELL(nCol, nRow - 1).IsRotated());
+
 if(!aX.equalZero() && !aY.equalZero())
 {
-// get needed local values
-basegfx::B2DPoint 
aOrigin(basegfx::utils::getColumn(aCoordinateSystem, 2));
-const bool bOverlapX(rCell.mbOverlapX);
+// additionally needed local values
 const bool bOverlapY(rCell.mbOverlapY);
-const bool bFirstCol(nCol == nFirstCol);
 const bool bLastCol(nCol == nLastCol);
 const bool bFirstRow(nRow == nFirstRow);
 const bool bLastRow(nRow == nLastRow);
 
-// handle rotation: If cell is rotated, handle lower/right 
edge inside
-// this local geometry due to the created CoordinateSystem 
already representing
-// the needed transformations.
-const bool bRotated(rCell.IsRotated());
-
-// Additionally avoid double-handling by suppressing handling 
when self not rotated,
-// but above/left is rotated and thus already handled. Two 
directly connected
-// rotated will paint/create both edges, they might be rotated 
differently.
-const bool bSuppressAbove(!bRotated && nRow > nFirstRow && 
CELL(nCol, nRow - 1).IsRotated());
-const bool bSupressLeft(!bRotated && nCol > nFirstCol && 
CELL(nCol - 1, nRow).IsRotated());
-
 // create upper line for this Cell
 if ((!bOverlapY // true for first line in merged cells 
or cells
 || bFirstRow)   // true for non_Calc usages of this 
tooling
@@ -1281,6 +1283,21 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 }
 }
 }
+else
+{
+// create left line for this Cell
+if ((!bOverlapX // true for first column in merged 
cells or cells
+|| bFirstCol)   // true for non_Calc usages of this 
tooling
+&& !bSupressLeft)   // true when left is not rotated, so 
edge is already handled (see bRotated)
+{
+const Style& rLeft(GetCellStyleLeft(nCol, nRow));
+
+if (rLeft.IsUsed())
+{
+HelperCreateVerticalEntry(*this, rLeft, nCol, nRow, 
aOrigin, aX, aY, aVerticalSequences[nCol - nStartCol], true, pForceColor);
+ 

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

[Stephan Bergmann (via logerrit)]

 external/skia/Wdeprecated-copy-dtor.patch.0 |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 065c8fa896b92a393d87cfdfd650106402e865c1
Author: Stephan Bergmann 
AuthorDate: Thu Dec 12 11:21:54 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 13:54:15 2019 +0100

external/skia: Further -Werror=deprecated-copy-dtor for Clang 10 trunk

...where the warning finds more occurrences than with GCC

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

diff --git a/external/skia/Wdeprecated-copy-dtor.patch.0 
b/external/skia/Wdeprecated-copy-dtor.patch.0
index 335ad9b84b94..710fe9c249d9 100644
--- a/external/skia/Wdeprecated-copy-dtor.patch.0
+++ b/external/skia/Wdeprecated-copy-dtor.patch.0
@@ -1,3 +1,13 @@
+--- include/gpu/GrDriverBugWorkarounds.h
 include/gpu/GrDriverBugWorkarounds.h
+@@ -35,6 +35,7 @@
+  public:
+   GrDriverBugWorkarounds();
+   explicit GrDriverBugWorkarounds(const std::vector& workarounds);
++  GrDriverBugWorkarounds(GrDriverBugWorkarounds const &) = default;
+ 
+   GrDriverBugWorkarounds& operator=(const GrDriverBugWorkarounds&) = default;
+ 
 --- tools/sk_app/VulkanWindowContext.h
 +++ tools/sk_app/VulkanWindowContext.h
 @@ -33,6 +33,8 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sw/inc/bparr.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3bf7a861b37a93e196b2e53eeaa5a561d26ed240
Author: Stephan Bergmann 
AuthorDate: Thu Dec 12 11:33:13 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 14:02:42 2019 +0100

Silence some Clang 10 trunk -Wdeprecated-copy-dtor

...by making the user-declared dtor not user-provided.  Non-deleted copy
functions are still deprecated with any user-declared dtor, not just a user-
provided one, but Clang and GCC happen to not emit a warning then (see the
discussion at  "[Diagnostics] Make
behaviour of Clang's -Wdeprecated-copy same as in GCC"), so keep the code
simple.

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

diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 2c990259d11a..0730a5c5a61b 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -37,7 +37,7 @@ class BigPtrEntry
 sal_uInt16  m_nOffset;
 public:
 BigPtrEntry() : m_pBlock(nullptr), m_nOffset(0) {}
-virtual ~BigPtrEntry() {}
+virtual ~BigPtrEntry() = default;
 
 inline sal_uLong GetPos() const;
 inline BigPtrArray& GetArray() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Weghorn (via logerrit)]

 android/source/src/java/org/libreoffice/ColorPaletteAdapter.java |5 +++--
 android/source/src/java/org/libreoffice/ColorPickerAdapter.java  |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 64bf055db690a4475cf49dc03800619674b891c2
Author: Michael Weghorn 
AuthorDate: Thu Dec 12 11:45:05 2019 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 12 14:30:57 2019 +0100

tdf#115698 android: Don't modify doc on color palette initialization

Previously, the call to 'ColorPaletteAdapter::setColorPalette' from
the 'ColorPickerAdapter' constructur (via 'initializeColorPalette')
would not just set the color palette, but also apply the color at
index (0, 0) to the current selection, since
'ColorPaleteAdapter::setPosition' calls
'colorPaletteListener.applyColor' after setting the position.

This is an undesirable side effect, and led to the situation described
in tdf#115698 that cell A1 would always get black background when
opening a spreadsheet in the Android viewer, since black is the color
at 'color_palette[0][0]' by default and cell A1 is explicitly selected
when Calc first opens, s. the 'CalcHeadersController' constructor.

For Writer, something similar could be reproduced by selecting a
word in a document using long-tap. If experimental editing mode was
enabled, that word got black background (other words selected
later didn't).

To avoid this, make 'ColorPaletteAdapter::setColorPalette' just set
the color palette and set back the values that indicate what is
selected but don't apply any color. (And make 'setColorPalette'
just take the palette as parameter, and set 0 for both start values,
as the only caller was doing as well).

Change-Id: I0fa720ac6550102701a2c82905c9720aab6daab2
Reviewed-on: https://gerrit.libreoffice.org/85044
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 

diff --git a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java 
b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
index a6d250f6380d..6ec6aa138f66 100644
--- a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
+++ b/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java
@@ -100,9 +100,10 @@ public class ColorPaletteAdapter extends 
RecyclerView.Adapterhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source forms/source include/canvas include/vcl oox/inc oox/source scaddins/source sc/inc sc/source sd/source svx/source sw/source ucb/source vcl/source vcl/unx w

[Stephan Bergmann (via logerrit)]

 basctl/source/basicide/bastypes.cxx|6 --
 basctl/source/inc/bastypes.hxx |2 --
 forms/source/component/GroupManager.cxx|4 
 forms/source/component/GroupManager.hxx|1 -
 include/canvas/spriteredrawmanager.hxx |2 --
 include/vcl/builder.hxx|1 -
 oox/inc/drawingml/customshapeproperties.hxx|1 -
 oox/inc/drawingml/table/tablecell.hxx  |1 -
 oox/inc/drawingml/table/tablerow.hxx   |1 -
 oox/inc/drawingml/table/tablestyle.hxx |1 -
 oox/inc/drawingml/textbody.hxx |1 -
 oox/source/drawingml/customshapeproperties.cxx |3 ---
 oox/source/drawingml/table/tablecell.cxx   |3 ---
 oox/source/drawingml/table/tablerow.cxx|3 ---
 oox/source/drawingml/table/tablestyle.cxx  |4 
 oox/source/drawingml/textbody.cxx  |4 
 sc/inc/dpgroup.hxx |1 -
 sc/source/core/data/dpgroup.cxx|4 
 sc/source/filter/excel/xistring.cxx|4 
 sc/source/filter/inc/xcl97rec.hxx  |1 -
 sc/source/filter/inc/xistring.hxx  |2 --
 sc/source/filter/xcl97/xcl97rec.cxx|4 
 sc/source/filter/xml/XMLStylesExportHelper.cxx |4 
 sc/source/filter/xml/XMLStylesExportHelper.hxx |1 -
 scaddins/source/analysis/analysishelper.cxx|4 
 scaddins/source/analysis/analysishelper.hxx|1 -
 scaddins/source/datefunc/datefunc.cxx  |4 
 scaddins/source/datefunc/datefunc.hxx  |1 -
 scaddins/source/pricing/pricing.cxx|4 
 scaddins/source/pricing/pricing.hxx|1 -
 sd/source/filter/eppt/epptbase.hxx |1 -
 sd/source/filter/eppt/pptx-text.cxx|4 
 svx/source/accessibility/ChildrenManagerImpl.cxx   |6 --
 svx/source/accessibility/ChildrenManagerImpl.hxx   |2 --
 sw/source/core/doc/docsort.cxx |8 
 sw/source/core/inc/docsort.hxx |2 --
 sw/source/filter/ww8/ww8toolbar.cxx|8 
 sw/source/filter/ww8/ww8toolbar.hxx|2 --
 ucb/source/ucp/file/filtask.cxx|5 -
 ucb/source/ucp/file/filtask.hxx|1 -
 vcl/source/gdi/pdfwriter_impl.cxx  |4 
 vcl/source/gdi/pdfwriter_impl.hxx  |1 -
 vcl/source/window/builder.cxx  |2 --
 vcl/unx/generic/print/glyphset.cxx |5 -
 vcl/unx/generic/print/glyphset.hxx |2 +-
 writerfilter/source/dmapper/PageBordersHandler.cxx |4 
 writerfilter/source/dmapper/PageBordersHandler.hxx |1 -
 47 files changed, 1 insertion(+), 131 deletions(-)

New commits:
commit 31fffe5538fd8011afa0076fdca39379c28fcff5
Author: Stephan Bergmann 
AuthorDate: Thu Dec 12 11:07:24 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 14:35:24 2019 +0100

Remove some redundant user-provided dtors

...which silences various -Wdeprecated-copy-dtor warnings from Clang 10 
trunk
about copy functions being implicitly defined as non-deleted even though the
class has a user-declared dtor

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

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index f38ba5d33e8c..006c6b00bc22 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -682,9 +682,6 @@ LibInfo::Key::Key (ScriptDocument const& rDocument, 
OUString const& rLibName) :
 m_aDocument(rDocument), m_aLibName(rLibName)
 { }
 
-LibInfo::Key::~Key ()
-{ }
-
 bool LibInfo::Key::operator == (Key const& rKey) const
 {
 return m_aDocument == rKey.m_aDocument && m_aLibName == rKey.m_aLibName;
@@ -706,9 +703,6 @@ LibInfo::Item::Item (
 m_eCurrentType(eCurrentType)
 { }
 
-LibInfo::Item::~Item ()
-{ }
-
 static bool QueryDel(const OUString& rName, const OUString &rStr, 
weld::Widget* pParent)
 {
 OUString aName = "\'" + rName + "\'";
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 3063c2bd6827..8ac2a4b3a9b1 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -257,7 +257,6 @@ private:
 
 public:
 Key (ScriptDocument const&, OUString const& rLibName);
-~Key ();
 public:
 bool operator == (Key const&) const;
 struct Hash
@@ -276,7 +275,6 @@ public:
 
 public:
 Item (OUString const& rCurrentName, ItemType eCurrentType);
-~Item ();
 const OUString& GetCurrentName()   

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

[Weblate (via logerrit)]

 loleaflet/po/ui-de.po |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit cdae6c9615e2bdab897ed1bf55d14d9638027d0f
Author: Weblate 
AuthorDate: Thu Dec 12 12:26:45 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 12 14:36:25 2019 +0100

LibreOffice Online/loleaflet-ui (German)

Currently translated at 86.0% (234 of 272 strings)

Change-Id: I9843207435a850a10efea642289af471b13d6aee

LibreOffice Online/loleaflet-ui (German)

Currently translated at 85.7% (233 of 272 strings)

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

diff --git a/loleaflet/po/ui-de.po b/loleaflet/po/ui-de.po
index c50bbe39b..81711964a 100644
--- a/loleaflet/po/ui-de.po
+++ b/loleaflet/po/ui-de.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-29 11:18+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: \n"
+"PO-Revision-Date: 2019-12-12 11:26+\n"
+"Last-Translator: Christian Lohmaier \n"
+"Language-Team: German 
\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.2.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.9.1\n"
 "X-Pootle-Path: /de/libo_online/loleaflet-ui-de.po\n"
 "X-Pootle-Revision: 3937733\n"
 
@@ -172,7 +173,7 @@ msgstr "Server herunterfahren"
 
 #: admin/admin.strings.js:43
 msgid "Server uptime"
-msgstr ""
+msgstr "Betriebszeit"
 
 #: admin/src/AdminSocketAnalytics.js:219
 msgid "Received"
@@ -277,7 +278,7 @@ msgstr "Sie"
 
 #: src/control/Control.DownloadProgress.js:36
 msgid "Start download"
-msgstr ""
+msgstr "Download starten"
 
 #: src/control/Control.DownloadProgress.js:51
 msgid "Confirm copy to clipboard"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes from the UX/design meeting 2019-DEC-12

[Heiko Tietze]

Present: Heiko
Comments from: Dieter, Bogdan, Mike, Stuart

Tickets

 * Repeat shortcut (Ctrl+Shift+Y) is too far for short-finger users using en 
(qwerty) keyboard
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129058
   + WFM (Heiko)
   + perhaps alt+Y (Stuart)
   + I always use TWO hands for that keyboard shortcuts =) (Roman)
   + keyboard issue for English, see also bug 115052 for other than English 
   + Excel (or all MSO) uses F4 (or ctrl+Y) for "repeat last action" (but the
 same key also for redo)
   + shift+ctrl+r - cannot press it without hurting myself, ctrl+at+r works
   + alt+ should be reserved for hotkeys
   + keep it - common, usable (maybe not for everyone), consistent (Heiko)
   + more opinions needed (Roman)
   => no further input, WF

 * Page sidebar: "Same Content" on header/footer sections is absolutely 
illogical 
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129200
   + make it similar to the page dialog with checkboxes (Dieter)
   => go for it

 * PRINTING: Change The Color of Print Preview Active Page Border
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129235
   + greenish background, triangles or printer icons in the background,
 light blue frame, different shadow...
   => let's try

 * Draw menu entry: Shape or Shapes?
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129288
   + -1 (Heiko, Bogdan)
   + +1 (Stuart)
 + Shape --> Shapes, Sheet --> Sheets, Form --> Forms, Page (singular)
 + change all singular at once
   => trust the native speaker and do as Stuart suggest



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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - 2 commits - bin/check-elf-dynamic-objects config_host/config_vclplug.h.in configure.ac vcl/inc vcl/qt5

[Michael Weghorn (via logerrit)]

 bin/check-elf-dynamic-objects   |2 -
 config_host/config_vclplug.h.in |1 
 configure.ac|   11 +-
 vcl/inc/qt5/Qt5Frame.hxx|1 
 vcl/qt5/Qt5Frame.cxx|   72 
 5 files changed, 84 insertions(+), 3 deletions(-)

New commits:
commit 547c11e5df562479c67931af0a656b701a0836bd
Author: Michael Weghorn 
AuthorDate: Tue Dec 10 10:29:19 2019 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Dec 12 14:41:04 2019 +0100

check-elf-dynamic-objects: qt5 needs libxcb-icccm.so.4

... since commit fe2baf9e84e0ca9aeaa683e37076f57fa3f38dca
("Qt5 fix missing XCB_ICCCM_WM_HINT_WINDOW_GROUP").

Change-Id: Idac4ae38cbec3604de358a3b2c77bb26a8115ce0
Reviewed-on: https://gerrit.libreoffice.org/84799
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 88ca6e9904e87ae3473a5d8936adb4a2ced8572f)
Reviewed-on: https://gerrit.libreoffice.org/84811
Reviewed-by: Jan-Marek Glogowski 

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 640c80a7f079..45bd0ecf45c6 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -94,7 +94,7 @@ openglwhitelist="libGL.so.1"
 giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 
libgthread-2.0.so.0 libglib-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
 gstreamerwhitelist="libgstaudio-1.0.so.0 libgstpbutils-1.0.so.0 
libgstvideo-1.0.so.0 libgstbase-1.0.so.0 libgstreamer-1.0.so.0"
 gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 
libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 
libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 
libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 
libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3 
libharfbuzz.so.0"
-qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 
libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libglib-2.0.so.0 
libgobject-2.0.so.0 libxcb.so.1"
+qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 
libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libglib-2.0.so.0 
libgobject-2.0.so.0 libxcb.so.1 libxcb-icccm.so.4"
 kf5whitelist="libKF5ConfigCore.so.5 libKF5CoreAddons.so.5 libKF5I18n.so.5 
libKF5KIOCore.so.5 libKF5KIOFileWidgets.so.5 libKF5KIOWidgets.so.5 
libKF5WindowSystem.so.5"
 avahiwhitelist="libdbus-glib-1.so.2 libdbus-1.so.3 libgobject-2.0.so.0 
libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libavahi-common.so.3 
libavahi-client.so.3"
 kerberoswhitelist="libgssapi_krb5.so.2 libcom_err.so.2 libkrb5.so.3"
commit 20be5cd0bdc57d812bf34a2debfe48caa51de881
Author: Jan-Marek Glogowski 
AuthorDate: Tue Dec 3 08:32:58 2019 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Dec 12 14:40:55 2019 +0100

Qt5 fix missing XCB_ICCCM_WM_HINT_WINDOW_GROUP

This is the application level equivalent of the Qt5 fix for bug
QTBUG-46626 / commit 0de4b32 ("xcb: fix issue with dialogs hidden
by other windows"), which was broken since Qt 5.4 and is just
fixed since Qt 5.12.

It is needed for some window managers, which don't know about the
WM_CLIENT_LEADER property. Both settings are the same, but just
the latter is set by older Qt5 releases. This probably isn't a
real problem, as GNOME or XFCE would use the gtk VCL plugin, but
since I already wrote the code when debugging tdf#129071, there
is also no reason to drop it (except: more code, more bugs...).

This fix is optional and needs development headers for xcb-icccm,
which can actually be compiled into Qt5. If missing configure will
just print a warning, since it's a runtime requirement and we
explicitly drop the linked Qt version symbol, so the potential
build Qt version won't matter.

Change-Id: Ifc5a8f8a40ee13779a911efb53e8b8b868614d0b
Reviewed-on: https://gerrit.libreoffice.org/84299
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit fe2baf9e84e0ca9aeaa683e37076f57fa3f38dca)
Reviewed-on: https://gerrit.libreoffice.org/84810

diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in
index 8ff5a9ce527f..488140b9ee4d 100644
--- a/config_host/config_vclplug.h.in
+++ b/config_host/config_vclplug.h.in
@@ -15,5 +15,6 @@ Settings about which desktops have support enabled.
 #define ENABLE_GSTREAMER_1_0 0
 #define QT5_HAVE_GOBJECT 0
 #define QT5_USING_X11 0
+#define QT5_HAVE_XCB_ICCCM 0
 
 #endif
diff --git a/configure.ac b/configure.ac
index 797091af8257..3e86ddb7f78b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11336,8 +11336,15 @@ then
 
 if test "$USING_X11" = TRUE; then
 PKG_CHECK_MODULES(QT5_XCB,[xcb],,[AC_MSG_ERROR([XCB not found, which 
is needed for correct app grouping in X11.])])
-QT5_CFLAGS="$QT5_CFLAGS $QT5_X

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

[Gabor Kelemen (via logerrit)]

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

New commits:
commit 562c30d5ad142fcdc77be6125fdac6d48b782fd7
Author: Gabor Kelemen 
AuthorDate: Tue Dec 10 23:24:29 2019 +0100
Commit: László Németh 
CommitDate: Thu Dec 12 14:45:57 2019 +0100

tdf#123076 Get paper size for print preview

Initialize from current paper size which can be different from A4

Change-Id: Iae5e33d79c0783a32dad8635a66cc3fbe83dc568
Reviewed-on: https://gerrit.libreoffice.org/84920
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: László Németh 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index c50fb512dd92..b42a1ce41213 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -890,6 +890,8 @@ void PrintDialog::preparePreview( bool i_bMayUseCache )
 {
 VclPtr aPrt( maPController->getPrinter() );
 Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), 
MapMode( MapUnit::Map100thMM ) );
+// tdf#123076 Get paper size for the preview top label
+mePaper = aPrt->GetPaper();
 GDIMetaFile aMtf;
 
 // page range may have changed depending on options
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 framework/inc/helper/statusindicatorfactory.hxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 7612651a1c51c1c86788c637ef4ab2db7751cc10
Author: Stephan Bergmann 
AuthorDate: Thu Dec 12 11:15:12 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 14:58:07 2019 +0100

Remove redundant member clear() from dtor

...and then remove newly-redundant user-provided dtor completely, similar to
 "Remove some redundant 
user-provided
dtors"

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

diff --git a/framework/inc/helper/statusindicatorfactory.hxx 
b/framework/inc/helper/statusindicatorfactory.hxx
index da02dbfc626a..467c1ccd84bf 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -86,13 +86,6 @@ struct IndicatorInfo
 m_nValue = 0;
 }
 
-/** @short  Don't forget to free used references!
- */
-~IndicatorInfo()
-{
-m_xIndicator.clear();
-}
-
 /** @short  Used to locate an info struct inside a stl structure...
 
 @descr  The indicator object itself is used as key. Its values
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: android/app

[Pedro Pinto Silva (via logerrit)]

 android/app/src/main/res/values-pt-rBR/strings.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a002f5ee86b173cdd1a570fca0c338f4561191e9
Author: Pedro Pinto Silva 
AuthorDate: Thu Dec 12 15:04:56 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 15:21:37 2019 +0100

* Change menu item text so it fits in the sidepane
* Fix diretorias to diretotios

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

diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml 
b/android/app/src/main/res/values-pt-rBR/strings.xml
index 2f2635506..d8d25 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -67,7 +67,7 @@
 
 Locais de arquivos
 Fechar Locais de arquivos
-Diretorias de documentos
+Diretórios de documentos
 Sistema local de arquivos
 SD externo
 Dispositivo OTG (experimental)
@@ -86,7 +86,7 @@
 
 
 
-Configurações do provedor de 
armazenamento
+Configurações de servidor
 Configurações do servidor na 
nuvem
 Configurações de armazenamento 
físico
 Caminho SD externo
___
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-0' - android/app

[Pedro Pinto Silva (via logerrit)]

 android/app/src/main/res/values-pt-rBR/strings.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c304dfe679437c0666fa45a64a58d8cde0877c32
Author: Pedro Pinto Silva 
AuthorDate: Thu Dec 12 15:04:56 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Dec 12 15:21:59 2019 +0100

* Change menu item text so it fits in the sidepane
* Fix diretorias to diretotios

Change-Id: I11152a1c0a3deb536930260007682e444ace74f9
Reviewed-on: https://gerrit.libreoffice.org/85058
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit a002f5ee86b173cdd1a570fca0c338f4561191e9)
Reviewed-on: https://gerrit.libreoffice.org/85059

diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml 
b/android/app/src/main/res/values-pt-rBR/strings.xml
index 2f2635506..d8d25 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -67,7 +67,7 @@
 
 Locais de arquivos
 Fechar Locais de arquivos
-Diretorias de documentos
+Diretórios de documentos
 Sistema local de arquivos
 SD externo
 Dispositivo OTG (experimental)
@@ -86,7 +86,7 @@
 
 
 
-Configurações do provedor de 
armazenamento
+Configurações de servidor
 Configurações do servidor na 
nuvem
 Configurações de armazenamento 
físico
 Caminho SD externo
___
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.2' - sfx2/source

[Szymon Kłos (via logerrit)]

 sfx2/source/view/lokhelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a5ded3182681e59ce8223cf07d192d587bd7af0e
Author: Szymon Kłos 
AuthorDate: Thu Dec 12 09:34:54 2019 +0100
Commit: Szymon Kłos 
CommitDate: Thu Dec 12 15:36:32 2019 +0100

Use INVALID_POOL_ITEM instead of magic number

Change-Id: I44fdc602563164944bee40848b13de0c0c62e4f7
Reviewed-on: https://gerrit.libreoffice.org/85015
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 2232b397996d..58076bf0143e 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -241,7 +241,7 @@ namespace {
 
 void SfxLokHelper::sendUnoStatus(const SfxViewShell* pShell, const 
SfxPoolItem* pItem)
 {
-if (!pShell || !pItem || pItem == reinterpret_cast(-1) 
|| DisableCallbacks::disabled())
+if (!pShell || !pItem || pItem == INVALID_POOL_ITEM || 
DisableCallbacks::disabled())
 return;
 
 boost::property_tree::ptree aItem = pItem->dumpAsJSON();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ESC meeting minutes: 2019-12-12

[Stephan Bergmann]

* Present:
 + Cloph, Heiko, Caolan, Eike, Stephan, Xisco, Ilmari, Olivier, 
Michael w.,

   Sophie

* Completed Action Items:

* Pending Action Items:
+ Propose new certified developers (Kendy, Stephan, Thorsten)
  + still waiting
+ make gnu make 4.0 a requirement on master (Michael S)

* Release Engineering update (Cloph)
+ 6.4 status
  + string + ui freeze in 1 week
  + Late features?
+ ODF tender, perhaps (Thorsten)
  + string changes went in to 6.4 precautiously (Thorsten)
+ 6.3 status
  + 6.3.4 released today
+ Remotes
+ Android viewer
  + there were some x86 fixes, but is still broken for Cloph
  + arm64 – likely to have runtime problems
  + Kendy has some patches to bridges and elsewhere, but maybe 
not all

of them are needed thanks to the Stephan’s patch
+ Online
  + libreoffice-6-4 branch is created

* Documentation (Olivier)
  + New Help
 + progress in XHP editor (ohallot)
 + Open, edit, and Save XHP file locally
 + fixes in editor transform, css and php
 + Selector for system (MAC/WIN/UNIX) and modules (Writer/..)

  + Helpcontent2
 + Housekeeping svg icons (ohallot)
 + Updates and housekeeping (ohallot)
 + Updated contents for *_XCL and *_EXCEL2003 functions.
 + Fixes (Caolán, M. Kaganski)

  + Google Season Of Doc
 + Google approved the new Guide, program over
 + Book is ready LibreOffice Online
 + Blog post and DL website is on the way.
 + PDF: https://nextcloud.documentfoundation.org/s/RtHBeXoeiZr2eM8
  + Calc guide:
+ on going

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
234(234) (topicUI) bugs open, 253(253) (needsUXEval) needs to 
be evaluated by the UXteam

+ Updates:
BZ changes   1 week1 month   3 months   12 months
 added  11(7) 22(2) 43(5)  104(1)
 commented 121(30)   363(39)   846(59)2374(82)
   removed   1(1)  2(1)  2(1)   14(1)
  resolved   9(-2)38(3) 88(4)  224(7)
+ top 10 contributors:
  Heiko Tietze made 199 changes in 1 month, and 961 changes in 
1 year
  Xisco Faulí made 103 changes in 1 month, and 417 changes in 1 
year

  Timur made 99 changes in 1 month, and 156 changes in 1 year
  Foote, V Stuart made 53 changes in 1 month, and 396 changes 
in 1 year
  Dieter Praas made 52 changes in 1 month, and 327 changes in 1 
year
  Kainz, Andreas made 21 changes in 1 month, and 245 changes in 
1 year
  kompilainenn made 18 changes in 1 month, and 284 changes in 1 
year
  Muhammet Kara made 17 changes in 1 month, and 26 changes in 1 
year
  Franklin Weng made 14 changes in 1 month, and 19 changes in 1 
year
  Mehrbrodt, Samuel made 13 changes in 1 month, and 109 changes 
in 1y

+ New tickets with needsUXEval Dec/05-12

   -> * Mailmerge: Dialog size should be remembered and increased 
dialog should

enlarge records area and not space above OK/Cancel buttons
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129245
  * Add predefined double screen sizes for slide show using "All 
displays"

(workaround: manually double slide width)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=124505
  * EDITING: Support fill character in a hanging indent of a paragraph
   + https://bugs.documentfoundation.org/show_bug.cgi?id=128986
  * EDITING: Swap-Text feature request
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129273
  * switching from 4:3 to 16:9 aspect ratio warps images and formulas
   + https://bugs.documentfoundation.org/show_bug.cgi?id=128801
  * Feature request - add option for creating layers for images
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129276
   -> * Further refinement of OpenType/Graphite Font features in the 
“Character”

dialogue
+ https://bugs.documentfoundation.org/show_bug.cgi?id=129219
  => in discussion

  * Change Calc's Print Preview Page to Use Gradient As Writer's Page
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129238
  * Draw menu entry: Shape or Shapes?
+ https://bugs.documentfoundation.org/show_bug.cgi?id=129288
  * HYPERLINK DIALOG: Hyperlink Text below URL
+ https://bugs.documentfoundation.org/show_bug.cgi?id=129295
  * Split Cell Recommendations
+ https://bugs.documentfoundation.org/show_bug.cgi?id=129203
  * PRINTING: Change The Color of Print Preview Active Page Border
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129235
   + easyhack
  => NEW

  * Styles Lists should include Default
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129298
  => WF

* Crash Testing (Caolan)
+ 5(+5) import fail

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

[Jim Raykowski (via logerrit)]

 cui/source/factory/dlgfact.cxx |4 +++-
 cui/source/inc/backgrnd.hxx|5 +
 cui/source/tabpages/backgrnd.cxx   |7 +++
 sw/source/ui/frmdlg/pattern.cxx|9 +++--
 sw/source/uibase/app/appopt.cxx|4 +++-
 sw/source/uibase/shells/basesh.cxx |3 ++-
 6 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit 03facb4bb75e4283c91de6f081ee96137ca4346c
Author: Jim Raykowski 
AuthorDate: Fri Dec 7 17:41:54 2018 -0900
Commit: Mike Kaganski 
CommitDate: Thu Dec 12 16:58:05 2019 +0100

tdf#105225 New UNO and Writer Web background tab pages

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

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 039f713d2279..63a7e2a089dd 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1424,6 +1424,7 @@ CreateTabPage 
AbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId
 {
 switch ( nId )
 {
+case RID_SW_TP_BACKGROUND :
 case RID_SVXPAGE_BKG :
 return SvxBkgTabPage::Create;
 case RID_SVXPAGE_TEXTANIMATION :
@@ -1468,7 +1469,6 @@ CreateTabPage 
AbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId
 return SvxTextAttrPage::Create;
 case RID_SVXPAGE_ALIGNMENT :
 return svx::AlignmentTabPage::Create;
-case RID_SW_TP_BACKGROUND :
 case RID_SVXPAGE_BACKGROUND :
 return SvxBackgroundTabPage::Create;
 case RID_SVXPAGE_BORDER :
@@ -1534,6 +1534,8 @@ GetTabPageRanges 
AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI
 case RID_SVXPAGE_ALIGNMENT :
 return svx::AlignmentTabPage::GetRanges;
 case RID_SW_TP_BACKGROUND :
+case RID_SVXPAGE_BKG:
+return SvxBkgTabPage::GetRanges;
 case RID_SVXPAGE_BACKGROUND :
 return SvxBackgroundTabPage::GetRanges;
 case RID_SVXPAGE_BORDER :
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 782e56d9f811..2392faae129d 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -153,6 +153,8 @@ private:
 
 class SvxBkgTabPage : public SvxAreaTabPage
 {
+static const sal_uInt16 pPageRanges[];
+
 std::unique_ptr m_xTblLBox;
 boolbHighlighting   : 1;
 boolbCharBackColor  : 1;
@@ -166,6 +168,9 @@ public:
 SvxBkgTabPage(weld::Container* pPage, weld::DialogController* pController, 
const SfxItemSet& rInAttrs);
 virtual ~SvxBkgTabPage() override;
 
+// returns the area of the which-values
+static const sal_uInt16* GetRanges() { return pPageRanges; }
+
 static std::unique_ptr Create( weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet* );
 virtual bool FillItemSet( SfxItemSet* ) override;
 virtual void ActivatePage( const SfxItemSet& ) override;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 17bc6e6b3411..18bcfc734689 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -63,6 +63,13 @@ const sal_uInt16 SvxBackgroundTabPage::pPageRanges[] =
 0
 };
 
+const sal_uInt16 SvxBkgTabPage::pPageRanges[] =
+{
+SID_ATTR_BRUSH, SID_ATTR_BRUSH,
+SID_ATTR_BRUSH_CHAR, SID_ATTR_BRUSH_CHAR,
+0
+};
+
 /// Returns the fill style of the currently selected entry.
 static drawing::FillStyle lcl_getFillStyle(const weld::ComboBox& rLbSelect)
 {
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index 2fccc5172b32..9cc2e271d7a3 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -29,9 +29,14 @@ SwBackgroundDlg::SwBackgroundDlg(weld::Window* pParent, 
const SfxItemSet& rSet)
 {
 m_xDialog->set_title(SwResId(STR_FRMUI_PATTERN));
 SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BACKGROUND );
+::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BKG );
 if ( fnCreatePage )
-SetTabPage((*fnCreatePage)(get_content_area(), this, &rSet));
+{
+std::unique_ptr xRet = (*fnCreatePage)(get_content_area(), 
this, &rSet);
+xRet->PageCreated(rSet);
+xRet->ActivatePage(rSet);
+SetTabPage(std::move(xRet));
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index f071b85997fe..90c04f18ae59 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -101,6 +101,7 @@ std::unique_ptr SwModule::CreateItemSet( 
sal_uInt16 nId )
 GetPool(),
 svl::Items<
 RES_BACKGROUND, RES_BACKGROUND,
+XATTR_FILL_FIRST, XATTR_FILL_LAST,
   

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - filter/source

[Jan-Marek Glogowski (via logerrit)]

 filter/source/pdf/impdialog.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 75406122dd7f6896d003aff46decb78bb40f2fa8
Author: Jan-Marek Glogowski 
AuthorDate: Wed Dec 11 19:14:31 2019 +0100
Commit: Xisco Faulí 
CommitDate: Thu Dec 12 17:00:16 2019 +0100

tdf#127493 store ExportFormFields checkbox value

... and also correctly set the initial frames sensitivity.

The commit removed the no longer needed UserSelection variant of
mbExportFormFields but forgit to actually set it now.

Regression from my commit 76fcd878da1624e73f1eb9d9405485d4faf66edf.

Change-Id: Ia5fcc1c37e2e4b4a330b59a492f817d2db8d7347
Reviewed-on: https://gerrit.libreoffice.org/84975
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit b06cba8f13e0b71346cb884cf827751f2086fd8e)
Reviewed-on: https://gerrit.libreoffice.org/85037
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index e19df5f9e0d7..bbb6c9973bb3 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -567,6 +567,7 @@ void 
ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
 
 mxLbFormsFormat->set_active(static_cast(pParent->mnFormsType));
 mxCbAllowDuplicateFieldNames->set_active( 
pParent->mbAllowDuplicateFieldNames );
+mxFormsFrame->set_sensitive(pParent->mbExportFormFields);
 
 mxCbExportBookmarks->set_active( pParent->mbExportBookmarks );
 
@@ -670,6 +671,7 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( 
ImpPDFTabDialog* pParent )
 else
 mbUseTaggedPDFUserSelection = pParent->mbUseTaggedPDF;
 pParent->mbUseTaggedPDFUserSelection = mbUseTaggedPDFUserSelection;
+pParent->mbExportFormFields = mxCbExportFormFields->get_active();
 
 if( mxCbWatermark->get_active() )
 pParent->maWatermarkText = mxEdWatermark->get_text();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 source/text/sbasic/python/python_handler.xhp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 08fa68db86928852e7b025b76059fcceceedf325
Author: Caolán McNamara 
AuthorDate: Thu Dec 12 16:00:40 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 12 17:05:17 2019 +0100

tdf#127919 link Assign Component dialog to 'Creating A Dialog Handler'

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

diff --git a/source/text/sbasic/python/python_handler.xhp 
b/source/text/sbasic/python/python_handler.xhp
index 1f9e9ce35..87887105e 100644
--- a/source/text/sbasic/python/python_handler.xhp
+++ b/source/text/sbasic/python/python_handler.xhp
@@ -23,6 +23,7 @@
  API;DialogProvider2
  API;XDialogEventHandler
   
+  
   Creating a Dialog Handler
   Next to assigning macros to events or creating event listeners, one can use dialog handlers, whose 
principle is to define UNO keywords, or methods, that are mapped to events to 
watch for. The event handler is responsible for executing methods using the 
vnd.sun.star.UNO: protocol. Unlike 
listeners that require to define all supported methods, even if unused, dialog 
handlers require only two methods on top of intended control hook 
scripts.
   The advantages of this approach 
are:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara (via logerrit)]

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

New commits:
commit 693bdcc3a8c4e849c306b0187a5bf8ffe4ddb824
Author: Caolán McNamara 
AuthorDate: Thu Dec 12 16:00:40 2019 +
Commit: Gerrit Code Review 
CommitDate: Thu Dec 12 17:05:17 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#127919 link Assign Component dialog to 'Creating A Dialog Handler'

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

diff --git a/helpcontent2 b/helpcontent2
index 96c9eaf34676..08fa68db8692 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 96c9eaf34676be060349e683f271995abc7779eb
+Subproject commit 08fa68db86928852e7b025b76059fcceceedf325
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-4' - source/text

[Caolán McNamara (via logerrit)]

 source/text/sbasic/python/python_handler.xhp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 54335ce48cca4ab26112f700210ecbe5fa5a0595
Author: Caolán McNamara 
AuthorDate: Thu Dec 12 16:00:40 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 12 17:08:57 2019 +0100

tdf#127919 link Assign Component dialog to 'Creating A Dialog Handler'

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

diff --git a/source/text/sbasic/python/python_handler.xhp 
b/source/text/sbasic/python/python_handler.xhp
index 1f9e9ce35..87887105e 100644
--- a/source/text/sbasic/python/python_handler.xhp
+++ b/source/text/sbasic/python/python_handler.xhp
@@ -23,6 +23,7 @@
  API;DialogProvider2
  API;XDialogEventHandler
   
+  
   Creating a Dialog Handler
   Next to assigning macros to events or creating event listeners, one can use dialog handlers, whose 
principle is to define UNO keywords, or methods, that are mapped to events to 
watch for. The event handler is responsible for executing methods using the 
vnd.sun.star.UNO: protocol. Unlike 
listeners that require to define all supported methods, even if unused, dialog 
handlers require only two methods on top of intended control hook 
scripts.
   The advantages of this approach 
are:
___
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' - helpcontent2

[Caolán McNamara (via logerrit)]

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

New commits:
commit 87748e368d68ce6a69496a3beeeabb8acf8ebe7d
Author: Caolán McNamara 
AuthorDate: Thu Dec 12 16:00:40 2019 +
Commit: Gerrit Code Review 
CommitDate: Thu Dec 12 17:08:57 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-4'
  - tdf#127919 link Assign Component dialog to 'Creating A Dialog Handler'

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

diff --git a/helpcontent2 b/helpcontent2
index b9e507c6a3a4..54335ce48cca 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b9e507c6a3a4be582dd09ac1d81b7c093a2985ae
+Subproject commit 54335ce48cca4ab26112f700210ecbe5fa5a0595
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sc/source/filter/excel/xistyle.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4781ba436f72b5b763833c3c036e7f1c0e4d9e3b
Author: Stephan Bergmann 
AuthorDate: Thu Dec 12 16:38:39 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 17:35:31 2019 +0100

This shall presumably be ScVerticalStackCell

(changed from SfxBoolItem(ATTR_STACKED,...) in
2579895f2c18fd7d606715f91b1463900f6d6937 "Related: tdf#129300 add
ScVerticalStackCell to provide a description")

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

diff --git a/sc/source/filter/excel/xistyle.cxx 
b/sc/source/filter/excel/xistyle.cxx
index 3a2cd52c03cf..b1c308673cd7 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -830,7 +830,7 @@ void XclImpCellAlign::FillToItemSet( SfxItemSet& rItemSet, 
const XclImpFont* pFo
 // text orientation/rotation (BIFF2-BIFF7 sets mnOrient)
 sal_uInt8 nXclRot = (mnOrient == EXC_ORIENT_NONE) ? mnRotation : 
XclTools::GetXclRotFromOrient( mnOrient );
 bool bStacked = (nXclRot == EXC_ROT_STACKED);
-ScfTools::PutItem( rItemSet, ScShrinkToFitCell( bStacked ), bSkipPoolDefs 
);
+ScfTools::PutItem( rItemSet, ScVerticalStackCell( bStacked ), 
bSkipPoolDefs );
 // set an angle in the range from -90 to 90 degrees
 sal_Int32 nAngle = XclTools::GetScRotation( nXclRot, 0 );
 ScfTools::PutItem( rItemSet, ScRotateValueItem( nAngle ), bSkipPoolDefs );
___
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

[Samuel Mehrbrodt (via logerrit)]

 vcl/source/treelist/svimpbox.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9ed66c205d57093dccafa3d16fba7ddd0a109ba6
Author: Samuel Mehrbrodt 
AuthorDate: Tue Dec 10 18:08:14 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Dec 12 17:40:01 2019 +0100

tdf#128824 Keep multiselection in style list on right click

Change-Id: I196f8c7d3a1a0b3267498f6cde55069ba3a60523
Reviewed-on: https://gerrit.libreoffice.org/84882
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 13966121b49369950f2c214f3ab109fbad0386ad)
Reviewed-on: https://gerrit.libreoffice.org/84947
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index e2dca323dd26..75b482ecaa0b 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -2071,7 +2071,8 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
 return;
 // Inplace-Editing?
 }
-if ( m_aSelEng.GetSelectionMode() != SelectionMode::NONE )
+if ( m_aSelEng.GetSelectionMode() != SelectionMode::NONE
+ && !rMEvt.IsRight() ) // tdf#128824
 m_aSelEng.SelMouseButtonDown( rMEvt );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen (via logerrit)]

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

New commits:
commit 96bf3c26037c520817fc256d0c942bc78eef3472
Author: Gabor Kelemen 
AuthorDate: Tue Dec 10 23:24:29 2019 +0100
Commit: Xisco Faulí 
CommitDate: Thu Dec 12 17:47:35 2019 +0100

tdf#123076 Get paper size for print preview

Initialize from current paper size which can be different from A4

Change-Id: Iae5e33d79c0783a32dad8635a66cc3fbe83dc568
Reviewed-on: https://gerrit.libreoffice.org/84920
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: László Németh 
(cherry picked from commit 562c30d5ad142fcdc77be6125fdac6d48b782fd7)
Reviewed-on: https://gerrit.libreoffice.org/85057
Reviewed-by: Xisco Faulí 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 270d4ca62a38..336929525360 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -937,6 +937,8 @@ void PrintDialog::preparePreview( bool i_bMayUseCache )
 {
 VclPtr aPrt( maPController->getPrinter() );
 Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), 
MapMode( MapUnit::Map100thMM ) );
+// tdf#123076 Get paper size for the preview top label
+mePaper = aPrt->GetPaper();
 GDIMetaFile aMtf;
 
 // page range may have changed depending on options
___
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

[Gabor Kelemen (via logerrit)]

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

New commits:
commit 8659c42c4a016722cf6418e6ff1cd34bc5bdf88e
Author: Gabor Kelemen 
AuthorDate: Tue Dec 10 23:24:29 2019 +0100
Commit: Xisco Faulí 
CommitDate: Thu Dec 12 17:47:50 2019 +0100

tdf#123076 Get paper size for print preview

Initialize from current paper size which can be different from A4

Change-Id: Iae5e33d79c0783a32dad8635a66cc3fbe83dc568
Reviewed-on: https://gerrit.libreoffice.org/84920
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: László Németh 
(cherry picked from commit 562c30d5ad142fcdc77be6125fdac6d48b782fd7)
Reviewed-on: https://gerrit.libreoffice.org/85053
Reviewed-by: Xisco Faulí 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index c50fb512dd92..b42a1ce41213 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -890,6 +890,8 @@ void PrintDialog::preparePreview( bool i_bMayUseCache )
 {
 VclPtr aPrt( maPController->getPrinter() );
 Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), 
MapMode( MapUnit::Map100thMM ) );
+// tdf#123076 Get paper size for the preview top label
+mePaper = aPrt->GetPaper();
 GDIMetaFile aMtf;
 
 // page range may have changed depending on options
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sc/inc/clipcontext.hxx|1 
 sc/inc/compiler.hxx   |2 
 sc/inc/externalrefmgr.hxx |4 +
 sc/inc/reftokenhelper.hxx |   10 +--
 sc/inc/token.hxx  |   10 +--
 sc/inc/tokenarray.hxx |8 +--
 sc/qa/unit/subsequent_export-test.cxx |2 
 sc/qa/unit/ucalc_formula.cxx  |   34 ++---
 sc/source/core/data/clipcontext.cxx   |2 
 sc/source/core/data/column.cxx|   18 +++---
 sc/source/core/data/column2.cxx   |2 
 sc/source/core/data/column3.cxx   |   42 
 sc/source/core/data/conditio.cxx  |8 +--
 sc/source/core/data/documen4.cxx  |4 -
 sc/source/core/data/documentimport.cxx|2 
 sc/source/core/data/formulacell.cxx   |   22 
 sc/source/core/data/table2.cxx|8 +--
 sc/source/core/data/table3.cxx|2 
 sc/source/core/data/validat.cxx   |4 -
 sc/source/core/tool/chartlis.cxx  |6 +-
 sc/source/core/tool/compiler.cxx  |   30 +--
 sc/source/core/tool/consoli.cxx   |4 -
 sc/source/core/tool/detfunc.cxx   |8 +--
 sc/source/core/tool/formulalogger.cxx |2 
 sc/source/core/tool/interpr1.cxx  |   34 ++---
 sc/source/core/tool/interpr2.cxx  |6 +-
 sc/source/core/tool/interpr4.cxx  |   14 ++---
 sc/source/core/tool/rangenam.cxx  |6 +-
 sc/source/core/tool/reftokenhelper.cxx|   30 +--
 sc/source/core/tool/token.cxx |   78 +++---
 sc/source/filter/excel/excform.cxx|   12 ++--
 sc/source/filter/excel/excform8.cxx   |   17 +++---
 sc/source/filter/excel/xechart.cxx|2 
 sc/source/filter/excel/xeformula.cxx  |6 +-
 sc/source/filter/excel/xichart.cxx|2 
 sc/source/filter/html/htmlimp.cxx |2 
 sc/source/filter/inc/lotrange.hxx |2 
 sc/source/filter/inc/namebuff.hxx |2 
 sc/source/filter/inc/qproform.hxx |2 
 sc/source/filter/inc/tokstack.hxx |6 +-
 sc/source/filter/lotus/lotform.cxx|4 -
 sc/source/filter/lotus/lotus.cxx  |2 
 sc/source/filter/lotus/op.cxx |4 -
 sc/source/filter/lotus/tool.cxx   |8 +--
 sc/source/filter/oox/condformatbuffer.cxx |   10 +--
 sc/source/filter/oox/formulabuffer.cxx|5 -
 sc/source/filter/oox/workbookhelper.cxx   |2 
 sc/source/filter/oox/worksheethelper.cxx  |2 
 sc/source/filter/qpro/qpro.cxx|2 
 sc/source/filter/qpro/qproform.cxx|4 -
 sc/source/filter/xml/xmlcelli.cxx |2 
 sc/source/filter/xml/xmlsubti.cxx |2 
 sc/source/ui/docshell/docfunc.cxx |2 
 sc/source/ui/docshell/externalrefmgr.cxx  |   20 ---
 sc/source/ui/docshell/tablink.cxx |2 
 sc/source/ui/formdlg/formula.cxx  |4 -
 sc/source/ui/unoobj/cellsuno.cxx  |6 +-
 sc/source/ui/unoobj/chart2uno.cxx |   76 +++--
 sc/source/ui/unoobj/fmtuno.cxx|8 +--
 sc/source/ui/unoobj/funcuno.cxx   |2 
 sc/source/ui/unoobj/nameuno.cxx   |2 
 sc/source/ui/unoobj/tokenuno.cxx  |2 
 sc/source/ui/vba/vbarange.cxx |2 
 sc/source/ui/view/cellsh1.cxx |2 
 sc/source/ui/view/viewfun2.cxx|4 -
 65 files changed, 323 insertions(+), 312 deletions(-)

New commits:
commit 40b0bd21e87480b659e7ed92854eee385a2a3c55
Author: Noel Grandin 
AuthorDate: Thu Dec 12 15:01:02 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 12 17:49:02 2019 +0100

sc: rowcol: tdf#50916 pass ScDocument to the token classes

needed to create a fake ScDocument for the external ref manager, since
it has no ScDocument at all

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

diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index e2b99ba5bf34..dd84c0e17501 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -95,6 +95,7 @@ public:
 
 ScDocument* getUndoDoc();
 ScDocument* getClipDoc();
+ScDocument* getDestDoc() { return &mrDestDoc; }
 InsertDeleteFlags getInsertFlag() const;
 
 void setDeleteFlag( InsertDeleteFlags nFlag );
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 98a3aed7ee78..dce569c2b68a 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -167,7 +167,7 @@ public:
  */
 bool IsValidReference(const ScDocument* pDoc) const;
 
-formula::FormulaToken* CreateToken() const;   // create typified token
+formula::FormulaToken* CreateToken(const ScDocument* pDoc) const;   // 
create typified token
 };
 
 class SC_DLLPUBLIC ScCompiler : public formula

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

[Stephan Bergmann (via logerrit)]

 sc/inc/scopetools.hxx|6 ++
 sc/source/core/data/document.cxx |   25 -
 sc/source/core/inc/bcaslot.hxx   |6 ++
 3 files changed, 32 insertions(+), 5 deletions(-)

New commits:
commit 3e59716375a240576fd6d8759b32b4319506ed70
Author: Stephan Bergmann 
AuthorDate: Thu Dec 12 16:42:42 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 18:17:26 2019 +0100

Prevent BroadcastRecalcOnRefMoveHandler copies

...which would contain copies of AutoCalcSwitch and ScBulkBroadcast that 
both do
things in their dtors.  std::sort (into which 
BroadcastRecalcOnRefMoveHandler is
passed as function object argument) returns its function object argument, 
which
caused the BroadcastRecalcOnRefMoveHandler copies.

Better split the RAII part that holds AutoCalcSwitch and ScBulkBroadcast and
does things in their dtors into a BroadcastRecalcOnRefMoveGuard class of its
own.  (And while at it, explicitly delete the copy/move functions of
AutoCalcSwitch and ScBulkBroadcast to avoid such issues in the future.)

(The RAII part of BroadcastRecalcOnRefMoveHandler had been added with
60d0b992ea3a910be79ae4a8e8b0bb32a358b18a "sc-perf: tdf#87101 add bulk scope 
for
BroadcastRecalcOnRefMove() calls".  The issue was found with Clang 10 trunk
-Wdeprecated-copy-dtor.)

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

diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index 571b1fce52f5..b71154330e96 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -24,6 +24,12 @@ class SC_DLLPUBLIC AutoCalcSwitch
 {
 ScDocument& mrDoc;
 bool const mbOldValue;
+
+AutoCalcSwitch(AutoCalcSwitch const &) = delete;
+AutoCalcSwitch(AutoCalcSwitch &&) = delete;
+AutoCalcSwitch & operator =(AutoCalcSwitch const &) = delete;
+AutoCalcSwitch & operator =(AutoCalcSwitch &&) = delete;
+
 public:
 AutoCalcSwitch(ScDocument& rDoc, bool bAutoCalc);
 ~AutoCalcSwitch();
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 3c34473359f2..fa1913a0c11c 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1226,8 +1226,11 @@ struct BroadcastRecalcOnRefMoveHandler
 if (p)
 p->BroadcastRecalcOnRefMove();
 }
+};
 
-explicit BroadcastRecalcOnRefMoveHandler( ScDocument* pDoc ) :
+struct BroadcastRecalcOnRefMoveGuard
+{
+explicit BroadcastRecalcOnRefMoveGuard( ScDocument* pDoc ) :
 aSwitch( *pDoc, false),
 aBulk( pDoc->GetBASM(), SfxHintId::ScDataChanged)
 {
@@ -1339,7 +1342,10 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB 
nStartTab,
 a->SetDirtyIfPostponed();
 }
 
-std::for_each(maTabs.begin(), maTabs.end(), 
BroadcastRecalcOnRefMoveHandler( this));
+{
+BroadcastRecalcOnRefMoveGuard g(this);
+std::for_each(maTabs.begin(), maTabs.end(), 
BroadcastRecalcOnRefMoveHandler());
+}
 }
 bRet = true;
 }
@@ -1450,7 +1456,10 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB 
nStartTab,
 a->SetDirtyIfPostponed();
 }
 
-std::for_each(maTabs.begin(), maTabs.end(), 
BroadcastRecalcOnRefMoveHandler( this));
+{
+BroadcastRecalcOnRefMoveGuard g(this);
+std::for_each(maTabs.begin(), maTabs.end(), 
BroadcastRecalcOnRefMoveHandler());
+}
 }
 
 if (pChartListenerCollection)
@@ -1552,7 +1561,10 @@ bool ScDocument::InsertCol( SCROW nStartRow, SCTAB 
nStartTab,
 std::for_each(maTabs.begin(), maTabs.end(), 
SetDirtyIfPostponedHandler());
 // Cells containing functions such as CELL, COLUMN or ROW may have
 // changed their values on relocation. Broadcast them.
-std::for_each(maTabs.begin(), maTabs.end(), 
BroadcastRecalcOnRefMoveHandler( this));
+{
+BroadcastRecalcOnRefMoveGuard g(this);
+std::for_each(maTabs.begin(), maTabs.end(), 
BroadcastRecalcOnRefMoveHandler());
+}
 }
 bRet = true;
 }
@@ -1653,7 +1665,10 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB 
nStartTab, SCROW nEndRow, SCTA
 a->SetDirtyIfPostponed();
 }
 
-std::for_each(maTabs.begin(), maTabs.end(), 
BroadcastRecalcOnRefMoveHandler( this));
+{
+BroadcastRecalcOnRefMoveGuard g(this);
+std::for_each(maTabs.begin(), maTabs.end(), 
BroadcastRecalcOnRefMoveHandler());
+}
 }
 
 if (pChartListenerCollection)
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 20322d5f4fc2..11c0942df9a2 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -351,6 +351,12 @@ c

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

[Stephan Bergmann (via logerrit)]

 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |   25 +--
 1 file changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 23cfd3d1004f5ddda8cd79878c00b6c64f20068c
Author: Stephan Bergmann 
AuthorDate: Thu Dec 12 16:56:52 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 12 18:25:44 2019 +0100

ScShapeChild has broken copy functions

...as its dtor calls mpAccShape->dispose() on the copied pointer member, 
thus
potentially calling dispose too early (and multiple times, but which in 
itself
should be harmless).  The copy functions are used when vectors of 
ScShapeChild
(as used in ScShapeRange) get sorted with std::stort (which requires
ScShapeChild to be moveable, but as the move functions are implicitly 
deleted
because of the user-declared dtor, the implicitly defined copy functions are
used instead).

So turn ScShapeChild into a move-only class, clearing mpAccShape in 
moved-from
instances.

(The issue appears to exist ever since the code got introduced with
e916b33bde0e863d33fdbb09dfd08c847ab76f20 "#95584#; add notes and shape 
support".
It was found with Clang 10 trunk -Wdeprecated-copy-dtor.)

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

diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx 
b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index f887784bd92d..f27e98f5742c 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -580,7 +581,17 @@ struct ScShapeChild
 : mnRangeId(0)
 {
 }
+ScShapeChild(ScShapeChild const &) = delete;
+ScShapeChild(ScShapeChild &&) = default;
 ~ScShapeChild();
+ScShapeChild & operator =(ScShapeChild const &) = delete;
+ScShapeChild & operator =(ScShapeChild && other) {
+std::swap(mpAccShape, other.mpAccShape);
+mxShape = std::move(other.mxShape);
+mnRangeId = other.mnRangeId;
+return *this;
+}
+
 mutable rtl::Reference< ::accessibility::AccessibleShape > mpAccShape;
 css::uno::Reference< css::drawing::XShape > mxShape;
 sal_Int32 mnRangeId;
@@ -617,6 +628,12 @@ namespace {
 
 struct ScShapeRange
 {
+ScShapeRange() = default;
+ScShapeRange(ScShapeRange const &) = delete;
+ScShapeRange(ScShapeRange &&) = default;
+ScShapeRange & operator =(ScShapeRange const &) = delete;
+ScShapeRange & operator =(ScShapeRange &&) = default;
+
 ScShapeChildVec maBackShapes;
 ScShapeChildVec maForeShapes; // inclusive internal shapes
 ScShapeChildVec maControls;
@@ -747,7 +764,7 @@ void ScShapeChildren::FindChanged(ScShapeRange& rOld, 
ScShapeRange& rNew) const
 
 void ScShapeChildren::DataChanged()
 {
-ScShapeRangeVec aOldShapeRanges(maShapeRanges);
+ScShapeRangeVec aOldShapeRanges(std::move(maShapeRanges));
 maShapeRanges.clear();
 maShapeRanges.resize(SC_PREVIEW_MAXRANGES);
 Init();
@@ -1012,17 +1029,17 @@ void ScShapeChildren::FillShapes(const 
tools::Rectangle& aPixelPaintRect, const
 aShape.mnRangeId = nRangeId;
 if (pObj->GetLayer().anyOf(SC_LAYER_INTERN, 
SC_LAYER_FRONT))
 {
-
maShapeRanges[nRangeId].maForeShapes.push_back(aShape);
+
maShapeRanges[nRangeId].maForeShapes.push_back(std::move(aShape));
 bForeAdded = true;
 }
 else if (pObj->GetLayer() == SC_LAYER_BACK)
 {
-
maShapeRanges[nRangeId].maBackShapes.push_back(aShape);
+
maShapeRanges[nRangeId].maBackShapes.push_back(std::move(aShape));
 bBackAdded = true;
 }
 else if (pObj->GetLayer() == SC_LAYER_CONTROLS)
 {
-
maShapeRanges[nRangeId].maControls.push_back(aShape);
+
maShapeRanges[nRangeId].maControls.push_back(std::move(aShape));
 bControlAdded = true;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/source/customize/cfgutil.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit dcad3c08b10ca6ef6ff01a43316d6dafcd0170b8
Author: Caolán McNamara 
AuthorDate: Thu Dec 12 15:29:43 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 12 21:13:13 2019 +0100

theChild->getName() already available as uiName

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

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 51b41faf2e26..b464ff53f4e4 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -519,8 +519,8 @@ void CuiConfigGroupListBox::FillScriptList(const 
css::uno::Reference< css::scrip
 OUString uiName = theChild->getName();
 if ( bIsRootNode )
 {
-if (  ! (theChild->getName() == user  || 
theChild->getName() == share ||
- theChild->getName() == currentDocTitle ) )
+if (  ! (uiName == user  || uiName == share ||
+ uiName == currentDocTitle ) )
 {
 bDisplay=false;
 }
commit f2c6faa72c60f1438340173f5a6dc5533bce55ba
Author: Caolán McNamara 
AuthorDate: Thu Dec 12 15:28:08 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 12 21:12:45 2019 +0100

children[n] already available as theChild

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

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 1d94255e73eb..51b41faf2e26 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -536,17 +536,17 @@ void CuiConfigGroupListBox::FillScriptList(const 
css::uno::Reference< css::scrip
 }
 }
 }
-if (children[n]->getType() != browse::BrowseNodeTypes::SCRIPT  
&& bDisplay )
+if (theChild->getType() != browse::BrowseNodeTypes::SCRIPT  && 
bDisplay )
 {
 //  We call acquire on the XBrowseNode so that it does not
 //  get autodestructed and become invalid when accessed later.
 theChild->acquire();
 
 bool bChildOnDemand = false;
-if ( !bCheapChildrenOnDemand && 
children[n]->hasChildNodes() )
+if ( !bCheapChildrenOnDemand && theChild->hasChildNodes() )
 {
 Sequence< Reference< browse::XBrowseNode > > 
grandchildren =
-children[n]->getChildNodes();
+theChild->getChildNodes();
 
 for ( sal_Int32 m = 0; m < grandchildren.getLength(); 
++m )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 vcl/uiconfig/theme_definitions/ios/definition.xml |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit ab9ac0fc697f57f0804dea03812dd2adfd99794b
Author: Tomaž Vajngerl 
AuthorDate: Thu Dec 12 21:41:39 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Dec 12 21:41:39 2019 +0100

iOS theme: set spinbox orientation to "decrease-edit-increase"

iOS theme was designed to have spinbox orientation set to
"decrease-edit-increase", but this was not explicitly set in the
theme definition as it was also the default. The defualt was
changed recently to "stacked" and it broke the iOS theme.

Change-Id: If43fa46c04415dda1efe0855c4901b5aede7eb32

diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml 
b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 8725e14ee1f2..958c85600e15 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -95,6 +95,11 @@
 selected="true|false|any"
 button-value="true|false|any"
 extra="{various}"
+
+control specific:
+ attributes:
+- orientation: stacked (default), edit-decrease-increase, 
decrease-edit-increase
+
 -->
 
 
@@ -242,7 +247,7 @@
 
 
 
-
+
 
 
 
___
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.2' - vcl/uiconfig

[Tomaž Vajngerl (via logerrit)]

 vcl/uiconfig/theme_definitions/ios/definition.xml |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6c0ddbaec3db2958b8c393b54ca29dd3862d931a
Author: Tomaž Vajngerl 
AuthorDate: Thu Dec 12 21:41:39 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Dec 12 21:49:27 2019 +0100

iOS theme: set spinbox orientation to "decrease-edit-increase"

iOS theme was designed to have spinbox orientation set to
"decrease-edit-increase", but this was not explicitly set in the
theme definition as it was also the default. The defualt was
changed recently to "stacked" and it broke the iOS theme.

Change-Id: If43fa46c04415dda1efe0855c4901b5aede7eb32
(cherry picked from commit ab9ac0fc697f57f0804dea03812dd2adfd99794b)

diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml 
b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 8725e14ee1f2..958c85600e15 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -95,6 +95,11 @@
 selected="true|false|any"
 button-value="true|false|any"
 extra="{various}"
+
+control specific:
+ attributes:
+- orientation: stacked (default), edit-decrease-increase, 
decrease-edit-increase
+
 -->
 
 
@@ -242,7 +247,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/control/opendoccontrols.cxx |4 
 dbaccess/uiconfig/ui/generalpagewizard.ui  |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit dac33e465a19f0cdd8b8450ca1631cb3e09d771f
Author: Caolán McNamara 
AuthorDate: Thu Dec 12 16:24:45 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 12 21:56:44 2019 +0100

Resolves: tdf#128972 limit width of combobox of recently-used

in the wizard so that the end of the combobox is available and the
dialog isn't oversized.

the user can resize the window to see more of the text of the recently-used

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

diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx 
b/dbaccess/source/ui/control/opendoccontrols.cxx
index 1a86e465b3c9..48c7a9162c39 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -124,6 +124,10 @@ namespace dbaui
 OpenDocumentListBox::OpenDocumentListBox(std::unique_ptr 
xControl, const sal_Char* _pAsciiModuleName )
 : m_xControl(std::move(xControl))
 {
+// we need to limit the max auto width feature of the filter box
+int nWidth = m_xControl->get_approximate_digit_width() * 50;
+m_xControl->set_size_request(nWidth, -1);
+
 impl_init( _pAsciiModuleName );
 }
 
diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui 
b/dbaccess/uiconfig/ui/generalpagewizard.ui
index 32a666a71db9..029fc1adf94d 100644
--- a/dbaccess/uiconfig/ui/generalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/generalpagewizard.ui
@@ -153,7 +153,7 @@
   
 True
 False
-start
+True
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gen-boost-headers compilerplugins/clang config_host.mk.in configure.ac external/boost solenv/gbuild

[Stephan Bergmann (via logerrit)]

 bin/gen-boost-headers  |1 
 compilerplugins/clang/test/commaoperator.cxx   |2 -
 compilerplugins/clang/test/unnecessaryoverride.cxx |3 +
 config_host.mk.in  |1 
 configure.ac   |   17 
++
 external/boost/include/boost/algorithm/string.hpp  |1 
 external/boost/include/boost/algorithm/string/case_conv.hpp|1 
 external/boost/include/boost/algorithm/string/classification.hpp   |1 
 external/boost/include/boost/algorithm/string/predicate.hpp|1 
 external/boost/include/boost/algorithm/string/split.hpp|1 
 external/boost/include/boost/any.hpp   |1 
 external/boost/include/boost/archive/iterators/base64_from_binary.hpp  |1 
 external/boost/include/boost/archive/iterators/binary_from_base64.hpp  |1 
 external/boost/include/boost/archive/iterators/remove_whitespace.hpp   |1 
 external/boost/include/boost/archive/iterators/transform_width.hpp |1 
 external/boost/include/boost/asio.hpp  |1 
 external/boost/include/boost/assign.hpp|1 
 external/boost/include/boost/bimap/bimap.hpp   |1 
 external/boost/include/boost/bimap/unordered_set_of.hpp|1 
 external/boost/include/boost/bind.hpp  |1 
 external/boost/include/boost/cast.hpp  |1 
 external/boost/include/boost/circular_buffer.hpp   |1 
 external/boost/include/boost/config.hpp|1 
 external/boost/include/boost/container/deque.hpp   |1 
 external/boost/include/boost/cstdint.hpp   |1 
 external/boost/include/boost/current_function.hpp  |1 
 external/boost/include/boost/date_time.hpp |1 
 external/boost/include/boost/date_time/posix_time/posix_time.hpp   |1 
 external/boost/include/boost/enable_shared_from_this.hpp   |1 
 external/boost/include/boost/exception/diagnostic_information.hpp  |1 
 external/boost/include/boost/filesystem.hpp|1 
 external/boost/include/boost/filesystem/path.hpp   |1 
 external/boost/include/boost/foreach.hpp   |1 
 external/boost/include/boost/format.hpp|1 
 external/boost/include/boost/function.hpp  |1 
 external/boost/include/boost/functional/hash.hpp   |1 
 external/boost/include/boost/fusion/adapted/std_pair.hpp   |1 
 external/boost/include/boost/fusion/include/adapt_struct.hpp   |1 
 external/boost/include/boost/intrusive/circular_list_algorithms.hpp|1 
 external/boost/include/boost/intrusive_ptr.hpp |1 
 external/boost/include/boost/io/ios_state.hpp  |1 
 external/boost/include/boost/iostreams/device/file_descriptor.hpp  |1 
 external/boost/include/boost/iostreams/filter/gzip.hpp |1 
 external/boost/include/boost/iostreams/filtering_stream.hpp|1 
 external/boost/include/boost/iterator/iterator_facade.hpp  |1 
 external/boost/include/boost/lexical_cast.hpp  |1 
 external/boost/include/boost/locale.hpp|1 
 external/boost/include/boost/locale/gnu_gettext.hpp|1 
 external/boost/include/boost/logic/tribool.hpp |1 
 external/boost/include/boost/make_shared.hpp   |1 
 external/boost/include/boost/math/common_factor_rt.hpp |1 
 external/boost/include/boost/math/constants/constants.hpp  |1 
 external/boost/include/boost/math/special_functions/expm1.hpp  |1 
 external/boost/include/boost/math/special_functions/log1p.hpp  |1 
 external/boost/include/boost/math/special_functions/sinc.hpp   |1 
 external/boost/include/boost/multi_array.hpp   |1 
 external/boost/include/boost/multi_index/composite_key.hpp |1 
 external/boost/include/boost/multi_index/identity.hpp  |1 
 external/boost/include/boost/multi_index/mem_fun.hpp   |1 
 external/boost/include/boost/multi_index/ordered_index.hpp |1 
 external/boost/include/boost/multi_index/random_access_index.hpp   |1 
 external/boost/include/boost/multi_index_container.hpp |1 
 external/boost/include/bo

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

[Andrea Gelmini (via logerrit)]

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

New commits:
commit 3f187b046bac1f362f7b53569caf83963646561d
Author: Andrea Gelmini 
AuthorDate: Thu Dec 12 22:38:23 2019 +0100
Commit: Julien Nabet 
CommitDate: Thu Dec 12 23:12:58 2019 +0100

Fix typo

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

diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index dbbbda2c2f42..d47fb63436d2 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -198,7 +198,7 @@ public:
 
 /// Set the app's (somewhat) magic/main-thread to this one.
 virtual voidupdateMainThread() {}
-/// Disconnect that - good for detatching from the JavaVM on Android.
+/// Disconnect that - good for detaching from the JavaVM on Android.
 virtual voidreleaseMainThread() {}
 
 /// get information about underlying versions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 vcl/android/androidinst.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3c5d1078208f997f21efe7222453ba3b2f49190e
Author: Andrea Gelmini 
AuthorDate: Thu Dec 12 22:38:16 2019 +0100
Commit: Julien Nabet 
CommitDate: Thu Dec 12 23:13:42 2019 +0100

Fix typo

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

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index ddc6e92d55f3..94e5f4227344 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -57,7 +57,7 @@ AndroidSalInstance *AndroidSalInstance::getInstance()
 AndroidSalInstance::AndroidSalInstance( std::unique_ptr pMutex )
 : SvpSalInstance( std::move(pMutex) )
 {
-// FIXME: remove when uniPoll & runLoop is the only android entry poit.
+// FIXME: remove when uniPoll & runLoop is the only Android entry point.
 int res = (lo_get_javavm())->AttachCurrentThread(&m_pJNIEnv, NULL);
 LOGI("AttachCurrentThread res=%d env=%p", res, m_pJNIEnv);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 compilerplugins/clang/finalclasses.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff566c67d67e96c97bcf4064b39df6998733c84e
Author: Andrea Gelmini 
AuthorDate: Thu Dec 12 22:38:06 2019 +0100
Commit: Julien Nabet 
CommitDate: Thu Dec 12 23:14:49 2019 +0100

Fix typo

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

diff --git a/compilerplugins/clang/finalclasses.py 
b/compilerplugins/clang/finalclasses.py
index ea027f9a48b4..49a30b1e6511 100755
--- a/compilerplugins/clang/finalclasses.py
+++ b/compilerplugins/clang/finalclasses.py
@@ -40,7 +40,7 @@ for clazz in sorted(definitionSet - inheritFromSet):
 # ignore test and external code
 if ("/qa/" in file): continue
 if (file.startswith("workdir/")): continue
-# We are only realling interested in classes that are shared between 
linkage units, where the compiler
+# We are only really interested in classes that are shared between linkage 
units, where the compiler
 # is not able to figure out for itself that classes are final.
 if not(file.startswith("include/") or file.startswith("sw/inc/") or 
file.startswith("sc/inc/") or file.startswith("vcl/inc/")): continue
 # Exclude URE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 sd/uiconfig/sdraw/ui/notebookbar.ui|  185 +-
 sd/uiconfig/sdraw/ui/notebookbar_compact.ui|  183 +-
 sd/uiconfig/simpress/ui/notebookbar.ui |  175 +
 sd/uiconfig/simpress/ui/notebookbar_compact.ui |  761 +++--
 4 files changed, 974 insertions(+), 330 deletions(-)

New commits:
commit d755b2d4a3340f42a90d15d4795cc947a0b18e4a
Author: andreas kainz 
AuthorDate: Tue Dec 10 22:00:00 2019 +0100
Commit: andreas_kainz 
CommitDate: Fri Dec 13 02:10:12 2019 +0100

Draw/Impress add Extension support to Tabbed NB

Change-Id: I44ab4107a826ed14bec770a4367cfb8eee09d316
Reviewed-on: https://gerrit.libreoffice.org/84900
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index ff79272ca427..af2f48afa31b 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -82,6 +82,30 @@
   
 
   
+  
+True
+False
+
+  
+True
+False
+AddonCommand
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+service:com.sun.star.deployment.ui.PackageManagerDialog
+  
+
+  
   
 True
 False
@@ -17298,7 +17322,7 @@
   
 
 
-  
+  
 True
 True
 end
@@ -18076,6 +18100,145 @@
 False
   
 
+
+  
+True
+False
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+center
+True
+  
+  
+False
+True
+1
+  
+
+  
+  
+True
+True
+0
+  
+
+
+  
+True
+False
+end
+center
+True
+
+  
+True
+False
+center
+True
+vertical
+
+  
+E_xtension
+True
+True
+False
+False
+end
+center
+True
+none
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+end
+True
+both-horiz
+False
+1
+
+  
+True
+False
+service:com.sun.star.deployment.ui.PackageManagerDialog
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+False
+end
+1
+  
+
+
+  
+True
+False
+end
+5
+5
+vertical
+  
+  
+False
+True
+5
+end
+ 

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

[Thorsten Behrens (via logerrit)]

 framework/source/services/autorecovery.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 8b2e00d1334483ff2fe612c008c77fc3a206b6b4
Author: Thorsten Behrens 
AuthorDate: Fri Dec 13 03:01:28 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Dec 13 03:01:28 2019 +0100

Don't autosave encrypted documents

As we cannot generally make sure they stay encrypted.

Change-Id: I15ed41fabcc553608e418608ad1166a951daa4b6

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index d58883e83fe3..056e2bce3f38 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2384,7 +2384,10 @@ void AutoRecovery::implts_registerDocument(const 
css::uno::Reference< css::frame
 
 // check if this document must be ignored for recovery !
 // Some use cases don't wish support for AutoSave/Recovery ... as e.g. 
OLE-Server / ActiveX Control etcpp.
-bool bNoAutoSave = 
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), 
false);
+bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(
+utl::MediaDescriptor::PROP_NOAUTOSAVE(), false)
+|| lDescriptor.getValue(
+utl::MediaDescriptor::PROP_ENCRYPTIONDATA()).hasValue();
 if (bNoAutoSave)
 return;
 
@@ -2802,7 +2805,10 @@ bool 
lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo const & rInf
 return true;
 
 utl::MediaDescriptor lDescriptor(rInfo.Document->getArgs());
-bool bNoAutoSave = 
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), 
false);
+bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(
+utl::MediaDescriptor::PROP_NOAUTOSAVE(), false)
+|| lDescriptor.getValue(
+utl::MediaDescriptor::PROP_ENCRYPTIONDATA()).hasValue();
 
 return bNoAutoSave;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Benchmark results on mdds::multi_type_vector

[Kohei Yoshida]

I just finished my benchmark testing on mdds::multi_type_vector, and
summarized my results in this blog post:

http://kohei.us/2019/12/12/benchmark-results-on-mdds-multi_type_vector/

Hopefully my findings and intepretations make sense.  In short, the
numbers look great.  The overhead of block shifting is a concern, but
I'm optimistic that this is going to be a non-issue for the most part.

Kohei

-- 
Kohei Yoshida, LibreOffice Calc volunteer hacker

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

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

[Noel Grandin (via logerrit)]

 sc/inc/columniterator.hxx |6 ++---
 sc/inc/formulacell.hxx|4 +--
 sc/inc/formulaiter.hxx|3 +-
 sc/qa/unit/subsequent_export-test.cxx |2 -
 sc/source/core/data/attarray.cxx  |   26 +++---
 sc/source/core/data/bcaslot.cxx   |6 ++---
 sc/source/core/data/column.cxx|6 ++---
 sc/source/core/data/column2.cxx   |   12 +-
 sc/source/core/data/column4.cxx   |   30 +-
 sc/source/core/data/columniterator.cxx|   12 +-
 sc/source/core/data/columnspanset.cxx |   12 +-
 sc/source/core/data/dociter.cxx   |   24 ++--
 sc/source/core/data/documen8.cxx  |4 +--
 sc/source/core/data/document.cxx  |   10 
 sc/source/core/data/dpcache.cxx   |2 -
 sc/source/core/data/drwlayer.cxx  |4 +--
 sc/source/core/data/fillinfo.cxx  |4 +--
 sc/source/core/data/formulacell.cxx   |   14 ++--
 sc/source/core/data/formulaiter.cxx   |   11 +
 sc/source/core/data/markarr.cxx   |4 +--
 sc/source/core/data/table4.cxx|2 -
 sc/source/core/data/table5.cxx|2 -
 sc/source/core/inc/bcaslot.hxx|6 ++---
 sc/source/core/tool/chgtrack.cxx  |2 -
 sc/source/core/tool/detfunc.cxx   |   20 -
 sc/source/filter/xml/xmlcelli.cxx |2 -
 sc/source/ui/Accessibility/AccessibleCell.cxx |4 +--
 sc/source/ui/app/transobj.cxx |2 -
 sc/source/ui/docshell/impex.cxx   |2 -
 sc/source/ui/docshell/tablink.cxx |2 -
 sc/source/ui/unoobj/cellsuno.cxx  |8 +++---
 sc/source/ui/view/gridwin.cxx |2 -
 32 files changed, 126 insertions(+), 124 deletions(-)

New commits:
commit afad9ccb381a02b90654a5fa302480e46f38a1fc
Author: Noel Grandin 
AuthorDate: Thu Dec 12 16:49:19 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 13 07:04:49 2019 +0100

sc: rowcol: tdf#50916 pass ScDocument* around in data/

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

diff --git a/sc/inc/columniterator.hxx b/sc/inc/columniterator.hxx
index 51270f363ea7..a217b6d9dff0 100644
--- a/sc/inc/columniterator.hxx
+++ b/sc/inc/columniterator.hxx
@@ -32,7 +32,7 @@ class ScColumnTextWidthIterator
 public:
 ScColumnTextWidthIterator(const ScColumnTextWidthIterator&) = delete;
 const ScColumnTextWidthIterator& operator=(const 
ScColumnTextWidthIterator&) = delete;
-ScColumnTextWidthIterator(ScColumn& rCol, SCROW nStartRow, SCROW nEndRow);
+ScColumnTextWidthIterator(const ScDocument& rDoc, ScColumn& rCol, SCROW 
nStartRow, SCROW nEndRow);
 
 /**
  * @param rDoc document instance.
@@ -42,7 +42,7 @@ public:
  *  validity.
  * @param nEndRow end row position.
  */
-ScColumnTextWidthIterator(ScDocument& rDoc, const ScAddress& rStartPos, 
SCROW nEndRow);
+ScColumnTextWidthIterator(const ScDocument& rDoc, const ScAddress& 
rStartPos, SCROW nEndRow);
 
 void next();
 bool hasCell() const;
@@ -51,7 +51,7 @@ public:
 void setValue(sal_uInt16 nVal);
 
 private:
-void init(SCROW nStartRow, SCROW nEndRow);
+void init(const ScDocument& rDoc, SCROW nStartRow, SCROW nEndRow);
 void getDataIterators(size_t nOffsetInBlock);
 void checkEndRow();
 };
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 9a5af01a3851..9f9ab5f23587 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -332,9 +332,9 @@ public:
  */
 svl::SharedString GetRawString() const;
 const ScMatrix* GetMatrix();
-boolGetMatrixOrigin( ScAddress& rPos ) const;
+boolGetMatrixOrigin( const ScDocument* pDoc, ScAddress& rPos ) 
const;
 voidGetResultDimensions( SCSIZE& rCols, SCSIZE& rRows );
-sc::MatrixEdge  GetMatrixEdge( ScAddress& rOrgPos ) const;
+sc::MatrixEdge  GetMatrixEdge( const ScDocument* pDoc, ScAddress& rOrgPos 
) const;
 FormulaErrorGetErrCode();   // interpret first if necessary
 FormulaErrorGetRawError() const;  // don't interpret, just return code 
or result error
 boolGetErrorOrValue( FormulaError& rErr, double& rVal );
diff --git a/sc/inc/formulaiter.hxx b/sc/inc/formulaiter.hxx
index aa92e78c7b65..660a201836da 100644
--- a/sc/inc/formulaiter.hxx
+++ b/sc/inc/formulaiter.hxx
@@ -32,10 +32,11 @@ class ScFormulaCell;
 class ScDetectiveRefIter
 {
 private:
+const ScDocument* mpDoc;
 formula::FormulaTokenArrayPlainIterator maIter;
 ScAddress const aPos;
 public:
-ScDetectiveRefIter( ScFor

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang desktop/inc desktop/source include/vcl sw/source vcl/inc vcl/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/singlevalfields.could-be-bool.results |   45 -
 compilerplugins/clang/singlevalfields.results   |  324 
+++-
 compilerplugins/clang/unusedfields.only-used-in-constructor.results |  392 
+-
 compilerplugins/clang/unusedfields.readonly.results |  290 
+++
 compilerplugins/clang/unusedfields.untouched.results|  236 
+++---
 compilerplugins/clang/unusedfields.writeonly.results|  266 
+++---
 desktop/inc/lib/init.hxx|1 
 desktop/source/lib/init.cxx |5 
 include/vcl/treelistbox.hxx |1 
 sw/source/uibase/inc/olmenu.hxx |3 
 sw/source/uibase/lingu/olmenu.cxx   |3 
 vcl/inc/svimpbox.hxx|5 
 vcl/source/control/imivctl.hxx  |3 
 vcl/source/control/imivctl1.cxx |   17 
 vcl/source/treelist/svimpbox.cxx|   31 
 vcl/source/treelist/svtabbx.cxx |   14 
 vcl/source/treelist/treelistbox.cxx |5 
 17 files changed, 793 insertions(+), 848 deletions(-)

New commits:
commit 753084a3f73bb8a88412feac7aa40a2750e6e9f3
Author: Noel Grandin 
AuthorDate: Wed Dec 11 12:56:57 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 13 07:05:24 2019 +0100

loplugin:singlevalfields

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

diff --git a/compilerplugins/clang/singlevalfields.could-be-bool.results 
b/compilerplugins/clang/singlevalfields.could-be-bool.results
index 8009a02ee3bc..dc2692b082bf 100644
--- a/compilerplugins/clang/singlevalfields.could-be-bool.results
+++ b/compilerplugins/clang/singlevalfields.could-be-bool.results
@@ -16,16 +16,16 @@ desktop/source/app/main.c:29
 editeng/source/misc/hangulhanja.cxx:79
 editeng::HangulHanjaConversion_Impl m_eConvType
 class HangulHanjaConversion::ConversionType
-editeng/source/misc/svxacorr.cxx:234
+editeng/source/misc/svxacorr.cxx:239
 GetIgnoreTranslWrapper bIsInit
 int
-filter/source/graphicfilter/eps/eps.cxx:142
-PSWriter nNextChrSetId
+filter/source/graphicfilter/eps/eps.cxx:144
+(anonymous namespace)::PSWriter nNextChrSetId
 sal_uInt8
 include/opencl/openclwrapper.hxx:46
 openclwrapper::GPUEnv mnIsUserCreated
 int
-include/svtools/ruler.hxx:621
+include/svtools/ruler.hxx:622
 Ruler mnBorderWidth
 long
 include/tools/ref.hxx:126
@@ -49,8 +49,8 @@ jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:191
 libreofficekit/source/gtk/tilebuffer.hxx:229
 LOEvent m_nSetGraphicSelectionType
 int
-sal/rtl/cipher.cxx:110
-Cipher_Impl m_algorithm
+sal/rtl/cipher.cxx:112
+(anonymous namespace)::Cipher_Impl m_algorithm
 rtlCipherAlgorithm
 sc/source/filter/inc/stylesbuffer.hxx:290
 oox::xls::ApiAlignmentData mnHorJustifyMethod
@@ -58,35 +58,26 @@ sc/source/filter/inc/stylesbuffer.hxx:290
 sc/source/filter/inc/stylesbuffer.hxx:292
 oox::xls::ApiAlignmentData mnVerJustifyMethod
 sal_Int32
-sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1025
-ScPagePreviewCountData nHeaders
+sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1067
+(anonymous namespace)::ScPagePreviewCountData nHeaders
 long
-sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1026
-ScPagePreviewCountData nTables
+sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1068
+(anonymous namespace)::ScPagePreviewCountData nTables
 long
-sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1028
-ScPagePreviewCountData nFooters
+sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx:1070
+(anonymous namespace)::ScPagePreviewCountData nFooters
 long
 sc/source/ui/vba/vbahyperlink.hxx:83
 ScVbaHyperlink mnType
 long
-sd/qa/unit/tiledrendering/tiledrendering.cxx:956
-ViewCallback m_nPart
+sd/qa/unit/tiledrendering/tiledrendering.cxx:958
+(anonymous namespace)::ViewCallback m_nPart
 int
-soltools/cpp/_tokens.c:35
-/media/disk2/libo4/soltools/cpp/_tokens.c EBCDIC_ExternTokenDetected
-int
-soltools/cpp/_tokens.c:36
-/media/disk2/libo4/soltools/cpp/_tokens.c EBCDIC_StartTokenDetected
-int
-soltools/cpp/cpp.h:121
-includelist always
-char
 svx/source/inc/cell.hxx:205
 sdr::table::Cell mnCellContentType
 css::table::CellContentType
-svx/source/table/tablertfimporter.cxx:55
-sdr::table::RTFCellDefault mnRowSpan
+svx/source/table/tablertfimporter.cxx:57
+sdr::table::(anonymous namespace)::RTFCellDefault mnRowSpan
 sal_Int32
 sw/source/filter/ww8/

[Libreoffice-commits] core.git: 2 commits - basic/inc basic/source chart2/source compilerplugins/clang cui/source dbaccess/source drawinglayer/source extensions/source forms/source include/connectivit

[Noel Grandin (via logerrit)]

 basic/inc/sbstdobj.hxx   |1 
 basic/source/runtime/stdobj1.cxx |2 
 chart2/source/controller/dialogs/dlg_DataEditor.cxx  |7 
 chart2/source/controller/dialogs/dlg_DataSource.cxx  |   14 
 chart2/source/controller/inc/dlg_DataEditor.hxx  |1 
 chart2/source/controller/inc/dlg_DataSource.hxx  |3 
 compilerplugins/clang/unusedmethods.results  |  358 ++-
 cui/source/dialogs/cuihyperdlg.cxx   |2 
 cui/source/dialogs/iconcdlg.cxx  |7 
 cui/source/inc/cuihyperdlg.hxx   |3 
 cui/source/options/optjava.cxx   |8 
 cui/source/options/optjava.hxx   |1 
 cui/source/tabpages/backgrnd.cxx |3 
 dbaccess/source/ui/inc/RTableConnectionData.hxx  |2 
 dbaccess/source/ui/relationdesign/RTableConnectionData.cxx   |7 
 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |3 
 extensions/source/propctrlr/browserline.cxx  |5 
 extensions/source/propctrlr/browserline.hxx  |1 
 extensions/source/propctrlr/browserlistbox.cxx   |   25 
 extensions/source/propctrlr/browserlistbox.hxx   |9 
 extensions/source/propctrlr/browserpage.hxx  |2 
 extensions/source/propctrlr/commoncontrol.cxx|   13 
 extensions/source/propctrlr/commoncontrol.hxx|5 
 extensions/source/propctrlr/propertyeditor.cxx   |   13 
 extensions/source/propctrlr/propertyeditor.hxx   |3 
 extensions/source/propctrlr/standardcontrol.hxx  |   32 
 extensions/source/propctrlr/usercontrol.hxx  |2 
 forms/source/component/clickableimage.cxx|8 
 forms/source/component/clickableimage.hxx|1 
 include/connectivity/sqlerror.hxx|   19 
 include/svl/rngitem.hxx  |1 
 include/svtools/fileurlbox.hxx   |   67 --
 include/svtools/inettbc.hxx  |3 
 include/svx/sxfiitm.hxx  |1 
 include/vcl/edit.hxx |2 
 include/vcl/field.hxx|4 
 include/vcl/lstbox.hxx   |1 
 include/vcl/tabctrl.hxx  |2 
 lingucomponent/source/languageguessing/guesslang.cxx |6 
 lingucomponent/source/numbertext/numbertext.cxx  |8 
 linguistic/source/convdicxml.cxx |5 
 oox/source/drawingml/diagram/datamodel.cxx   |2 
 oox/source/drawingml/diagram/datamodel.hxx   |2 
 reportdesign/source/ui/inc/ReportController.hxx  |1 
 reportdesign/source/ui/report/ReportController.cxx   |   10 
 solenv/clang-format/blacklist|2 
 svtools/Library_svt.mk   |1 
 svtools/source/control/fileurlbox.cxx|   99 ---
 sw/inc/unoframe.hxx  |1 
 sw/source/filter/html/htmlftn.cxx|5 
 sw/source/filter/html/htmltab.cxx|4 
 sw/source/filter/html/swhtml.cxx |2 
 sw/source/filter/html/swhtml.hxx |1 
 sw/source/filter/ww8/wrtww8.hxx  |1 
 sw/source/filter/ww8/wrtww8gr.cxx|2 
 sw/source/ui/index/multmrk.cxx   |7 
 sw/source/uibase/docvw/SidebarTxtControlAcc.cxx  |9 
 sw/source/uibase/inc/multmrk.hxx |9 
 sw/source/uibase/inc/unotools.hxx|1 
 sw/source/uibase/utlui/unotools.cxx  |2 
 ucb/source/cacher/cachedcontentresultset.cxx |8 
 ucb/source/cacher/cachedcontentresultset.hxx |1 
 vcl/inc/wizdlg.hxx   |   17 
 vcl/source/app/salvtables.cxx|7 
 vcl/source/control/edit.cxx  |5 
 vcl/source/control/field.cxx |6 
 vcl/source/control/imivctl.hxx   |1 
 vcl/source/control/imivctl1.cxx  |7 
 vcl/source/control/listbox.cxx   |5 
 vcl/source/control/roadmapwizard.cxx |6 
 vcl/source/control/tabctrl.cxx   |   23 
 vcl/source/c

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

[Kelemen Gábor (via logerrit)]

 chart2/source/tools/DiagramHelper.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4f7f39a262c5db74285bc44798f438a431fa7210
Author: Kelemen Gábor 
AuthorDate: Fri Dec 6 11:03:29 2019 +0100
Commit: László Németh 
CommitDate: Fri Dec 13 08:27:47 2019 +0100

tdf#34517 Bring forward/backward in chart series switched

Turns out bringing a data series forward means its index
is increased while bringing backwards means decreasing it.

Since the bool MOVE_SERIES_FORWARD is defined as true in
ControllerCommandDispatch.cxx the condition here meant that
bringing forward decreased the index and MOVE_SERIES_BACKWARD
as false meant that bringing backward increased the index.

Now the commands do the expected series order change.

Change-Id: Ib49b301eacc227439b8fb3b0dc3513e59cbdc484
Reviewed-on: https://gerrit.libreoffice.org/84608
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 6cdab5c92cecf90090ba72dfa6c22edf0d41028f)
Reviewed-on: https://gerrit.libreoffice.org/85025

diff --git a/chart2/source/tools/DiagramHelper.cxx 
b/chart2/source/tools/DiagramHelper.cxx
index 22ddfb27acd5..14d8126625ae 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1328,7 +1328,8 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed(
 {
 sal_Int32 nNewSeriesIndex = nS;
 
-if( bForward )
+// tdf#34517 Bringing forward means 
increasing, backwards means decreasing series position
+if( !bForward )
 nNewSeriesIndex--;
 else
 nNewSeriesIndex++;
___
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' - sw/uiconfig

[Roman Kuznetsov (via logerrit)]

 sw/uiconfig/swriter/ui/sidebartableedit.ui |  720 +
 1 file changed, 444 insertions(+), 276 deletions(-)

New commits:
commit aa86a2e30de9e9433dcc41c09023a07945affaf9
Author: Roman Kuznetsov 
AuthorDate: Mon Dec 9 18:20:00 2019 +0100
Commit: Roman Kuznetsov 
CommitDate: Fri Dec 13 08:38:14 2019 +0100

tdf#128683 Add more tools to Table section in Writer's Sidebar

Change-Id: I505cbf0a7324cc82d0fcb1ac76a7f2a23b8a0b0c
Reviewed-on: https://gerrit.libreoffice.org/84783
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov 
(cherry picked from commit d068c68640f32d4a94da4df197441ee09a702b75)
Reviewed-on: https://gerrit.libreoffice.org/84966

diff --git a/sw/uiconfig/swriter/ui/sidebartableedit.ui 
b/sw/uiconfig/swriter/ui/sidebartableedit.ui
index 6f9c477bffd6..d2e1d5418342 100644
--- a/sw/uiconfig/swriter/ui/sidebartableedit.ui
+++ b/sw/uiconfig/swriter/ui/sidebartableedit.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -12,370 +12,538 @@
 False
 6
 vertical
-6
+6
+3
 True
 
-  
+  
+True
+True
+True
+Row Height
+start
+True
+0
+
+  
+Row Height
+  
+
+  
+  
+1
+5
+  
+
+
+  
+True
+False
+start
+Insert:
+  
+  
+0
+0
+  
+
+
+  
 True
 False
-20
 
-  
+  
+True
+False
+.uno:InsertRowsBefore
+True
+  
+  
+False
+True
+  
+
+
+  
 True
 False
-
-  
-True
-False
-.uno:InsertRowsBefore
-True
-  
-  
-False
-True
-  
-
-
-  
-True
-False
-.uno:InsertRowsAfter
-True
-  
-  
-False
-True
-  
-
-
-  
-True
-False
-.uno:InsertColumnsBefore
-True
-  
-  
-False
-True
-  
-
-
-  
-True
-False
-.uno:InsertColumnsAfter
-True
-  
-  
-False
-True
-  
-
+.uno:InsertRowsAfter
+True
   
   
 False
-True
-0
+True
   
 
 
-  
+  
 True
 False
-
-  
-True
-False
-.uno:DeleteRows
-True
-  
-  
-False
-True
-  
-
-
-  
-True
-False
-.uno:DeleteColumns
-True
-  
-  
-False
-True
-  
-
-
-  
-True
-False
-.uno:DeleteTable
-True
-  
-  
-False
-True
-  
-
+.uno:InsertColumnsBefore
+True
   
   
 False
-True
-1
+True
   
 
 
-  
+  
 True
 False
-
-  
-True
-False
-.uno:MergeCells
-True
-  
-  
-False
-True
-  
-
+.uno:InsertColumnsAfter
+True
   
 

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

[Noel Grandin (via logerrit)]

 sc/inc/refdata.hxx   |3 ++
 sc/source/core/tool/refdata.cxx  |   52 +++
 sc/source/filter/dif/difimp.cxx  |   18 ++--
 sc/source/filter/excel/colrowst.cxx  |   10 +++---
 sc/source/filter/excel/excform.cxx   |   14 -
 sc/source/filter/excel/excform8.cxx  |   20 ++---
 sc/source/filter/excel/impop.cxx |   10 +++---
 sc/source/filter/excel/xechart.cxx   |4 +-
 sc/source/filter/excel/xeformula.cxx |   14 -
 sc/source/filter/excel/xelink.cxx|4 +-
 sc/source/filter/excel/xetable.cxx   |6 ++--
 sc/source/filter/excel/xichart.cxx   |4 +-
 sc/source/filter/excel/xlformula.cxx |   15 +-
 sc/source/filter/html/htmlpars.cxx   |2 -
 sc/source/filter/inc/dif.hxx |4 +-
 sc/source/filter/inc/lotattr.hxx |4 +-
 sc/source/filter/inc/lotform.hxx |   10 +++---
 sc/source/filter/inc/lotrange.hxx|2 -
 sc/source/filter/inc/namebuff.hxx|8 ++---
 sc/source/filter/inc/qproform.hxx|2 -
 sc/source/filter/inc/xlformula.hxx   |2 -
 sc/source/filter/lotus/lotattr.cxx   |8 ++---
 sc/source/filter/lotus/lotform.cxx   |   10 +++---
 sc/source/filter/lotus/lotimpop.cxx  |8 ++---
 sc/source/filter/lotus/op.cxx|   22 +++---
 sc/source/filter/lotus/tool.cxx  |   14 -
 sc/source/filter/qpro/qproform.cxx   |   10 +++---
 sc/source/filter/rtf/eeimpars.cxx|6 ++--
 28 files changed, 170 insertions(+), 116 deletions(-)

New commits:
commit 0cb4b2a18b790ff74a6893781beba2c4a4a8ce8f
Author: Noel Grandin 
AuthorDate: Fri Dec 13 09:16:28 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 13 08:58:00 2019 +0100

sc: rowcol: tdf#50916 pass ScDocument* around in filter/

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

diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index f46e13e60821..a6e2299054b9 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -100,7 +100,9 @@ public:
 bool ValidExternal(const ScDocument* pDoc) const;
 
 ScAddress toAbs( const ScAddress& rPos ) const;
+ScAddress toAbs( const ScDocument* pDoc, const ScAddress& rPos ) const;
 void SetAddress( const ScAddress& rAddr, const ScAddress& rPos );
+void SetAddress( const ScDocument* pDoc, const ScAddress& rAddr, const 
ScAddress& rPos );
 SCROW Row() const;
 SCCOL Col() const;
 SCTAB Tab() const;
@@ -166,6 +168,7 @@ struct ScComplexRefData
 }
 
 SC_DLLPUBLIC ScRange toAbs( const ScAddress& rPos ) const;
+SC_DLLPUBLIC ScRange toAbs( const ScDocument* pDoc, const ScAddress& rPos 
) const;
 
 /** Set a new range, assuming that the ordering of the range matches the
 ordering of the reference data flags already set. */
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index 614f266ad1a5..3d9bfd29818e 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -205,6 +205,26 @@ ScAddress ScSingleRefData::toAbs( const ScAddress& rPos ) 
const
 return aAbs;
 }
 
+ScAddress ScSingleRefData::toAbs( const ScDocument* pDoc, const ScAddress& 
rPos ) const
+{
+SCCOL nRetCol = Flags.bColRel ? mnCol + rPos.Col() : mnCol;
+SCROW nRetRow = Flags.bRowRel ? mnRow + rPos.Row() : mnRow;
+SCTAB nRetTab = Flags.bTabRel ? mnTab + rPos.Tab() : mnTab;
+
+ScAddress aAbs(ScAddress::INITIALIZE_INVALID);
+
+if (pDoc->ValidCol(nRetCol))
+aAbs.SetCol(nRetCol);
+
+if (pDoc->ValidRow(nRetRow))
+aAbs.SetRow(nRetRow);
+
+if (ValidTab(nRetTab))
+aAbs.SetTab(nRetTab);
+
+return aAbs;
+}
+
 void ScSingleRefData::SetAddress( const ScAddress& rAddr, const ScAddress& 
rPos )
 {
 if (Flags.bColRel)
@@ -232,6 +252,33 @@ void ScSingleRefData::SetAddress( const ScAddress& rAddr, 
const ScAddress& rPos
 SetTabDeleted(true);
 }
 
+void ScSingleRefData::SetAddress( const ScDocument* pDoc, const ScAddress& 
rAddr, const ScAddress& rPos )
+{
+if (Flags.bColRel)
+mnCol = rAddr.Col() - rPos.Col();
+else
+mnCol = rAddr.Col();
+
+if (!pDoc->ValidCol(rAddr.Col()))
+SetColDeleted(true);
+
+if (Flags.bRowRel)
+mnRow = rAddr.Row() - rPos.Row();
+else
+mnRow = rAddr.Row();
+
+if (!pDoc->ValidRow(rAddr.Row()))
+SetRowDeleted(true);
+
+if (Flags.bTabRel)
+mnTab = rAddr.Tab() - rPos.Tab();
+else
+mnTab = rAddr.Tab();
+
+if (!ValidTab( rAddr.Tab(), MAXTAB))
+SetTabDeleted(true);
+}
+
 SCROW ScSingleRefData::Row() const
 {
 if (Flags.bRowDeleted)
@@ -485,6 +532,11 @@ ScRange ScComplexRefData::toAbs( const ScAddress& rPos ) 
const
 return ScRange(Ref1.toAbs(rPos), Ref2.toAbs(rPos));
 }
 
+ScRange ScComplexRefData::toAbs( const ScDocument* pDoc, const ScAddress& rPos 
) const
+{
+return ScRange(R