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

[Szymon Kłos (via logerrit)]

 loleaflet/css/toolbar.css|3 +++
 loleaflet/src/control/Control.JSDialogBuilder.js |4 
 2 files changed, 7 insertions(+)

New commits:
commit d663129d88403ab822a83e81315275fca845d775
Author: Szymon Kłos 
AuthorDate: Wed Oct 9 08:58:43 2019 +0200
Commit: Szymon Kłos 
CommitDate: Wed Oct 9 08:58:56 2019 +0200

jsdialog: add missing id to elements

Change-Id: Ic022d0d768064c68a0374b9fa9e0ca41ceb7e3d5

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index dc4d04b34..87b619d63 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -328,6 +328,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
_spinfieldControl: function(parentContainer, data, builder) {
var spinfield = L.DomUtil.create('input', '', parentContainer);
spinfield.type = 'number';
+   spinfield.id = data.id;
 
if (data.enabled == 'false')
$(spinfield).attr('disabled', 'disabled');
@@ -350,6 +351,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
_editControl: function(parentContainer, data, builder) {
var edit = L.DomUtil.create('input', '', parentContainer);
edit.value = builder._cleanText(data.text);
+   edit.id = data.id;
 
if (data.enabled == 'false')
$(edit).attr('disabled', 'disabled');
@@ -367,6 +369,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
_pushbuttonControl: function(parentContainer, data, builder) {
var pushbutton = L.DomUtil.create('button', '', 
parentContainer);
pushbutton.innerHTML = builder._cleanText(data.text);
+   pushbutton.id = data.id;
 
if (data.enabled == 'false')
$(pushbutton).attr('disabled', 'disabled');
@@ -408,6 +411,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
_fixedtextControl: function(parentContainer, data, builder) {
var fixedtext = L.DomUtil.create('p', '', parentContainer);
fixedtext.innerHTML = builder._cleanText(data.text);
+   fixedtext.id = data.id;
 
if (data.hidden)
$(fixedtext).hide();
commit a06821a1a0880fdb5548cbc3184fdb03cccb4150
Author: Pedro 
AuthorDate: Wed Oct 9 08:03:02 2019 +0200
Commit: Szymon Kłos 
CommitDate: Wed Oct 9 08:58:56 2019 +0200

Turn round color picker elements

Change-Id: Id35b8dae443446a28ffdb1f5116115b80d6190be

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 717aaed83..297c6cfbf 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -4,6 +4,9 @@
}
 }
 @media (max-width: 767px), (max-device-height: 767px) {
+   #BackColor .w2ui-tb-caption > div, #FontColor .w2ui-tb-caption > div, 
#BackgroundColor .w2ui-tb-caption > div{
+   border-radius:100px !important;
+   }
#toolbar-down table.w2ui-button.checked .w2ui-tb-image{
-webkit-filter: grayscale(100%) brightness(80%) sepia(100%) 
hue-rotate(-190deg) saturate(900%) contrast(0.8);
filter: grayscale(100%) brightness(80%) sepia(100%) 
hue-rotate(-190deg) saturate(900%) contrast(0.8);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/l10n-docker-nightly.sh

[Andras Timar (via logerrit)]

 docker/l10n-docker-nightly.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 340b2ad8d492635387d6094e3915cb349aa99d39
Author: Andras Timar 
AuthorDate: Wed Oct 9 08:54:24 2019 +0200
Commit: Andras Timar 
CommitDate: Wed Oct 9 08:54:24 2019 +0200

docker: run git clean before git pull

Fixes:
https://ci.libreoffice.org/job/lo_online_docker_master/118/console

Change-Id: Ib7f228cdbb191f0a397849fb6adf20b37591c1c1

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index 1015b24f6..4d11097b1 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -65,7 +65,7 @@ if test ! -d online ; then
 git clone https://git.libreoffice.org/online online || exit 1
 fi
 
-( cd online && git fetch --all && git checkout -f $LIBREOFFICE_BRANCH && git 
pull -r ) || exit 1
+( cd online && git fetch --all && git checkout -f $LIBREOFFICE_BRANCH && git 
clean -f -f -d && git pull -r ) || exit 1
 
 # LibreOffice #
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 configure.ac |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 58599816d7a2898ea54edb57ae320ebbfd5298b4
Author: Stephan Bergmann 
AuthorDate: Tue Oct 8 16:10:14 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 9 08:24:06 2019 +0200

With Cygwin, AC_PATH_PROG needs Cygwin-style paths

(And instead directly specifying CLANGDIR as a Cygwin-style path in my 
clang-cl
build's autogen.input doesn't work, as compilerplugins/Makefile-clang.mk 
spells
a dependency on

  $(CLANGDIR)/bin/clang$(CLANG_EXE_EXT)

which Make on Windows requires to be a Windows-style path.)

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

diff --git a/configure.ac b/configure.ac
index d90fc802484f..bf2002ebcace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7011,7 +7011,11 @@ if test "$COM_IS_CLANG" = "TRUE"; then
 if test -z "$COMPILER_PLUGINS_CXX"; then
 COMPILER_PLUGINS_CXX=$CXX
 fi
-AC_PATH_PROG(LLVM_CONFIG, llvm-config,[],$CLANGDIR/bin $PATH)
+clangbindir=$CLANGDIR/bin
+if test "$build_os" = "cygwin"; then
+clangbindir=$(cygpath -u "$clangbindir")
+fi
+AC_PATH_PROG(LLVM_CONFIG, llvm-config,[],"$clangbindir" $PATH)
 if test -n "$LLVM_CONFIG"; then
 COMPILER_PLUGINS_CXXFLAGS=$($LLVM_CONFIG --cxxflags)
 COMPILER_PLUGINS_LINKFLAGS=$($LLVM_CONFIG --ldflags --libs 
--system-libs | tr '\n' ' ')
___
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' - configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2a3b9af83b3ab2891d8d2257bf11e34f8f62e32b
Author: Tor Lillqvist 
AuthorDate: Wed Oct 9 09:01:27 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 9 09:17:11 2019 +0300

Accept iOS SDK 13.1

Change-Id: I02870b35f67dd9ca47061311186d74dfec823aa7

diff --git a/configure.ac b/configure.ac
index 0ecaa54ff976..f30b5e5712d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2967,8 +2967,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.0
-older_sdk_vers="12.4 12.2 12.1 12.0 11.4"
+current_sdk_ver=13.1
+older_sdk_vers="13.0 12.4 12.2 12.1 12.0 11.4"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=11.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0d1131a3a004ef72b30e5b7fdbfdc58ac1902468
Author: Tor Lillqvist 
AuthorDate: Wed Oct 9 09:01:27 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 9 09:13:49 2019 +0300

Accept iOS SDK 13.1

Change-Id: I02870b35f67dd9ca47061311186d74dfec823aa7

diff --git a/configure.ac b/configure.ac
index a28f1efaf8aa..6ec47dca7a34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2904,8 +2904,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.0
-older_sdk_vers="12.4 12.2 12.1 12.0 11.4 11.2"
+current_sdk_ver=13.1
+older_sdk_vers="13.0 12.4 12.2 12.1 12.0 11.4 11.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=11.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 92d860f3fdd7c5390fa6c100d6f4dbbfa8f14fe7
Author: Tor Lillqvist 
AuthorDate: Wed Oct 9 09:03:29 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 9 09:03:29 2019 +0300

Bump the minimum iOS run-time version to 12.2

Change-Id: I082a7d62e222e625d1d921bea39b45578118d225

diff --git a/configure.ac b/configure.ac
index 98694cd096ce..d90fc802484f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3009,10 +3009,10 @@ if test $_os = iOS; then
 older_sdk_vers="13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
-versionmin=-mios-simulator-version-min=11.0
+versionmin=-mios-simulator-version-min=12.2
 else
 platform=iPhoneOS
-versionmin=-miphoneos-version-min=11.0
+versionmin=-miphoneos-version-min=12.2
 fi
 xcode_developer=`xcode-select -print-path`
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2738622e6faf62da2753d97cd770e2b887f765b8
Author: Tor Lillqvist 
AuthorDate: Wed Oct 9 09:01:27 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 9 09:01:47 2019 +0300

Accept iOS SDK 13.1

Change-Id: I02870b35f67dd9ca47061311186d74dfec823aa7

diff --git a/configure.ac b/configure.ac
index 5f3b2e71d2b3..98694cd096ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3005,8 +3005,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.0
-older_sdk_vers="12.4 12.2"
+current_sdk_ver=13.1
+older_sdk_vers="13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=11.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 sd/source/ui/docshell/docshel4.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 1dc4c8266d45eb2f5c3de303eaa9233e3b52f058
Author: Julien Nabet 
AuthorDate: Tue Oct 8 22:47:01 2019 +0200
Commit: Julien Nabet 
CommitDate: Wed Oct 9 07:54:54 2019 +0200

tdf#128013: fix Crash when linking an odp file

See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=154847

Regression introduced by:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=3c86ffd8ded628e6f2b4187948a1b1056f6a0f56

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

diff --git a/sd/source/ui/docshell/docshel4.cxx 
b/sd/source/ui/docshell/docshel4.cxx
index 4def7ef0a1a6..803988cf6422 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -819,10 +819,13 @@ void DrawDocShell::GotoBookmark(const OUString& rBookmark)
 pDrawViewShell->SwitchPage(nSdPgNum);
 }
 
-// show page
-SvxZoomItem aZoom;
-aZoom.SetType( SvxZoomType::WHOLEPAGE );
-pDrawViewShell->GetDispatcher()->ExecuteList(SID_ATTR_ZOOM, 
SfxCallMode::ASYNCHRON, { &aZoom });
+if (pDrawViewShell->GetDispatcher())
+{
+// show page
+SvxZoomItem aZoom;
+aZoom.SetType( SvxZoomType::WHOLEPAGE );
+pDrawViewShell->GetDispatcher()->ExecuteList(SID_ATTR_ZOOM, 
SfxCallMode::ASYNCHRON, { &aZoom });
+}
 
 if (pObj != nullptr)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source compilerplugins/clang connectivity/source dbaccess/source include/dbaccess reportdesign/inc sw/source writerfilter/source xmloff/source

[Noel Grandin (via logerrit)]

 chart2/source/controller/main/ChartController_Insert.cxx   |4 +--
 chart2/source/controller/main/ChartController_Position.cxx |2 -
 chart2/source/controller/main/ChartController_Tools.cxx|2 -
 chart2/source/controller/main/ChartModelClone.cxx  |2 -
 compilerplugins/clang/redundantpointerops.cxx  |   15 +++--
 connectivity/source/drivers/mysqlc/mysqlc_connection.hxx   |2 -
 dbaccess/source/core/dataaccess/datasource.cxx |2 -
 dbaccess/source/ui/browser/genericcontroller.cxx   |2 -
 include/dbaccess/dataview.hxx  |2 -
 reportdesign/inc/RptModel.hxx  |2 -
 sw/source/core/ole/ndole.cxx   |2 -
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  |3 --
 writerfilter/source/dmapper/StyleSheetTable.cxx|2 -
 xmloff/source/core/xmlexp.cxx  |4 +--
 xmloff/source/core/xmlmultiimagehelper.cxx |4 +--
 xmloff/source/text/XMLTextFrameContext.cxx |4 +--
 16 files changed, 28 insertions(+), 26 deletions(-)

New commits:
commit 682fdbf1312cf6ca70fe209bf4d7051dad8f5008
Author: Noel Grandin 
AuthorDate: Tue Oct 8 10:30:36 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 9 07:44:49 2019 +0200

loplugin:redundantpointerops check other pointer types

as well as unique_ptr

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

diff --git a/chart2/source/controller/main/ChartController_Insert.cxx 
b/chart2/source/controller/main/ChartController_Insert.cxx
index 5789ebdd27c9..ec45a22eae0e 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -195,7 +195,7 @@ void ChartController::executeDispatch_DeleteLegend()
 ActionDescriptionProvider::ActionType::Delete, SchResId( 
STR_OBJECT_LEGEND )),
 m_xUndoManager );
 
-ChartModel& rModel = dynamic_cast(*getModel().get());
+ChartModel& rModel = dynamic_cast(*getModel());
 LegendHelper::hideLegend(rModel);
 aUndoGuard.commit();
 }
@@ -207,7 +207,7 @@ void ChartController::executeDispatch_InsertLegend()
 ActionDescriptionProvider::ActionType::Insert, SchResId( 
STR_OBJECT_LEGEND )),
 m_xUndoManager );
 
-ChartModel& rModel = dynamic_cast(*getModel().get());
+ChartModel& rModel = dynamic_cast(*getModel());
 Reference< chart2::XLegend > xLegend = LegendHelper::showLegend(rModel, 
m_xCC);
 aUndoGuard.commit();
 }
diff --git a/chart2/source/controller/main/ChartController_Position.cxx 
b/chart2/source/controller/main/ChartController_Position.cxx
index f38bba593a15..410d67461118 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -192,7 +192,7 @@ void ChartController::executeDispatch_PositionAndSize(const 
::css::uno::Sequence
 bool bChanged = false;
 if ( eObjectType == OBJECTTYPE_LEGEND )
 {
-ChartModel& rModel = 
dynamic_cast(*getModel().get());
+ChartModel& rModel = dynamic_cast(*getModel());
 bChanged = 
DiagramHelper::switchDiagramPositioningToExcludingPositioning(rModel, false , 
true);
 }
 
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index 423165322252..74f7e9ab6f79 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -998,7 +998,7 @@ void 
ChartController::impl_switchDiagramPositioningToExcludingPositioning()
 ActionDescriptionProvider::ActionType::PosSize,
 ObjectNameProvider::getName( OBJECTTYPE_DIAGRAM)),
 m_xUndoManager );
-ChartModel& rModel = 
dynamic_cast(*m_aModel->getModel().get());
+ChartModel& rModel = dynamic_cast(*m_aModel->getModel());
 if (DiagramHelper::switchDiagramPositioningToExcludingPositioning(rModel, 
true, true))
 aUndoGuard.commit();
 }
diff --git a/chart2/source/controller/main/ChartModelClone.cxx 
b/chart2/source/controller/main/ChartModelClone.cxx
index 339547943552..456bd178c81b 100644
--- a/chart2/source/controller/main/ChartModelClone.cxx
+++ b/chart2/source/controller/main/ChartModelClone.cxx
@@ -192,7 +192,7 @@ namespace chart
 Reference< XChartDocument > xDestination( i_model, UNO_QUERY_THROW 
);
 
 // propagate the correct flag for plotting of hidden values to the 
data provider and all used sequences
-ChartModel& rModel = dynamic_cast(*i_model.get());
+ChartModel& rModel = dynamic_cast(*i_model);
 
ChartModelHelper::setIncludeHiddenCells(ChartModelHel

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

[Noel Grandin (via logerrit)]

 ucb/source/ucp/hierarchy/hierarchydatasource.cxx |   35 ---
 ucb/source/ucp/hierarchy/hierarchydatasource.hxx |   22 +++---
 2 files changed, 5 insertions(+), 52 deletions(-)

New commits:
commit c71896debc7ef5f6d6e918f59fa44423eb5df480
Author: Noel Grandin 
AuthorDate: Mon Oct 7 15:18:59 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 9 07:44:10 2019 +0200

use cppu::WeakImplHelper in HierarchyDataSource

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

diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx 
b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 5f358dd76fc0..490c3c0eaecf 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -192,41 +192,6 @@ HierarchyDataSource::~HierarchyDataSource()
 {
 }
 
-
-// XInterface methods.
-void SAL_CALL HierarchyDataSource::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL HierarchyDataSource::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL HierarchyDataSource::queryInterface( const 
css::uno::Type & rType )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
-   static_cast< 
lang::XTypeProvider* >(this),
-   static_cast< 
lang::XServiceInfo* >(this),
-   static_cast< lang::XComponent* 
>(this),
-   static_cast< 
lang::XMultiServiceFactory* >(this)
-   );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_4( HierarchyDataSource,
-  lang::XTypeProvider,
-  lang::XServiceInfo,
-  lang::XComponent,
-  lang::XMultiServiceFactory );
-
-
 // XServiceInfo methods.
 
 XSERVICEINFO_COMMOM_IMPL( HierarchyDataSource,
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx 
b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 5eb3a9e50006..48015ea2b0da 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -27,7 +27,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 namespace comphelper { class OInterfaceContainerHelper2; }
@@ -35,11 +35,10 @@ namespace comphelper { class OInterfaceContainerHelper2; }
 namespace hierarchy_ucp {
 
 
-class HierarchyDataSource : public cppu::OWeakObject,
-public css::lang::XServiceInfo,
-public css::lang::XTypeProvider,
-public css::lang::XComponent,
-public css::lang::XMultiServiceFactory
+class HierarchyDataSource : public cppu::WeakImplHelper<
+css::lang::XServiceInfo,
+css::lang::XComponent,
+css::lang::XMultiServiceFactory>
 {
 osl::Mutex m_aMutex;
 css::uno::Reference< css::uno::XComponentContext > m_xContext;
@@ -50,13 +49,6 @@ public:
 explicit HierarchyDataSource( const css::uno::Reference< 
css::uno::XComponentContext > & rxContext );
 virtual ~HierarchyDataSource() override;
 
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType ) override;
-virtual void SAL_CALL acquire()
-throw() override;
-virtual void SAL_CALL release()
-throw() override;
-
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
override;
@@ -68,10 +60,6 @@ public:
 static css::uno::Reference< css::lang::XSingleServiceFactory > 
createServiceFactory( const css::uno::Reference<
   css::lang::XMultiServiceFactory >& rxServiceMgr );
 
-// XTypeProvider
-virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 
override;
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-
 // XComponent
 virtual void SAL_CALL dispose() override;
 virtual void SAL_CALL addEventListener( const css::uno::Reference< 
css::lang::XEventListener > & xListener ) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/unx

[Samuel Mehrbrodt (via logerrit)]

 vcl/unx/gtk/gtksalmenu.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit fd95a92d600b751ad6a23f35db446bf063cb722b
Author: Samuel Mehrbrodt 
AuthorDate: Tue Oct 8 15:45:45 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Oct 9 05:09:53 2019 +0200

tdf#124391 Fix doubled menu in global menu

Regression from 3bedbfd9b3cee5a8d2da6ee0486859bd725979ba

Change-Id: I56473a2b0620f90f23b1bcde3ae1290801021038
Reviewed-on: https://gerrit.libreoffice.org/80465
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 27ba8096bce8..39e1beab33e7 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -229,8 +229,12 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool 
bRemoveDisabledEntries)
 if (mbMenuBar && maUpdateMenuBarIdle.IsActive())
 {
 maUpdateMenuBarIdle.Stop();
-maUpdateMenuBarIdle.Invoke();
-return;
+// tdf#124391 Prevent doubled menus in global menu
+if (!bUnityMode)
+{
+maUpdateMenuBarIdle.Invoke();
+return;
+}
 }
 }
 
___
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/unx

[Samuel Mehrbrodt (via logerrit)]

 vcl/unx/gtk/gtksalmenu.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit eccf0193885d1e46a207966eb52a408dc60e8109
Author: Samuel Mehrbrodt 
AuthorDate: Tue Oct 8 15:45:45 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Oct 9 05:09:16 2019 +0200

tdf#124391 Fix doubled menu in global menu

Regression from 3bedbfd9b3cee5a8d2da6ee0486859bd725979ba

Change-Id: I56473a2b0620f90f23b1bcde3ae1290801021038
Reviewed-on: https://gerrit.libreoffice.org/80464
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 8dbd8817b1ff..91946e09fd1c 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -229,8 +229,12 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool 
bRemoveDisabledEntries)
 if (mbMenuBar && maUpdateMenuBarIdle.IsActive())
 {
 maUpdateMenuBarIdle.Stop();
-maUpdateMenuBarIdle.Invoke();
-return;
+// tdf#124391 Prevent doubled menus in global menu
+if (!bUnityMode)
+{
+maUpdateMenuBarIdle.Invoke();
+return;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 connectivity/source/drivers/postgresql/pq_connection.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b16730d8f10b596e00f34e15ca9c011f347f57b1
Author: Stephan Bergmann 
AuthorDate: Tue Oct 8 17:41:51 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 23:50:48 2019 +0200

loplugin:stringadd (macOS)

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

diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx 
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index e07c035eda70..0b5ea84bc6fa 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -132,11 +132,11 @@ static LogLevel readLogLevelFromConfiguration()
 OUString fileName;
 osl_getModuleURLFromFunctionAddress(
 reinterpret_cast(readLogLevelFromConfiguration), 
&fileName.pData );
-fileName = fileName.copy( fileName.lastIndexOf( '/' )+1 );
+fileName = fileName.copy( fileName.lastIndexOf( '/' )+1 ) +
 #ifdef MACOSX
-fileName += "../Resources/";
+"../Resources/"
 #endif
-fileName += "postgresql-sdbc.ini";
+"postgresql-sdbc.ini";
 rtl::Bootstrap bootstrapHandle( fileName );
 
 OUString str;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - compilerplugins/Makefile-clang.mk configure.ac vcl/osx

[Stephan Bergmann (via logerrit)]

 compilerplugins/Makefile-clang.mk |3 ++-
 configure.ac  |4 +++-
 vcl/osx/saldata.cxx   |5 -
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 8bfdb0a48d474f9288fcc368000c90bffbea6506
Author: Stephan Bergmann 
AuthorDate: Tue Oct 8 17:40:35 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 23:50:29 2019 +0200

loplugin:external

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

diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index 8fda9e6f5fdf..ef46d6f4aa60 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -121,6 +121,7 @@ void SalData::ensureThreadAutoreleasePool()
 }
 }
 
+namespace {
 
 NSImage* load_icon_by_name(const OUString& rIconName)
 {
@@ -141,6 +142,8 @@ NSImage* load_icon_by_name(const OUString& rIconName)
 return image;
 }
 
+}
+
 #define MAKE_CURSOR( vcl_name, name, name2 ) \
 case vcl_name: \
 aHotSpot = NSPoint{name##curs_x_hot, name##curs_y_hot}; \
commit ed654adf92eab0cd21744fbfbfe54ff6d42bed87
Author: Stephan Bergmann 
AuthorDate: Tue Oct 8 17:39:33 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 23:50:01 2019 +0200

loplugin:nullptr

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

diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index e0e974ff1f3d..8fda9e6f5fdf 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -256,7 +256,7 @@ NSCursor* SalData::getCursor( PointerStyle i_eStyle )
 NSAffineTransform *xform = [[NSAffineTransform alloc] init];
 [xform scaleBy:scale];
 id hints = @{ NSImageHintCTM: xform };
-CGImageRef rasterCGImage = [theImage CGImageForProposedRect:NULL 
context:nil hints:hints];
+CGImageRef rasterCGImage = [theImage 
CGImageForProposedRect:nullptr context:nil hints:hints];
 NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] 
initWithCGImage:rasterCGImage];
 [rep setSize:cursorSize];
 [multiResImage addRepresentation:rep];
commit ffdd79eda08b7ce4492d33fa265d24c60b88d173
Author: Stephan Bergmann 
AuthorDate: Tue Oct 8 16:28:54 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 23:49:36 2019 +0200

My Windows clang-cl build still doesn't use LO_CLANG_SHARED_PLUGINS

...so disable the new configure.ac checks introduced with
ad5cbcf6ba0afdc1d8d7405c2641cce8de4a360b "try to autodetect flags needed to
build Clang plugins" that are only relevant when using 
LO_CLANG_SHARED_PLUGINS
and would fail miserably for my clang-cl build

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

diff --git a/compilerplugins/Makefile-clang.mk 
b/compilerplugins/Makefile-clang.mk
index 0d599dcef59a..eb1ae04d0bf4 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -37,7 +37,8 @@ endif
 # Whether to make plugins use one shared ASTRecursiveVisitor (plugins run 
faster).
 # By default enabled, disable if you work on an affected plugin (re-generating 
takes time).
 LO_CLANG_SHARED_PLUGINS=1
-#TODO:
+#TODO: Windows doesn't use LO_CLANG_SHARED_PLUGINS for now, see corresponding 
TODO comment in
+# configure.ac:
 ifeq ($(OS),WNT)
 LO_CLANG_SHARED_PLUGINS=
 endif
diff --git a/configure.ac b/configure.ac
index e387e4429f0b..5f3b2e71d2b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7041,7 +7041,9 @@ if test "$COM_IS_CLANG" = "TRUE"; then
 add_warning "Cannot find Clang headers to build compiler 
plugins, plugins disabled."
 fi
 ])
-if test -n "$COMPILER_PLUGINS"; then
+dnl TODO: Windows doesn't use LO_CLANG_SHARED_PLUGINS for now, see 
corresponding TODO
+dnl comment in compilerplugins/Makefile-clang.mk:
+if test -n "$COMPILER_PLUGINS" && test "$_os" != "WINNT"; then
 LDFLAGS=""
 AC_MSG_CHECKING([for clang libraries to use])
 if test -z "$CLANGTOOLLIBS"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 configure.ac |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c262e9f94bfbd82f2020fa493c474ed9cffc3b04
Author: Stephan Bergmann 
AuthorDate: Tue Oct 8 16:16:38 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 23:49:20 2019 +0200

Clarify COMPILER_PLUGINS_CXX_LINKFLAGS vs. COMPILER_PLUGINS_LINKFLAGS

COMPILER_PLUGINS_CXX_LINKFLAGS was introduced with
39e7a72b3e328e6b3d87479d693b01315610457b "Support loplugin in clang-cl" to
augment COMPILER_PLUGINS_CXX.  Due to MSVC cl.exe command-line processing,
certain linker-related arguments must come at the very end of the command 
line,
so cannot be included in COMPILER_PLUGINS_CXX.  
COMPILER_PLUGINS_CXX_LINKFLAGS
is specified in autogen.input (along with COMPILER_PLUGINS_CXX) and 
configure.ac
merely passes it on to its use in compilerplugins/Makefile-clang.mk.

ad5cbcf6ba0afdc1d8d7405c2641cce8de4a360b "try to autodetect flags needed to
build Clang plugins" now needs a configure.ac-internal variable to store the
output of `llvm-config --ldflags ...`, similarly to how
COMPILER_PLUGINS_CXXFLAGS stores the output of `llvm-config --cxxflags`.  It
reused COMPILER_PLUGINS_CXX_LINKFLAGS for that, but that makes it hard for 
my
clang-cl build to pass my specification of COMPILER_PLUGINS_CXX_LINKFLAGS 
from
autogen.input to its use in compilerplugins/Makefile-clang.mk.  So rename 
this
new variable to COMPILER_PLUGINS_LINKFLAGS (matching 
COMPILER_PLUGINS_CXXFLAGS).

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

diff --git a/configure.ac b/configure.ac
index 5bb1a2029817..e387e4429f0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7014,7 +7014,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then
 AC_PATH_PROG(LLVM_CONFIG, llvm-config,[],$CLANGDIR/bin $PATH)
 if test -n "$LLVM_CONFIG"; then
 COMPILER_PLUGINS_CXXFLAGS=$($LLVM_CONFIG --cxxflags)
-COMPILER_PLUGINS_CXX_LINKFLAGS=$($LLVM_CONFIG --ldflags --libs 
--system-libs | tr '\n' ' ')
+COMPILER_PLUGINS_LINKFLAGS=$($LLVM_CONFIG --ldflags --libs 
--system-libs | tr '\n' ' ')
 if test -z "$CLANGLIBDIR"; then
 CLANGLIBDIR=$($LLVM_CONFIG --libdir)
 fi
@@ -7046,14 +7046,14 @@ if test "$COM_IS_CLANG" = "TRUE"; then
 AC_MSG_CHECKING([for clang libraries to use])
 if test -z "$CLANGTOOLLIBS"; then
 LIBS="-lclangTooling -lclangDriver -lclangFrontend 
-lclangParse -lclangSema -lclangEdit \
- -lclangAnalysis -lclangAST -lclangLex -lclangSerialization -lclangBasic 
$COMPILER_PLUGINS_CXX_LINKFLAGS"
+ -lclangAnalysis -lclangAST -lclangLex -lclangSerialization -lclangBasic 
$COMPILER_PLUGINS_LINKFLAGS"
 AC_LINK_IFELSE([
 AC_LANG_PROGRAM([[#include 
"clang/Basic/SourceLocation.h"]],
 [[ clang::FullSourceLoc().dump(); ]])
 ],[CLANGTOOLLIBS="$LIBS"],[])
 fi
 if test -z "$CLANGTOOLLIBS"; then
-LIBS="-lclang-cpp $COMPILER_PLUGINS_CXX_LINKFLAGS"
+LIBS="-lclang-cpp $COMPILER_PLUGINS_LINKFLAGS"
 AC_LINK_IFELSE([
 AC_LANG_PROGRAM([[#include 
"clang/Basic/SourceLocation.h"]],
 [[ clang::FullSourceLoc().dump(); ]])
___
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' - 2 commits - extensions/source vcl/source

[Mike Kaganski (via logerrit)]

 extensions/source/ole/unoobjw.cxx |2 +-
 vcl/source/window/toolbox.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b6e07e9b87deab2f97ff492c13bb9396585b5e69
Author: Mike Kaganski 
AuthorDate: Tue Oct 8 22:59:41 2019 +0200
Commit: Mike Kaganski 
CommitDate: Tue Oct 8 23:25:04 2019 +0200

warning C4245: conversion from 'int' to 'sal_uInt16', signed/unsigned 
mismatch

Change-Id: Iafbb9a012dea23edfbf1795f6935d2da23e20f0d
Reviewed-on: https://gerrit.libreoffice.org/80501
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 78a235deb57b..9ba57c20ad08 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2506,7 +2506,7 @@ static void ImplDrawDropdownArrow(vcl::RenderContext& 
rRenderContext, const tool
 aPoly.SetPoint(Point(x, y), 3);
 
 if (bRotate) // TESTME: harder ...
-aPoly.Rotate(Point(x,y+height/2),-900);
+aPoly.Rotate(Point(x,y+height/2),2700);
 
 auto aaflags = rRenderContext.GetAntialiasing();
 rRenderContext.SetAntialiasing(AntialiasingFlags::EnableB2dDraw);
commit 5edbbc7dfe65d596fefde3be94adf70cec7ca1ff
Author: Mike Kaganski 
AuthorDate: Tue Oct 8 22:31:33 2019 +0200
Commit: Mike Kaganski 
CommitDate: Tue Oct 8 23:24:53 2019 +0200

warning C4100: 'Source': unreferenced formal parameter

Change-Id: Ic33d546b139781e017b8527f1b94c095cbe858fd
Reviewed-on: https://gerrit.libreoffice.org/80499
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index 8476bcc348ba..330fbadf957d 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -164,7 +164,7 @@ public:
 }
 
 // XEventListener
-void SAL_CALL disposing( const css::lang::EventObject& Source ) override
+void SAL_CALL disposing( const css::lang::EventObject& /* Source */ ) 
override
 {
 // ???
 }
___
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.JSDialogBuilder.js |2 +-
 loleaflet/src/core/LOUtil.js |   20 
 2 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 04a8d9f31838f924eb9319d1da20714a486ae222
Author: Marco Cecchetti 
AuthorDate: Tue Oct 8 21:55:01 2019 +0200
Commit: Marco Cecchetti 
CommitDate: Tue Oct 8 21:55:17 2019 +0200

loleaflet: avoid to show broken icon in the mobile wizard

Change-Id: Ib3626b6a7ccac996c5da98a8cb3ced5d7f9af7a2

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index ce3342452..dc4d04b34 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -514,7 +514,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
var icon = null;
var commandName = data.command ? 
data.command.substring('.uno:'.length) : data.id;
-   if (commandName && commandName.length) {
+   if (commandName && commandName.length && 
L.LOUtil.existsIconForCommand(commandName)) {
var iconSpan = L.DomUtil.create('span', 
'menu-entry-icon', menuEntry);
var iconPath = 'images/lc_' + commandName.toLowerCase() 
+ '.svg';
icon = L.DomUtil.create('img', '', iconSpan);
diff --git a/loleaflet/src/core/LOUtil.js b/loleaflet/src/core/LOUtil.js
index 27025f3a9..0172c1058 100644
--- a/loleaflet/src/core/LOUtil.js
+++ b/loleaflet/src/core/LOUtil.js
@@ -86,5 +86,25 @@ L.LOUtil = {
generateNewFileName: function(oldFileName, suffix) {
var idx = oldFileName.lastIndexOf('.');
return oldFileName.substring(0, idx) + suffix + 
oldFileName.substring(idx);
+   },
+
+   commandWithoutIcon: [
+   'InsertPageHeader',
+   'InsertPageFooter',
+   'InsertNonBreakingSpace',
+   'InsertHardHyphen',
+   'InsertSoftHyphen',
+   'InsertZWSP',
+   'InsertZWNBSP',
+   'InsertLRM',
+   'InsertRLM'
+   ],
+
+   existsIconForCommand: function(command) {
+   var commandName = command.startsWith('.uno:') ? 
command.substring('.uno:'.length) : command;
+   var res = !this.commandWithoutIcon.find(function (el) {
+   return el.startsWith(commandName);
+   });
+   return res;
}
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/images/lc_xlinecolor.svg |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 92b397c9f8d1e789c8f0eaf3b96a1b5d5a4ca906
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 21:31:11 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 21:31:11 2019 +0200

jsdialogs: add icon for XLineColor

Change-Id: I66dadb4f01a07412f6fa183c6424adfffb6957a8

diff --git a/loleaflet/images/lc_xlinecolor.svg 
b/loleaflet/images/lc_xlinecolor.svg
new file mode 100644
index 0..bf6ead04f
--- /dev/null
+++ b/loleaflet/images/lc_xlinecolor.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/css/toolbar.css|3 +++
 loleaflet/src/control/Control.JSDialogBuilder.js |2 ++
 2 files changed, 5 insertions(+)

New commits:
commit 8a35cd80258f0018d485285d9039bc30264483b1
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 21:26:56 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 21:26:56 2019 +0200

jsdialogs: use picker for Color, add ids

Change-Id: Ia9778ff2962c05eafb6b6b4ae636dc87b3d7bf01

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 398410cf5..717aaed83 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -49,6 +49,9 @@
#ParaspaceIncrease, #ParaspaceDecrease {
padding-left: 28px !important;
}
+   #Color {
+   padding: 20px 20px 0px 20px !important;
+   }
#Shadowed, #StyleNewByExample + div, #AlignTop, #AlignBottom + p, 
#mergecells{clear:both;}
#DecrementIndent + input:disabled{display: none;}
#buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel, 
#buttonnone, #buttonthrough, #bottom, #top, #standard, #Bold, #Italic, 
#Underline, #Strikeout{
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 148dca8a1..ce3342452 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -59,6 +59,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
this._toolitemHandlers['.uno:BackColor'] = this._colorControl;
this._toolitemHandlers['.uno:BackgroundColor'] = 
this._colorControl;
this._toolitemHandlers['.uno:FrameLineColor'] = 
this._colorControl;
+   this._toolitemHandlers['.uno:Color'] = this._colorControl;
 
this._currentDepth = 0;
},
@@ -458,6 +459,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
_colorControl: function(parentContainer, data, builder) {
var colorContainer = L.DomUtil.create('div', 'colorcontainer', 
parentContainer);
+   colorContainer.id = data.command.substr('.uno:'.length);
 
if (data.enabled == 'false')
$(colorContainer).attr('disabled', 'disabled');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/css/toolbar.css|7 +--
 loleaflet/src/control/Control.JSDialogBuilder.js |4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 34b49466ed4b7d3a2646198c777f7f57fdba
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 21:19:07 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 21:19:07 2019 +0200

jsdialogs: use picker for border and background colors

Change-Id: Iec5ee4214529ab5dbce1e0aece6e5814a1cf8365

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index f1258eba8..398410cf5 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -41,10 +41,13 @@
margin: 0px !important;
float:left;
}
-   .colorspan {
+   .colorcontainer {
width: 120px;
float: left;
-   padding: 0px 10px 0px 10px !important;
+   padding: 20px 20px 20px 20px !important;
+   }
+   #ParaspaceIncrease, #ParaspaceDecrease {
+   padding-left: 28px !important;
}
#Shadowed, #StyleNewByExample + div, #AlignTop, #AlignBottom + p, 
#mergecells{clear:both;}
#DecrementIndent + input:disabled{display: none;}
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 26b74e0f4..148dca8a1 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -57,6 +57,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
this._toolitemHandlers['.uno:FontHeight'] = 
this._fontHeightControl;
this._toolitemHandlers['.uno:FontColor'] = this._colorControl;
this._toolitemHandlers['.uno:BackColor'] = this._colorControl;
+   this._toolitemHandlers['.uno:BackgroundColor'] = 
this._colorControl;
+   this._toolitemHandlers['.uno:FrameLineColor'] = 
this._colorControl;
 
this._currentDepth = 0;
},
@@ -455,7 +457,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
},
 
_colorControl: function(parentContainer, data, builder) {
-   var colorContainer = L.DomUtil.create('div', 'colorspan', 
parentContainer);
+   var colorContainer = L.DomUtil.create('div', 'colorcontainer', 
parentContainer);
 
if (data.enabled == 'false')
$(colorContainer).attr('disabled', 'disabled');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/css/toolbar.css|   17 +++--
 loleaflet/src/control/Control.JSDialogBuilder.js |   11 +--
 2 files changed, 20 insertions(+), 8 deletions(-)

New commits:
commit 008ae186e5bf277327935c97ab6485f5612ab897
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 21:06:38 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 21:06:38 2019 +0200

jsdialogs: general style for color picker

Change-Id: Id883ab2fa9373be133f790746c72262c49e7381f

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 8a5ad47cd..f1258eba8 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -41,10 +41,10 @@
margin: 0px !important;
float:left;
}
-   [name='colorselector-0'] {
-   padding: 24px 0px 24px 20px !important;
-   margin: 0px !important;
-   float:left;
+   .colorspan {
+   width: 120px;
+   float: left;
+   padding: 0px 10px 0px 10px !important;
}
#Shadowed, #StyleNewByExample + div, #AlignTop, #AlignBottom + p, 
#mergecells{clear:both;}
#DecrementIndent + input:disabled{display: none;}
@@ -1067,11 +1067,16 @@ menu-entry-with-icon.padding-left + 
menu-entry-icon.width */
color: #0b87e7;
 }
 
-#tb_colorselector-0_item_color .w2ui-tb-caption > div {
+[id|=tb_colorselector] .w2ui-tb-caption > div {
height: 32px !important;
width: 32px !important;
 }
 
-[name='colorselector-0'] {
+[name|=colorselector] {
width: 80px;
 }
+
+.colorimage {
+   float: left;
+   height: 32px;
+}
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 61ed693c7..26b74e0f4 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -56,6 +56,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
this._toolitemHandlers['.uno:CharFontName'] = 
this._fontNameControl;
this._toolitemHandlers['.uno:FontHeight'] = 
this._fontHeightControl;
this._toolitemHandlers['.uno:FontColor'] = this._colorControl;
+   this._toolitemHandlers['.uno:BackColor'] = this._colorControl;
 
this._currentDepth = 0;
},
@@ -454,12 +455,18 @@ L.Control.JSDialogBuilder = L.Control.extend({
},
 
_colorControl: function(parentContainer, data, builder) {
-   var colorContainer = L.DomUtil.create('div', '', 
parentContainer);
+   var colorContainer = L.DomUtil.create('div', 'colorspan', 
parentContainer);
 
if (data.enabled == 'false')
$(colorContainer).attr('disabled', 'disabled');
 
-   var toolbar = $(colorContainer);
+   var imageContainer = L.DomUtil.create('div', 
'colorimagecontainer', colorContainer);
+   var image = L.DomUtil.create('img', 'colorimage', 
imageContainer);
+   var icon = builder._createIconPath(data.command);
+   image.src = icon;
+
+   var toolbarContainer = L.DomUtil.create('div', 'colorspan', 
colorContainer);
+   var toolbar = $(toolbarContainer);
var id = 'colorselector-' + builder._colorPickers.length;
var items = [{type: 'color',  id: 'color'}];
toolbar.w2toolbar({
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szabolcs Toth (via logerrit)]

 sc/qa/unit/data/ods/CommentTextHAlign.ods |binary
 sc/qa/unit/subsequent_export-test.cxx |   19 +++
 sc/source/filter/oox/commentsbuffer.cxx   |   16 
 sc/source/filter/xcl97/xcl97rec.cxx   |   17 +
 4 files changed, 52 insertions(+)

New commits:
commit 10c85f825f1fb5989490ec731fdba036c0b8e247
Author: Szabolcs Toth 
AuthorDate: Tue Oct 8 11:21:50 2019 +0200
Commit: László Németh 
CommitDate: Tue Oct 8 20:56:46 2019 +0200

tdf#123339 XLSX: fix horizontal alignment in comments

Import and export of VML element TextHAlign weren't
supported by Calc, losing horizontal aligment of the
comments assigned to the spreadsheet cells.

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

diff --git a/sc/qa/unit/data/ods/CommentTextHAlign.ods 
b/sc/qa/unit/data/ods/CommentTextHAlign.ods
new file mode 100644
index ..2132779cb76a
Binary files /dev/null and b/sc/qa/unit/data/ods/CommentTextHAlign.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index eaadde60f558..4c53441de68a 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -223,6 +223,7 @@ public:
 void testTdf126024XLSX();
 void testTdf126177XLSX();
 void testCommentTextVAlignment();
+void testCommentTextHAlignment();
 
 void testXltxExport();
 
@@ -351,6 +352,7 @@ public:
 CPPUNIT_TEST(testTdf126024XLSX);
 CPPUNIT_TEST(testTdf126177XLSX);
 CPPUNIT_TEST(testCommentTextVAlignment);
+CPPUNIT_TEST(testCommentTextHAlignment);
 
 CPPUNIT_TEST(testXltxExport);
 
@@ -4504,6 +4506,23 @@ void ScExportTest::testCommentTextVAlignment()
 assertXPathContent(pVmlDrawing, 
"/xml/v:shape/xx:ClientData/xx:TextVAlign", "Center");
 }
 
+void ScExportTest::testCommentTextHAlignment()
+{
+// Testing comment text alignments.
+ScDocShellRef xShell = loadDoc("CommentTextHAlign.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+
+const xmlDocPtr pVmlDrawing
+= XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/drawings/vmlDrawing1.vml");
+CPPUNIT_ASSERT(pVmlDrawing);
+
+assertXPathContent(pVmlDrawing, 
"/xml/v:shape/xx:ClientData/xx:TextHAlign", "Center");
+}
+
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/oox/commentsbuffer.cxx 
b/sc/source/filter/oox/commentsbuffer.cxx
index 00045842c9fd..c3c60c3f5a6d 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -77,6 +77,21 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign )
 }
 }
 
+static sal_Int16 lcl_ToParaAlign(sal_Int32 nAlign)
+{
+switch ( nAlign )
+{
+case XML_Left:
+return sal_Int16(css::style::ParagraphAdjust_LEFT);
+case XML_Right:
+return sal_Int16(css::style::ParagraphAdjust_RIGHT);
+case XML_Center:
+return sal_Int16(css::style::ParagraphAdjust_CENTER);
+default:
+return sal_Int16(css::style::ParagraphAdjust_BLOCK);
+}
+}
+
 CommentModel::CommentModel()
 : mnAuthorId(-1)
 , mbAutoFill(false)
@@ -171,6 +186,7 @@ void Comment::finalizeImport()
 // Setting comment text alignment
 const ::oox::vml::ClientData* xClientData = 
pNoteShape->getClientData();
 aCommentPr.setProperty(PROP_TextVerticalAdjust, 
lcl_ToVertAlign(xClientData->mnTextVAlign));
+aCommentPr.setProperty(PROP_ParaAdjust, 
lcl_ToParaAlign(xClientData->mnTextHAlign));
 }
 xAnno->setIsVisible( bVisible );
 
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx 
b/sc/source/filter/xcl97/xcl97rec.cxx
index f750fdb9ad6c..3384e305185e 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -624,6 +624,21 @@ sal_Int32 VmlCommentExporter::StartShape()
 return nId;
 }
 
+static const char* lcl_GetHorizAlignFromItemSetChar(const SfxItemSet& rItemSet)
+{
+switch (rItemSet.Get(EE_PARA_JUST).GetAdjust())
+{
+case SvxAdjust::Center:
+return "Center";
+case SvxAdjust::Right:
+return "Right";
+case SvxAdjust::Block:
+return "Justify";
+default:
+return "Left";
+}
+}
+
 static const char* lcl_GetVertAlignFromItemSetChar( const SfxItemSet& rItemSet 
)
 {
 switch( rItemSet.Get( SDRATTR_TEXT_VERTADJUST ).GetValue() )
@@ -650,6 +665,7 @@ void VmlCommentExporter::EndShape( sal_Int32 nShapeElement )
 
 // Getting comment text alignments
 const char* pVertAlign = 
lcl_GetVertAlignFromItemSetChar(mpCaption->GetMergedItemSet());
+const char* pHorizAlign = 
lcl_GetHorizAlignFromItemSetChar(mpCa

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

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

 compilerplugins/clang/automem.cxx   |2 +-
 compilerplugins/clang/checkunusedparams.cxx |2 +-
 compilerplugins/clang/constantparam.cxx |2 +-
 compilerplugins/clang/constfields.cxx   |2 +-
 compilerplugins/clang/constmethod.cxx   |2 +-
 compilerplugins/clang/convertlong.cxx   |2 +-
 compilerplugins/clang/countusersofdefaultparams.cxx |2 +-
 compilerplugins/clang/datamembershadow.cxx  |2 +-
 compilerplugins/clang/dyncastvisibility.cxx |2 +-
 compilerplugins/clang/expandablemethods.cxx |2 +-
 compilerplugins/clang/externandnotdefined.cxx   |2 +-
 compilerplugins/clang/finalclasses.cxx  |2 +-
 compilerplugins/clang/inlinefields.cxx  |2 +-
 compilerplugins/clang/logexceptionnicely.cxx|2 +-
 compilerplugins/clang/memoryvar.cxx |2 +-
 compilerplugins/clang/mergeclasses.cxx  |2 +-
 compilerplugins/clang/methodcycles.cxx  |2 +-
 compilerplugins/clang/noexceptmove.cxx  |2 +-
 compilerplugins/clang/nullptr.cxx   |2 +-
 compilerplugins/clang/plugin.cxx|8 
 compilerplugins/clang/plugin.hxx|7 +--
 compilerplugins/clang/refcounting.cxx   |2 +-
 compilerplugins/clang/referencecasting.cxx  |6 +++---
 compilerplugins/clang/reservedid.cxx|6 +++---
 compilerplugins/clang/salbool.cxx   |4 ++--
 compilerplugins/clang/shouldreturnbool.cxx  |2 +-
 compilerplugins/clang/singlevalfields.cxx   |2 +-
 compilerplugins/clang/staticmethods.cxx |2 +-
 compilerplugins/clang/store/badvectorinit.cxx   |2 +-
 compilerplugins/clang/store/constantfunction.cxx|2 +-
 compilerplugins/clang/store/defaultparams.cxx   |2 +-
 compilerplugins/clang/store/deletedspecial.cxx  |2 +-
 compilerplugins/clang/store/fpcomparison.cxx|2 +-
 compilerplugins/clang/store/returnbyref.cxx |2 +-
 compilerplugins/clang/store/revisibility.cxx|2 +-
 compilerplugins/clang/store/stylepolice.cxx |2 +-
 compilerplugins/clang/stringconcatauto.cxx  |2 +-
 compilerplugins/clang/stringconcatliterals.cxx  |4 ++--
 compilerplugins/clang/stringconstant.cxx|8 
 compilerplugins/clang/typedefparam.cxx  |2 +-
 compilerplugins/clang/unnecessaryoverride.cxx   |4 ++--
 compilerplugins/clang/unnecessaryvirtual.cxx|2 +-
 compilerplugins/clang/unoany.cxx|2 +-
 compilerplugins/clang/unusedenumconstants.cxx   |2 +-
 compilerplugins/clang/unusedfields.cxx  |2 +-
 compilerplugins/clang/unusedmethods.cxx |2 +-
 compilerplugins/clang/useuniqueptr.cxx  |2 +-
 compilerplugins/clang/vclwidgets.cxx|   12 ++--
 compilerplugins/clang/virtualdead.cxx   |2 +-
 compilerplugins/clang/virtualdown.cxx   |2 +-
 compilerplugins/clang/weakbase.cxx  |2 +-
 compilerplugins/clang/writeonlyvars.cxx |2 +-
 52 files changed, 74 insertions(+), 71 deletions(-)

New commits:
commit bef96f7a7b4d1dc7bcb01c949e0ae296c969dcee
Author: Luboš Luňák 
AuthorDate: Mon Oct 7 15:29:30 2019 +0200
Commit: Luboš Luňák 
CommitDate: Tue Oct 8 20:46:36 2019 +0200

better name for a function in compilerplugins

The function is not just about a spelling location.

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

diff --git a/compilerplugins/clang/automem.cxx 
b/compilerplugins/clang/automem.cxx
index 30f3223b89f9..099c05458e13 100644
--- a/compilerplugins/clang/automem.cxx
+++ b/compilerplugins/clang/automem.cxx
@@ -51,7 +51,7 @@ bool AutoMem::VisitCXXDeleteExpr(const CXXDeleteExpr* expr)
 {
 if (ignoreLocation( expr ))
 return true;
-StringRef aFileName = 
getFileNameOfSpellingLoc(compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr)));
+StringRef aFileName = 
getFilenameOfLocation(compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(expr)));
 if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/include/salhelper/")
 || loplugin::hasPathnamePrefix(aFileName, SRCDIR "/include/osl/")
 || loplugin::hasPathnamePrefix(aFileName, SRCDIR "/salhelper/")
diff --git a/compilerplugins/clang/checkunusedparams.cxx 
b/compilerplugins/clang/checkunusedparams.cxx
index 2d4bc0dd60fe..f5540db33e43 100644
--- a/compilerplugins/clang/checkunusedparams.cxx
+++ b/compilerplugins/clang/checkunusedparams.cxx
@@ -199,7 +199,7 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl 
const * decl) {
  

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

[Andrea Gelmini (via logerrit)]

 sw/source/uibase/docvw/edtwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 412c6c1ca9a9ed5c585935e8b6cfc70f1a7152c4
Author: Andrea Gelmini 
AuthorDate: Tue Oct 8 16:28:01 2019 +0200
Commit: Andrea Gelmini 
CommitDate: Tue Oct 8 20:16:30 2019 +0200

Fix typo

Change-Id: I10c8518ebd3897fa32bdd67f7e4d726ce5ff1cec
Reviewed-on: https://gerrit.libreoffice.org/80475
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 9271e4ec3aa8..6eddf90f54b9 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -6127,7 +6127,7 @@ void QuickHelpData::SortAndFilter(const OUString 
&rOrigWord)
 // Now the result of SwEditShell::GetChunkForAutoText is passed here to 
SwEditWin::ShowAutoText, and
 // then to SwGlossaryList::HasLongName, where all existing autotext entries' 
long names are tested
 // if they start with one of the list elements. The matches are sorted 
according the position of the
-// candidate that matched first, then alhpabetically inside the group of 
suggestions for a given
+// candidate that matched first, then alphabetically inside the group of 
suggestions for a given
 // candidate. Say, if we have these AutoText entry long names:
 //"Dr Frodo"
 //"Dr Credo"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/css/toolbar.css|   14 ++
 loleaflet/src/control/Control.JSDialogBuilder.js |   19 ---
 2 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 304415aa26080570d32c76146fcbe686c9455b0e
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 20:08:30 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 20:09:04 2019 +0200

jsdialogs: style FontColor button in Writer>Character

Change-Id: Id9ef3e0ec9c964b0b20ab9d129ff37c0da9bff21

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 6e85135a9..8a5ad47cd 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -41,6 +41,11 @@
margin: 0px !important;
float:left;
}
+   [name='colorselector-0'] {
+   padding: 24px 0px 24px 20px !important;
+   margin: 0px !important;
+   float:left;
+   }
#Shadowed, #StyleNewByExample + div, #AlignTop, #AlignBottom + p, 
#mergecells{clear:both;}
#DecrementIndent + input:disabled{display: none;}
#buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel, 
#buttonnone, #buttonthrough, #bottom, #top, #standard, #Bold, #Italic, 
#Underline, #Strikeout{
@@ -1061,3 +1066,12 @@ menu-entry-with-icon.padding-left + 
menu-entry-icon.width */
border: none;
color: #0b87e7;
 }
+
+#tb_colorselector-0_item_color .w2ui-tb-caption > div {
+   height: 32px !important;
+   width: 32px !important;
+}
+
+[name='colorselector-0'] {
+   width: 80px;
+}
commit eb95669a856e7920c1cfe54fa045affc90ed7ab9
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 19:53:19 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 20:09:04 2019 +0200

jsdialogs: add color picker objects management

Change-Id: I80e0e3cfb4d73aa3619b37c1de4e86d6794fd0a3

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 033ddb388..61ed693c7 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -17,10 +17,12 @@ L.Control.JSDialogBuilder = L.Control.extend({
 */
_controlHandlers: {},
_toolitemHandlers: {},
+   _colorPickers: [],
 
_currentDepth: 0,
 
_setup: function(options) {
+   this._clearColorPickers();
this.wizard = options.mobileWizard;
this.map = options.map;
this.callback = options.callback ? options.callback : 
this._defaultCallbackHandler;
@@ -53,10 +55,19 @@ L.Control.JSDialogBuilder = L.Control.extend({
this._toolitemHandlers['.uno:SelectWidth'] = 
this._lineWidthControl;
this._toolitemHandlers['.uno:CharFontName'] = 
this._fontNameControl;
this._toolitemHandlers['.uno:FontHeight'] = 
this._fontHeightControl;
+   this._toolitemHandlers['.uno:FontColor'] = this._colorControl;
 
this._currentDepth = 0;
},
 
+   _clearColorPickers: function() {
+   while (this._colorPickers.length) {
+   var id = this._colorPickers.pop();
+   w2ui[id].remove();
+   delete w2ui[id];
+   }
+   },
+
_toolitemHandler: function(parentContainer, data, builder) {
if (data.command) {
var handler = builder._toolitemHandlers[data.command];
@@ -442,20 +453,22 @@ L.Control.JSDialogBuilder = L.Control.extend({
return false;
},
 
-   _colorControl: function(parentContainer, data) {
+   _colorControl: function(parentContainer, data, builder) {
var colorContainer = L.DomUtil.create('div', '', 
parentContainer);
 
if (data.enabled == 'false')
$(colorContainer).attr('disabled', 'disabled');
 
var toolbar = $(colorContainer);
+   var id = 'colorselector-' + builder._colorPickers.length;
var items = [{type: 'color',  id: 'color'}];
toolbar.w2toolbar({
-   name: 'colorselector',
+   name: id,
tooltip: 'bottom',
items: items
});
-   w2ui['colorselector'].set('color', {color: '#ff0033'});
+   w2ui[id].set('color', {color: '#ff0033'});
+   builder._colorPickers.push(id);
 
return false;
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 loleaflet/src/control/Control.MobileWizard.js |   75 +-
 loleaflet/src/layer/tile/TileLayer.js |   42 --
 2 files changed, 74 insertions(+), 43 deletions(-)

New commits:
commit e1963de90547b636e0fc37d43747bb47679f34b0
Author: Tamás Zolnai 
AuthorDate: Tue Oct 8 20:03:26 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Oct 8 20:03:26 2019 +0200

mobile-wizard: move sidebar layout modification code to MobileWizard.js

Change-Id: Iedc1a5dc5ee021d19c1309652c86166d658d1aaa

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 04def764b..b71a8c93f 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -119,12 +119,85 @@ L.Control.MobileWizard = L.Control.extend({
this._showWizard();
this._hideKeyboard();
 
+   // We can change the sidebar as we want here
+   if (!data.text) { // sidebar indicator
+   this._modifySidebarLayout(data);
+   }
+
L.control.jsDialogBuilder({mobileWizard: this, map: 
this.map}).build(this.content.get(0), [data]);
 
this._mainTitle = data.text ? data.text : '';
this._setTitle(this._mainTitle);
}
-   }
+   },
+
+   _modifySidebarLayout: function (data) {
+   this._mergeStylesAndTextPropertyPanels(data);
+   this._removeItems(data, ['editcontour']);
+   },
+
+   _mergeStylesAndTextPropertyPanels: function (data) {
+   var stylesChildren = this._removeStylesPanelAndGetContent(data);
+   if (stylesChildren !== null) {
+   this._addChildrenToTextPanel(data, stylesChildren);
+   }
+   },
+
+   _removeStylesPanelAndGetContent: function (data) {
+   if (data.children) {
+   for (var i = 0; i < data.children.length; i++) {
+   if (data.children[i].type === 'panel' && 
data.children[i].children &&
+   data.children[i].children.length > 0 && 
data.children[i].children[0].id === 'SidebarStylesPanel') {
+   var ret = 
data.children[i].children[0].children;
+   data.children.splice(i, 1);
+   return ret;
+   }
+
+   var childReturn = 
this._removeStylesPanelAndGetContent(data.children[i]);
+   if (childReturn !== null) {
+   return childReturn;
+   }
+   }
+   }
+   return null;
+   },
+
+   _addChildrenToTextPanel: function (data, children) {
+   if (data.id === 'SidebarTextPanel') {
+   data.children = children.concat(data.children);
+   return 'success';
+   }
+
+   if (data.children) {
+   for (var i = 0; i < data.children.length; i++) {
+   var childReturn = 
this._addChildrenToTextPanel(data.children[i], children);
+   if (childReturn !== null) {
+   return childReturn;
+   }
+   }
+   }
+   return null;
+   },
+
+   _removeItems: function (data, items) {
+   if (data.children) {
+   var childRemoved = false;
+   for (var i = 0; i < data.children.length; i++) {
+   for (var j = 0; j < items.length; j++) {
+   if (data.children[i].id === items[j]) {
+   data.children.splice(i, 1);
+   childRemoved = true;
+   continue;
+   }
+   }
+   if (childRemoved === true) {
+   i = i - 1;
+   } else {
+   this._removeItems(data.children[i], 
items);
+   }
+   }
+   }
+   },
 });
 
 L.control.mobileWizard = function (options) {
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 91e5ed88b..1609b9ed0 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -756,80 +756,10 @@ L.TileLayer = L.GridLayer.extend({
_onJSDialogMsg: function (textMsg) {
 

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

[Szymon Kłos (via logerrit)]

 loleaflet/css/toolbar.css |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1deda90a72a0e678fa01ec43a014dc53ce6cbf4d
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 19:33:37 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 19:38:39 2019 +0200

jsdialogs: fix align of tabs

Change-Id: I8d2945526a315bc661b1866916b4050de1d8a055

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index ac434c80f..6e85135a9 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -1041,6 +1041,9 @@ menu-entry-with-icon.padding-left + menu-entry-icon.width 
*/
 .ui-tabs.mobile-wizard {
text-align: center;
height: 42px;
+   display: table;
+   width: 100%;
+   border-spacing: 10px;
 }
 
 .ui-tab.mobile-wizard {
@@ -1049,7 +1052,6 @@ menu-entry-with-icon.padding-left + menu-entry-icon.width 
*/
line-height: 36px;
 vertical-align: middle;
margin: 5px;
-   padding: 5px;
border-radius: 10px;
border: solid 1px #0b87e7;
 }
@@ -1057,4 +1059,5 @@ menu-entry-with-icon.padding-left + menu-entry-icon.width 
*/
 .ui-tab.selected.mobile-wizard {
background-color: #eaf5ff;
border: none;
+   color: #0b87e7;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 392f2d64e303cc9a6b6955dfdbde7baea46a6e99
Author: Stephan Bergmann 
AuthorDate: Tue Oct 8 15:59:17 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 19:21:30 2019 +0200

CXX is now always set before CXX_X64_BINARY on Windows

...since ea3d4e806cbdde18173da92187329f1ac2177e14 "Fix CXX_BASE for clang-cl
builds on Windows", as a side effect, moved the conditional

  CXX=$MSVC_CXX

further up.  This addresses the comment in the commit message of
463a79cbc16c1b4aba1775d7f8ae0324753c322c "CXX_X64_BINARY must be clang-cl 
not cl
when building with clang-cl":  "Ideally, the code would be reorganized so 
that
CXX_X64_BINARY is only set after CXX has been set."

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

diff --git a/configure.ac b/configure.ac
index 0943619e7701..5bb1a2029817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3622,7 +3622,7 @@ if test "$_os" = "WINNT"; then
 AC_MSG_WARN([Installation set will not contain 64-bit Explorer 
extensions])
 fi
 else
-CXX_X64_BINARY=${CXX:-$MSVC_CXX}
+CXX_X64_BINARY=$CXX
 fi
 AC_SUBST(BUILD_X64)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Protocol.hpp

[Michael Meeks (via logerrit)]

 common/Protocol.hpp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1b7d9626074204456237eb9ecb624d1249c613b4
Author: Michael Meeks 
AuthorDate: Tue Oct 8 13:50:20 2019 +0100
Commit: Michael Meeks 
CommitDate: Tue Oct 8 17:58:57 2019 +0100

Avoid lots of re-sizing of token array while parsing.

Change-Id: I009d1203838fa2d585bd415836fc6338f47e2be3

diff --git a/common/Protocol.hpp b/common/Protocol.hpp
index 2d897a323..cb915fa5f 100644
--- a/common/Protocol.hpp
+++ b/common/Protocol.hpp
@@ -109,6 +109,7 @@ namespace LOOLProtocol
 {
 return tokens;
 }
+tokens.reserve(8);
 
 const char* start = data;
 const char* end = data;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd.xml.in wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp wsd/Storage.cpp wsd/Storage.hpp

[Gabriel Masei (via logerrit)]

 loolwsd.xml.in  |7 +++
 wsd/LOOLWSD.cpp |1 +
 wsd/LOOLWSD.hpp |   34 --
 wsd/Storage.cpp |   48 +++-
 wsd/Storage.hpp |4 
 5 files changed, 75 insertions(+), 19 deletions(-)

New commits:
commit d597f22dac9042c3917d3b105adc810b6900d52c
Author: Gabriel Masei 
AuthorDate: Mon Oct 7 14:51:30 2019 +0300
Commit: Michael Meeks 
CommitDate: Tue Oct 8 18:57:36 2019 +0200

Add minimal TLS support for communication with storage

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

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index baa42874d..91c748e93 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -125,6 +125,13 @@
 
 localhost
 
+
+
+
+
+
+
+
 
 
 true
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index d0dd39878..c39f62d99 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -850,6 +850,7 @@ void LOOLWSD::initialize(Application& self)
 { "ssl.key_file_path", LOOLWSD_CONFIGDIR "/key.pem" },
 { "ssl.termination", "true" },
 { "storage.filesystem[@allow]", "false" },
+{ "storage.ssl.enable", "false" },
 { "storage.webdav[@allow]", "false" },
 { "storage.wopi.host[0]", "localhost" },
 { "storage.wopi.host[0][@allow]", "true" },
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 0253d08b2..333a6afc1 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -130,6 +130,27 @@ public:
 return getConfigValue(Application::instance().config(), name, def);
 }
 
+/// Reads and processes path entries with the given property
+/// from the configuration.
+/// Converts relative paths to absolute.
+static
+std::string getPathFromConfig(const std::string& name)
+{
+return getPathFromConfig(Application::instance().config(), name);
+}
+
+/// Reads and processes path entries with the given property
+/// from the configuration. If value is empty then it reads from fallback
+/// Converts relative paths to absolute.
+static
+std::string getPathFromConfigWithFallback(const std::string& name, const 
std::string& fallbackName)
+{
+std::string value = LOOLWSD::getPathFromConfig(name);
+if (value.empty())
+return LOOLWSD::getPathFromConfig(fallbackName);
+return value;
+}
+
 /// Trace a new session and take a snapshot of the file.
 static void dumpNewSessionTrace(const std::string& id, const std::string& 
sessionId, const std::string& uri, const std::string& path);
 
@@ -253,19 +274,20 @@ private:
 /// Reads and processes path entries with the given property
 /// from the configuration.
 /// Converts relative paths to absolute.
-std::string getPathFromConfig(const std::string& property) const
+static
+std::string getPathFromConfig(Poco::Util::LayeredConfiguration& config, 
const std::string& property)
 {
-std::string path = config().getString(property);
-if (path.empty() && config().hasProperty(property + "[@default]"))
+std::string path = config.getString(property);
+if (path.empty() && config.hasProperty(property + "[@default]"))
 {
 // Use the default value if empty and a default provided.
-path = config().getString(property + "[@default]");
+path = config.getString(property + "[@default]");
 }
 
 // Reconstruct absolute path if relative.
 if (!Poco::Path(path).isAbsolute() &&
-config().hasProperty(property + "[@relative]") &&
-config().getBool(property + "[@relative]"))
+config.hasProperty(property + "[@relative]") &&
+config.getBool(property + "[@relative]"))
 {
 path = 
Poco::Path(Application::instance().commandPath()).parent().append(path).toString();
 }
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index c96bd208f..49e804b89 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -54,6 +54,7 @@ using std::size_t;
 
 bool StorageBase::FilesystemEnabled;
 bool StorageBase::WopiEnabled;
+bool StorageBase::SSLEnabled;
 Util::RegexListMatcher StorageBase::WopiHosts;
 
 #if !MOBILEAPP
@@ -124,8 +125,29 @@ void StorageBase::initialize()
 // Init client
 Poco::Net::Context::Params sslClientParams;
 
-// TODO: Be more strict and setup SSL key/certs for remote server and us
-sslClientParams.verificationMode = Poco::Net::Context::VERIFY_NONE;
+SSLEnabled = LOOLWSD::getConfigValue("storage.ssl.enable", false);
+#if ENABLE_DEBUG
+char *StorageSSLEnabled = getenv("STORAGE_SSL_ENABLE");
+if (StorageSSLEnabled != NULL)
+{
+if (!strcasecmp(StorageSSLEnabled, "true"))
+ 

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

[Marco Cecchetti (via logerrit)]

 loleaflet/images/lc_headerandfooter.svg  |1 +
 loleaflet/src/control/Control.JSDialogBuilder.js |1 +
 2 files changed, 2 insertions(+)

New commits:
commit bf9035ffc7587c28e27a7bb173c08ed0079ee4af
Author: Marco Cecchetti 
AuthorDate: Tue Oct 8 18:48:48 2019 +0200
Commit: Marco Cecchetti 
CommitDate: Tue Oct 8 18:48:48 2019 +0200

loleaflet: impress: add icon for inserting header and footer

Change-Id: I72c7f0742b9ae1211a2232f195eec9f7e1903b58

diff --git a/loleaflet/images/lc_headerandfooter.svg 
b/loleaflet/images/lc_headerandfooter.svg
new file mode 100644
index 0..4c03f51d4
--- /dev/null
+++ b/loleaflet/images/lc_headerandfooter.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
commit 8508e3a289b888b225eaec7dc1d5e25339a020ae
Author: Marco Cecchetti 
AuthorDate: Tue Oct 8 18:38:02 2019 +0200
Commit: Marco Cecchetti 
CommitDate: Tue Oct 8 18:40:43 2019 +0200

loleaflet: close insertion mobile wizard after insert command

Change-Id: I59dc4abd0be9b59ec0b8c634bc0764b89d1d698d

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index aa13f30e3..033ddb388 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -508,6 +508,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
} else {
builder.map.sendUnoCommand(data.command)
}
+   window.onClick(null, 'insertion_mobile_wizard');
});
} else {
console.debug('Builder used outside of mobile wizard: 
please implement the click handler');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/editeng include/svx

[Noel Grandin (via logerrit)]

 include/editeng/unoprnms.hxx |1 -
 include/svx/strings.hrc  |1 -
 2 files changed, 2 deletions(-)

New commits:
commit cee1105a7361bd94650deeca39f02539d018a17c
Author: Noel Grandin 
AuthorDate: Tue Oct 8 14:54:49 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 8 18:31:59 2019 +0200

loplugin:duplicatedefines RID_SUBSETSTR_GEORGIAN_EXTENDED

was defined twice in the same header

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

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 3f762edf5e3b..1d00726183b2 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1674,7 +1674,6 @@
 #define RID_SUBSETSTR_ZANABAZAR_SQUARE  
NC_("RID_SUBSETMAP", "Zanabazar Square")
 #define RID_SUBSETSTR_CHESS_SYMBOLS 
NC_("RID_SUBSETMAP", "Chess Symbols")
 #define RID_SUBSETSTR_DOGRA 
NC_("RID_SUBSETMAP", "Dogra")
-#define RID_SUBSETSTR_GEORGIAN_EXTENDED 
NC_("RID_SUBSETMAP", "Georgian Extended")
 #define RID_SUBSETSTR_GUNJALA_GONDI 
NC_("RID_SUBSETMAP", "Gunjala Gondi")
 #define RID_SUBSETSTR_HANIFI_ROHINGYA   
NC_("RID_SUBSETMAP", "Hanifi Rohingya")
 #define RID_SUBSETSTR_INDIC_SIYAQ_NUMBERS   
NC_("RID_SUBSETMAP", "Indic Siyaq Numbers")
commit 86872303d374f0ec3d91036dfc824b74a5779938
Author: Noel Grandin 
AuthorDate: Tue Oct 8 14:53:08 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 8 18:31:41 2019 +0200

loplugin:duplicatedefines in editeng

UNO_NAME_EDIT_CHAR_FONTNAME was defined twice in the same file

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

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 9af8dcd25d1f..ca3b977afeee 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -324,7 +324,6 @@
 #define UNO_NAME_EDIT_CHAR_STRIKEOUT"CharStrikeout"
 #define UNO_NAME_EDIT_CHAR_CASEMAP  "CharCaseMap"
 #define UNO_NAME_EDIT_CHAR_ESCAPEMENT   "CharEscapement"
-#define UNO_NAME_EDIT_CHAR_FONTNAME "CharFontName"
 #define UNO_NAME_EDIT_CHAR_SHADOWED "CharShadowed"
 #define UNO_NAME_EDIT_CHAR_UNDERLINE"CharUnderline"
 #define UNO_NAME_EDIT_CHAR_OVERLINE "CharOverline"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 ucb/source/ucp/file/filid.cxx   |   45 
 ucb/source/ucp/file/filid.hxx   |   25 +--
 ucb/source/ucp/ftp/ftpcontentidentifier.cxx |   42 --
 ucb/source/ucp/ftp/ftpcontentidentifier.hxx |   27 +---
 4 files changed, 5 insertions(+), 134 deletions(-)

New commits:
commit 0adf816ccde0ad7a7449bb30b47ef27c49414b4f
Author: Noel Grandin 
AuthorDate: Mon Oct 7 15:17:17 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 8 18:31:20 2019 +0200

use cppu::WeakImplHelper in FTPContentIdentifier

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

diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx 
b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index ed8c312c592d..ece8525d8631 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -48,48 +48,6 @@ FTPContentIdentifier::~FTPContentIdentifier()
 }
 
 
-Any SAL_CALL
-FTPContentIdentifier::queryInterface(
-const Type& rType
-)
-{
-Any aRet =
-::cppu::queryInterface(rType,
-   static_cast< XTypeProvider* >(this),
-   static_cast< XContentIdentifier* >(this));
-
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-
-void SAL_CALL FTPContentIdentifier::acquire() throw() {
-OWeakObject::acquire();
-}
-
-
-void SAL_CALL FTPContentIdentifier::release() throw() {
-OWeakObject::release();
-}
-
-
-Sequence SAL_CALL
-FTPContentIdentifier::getImplementationId()
-{
-return css::uno::Sequence();
-}
-
-
-Sequence SAL_CALL
-FTPContentIdentifier::getTypes()
-{
-static cppu::OTypeCollection s_aCollection(
-cppu::UnoType::get(),
-cppu::UnoType::get());
-
-return s_aCollection.getTypes();
-}
-
-
 OUString SAL_CALL
 FTPContentIdentifier::getContentIdentifier(
 )
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx 
b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
index cd8de1494ada..367c7820b413 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
@@ -25,17 +25,15 @@
 #ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENTIDENTIFIER_HXX
 #define INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENTIDENTIFIER_HXX
 
-#include 
+#include 
 #include 
 #include 
 
 
 namespace ftp {
 
-class FTPContentIdentifier
-: public cppu::OWeakObject,
-  public css::lang::XTypeProvider,
-  public css::ucb::XContentIdentifier
+class FTPContentIdentifier :
+public cppu::WeakImplHelper
 {
 public:
 
@@ -43,25 +41,6 @@ namespace ftp {
 
 virtual ~FTPContentIdentifier() override;
 
-// XInterface
-
-virtual css::uno::Any SAL_CALL
-queryInterface( const css::uno::Type& rType ) override;
-
-virtual void SAL_CALL acquire() throw() override;
-
-virtual void SAL_CALL release() throw() override;
-
-// XTypeProvider
-
-virtual
-css::uno::Sequence SAL_CALL
-getTypes() override;
-
-virtual css::uno::Sequence SAL_CALL
-getImplementationId() override;
-
-
 // XContentIdentifier
 
 virtual OUString SAL_CALL
commit d8ad8cc3c8b09f82e2ee722c98b335bfd19b2041
Author: Noel Grandin 
AuthorDate: Mon Oct 7 15:16:04 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 8 18:31:09 2019 +0200

use cppu::WeakImplHelper in fileaccess::FileContentIdentifier

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

diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index aadcf2f14498..11ce232c7ea8 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -47,51 +47,6 @@ FileContentIdentifier::~FileContentIdentifier()
 {
 }
 
-
-void SAL_CALL
-FileContentIdentifier::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-
-void SAL_CALL
-FileContentIdentifier::release()
-  throw()
-{
-  OWeakObject::release();
-}
-
-
-uno::Any SAL_CALL
-FileContentIdentifier::queryInterface( const uno::Type& rType )
-{
-uno::Any aRet = cppu::queryInterface( rType,
-  static_cast< lang::XTypeProvider* 
>(this),
-  static_cast< XContentIdentifier* 
>(this) );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-
-uno::Sequence< sal_Int8 > SAL_CALL
-FileContentIdentifier::getImplementationId()
-{
-return css::uno::Sequence();
-}
-
-
-uno::Sequence< uno::Type > SAL_CALL
-FileContentIdentifier::getTypes()
-{
-static cppu::OTypeCollection s_aCollection(
-cppu::UnoType::get(),
-cppu::UnoType::get() );
-
-return s_aCol

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

[Jan Holesovsky (via logerrit)]

 sfx2/source/sidebar/Panel.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 707436f0b37fa2cf0e5a3fd41bcda504246876c6
Author: Jan Holesovsky 
AuthorDate: Tue Oct 8 16:49:35 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 18:12:31 2019 +0200

jsdialogs: Expose the panel names.

Change-Id: Ifa837bfcaba6e63c7058e34f1e386f571bfb4d61
Reviewed-on: https://gerrit.libreoffice.org/80481
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 
(cherry picked from commit b13e2e7d2b2767d4fadaf825756ee38bc941ad57)
Reviewed-on: https://gerrit.libreoffice.org/80490

diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 02a5cc565407..d9515affef63 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -63,9 +63,7 @@ Panel::Panel(const PanelDescriptor& rPanelDescriptor,
 , maContextAccess(rContextAccess)
 , mxFrame(rxFrame)
 {
-#ifdef DEBUG
-SetText(OUString("Panel"));
-#endif
+SetText(rPanelDescriptor.msTitle);
 }
 
 Panel::~Panel()
___
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

[Jan Holesovsky (via logerrit)]

 sfx2/source/sidebar/Panel.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b13e2e7d2b2767d4fadaf825756ee38bc941ad57
Author: Jan Holesovsky 
AuthorDate: Tue Oct 8 16:49:35 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 18:08:59 2019 +0200

jsdialogs: Expose the panel names.

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

diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 0abb5907aac5..7968f667b92d 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -61,9 +61,7 @@ Panel::Panel(const PanelDescriptor& rPanelDescriptor,
 , maContextAccess(rContextAccess)
 , mxFrame(rxFrame)
 {
-#ifdef DEBUG
-SetText(OUString("Panel"));
-#endif
+SetText(rPanelDescriptor.msTitle);
 }
 
 Panel::~Panel()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0e290aa52df9f9e12d3f848ce136bbdd9dc07661
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 17:22:10 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 18:10:00 2019 +0200

jsdialogs: use name of tab instead of panel id

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

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 89d50efb0..aa13f30e3 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -191,7 +191,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var tabsContainer = L.DomUtil.create('div', 'ui-tabs 
mobile-wizard ui-widget');
var contentsContainer = L.DomUtil.create('div', 
'ui-tabs-content mobile-wizard ui-widget', parentContainer);
 
-   var title1 = 
builder._cleanText(data.children[1].children[0].id);
+   var title1 = builder._cleanText(data.children[1].text);
var icon1 = builder._createIconPath(title1);
 
var tab1 = L.DomUtil.create('div', 'ui-tab mobile-wizard', 
tabsContainer);
@@ -216,7 +216,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
var tab2 = L.DomUtil.create('div', 'ui-tab mobile-wizard', 
tabsContainer);
 
-   var title2 = 
builder._cleanText(data.children[3].children[0].id);
+   var title2 = builder._cleanText(data.children[3].text);
var icon2 = builder._createIconPath(title2);
 
var button2 = L.DomUtil.create('img', 'ui-tab-content 
mobile-wizard unobutton', tab2);
commit e9fdbfe07aca366a9098c4938dfa3bb050487ab9
Author: Jan Holesovsky 
AuthorDate: Tue Oct 8 17:12:51 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 18:09:37 2019 +0200

mobile: Use the 'text' property for the names of the panels.

Depends on a core patch.

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

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index c575d3627..89d50efb0 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -179,7 +179,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
},
 
_panelHandler: function(parentContainer, data, builder) {
-   var title = data.children[0].id;
+   var title = data.text;
var contentNode = data.children[0];
 
builder._explorableEntry(parentContainer, title, contentNode, 
builder);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source include/o3tl o3tl/CompilerTest_o3tl_unsafe_downcast.mk o3tl/Module_o3tl.mk o3tl/qa

[Stephan Bergmann (via logerrit)]

 chart2/source/controller/main/DrawCommandDispatch.cxx |8 +---
 include/o3tl/unsafe_downcast.hxx  |   35 ++
 o3tl/CompilerTest_o3tl_unsafe_downcast.mk |   16 
 o3tl/Module_o3tl.mk   |1 
 o3tl/qa/compile-unsafe_downcast.cxx   |   32 
 5 files changed, 86 insertions(+), 6 deletions(-)

New commits:
commit 8ec3116162e030709c42420fc70e7423db9a06df
Author: Stephan Bergmann 
AuthorDate: Tue Oct 8 14:55:25 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 18:07:57 2019 +0200

Introduce o3tl::unsafe_downcast for known-good dynamic_cast downcasts

(This helps rewrite code that silences Coverity unchecked dynamic_cast 
warnings,
like 57b89ea1c2ff07b53c3cc002e5ec9e52abd0c1bd "coverity#704563 Unchecked 
dynamic
cast", in a way that is cleaner and potentially executes faster.)

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

diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx 
b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 0c46970d926a..e8230b1d2eab 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -24,6 +24,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -161,12 +162,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
 pObj->SetMergedItem( SdrTextHorzAdjustItem( 
SDRTEXTHORZADJUST_BLOCK ) );
 pObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( false ) );
 
-SdrObjCustomShape* pShape(dynamic_cast< SdrObjCustomShape* >( 
pObj ));
-assert(pShape);
-if(pShape)
-{
-pShape->MergeDefaultAttributes( &m_aCustomShapeType );
-}
+o3tl::unsafe_downcast< SdrObjCustomShape* >( pObj 
)->MergeDefaultAttributes( &m_aCustomShapeType );
 }
 }
 }
diff --git a/include/o3tl/unsafe_downcast.hxx b/include/o3tl/unsafe_downcast.hxx
new file mode 100644
index ..b49994eff135
--- /dev/null
+++ b/include/o3tl/unsafe_downcast.hxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_O3TL_UNSAFE_DOWNCAST_HXX
+#define INCLUDED_O3TL_UNSAFE_DOWNCAST_HXX
+
+#include 
+#include 
+
+namespace o3tl
+{
+// Do a downcast from polymorphic `BasePtr` to `DerivedPtr` when it is known 
that `p` is actually
+// pointing to an object of derived type (or is a nullptr).  This is 
potentially cheaper than
+// dynamic_cast and helps to avoid Coverity warnings about unchecked 
dynamic_cast.
+template 
+std::enable_if_t<
+(std::is_pointer_v<
+ DerivedPtr> && std::is_pointer_v && 
std::is_base_of_v, 
std::remove_pointer_t>),
+DerivedPtr>
+unsafe_downcast(BasePtr p)
+{
+assert(p == nullptr || dynamic_cast(p) != nullptr);
+return static_cast(p);
+}
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/o3tl/CompilerTest_o3tl_unsafe_downcast.mk 
b/o3tl/CompilerTest_o3tl_unsafe_downcast.mk
new file mode 100644
index ..0fbc8a247505
--- /dev/null
+++ b/o3tl/CompilerTest_o3tl_unsafe_downcast.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 
100 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CompilerTest_CompilerTest,o3tl_unsafe_downcast))
+
+$(eval $(call gb_CompilerTest_add_exception_objects,o3tl_unsafe_downcast, \
+o3tl/qa/compile-unsafe_downcast \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/o3tl/Module_o3tl.mk b/o3tl/Module_o3tl.mk
index 779b37ef56af..fa1516bca436 100644
--- a/o3tl/Module_o3tl.mk
+++ b/o3tl/Module_o3tl.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_targets,o3tl,\
 $(eval $(call gb_Module_add_check_targets,o3tl,\
CppunitTest_o3tl_tests \
$(if $(COM_IS_CLANG),CompilerTest_o3tl_temporary) \
+   $(if $(COM_IS_CLANG),CompilerTest_o3tl_unsafe_downcast) \
 ))
 
 # vim: set noet sw=4:
diff --git a/o3tl/qa/compile-unsafe_downcast.cxx 
b/o3tl/qa/compile-unsafe_downcast.cxx
new file mode 100644
index ..8471fc250e88
--- /dev/null
+++ b/o3tl/qa/compile-unsafe_downcast.cxx
@@ -0,0 +1,32 @@
+/* -*- 

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

[Pedro (via logerrit)]

 loleaflet/css/toolbar.css |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 47cc5e85dd11692fd494d47aca0dca9a51f1f327
Author: Pedro 
AuthorDate: Tue Oct 8 17:22:57 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 17:38:55 2019 +0200

mobile-wizard: AlignmentPropertyPanel: layout

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

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index fbbae4a0d..ac434c80f 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -33,15 +33,16 @@
border-radius:100px;
background-color: #696969;
}
-   #Bold > span, #Italic > span, #Underline > span, #Strikeout > span, 
#StyleApply > span, #StyleUpdateByExample > span, #StyleNewByExample > span, 
#Shadowed > span, #Grow > span, #Shrink > span, #Color > span, #Spacing > span, 
#SuperScript > span, #SubScript > span{
+   #Bold > span, #Italic > span, #Underline > span, #Strikeout > span, 
#StyleApply > span, #StyleUpdateByExample > span, #StyleNewByExample > span, 
#Shadowed > span, #Grow > span, #Shrink > span, #Color > span, #Spacing > span, 
#SuperScript > span, #SubScript > span, #AlignLeft > span, #AlignRight > span, 
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span, 
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom > 
span, #IncrementIndent > span, #DecrementIndent > span{
display: none !important;
}
-   #Bold, #Italic, #Underline, #Strikeout, #StyleApply, 
#StyleUpdateByExample, #StyleNewByExample, #Shadowed, #Grow, #Shrink, #Color, 
#Spacing, #SuperScript, #SubScript{
+   #Bold, #Italic, #Underline, #Strikeout, #StyleApply, 
#StyleUpdateByExample, #StyleNewByExample, #Shadowed, #Grow, #Shrink, #Color, 
#Spacing, #SuperScript, #SubScript,#AlignLeft, #AlignRight, 
#AlignHorizontalCenter, #AlignBlock, #ParaRightToLeft, #ParaLeftToRight, 
#AlignTop, #AlignVCenter, #AlignBottom, #IncrementIndent, #DecrementIndent{
padding: 24px 28px 24px 28px !important;
margin: 0px !important;
float:left;
}
-   #Shadowed, #StyleNewByExample + div{clear:both;}
+   #Shadowed, #StyleNewByExample + div, #AlignTop, #AlignBottom + p, 
#mergecells{clear:both;}
+   #DecrementIndent + input:disabled{display: none;}
#buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel, 
#buttonnone, #buttonthrough, #bottom, #top, #standard, #Bold, #Italic, 
#Underline, #Strikeout{
margin: 0;
 padding: 0;
@@ -51,7 +52,7 @@
padding: 24px 32px 24px 32px;
background-size: 24px !important;
}
-   #buttonbefore:focus, #buttonafter:focus, #buttonoptimal:focus, 
#buttonparallel:focus, #buttonnone:focus, #buttonthrough:focus, #bottom:focus, 
#top:focus, #standard:focus, #Bold:focus, #Bold:active, #Italic:focus, 
#Italic:active, #Underline:focus, #Underline:active, #Strikeout:focus, 
#Strikeout:active, #StyleApply:focus, #StyleApply:active, 
#StyleUpdateByExample:focus, #StyleUpdateByExample:active, 
#StyleNewByExample:focus, #StyleNewByExample:active, #Spacing:active, 
#SuperScript:active, #SubScript:active, #Shadowed:active, #Spacing:active, 
#SuperScript:active, #SubScript:active, #Grow:active, #Shrink:active, 
#Color:active {
+   #buttonbefore:focus, #buttonafter:focus, #buttonoptimal:focus, 
#buttonparallel:focus, #buttonnone:focus, #buttonthrough:focus, #bottom:focus, 
#top:focus, #standard:focus, #Bold:focus, #Bold:active, #Italic:focus, 
#Italic:active, #Underline:focus, #Underline:active, #Strikeout:focus, 
#Strikeout:active, #StyleApply:focus, #StyleApply:active, 
#StyleUpdateByExample:focus, #StyleUpdateByExample:active, 
#StyleNewByExample:focus, #StyleNewByExample:active, #Spacing:active, 
#SuperScript:active, #SubScript:active, #Shadowed:active, #Spacing:active, 
#SuperScript:active, #SubScript:active, #Grow:active, #Shrink:active, 
#Color:active, #AlignLeft:active, #AlignRight:active, 
#AlignHorizontalCenter:active, #AlignBlock:active, #AlignTop:active, 
#AlignVCenter:active, #AlignBottom:active, #IncrementIndent:active, 
#DecrementIndent:active{
border-radius: 4px;
 outline: none;
 background-color: #e5f1ff !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti (via logerrit)]

 loleaflet/images/lc_alignbottom.svg|1 +
 loleaflet/images/lc_aligntop.svg   |1 +
 loleaflet/images/lc_alignvcenter.svg   |1 +
 loleaflet/images/lc_framelinecolor.svg |1 +
 loleaflet/images/lc_linestyle.svg  |1 +
 5 files changed, 5 insertions(+)

New commits:
commit acd95732b623cf88f40aa9541623da24403070fe
Author: Marco Cecchetti 
AuthorDate: Tue Oct 8 17:01:42 2019 +0200
Commit: Marco Cecchetti 
CommitDate: Tue Oct 8 17:01:51 2019 +0200

loleaflet: calc: more icons for mobile wizard

Change-Id: If5112719a055ba059d95cff3b1d96df5fb9f39ae

diff --git a/loleaflet/images/lc_alignbottom.svg 
b/loleaflet/images/lc_alignbottom.svg
new file mode 100644
index 0..bc986b99f
--- /dev/null
+++ b/loleaflet/images/lc_alignbottom.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_aligntop.svg b/loleaflet/images/lc_aligntop.svg
new file mode 100644
index 0..ba9c7dbf0
--- /dev/null
+++ b/loleaflet/images/lc_aligntop.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_alignvcenter.svg 
b/loleaflet/images/lc_alignvcenter.svg
new file mode 100644
index 0..c47809aaf
--- /dev/null
+++ b/loleaflet/images/lc_alignvcenter.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_framelinecolor.svg 
b/loleaflet/images/lc_framelinecolor.svg
new file mode 100644
index 0..bf6ead04f
--- /dev/null
+++ b/loleaflet/images/lc_framelinecolor.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_linestyle.svg 
b/loleaflet/images/lc_linestyle.svg
new file mode 100644
index 0..d1db992e5
--- /dev/null
+++ b/loleaflet/images/lc_linestyle.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/vcl/abstdlg.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7dbebef754b66e28e92be200be434d17006d3767
Author: Caolán McNamara 
AuthorDate: Mon Oct 7 20:50:13 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 8 17:10:48 2019 +0200

no need for vcl::Window in vcl/abstdlg.hxx anymore

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

diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index ccbc64a753a0..645f1da4b301 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -32,7 +32,6 @@ namespace com { namespace sun { namespace star { namespace 
uno { template https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: osx/soffice.xcodeproj

[Tor Lillqvist (via logerrit)]

 osx/soffice.xcodeproj/project.pbxproj |   27 +++
 1 file changed, 27 insertions(+)

New commits:
commit 4936e38ba40501f57886aad946dded09b83e4786
Author: Tor Lillqvist 
AuthorDate: Tue Oct 8 17:48:37 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Oct 8 17:51:52 2019 +0300

Add missing source files in vcl/source/gdi

(A fairly ad-hoc small subset of the source files are included in the
Xcode project to make it possible to set breakpoints in them in
advance.)

Change-Id: I6c2655337e1d623b299e65aa977650e7519b7bd8

diff --git a/osx/soffice.xcodeproj/project.pbxproj 
b/osx/soffice.xcodeproj/project.pbxproj
index 1c7dd9704e3b..6a4ab8ce8d69 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -133,6 +133,19 @@
BE60B5AB1DB7D80200D3E1E4 /* saltimer.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = saltimer.cxx; path = ../vcl/osx/saltimer.cxx; sourceTree = ""; };
BE60B5AC1DB7D80200D3E1E4 /* service_entry.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = service_entry.cxx; path = ../vcl/osx/service_entry.cxx; sourceTree = 
""; };
BE60B5AD1DB7D80200D3E1E4 /* vclnsapp.mm */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; 
name = vclnsapp.mm; path = ../vcl/osx/vclnsapp.mm; sourceTree = ""; };
+   BE7EC139234CC0FA000D1DB6 /* VerticalOrientationData.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
VerticalOrientationData.cxx; path = 
../vcl/source/gdi/VerticalOrientationData.cxx; sourceTree = ""; };
+   BE7EC13A234CC0FA000D1DB6 /* impglyphitem.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
impglyphitem.cxx; path = ../vcl/source/gdi/impglyphitem.cxx; sourceTree = 
""; };
+   BE7EC13B234CC0FA000D1DB6 /* TypeSerializer.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
TypeSerializer.cxx; path = ../vcl/source/gdi/TypeSerializer.cxx; sourceTree = 
""; };
+   BE7EC13C234CC0FA000D1DB6 /* CommonSalLayout.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
CommonSalLayout.cxx; path = ../vcl/source/gdi/CommonSalLayout.cxx; sourceTree = 
""; };
+   BE7EC13D234CC0FA000D1DB6 /* scrptrun.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrptrun.cxx; 
path = ../vcl/source/gdi/scrptrun.cxx; sourceTree = ""; };
+   BE7EC13E234CC0FA000D1DB6 /* salgdiimpl.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
salgdiimpl.cxx; path = ../vcl/source/gdi/salgdiimpl.cxx; sourceTree = 
""; };
+   BE7EC13F234CC0FA000D1DB6 /* WidgetDefinition.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
WidgetDefinition.cxx; path = ../vcl/source/gdi/WidgetDefinition.cxx; sourceTree 
= ""; };
+   BE7EC140234CC0FA000D1DB6 /* mtfxmldump.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
mtfxmldump.cxx; path = ../vcl/source/gdi/mtfxmldump.cxx; sourceTree = 
""; };
+   BE7EC141234CC0FA000D1DB6 /* FileDefinitionWidgetDraw.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
FileDefinitionWidgetDraw.cxx; path = 
../vcl/source/gdi/FileDefinitionWidgetDraw.cxx; sourceTree = ""; };
+   BE7EC142234CC0FA000D1DB6 /* vectorgraphicdata.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
vectorgraphicdata.cxx; path = ../vcl/source/gdi/vectorgraphicdata.cxx; 
sourceTree = ""; };
+   BE7EC143234CC0FA000D1DB6 /* pdfbuildin_fonts.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
pdfbuildin_fonts.cxx; path = ../vcl/source/gdi/pdfbuildin_fonts.cxx; sourceTree 
= ""; };
+   BE7EC144234CC0FA000D1DB6 /* svmconverter.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
svmconverter.cxx; path = ../vcl/source/gdi/svmconverter.cxx; sourceTree = 
""; };
+   BE7EC145234CC0FA000D1DB6 /* WidgetDefinitionReader.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
WidgetDefinitionReader.cxx; path = 
../vcl/source/gdi/WidgetDefinitionReader.cxx; sourceTree = ""; };
BE82BE5718298DE100A447B5 /* formulacell.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
formulacell.cxx; path = ../sc/source/core/data/formulacell.cxx; sourceTree = 
""; };
BE82C3AA18C86D440050EB79 /* brand.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brand.cxx; 
path = ../vcl/source/app/brand.cxx; sourceTree = ""; };
BE82C3AB18C86D440050EB79 /* dndhelp.cxx */ = {is

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

[Szymon Kłos (via logerrit)]

 loleaflet/css/toolbar.css |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 922e898a947d60c1e51f4ca850e1d3cf11b22e25
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 16:57:09 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 16:57:21 2019 +0200

jsdialogs: show both tabs on small screens

Change-Id: I6c38703cf2580b75978fef2ca761d2fe93044f25

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index bbea39096..fbbae4a0d 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -1039,10 +1039,11 @@ menu-entry-with-icon.padding-left + 
menu-entry-icon.width */
 
 .ui-tabs.mobile-wizard {
text-align: center;
+   height: 42px;
 }
 
 .ui-tab.mobile-wizard {
-   display: inline-table;
+   display: table-cell;
height: 36px;
line-height: 36px;
 vertical-align: middle;
___
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' - sw/inc sw/qa sw/source

[Jan Holesovsky (via logerrit)]

 sw/inc/viewsh.hxx  |5 +
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   18 ++
 sw/source/uibase/ribbar/drawbase.cxx   |   23 ---
 sw/source/uibase/uno/unotxdoc.cxx  |   14 +-
 4 files changed, 48 insertions(+), 12 deletions(-)

New commits:
commit f6f4d69f8349a97ab301190675645b6ad3c8068c
Author: Jan Holesovsky 
AuthorDate: Thu Jan 17 14:46:47 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Oct 8 16:51:58 2019 +0200

lok sw: When inserting shapes, do that in the middle of the visible area.

Instead of in the middle of the entire document, which may be far away.

Change-Id: I50a1a5f159b73a3803cd7a549939b73a366e7dc5
Reviewed-on: https://gerrit.libreoffice.org/66584
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/80258
Tested-by: Jenkins CollaboraOffice 

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 66382ecc216c..8488b9482d3f 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -168,6 +168,7 @@ protected:
 static vcl::DeleteOnDeinit< std::shared_ptr > mpCareDialog;  
  ///< Avoid this window.
 
 SwRect  maVisArea;   ///< The modern version of 
VisArea.
+tools::RectanglemaLOKVisibleArea;///< The visible area in the 
LibreOfficeKit client.
 rtl::Reference   mxDoc;  ///< The document; never 0.
 
 sal_uInt16 mnStartAction; ///< != 0 if at least one Action is active.
@@ -245,6 +246,10 @@ public:
 
 const SwRect& VisArea() const;
 
+/// The visible area in the client (set by setClientVisibleArea).
+const tools::Rectangle getLOKVisibleArea() const { return 
maLOKVisibleArea; }
+void setLOKVisibleArea(const tools::Rectangle& rArea) { maLOKVisibleArea = 
rArea; }
+
 // If necessary scroll until passed Rect is situated in visible sector.
 void MakeVisible( const SwRect & );
 
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 16373bbf2a67..3a13c1649576 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -67,6 +67,7 @@ public:
 void testGetTextSelection();
 void testSetGraphicSelection();
 void testResetSelection();
+void testInsertShape();
 void testSearch();
 void testSearchViewArea();
 void testSearchTextFrame();
@@ -126,6 +127,7 @@ public:
 CPPUNIT_TEST(testGetTextSelection);
 CPPUNIT_TEST(testSetGraphicSelection);
 CPPUNIT_TEST(testResetSelection);
+CPPUNIT_TEST(testInsertShape);
 CPPUNIT_TEST(testSearch);
 CPPUNIT_TEST(testSearchViewArea);
 CPPUNIT_TEST(testSearchTextFrame);
@@ -487,6 +489,22 @@ void SwTiledRenderingTest::testResetSelection()
 CPPUNIT_ASSERT(!pWrtShell->IsSelFrameMode());
 }
 
+void SwTiledRenderingTest::testInsertShape()
+{
+comphelper::LibreOfficeKit::setActive();
+
+SwXTextDocument* pXTextDocument = createDoc("2-pages.odt");
+SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+
+pXTextDocument->setClientVisibleArea(tools::Rectangle(0, 0, 1, 4000));
+comphelper::dispatchCommand(".uno:BasicShapes.circle", 
uno::Sequence());
+
+// check that the shape was inserted in the visible area, not outside
+SdrPage* pPage = 
pWrtShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+SdrObject* pObject = pPage->GetObj(0);
+CPPUNIT_ASSERT_EQUAL(tools::Rectangle(2736, 868, 7264, 3132), 
pObject->GetSnapRect());
+}
+
 static void lcl_search(bool bBackward)
 {
 uno::Sequence 
aPropertyValues(comphelper::InitPropertySequence(
diff --git a/sw/source/uibase/ribbar/drawbase.cxx 
b/sw/source/uibase/ribbar/drawbase.cxx
index fdd09bab6dc9..4aa0bdeedd64 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -524,13 +525,21 @@ void SwDrawBase::CreateDefaultObject()
 Point  SwDrawBase::GetDefaultCenterPos()
 {
 Size aDocSz(m_pSh->GetDocSize());
-const SwRect& rVisArea = m_pSh->VisArea();
-Point aStartPos = rVisArea.Center();
-if(rVisArea.Width() > aDocSz.Width())
-aStartPos.setX( aDocSz.Width() / 2 + rVisArea.Left() );
-if(rVisArea.Height() > aDocSz.Height())
-aStartPos.setY( aDocSz.Height() / 2 + rVisArea.Top() );
-return aStartPos;
+
+SwRect aVisArea(m_pSh->VisArea());
+if (comphelper::LibreOfficeKit::isActive())
+{
+aVisArea = m_pSh->getLOKVisibleArea();
+aVisArea.Intersection(SwRect(Point(), aDocSz));
+}
+
+Point aCenter = aVisArea.Center();
+if (aVisArea.Width() > aDocSz.Width())
+aCenter.setX(aDocSz.Width() / 2 + aVisArea.Left());
+if (aVisArea.Height() > aDocSz.Height())
+aCenter.setY(aDocSz.Height() / 2 + aVisArea.Top());
+
+return

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

[Michael Meeks (via logerrit)]

 sfx2/source/sidebar/Deck.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2d7d3cc936cb5b0a242ad7a5c714ebde03df574d
Author: Michael Meeks 
AuthorDate: Tue Oct 8 14:01:11 2019 +0100
Commit: Michael Meeks 
CommitDate: Tue Oct 8 16:50:40 2019 +0200

lok: only generate sidebar JSON for mobile views, for now.

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

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 5bc09fdfc2f5..d54b4cea5c67 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -196,7 +196,10 @@ void Deck::Resize()
 {
 Window::Resize();
 
-if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+const vcl::ILibreOfficeKitNotifier *pNotifier;
+if (comphelper::LibreOfficeKit::isActive() &&
+comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()) &&
+(pNotifier = GetLOKNotifier()))
 {
 std::vector aItems;
 aItems.emplace_back("type", "deck");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/css/toolbar.css|1 -
 loleaflet/src/control/Control.Toolbar.js |   20 +++-
 2 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 06bbdd2c75fa320a5550347b5ef385598a42dc93
Author: Henry Castro 
AuthorDate: Tue Oct 8 10:22:59 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Oct 8 16:51:58 2019 +0200

loleaflet: mobile: avoid to set twice the same toolbar item

ImpressTileLayer has its own toolbar that it was created
with items 'prev' and 'next'. When update parts event is
triggered it is not necessary to set it again. The code is
valid only for Desktop view.

Change-Id: I51345a824079565bb9b8d2feae7c71624bbe4841
Reviewed-on: https://gerrit.libreoffice.org/80476
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index d2543bc4e..728064b4a 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1956,15 +1956,17 @@ function onUpdateParts(e) {
return;
}
 
-   if (e.docType === 'presentation') {
-   toolbar.set('prev', {hint: _('Previous slide')});
-   toolbar.set('next', {hint: _('Next slide')});
-   }
-   else {
-   toolbar.hide('presentation');
-   toolbar.hide('insertpage');
-   toolbar.hide('duplicatepage');
-   toolbar.hide('deletepage');
+   if (!window.mode.isMobile()) {
+   if (e.docType === 'presentation') {
+   toolbar.set('prev', {hint: _('Previous slide')});
+   toolbar.set('next', {hint: _('Next slide')});
+   }
+   else {
+   toolbar.hide('presentation');
+   toolbar.hide('insertpage');
+   toolbar.hide('duplicatepage');
+   toolbar.hide('deletepage');
+   }
}
 
if (e.docType !== 'spreadsheet') {
commit 7a6517634148ca61616d6ecd8dda1b50a673f68b
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 16:50:57 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 16:50:57 2019 +0200

jsdialogs: no white text in tabs

Change-Id: I998a21f9e0f4407784f72915d5a2f187f86ed76b

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index c1f4d2110..bbea39096 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -1053,7 +1053,6 @@ menu-entry-with-icon.padding-left + menu-entry-icon.width 
*/
 }
 
 .ui-tab.selected.mobile-wizard {
-   color: white;
background-color: #eaf5ff;
border: none;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks (via logerrit)]

 sfx2/source/sidebar/Deck.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d6bb6ed7e5d20305662d75feccbbefaafb09c6df
Author: Michael Meeks 
AuthorDate: Tue Oct 8 14:01:11 2019 +0100
Commit: Michael Meeks 
CommitDate: Tue Oct 8 16:50:46 2019 +0200

lok: only generate sidebar JSON for mobile views, for now.

Change-Id: I7a4b20cfc93ddd77752790a7c303f512a62afbb3
Reviewed-on: https://gerrit.libreoffice.org/80459
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 62eaf1ecf026..b38525bf7e4d 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -187,7 +187,10 @@ void Deck::Resize()
 {
 Window::Resize();
 
-if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+const vcl::ILibreOfficeKitNotifier *pNotifier;
+if (comphelper::LibreOfficeKit::isActive() &&
+comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()) &&
+(pNotifier = GetLOKNotifier()))
 {
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 chart2/source/controller/main/DrawCommandDispatch.cxx |   52 ++
 1 file changed, 20 insertions(+), 32 deletions(-)

New commits:
commit 063702253e33734e2a867ae5145e05a3153b3c04
Author: Stephan Bergmann 
AuthorDate: Tue Oct 8 14:28:42 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 16:49:06 2019 +0200

Simplify some uses of dynamic_cast

(SdrCaptionObj is derived from SdrTextObj, and 
SdrTextObj::SetVerticalWriting
isn't shadowed anywhere along the derivation path to SdrCaptionObj, so 
dropping
the dynamic_cast to SdrTextObj in the last block is fine.)

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

diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx 
b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 7540d7962eae..0c46970d926a 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -445,7 +445,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const 
sal_uInt16 nID )
 case COMMAND_ID_DRAW_LINE:
 case COMMAND_ID_LINE_ARROW_END:
 {
-if ( dynamic_cast( pObj) !=  
nullptr )
+if ( auto const pathObj = 
dynamic_cast( pObj) )
 {
 Point aStart = aRect.TopLeft();
 Point aEnd = aRect.BottomRight();
@@ -453,7 +453,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const 
sal_uInt16 nID )
 basegfx::B2DPolygon aPoly;
 aPoly.append( basegfx::B2DPoint( aStart.X(), 
nYMiddle ) );
 aPoly.append( basegfx::B2DPoint( aEnd.X(), 
nYMiddle ) );
-
dynamic_cast(*pObj).SetPathPoly(basegfx::B2DPolyPolygon(aPoly));
+
pathObj->SetPathPoly(basegfx::B2DPolyPolygon(aPoly));
 SfxItemSet aSet( 
pDrawModelWrapper->GetItemPool() );
 setLineEnds( aSet );
 pObj->SetMergedItemSet( aSet );
@@ -462,7 +462,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const 
sal_uInt16 nID )
 break;
 case COMMAND_ID_DRAW_FREELINE_NOFILL:
 {
-if ( dynamic_cast( pObj) !=  
nullptr )
+if ( auto const pathObj = 
dynamic_cast( pObj) )
 {
 basegfx::B2DPolygon aInnerPoly;
 aInnerPoly.append( basegfx::B2DPoint( 
aRect.Left(), aRect.Bottom() ) );
@@ -476,30 +476,26 @@ SdrObject* DrawCommandDispatch::createDefaultObject( 
const sal_uInt16 nID )
 basegfx::B2DPoint( aRect.Right(), 
aRect.Top() ) );
 basegfx::B2DPolyPolygon aPoly;
 aPoly.append( aInnerPoly );
-
dynamic_cast(*pObj).SetPathPoly(aPoly);
+pathObj->SetPathPoly(aPoly);
 }
 }
 break;
 case COMMAND_ID_DRAW_TEXT:
 case COMMAND_ID_DRAW_TEXT_VERTICAL:
 {
-if ( dynamic_cast( pObj) !=  
nullptr )
+if ( SdrTextObj* pTextObj = 
dynamic_cast( pObj) )
 {
-SdrTextObj* pTextObj = dynamic_cast< 
SdrTextObj* >( pObj );
-if ( pTextObj )
+pTextObj->SetLogicRect( aRect );
+bool bVertical = ( nID == 
COMMAND_ID_DRAW_TEXT_VERTICAL );
+pTextObj->SetVerticalWriting( bVertical );
+if ( bVertical )
 {
-pTextObj->SetLogicRect( aRect );
-bool bVertical = ( nID == 
COMMAND_ID_DRAW_TEXT_VERTICAL );
-pTextObj->SetVerticalWriting( bVertical );
-if ( bVertical )
-{
-SfxItemSet aSet( 
pDrawModelWrapper->GetItemPool() );
-aSet.Put( 
makeSdrTextAutoGrowWidthItem( true ) );
-aSet.Put( 
makeSdrTextAutoGrowHeightItem( false ) );
-aSet.Put( SdrTextVertAdjustItem( 
SDRTEXTVERTADJUST_TOP ) );
-aSet.Put( SdrTe

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

[Pedro (via logerrit)]

 loleaflet/css/toolbar.css |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 9a8301281f58270aa41a36bc5dd67eebc68f6bde
Author: Pedro 
AuthorDate: Tue Oct 8 16:25:33 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 16:47:51 2019 +0200

toolbar-down(only): Style active states(checked) according to the overall 
theme without replacing icon

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

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index dd231b987..c1f4d2110 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -4,6 +4,17 @@
}
 }
 @media (max-width: 767px), (max-device-height: 767px) {
+   #toolbar-down table.w2ui-button.checked .w2ui-tb-image{
+   -webkit-filter: grayscale(100%) brightness(80%) sepia(100%) 
hue-rotate(-190deg) saturate(900%) contrast(0.8);
+   filter: grayscale(100%) brightness(80%) sepia(100%) 
hue-rotate(-190deg) saturate(900%) contrast(0.8);
+   background-size: 18px !important;
+   }
+
+   #toolbar-down table.w2ui-button.checked {
+   border: 1px solid #e5f1ff;
+   background-color: #e5f1ff;
+   border-radius: 0px;
+   }
.w2ui-icon.users{
background-size: 20px !important;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro (via logerrit)]

 loleaflet/css/toolbar.css |   19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

New commits:
commit c8289a14e9d75fa90fecc2aaa6a6ac039b73aea9
Author: Pedro 
AuthorDate: Tue Oct 8 16:04:50 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 16:47:01 2019 +0200

mobile-wizard:SidebarTextPanel: Work on grouping elements, their layout and 
states

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

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index b24e8bb3f..dd231b987 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -18,7 +18,20 @@
#buttonnone + label, #buttonbefore + label, #buttonafter + label, 
#buttonoptimal + label, #buttonparallel + label, #buttonnone + label, 
#buttonthrough + label{
padding-left: 0;
}
-   #buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel, 
#buttonnone, #buttonthrough, #bottom, #top, #standard{
+   #Color > img{
+   border-radius:100px;
+   background-color: #696969;
+   }
+   #Bold > span, #Italic > span, #Underline > span, #Strikeout > span, 
#StyleApply > span, #StyleUpdateByExample > span, #StyleNewByExample > span, 
#Shadowed > span, #Grow > span, #Shrink > span, #Color > span, #Spacing > span, 
#SuperScript > span, #SubScript > span{
+   display: none !important;
+   }
+   #Bold, #Italic, #Underline, #Strikeout, #StyleApply, 
#StyleUpdateByExample, #StyleNewByExample, #Shadowed, #Grow, #Shrink, #Color, 
#Spacing, #SuperScript, #SubScript{
+   padding: 24px 28px 24px 28px !important;
+   margin: 0px !important;
+   float:left;
+   }
+   #Shadowed, #StyleNewByExample + div{clear:both;}
+   #buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel, 
#buttonnone, #buttonthrough, #bottom, #top, #standard, #Bold, #Italic, 
#Underline, #Strikeout{
margin: 0;
 padding: 0;
 -webkit-appearance: none;
@@ -27,10 +40,10 @@
padding: 24px 32px 24px 32px;
background-size: 24px !important;
}
-   #buttonbefore:focus, #buttonafter:focus, #buttonoptimal:focus, 
#buttonparallel:focus, #buttonnone:focus, #buttonthrough:focus,  #bottom:focus, 
#top:focus, #standard:focus{
+   #buttonbefore:focus, #buttonafter:focus, #buttonoptimal:focus, 
#buttonparallel:focus, #buttonnone:focus, #buttonthrough:focus, #bottom:focus, 
#top:focus, #standard:focus, #Bold:focus, #Bold:active, #Italic:focus, 
#Italic:active, #Underline:focus, #Underline:active, #Strikeout:focus, 
#Strikeout:active, #StyleApply:focus, #StyleApply:active, 
#StyleUpdateByExample:focus, #StyleUpdateByExample:active, 
#StyleNewByExample:focus, #StyleNewByExample:active, #Spacing:active, 
#SuperScript:active, #SubScript:active, #Shadowed:active, #Spacing:active, 
#SuperScript:active, #SubScript:active, #Grow:active, #Shrink:active, 
#Color:active {
border-radius: 4px;
 outline: none;
-background-color: #e5f1ff;
+background-color: #e5f1ff !important;
}
#buttonbefore{background: url(images/sc_wrapleft.svg) no-repeat center;}
#buttonafter{background: url(images/sc_wrapright.svg) no-repeat center;}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/css/toolbar.css|   25 +
 loleaflet/html/loleaflet.html.m4 |3 
 loleaflet/src/control/Control.JSDialogBuilder.js |  107 ---
 loleaflet/src/control/Control.MobileWizard.js|   20 +++-
 4 files changed, 140 insertions(+), 15 deletions(-)

New commits:
commit 5fba4dc23122022887fd12e50ad401380151607b
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 16:42:01 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 16:42:45 2019 +0200

jsdialogs: move tabs to a separate container

Change-Id: I08723d02f47553644c29780f41a0a74470995d8c

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 642e58ca8..b24e8bb3f 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -926,6 +926,10 @@ tr.useritem > td > img {
width: 100%;
 }
 
+#mobile-wizard-tabs {
+   height: 42px;
+}
+
 #mobile-wizard-content *{
font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;
color: #212121;
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 72abb80ca..eafa2b306 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -192,7 +192,8 @@ ifelse(MOBILEAPP,[true],
   
 
   
-  
+  
+  
 
 
 
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 48d478bf2..c575d3627 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -188,7 +188,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
},
 
_panelTabsHandler: function(parentContainer, data, builder) {
-   var tabsContainer = L.DomUtil.create('div', 'ui-tabs 
mobile-wizard ui-widget', parentContainer);
+   var tabsContainer = L.DomUtil.create('div', 'ui-tabs 
mobile-wizard ui-widget');
var contentsContainer = L.DomUtil.create('div', 
'ui-tabs-content mobile-wizard ui-widget', parentContainer);
 
var title1 = 
builder._cleanText(data.children[1].children[0].id);
@@ -236,12 +236,15 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
$(contentDiv2).hide();
if (builder.wizard) {
+   builder.wizard.setTabs(tabsContainer);
+
$(tab1).click(function() {
$(tab1).addClass('selected');
$(tab2).removeClass('selected');
$(contentDiv).show();
$(contentDiv2).hide();
});
+
$(tab2).click(function() {
$(tab2).addClass('selected');
$(tab1).removeClass('selected');
@@ -252,6 +255,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
console.debug('Builder used outside of mobile wizard: 
please implement the click handler');
}
 
+   $(tab1).click();
+   builder.wizard.goLevelDown(contentDiv);
+
return false;
},
 
diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 4da1fb2cc..04def764b 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -3,13 +3,14 @@
  * L.Control.MobileWizard
  */
 
-/* global $ w2ui*/
+/* global $ w2ui */
 L.Control.MobileWizard = L.Control.extend({
 
_inMainMenu: true,
_isActive: false,
_currentDepth: 0,
_mainTitle: '',
+   _isTabMode: false,
 
onAdd: function (map) {
this.map = map;
@@ -24,6 +25,9 @@ L.Control.MobileWizard = L.Control.extend({
this._inMainMenu = true;
this.content.empty();
this.backButton.addClass('close-button');
+   $('#mobile-wizard-tabs').empty();
+   $('#mobile-wizard-content').css('top', '48px');
+   this._isTabMode = false;
},
 
_setupBackButton: function() {
@@ -52,8 +56,16 @@ L.Control.MobileWizard = L.Control.extend({
return this._currentDepth;
},
 
+   setTabs: function(tabs) {
+   $('#mobile-wizard-tabs').empty();
+   $('#mobile-wizard-tabs').append(tabs);
+   $('#mobile-wizard-content').css('top', '110px');
+   this._isTabMode = true;
+   },
+
goLevelDown: function(contentToShow) {
-   this.backButton.removeClass('close-button');
+   if (!this._isTabMode || this._currentDepth > 0)
+   this.backButton.removeClass('close-button');
 
var titles = '.ui-header.level-' + this.getCurrentLevel() + 
'.mobile-wizard';
$(titles).hide('slide', { direction: 'left' }, 'fast');
@@ -

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

[Gabor Kelemen (via logerrit)]

 sc/source/ui/condformat/condformatdlgentry.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 850123c8572f07eafc16eed2eb00b4d83945808b
Author: Gabor Kelemen 
AuthorDate: Tue Aug 6 21:45:45 2019 +0200
Commit: László Németh 
CommitDate: Tue Oct 8 16:41:37 2019 +0200

tdf#125289 Use default colors from the new standard palette

These look quite similar to the previous ones and
we have translatable strings for them

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

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index f14bcd066784..39170fcb9c77 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -774,8 +774,8 @@ void ScColorScale2FrmtEntry::Init()
 {
 mxLbEntryTypeMin->connect_changed( LINK( this, ScColorScale2FrmtEntry, 
EntryTypeHdl ) );
 mxLbEntryTypeMax->connect_changed( LINK( this, ScColorScale2FrmtEntry, 
EntryTypeHdl ) );
-mxLbColMin->SelectEntry(Color(0xFFF685)); // Light Yellow 2
-mxLbColMax->SelectEntry(Color(0x65C295)); // Light Green 2
+mxLbColMin->SelectEntry(Color(0x6d)); // Light Yellow 2
+mxLbColMax->SelectEntry(Color(0x77bc65)); // Light Green 2
 }
 
 ScFormatEntry* ScColorScale2FrmtEntry::createColorscaleEntry() const
@@ -920,7 +920,7 @@ void ScColorScale3FrmtEntry::Init()
 mxLbEntryTypeMiddle->connect_changed( LINK( this, ScColorScale3FrmtEntry, 
EntryTypeHdl ) );
 mxLbColMin->SelectEntry(COL_LIGHTRED);
 mxLbColMiddle->SelectEntry(COL_YELLOW);
-mxLbColMax->SelectEntry(Color(0x00CC00));
+mxLbColMax->SelectEntry(Color(0x00a933));
 }
 
 ScFormatEntry* ScColorScale3FrmtEntry::createColorscaleEntry() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |   48 -
 1 file changed, 48 deletions(-)

New commits:
commit 034715aec10c62a521e8331b4fdcedeccedabd9d
Author: Henry Castro 
AuthorDate: Tue Oct 8 09:58:49 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Oct 8 16:41:32 2019 +0200

Revert "Open/close sidebar on swipe"

This reverts commit 30cc128690119114e4b2b92c83f69d6e133623b7.

The requirements have changed, now in Mobile we use a wizard dialog
to show a sidebar.

Change-Id: I3e57a0a9b76b6d1aef54dd1654b82984e7ceef88
Reviewed-on: https://gerrit.libreoffice.org/80470
Reviewed-by: Michael Meeks 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index f4850dbbf..30eebeaa0 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -127,25 +127,6 @@ L.Control.LokDialog = L.Control.extend({
map.on('closesidebar', this._closeSidebar, this);
map.on('editorgotfocus', this._onEditorGotFocus, this);
L.DomEvent.on(document, 'mouseup', this.onCloseCurrentPopUp, 
this);
-
-   this.slideAnimationDuration = 250;//sidebar open animation 
duration
-
-   //open sidebar on left swipe on document view
-   var documentContainerHammer = new 
Hammer(document.getElementById('document-container'));
-   documentContainerHammer.on('swipeleft', function (e) {
-   var startX = e.changedPointers[0].clientX - e.deltaX;
-   if (startX < window.screen.width * 0.7)//detect open 
swipes only near screen edge
-   return;
-   map._socket.sendMessage('uno .uno:Sidebar');
-   })
-
-   //close sidebar on right swipe on sidebar panel, also on 
document view(for tablets)
-   var sidebarPanelHammer = new 
Hammer(document.getElementById('sidebar-panel'));
-   [sidebarPanelHammer, documentContainerHammer].forEach(function 
(hammerElement) {
-   hammerElement.on('swiperight', function () {
-   map._socket.sendMessage('uno .uno:Sidebar');
-   })
-   })
},
 
_dialogs: {},
@@ -608,19 +589,6 @@ L.Control.LokDialog = L.Control.extend({
 
// Render window.
this._sendPaintWindowRect(id);
-
-   //play slide from right animation on mobile and tablets
-   if (L.Browser.mobile) {
-   var sidebar = $('#sidebar-dock-wrapper');
-   var bottomBar = $('#toolbar-down');
-   sidebar.css('bottom', '0px');//to take the space 
occupied by the bottom menu
-   sidebar.css('position', 'fixed');//fixed position in 
order to prevent scrollbars to appear while opening/closing
-   bottomBar.animate({ 'opacity': 0 }, 
this.slideAnimationDuration);
-   sidebar.css('margin-right', -width * ratio + 
'px').animate({ 'margin-right': '0px' }, this.slideAnimationDuration, function 
() {
-   $('#toolbar-down').hide();
-   sidebar.css('position', '');
-   });
-   }
},
 
_setupWindowEvents: function(id, canvas/*, dlgInput*/) {
@@ -739,22 +707,6 @@ L.Control.LokDialog = L.Control.extend({
},
 
_onSidebarClose: function(dialogId) {
-   //play slide animation to right if this is a mobile or tablet
-   if (L.Browser.mobile) {
-   var sidebar = $('#sidebar-dock-wrapper');
-   var bottomBar = $('#toolbar-down');
-   var sidebarWidth = $('#sidebar-dock-wrapper').width();
-   bottomBar.animate({ 'opacity': 1 }, 
this.slideAnimationDuration);
-   sidebar.css('position', 'fixed');//fixed position in 
order to prevent scrollbars to appear while opening/closing
-   sidebar.animate({ 'margin-right': -sidebarWidth + 'px' 
}, this.slideAnimationDuration, function () {
-   //remove artifacts from the animation
-   sidebar.css('margin-right', '');
-   sidebar.css('display', '');
-   sidebar.css('position', '');
-   $('#toolbar-down').show();
-   });
-   }
-
this._resizeSidebar(dialogId, 0);
$('#' + this._currentDeck.strId).remove();
this._map.focus();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heiko Tietze (via logerrit)]

 cui/source/customize/acccfg.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 8519c6d98250a5f2b4c78e330fc79907c596a447
Author: Heiko Tietze 
AuthorDate: Tue Oct 8 11:30:19 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Oct 8 16:39:28 2019 +0200

Resolves tdf#127903 - Allow customization with equal key

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

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index e4623e69300f..24a601d0af99 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -149,6 +149,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_SHIFT | KEY_BACKSPACE,
 KEY_SHIFT | KEY_INSERT,
 KEY_SHIFT | KEY_DELETE,
+KEY_SHIFT | KEY_EQUAL,
 
 KEY_MOD1 | KEY_0,
 KEY_MOD1 | KEY_1,
@@ -230,6 +231,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_MOD1 | KEY_SUBTRACT,
 KEY_MOD1 | KEY_MULTIPLY,
 KEY_MOD1 | KEY_DIVIDE,
+KEY_MOD1 | KEY_EQUAL,
 
 KEY_SHIFT | KEY_MOD1 | KEY_0,
 KEY_SHIFT | KEY_MOD1 | KEY_1,
@@ -307,6 +309,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_SHIFT | KEY_MOD1 | KEY_BACKSPACE,
 KEY_SHIFT | KEY_MOD1 | KEY_INSERT,
 KEY_SHIFT | KEY_MOD1 | KEY_DELETE,
+KEY_SHIFT | KEY_MOD1 | KEY_EQUAL,
 
 KEY_MOD2 | KEY_0,
 KEY_MOD2 | KEY_1,
@@ -382,6 +385,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_MOD2 | KEY_BACKSPACE,
 KEY_MOD2 | KEY_INSERT,
 KEY_MOD2 | KEY_DELETE,
+KEY_MOD2 | KEY_EQUAL,
 
 KEY_SHIFT | KEY_MOD2 | KEY_0,
 KEY_SHIFT | KEY_MOD2 | KEY_1,
@@ -458,6 +462,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_SHIFT | KEY_MOD2 | KEY_BACKSPACE,
 KEY_SHIFT | KEY_MOD2 | KEY_INSERT,
 KEY_SHIFT | KEY_MOD2 | KEY_DELETE,
+KEY_SHIFT | KEY_MOD2 | KEY_EQUAL,
 
 KEY_MOD1 | KEY_MOD2 | KEY_0,
 KEY_MOD1 | KEY_MOD2 | KEY_1,
@@ -607,7 +612,8 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_SPACE,
 KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_BACKSPACE,
 KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_INSERT,
-KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_DELETE
+KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_DELETE,
+KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_EQUAL
 
 #ifdef __APPLE__
,KEY_MOD3 | KEY_0,
@@ -690,6 +696,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_MOD3 | KEY_SUBTRACT,
 KEY_MOD3 | KEY_MULTIPLY,
 KEY_MOD3 | KEY_DIVIDE,
+KEY_MOD3 | KEY_EQUAL,
 
 KEY_SHIFT | KEY_MOD3 | KEY_0,
 KEY_SHIFT | KEY_MOD3 | KEY_1,
@@ -766,7 +773,8 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_SHIFT | KEY_MOD3 | KEY_SPACE,
 KEY_SHIFT | KEY_MOD3 | KEY_BACKSPACE,
 KEY_SHIFT | KEY_MOD3 | KEY_INSERT,
-KEY_SHIFT | KEY_MOD3 | KEY_DELETE
+KEY_SHIFT | KEY_MOD3 | KEY_DELETE,
+KEY_SHIFT | KEY_MOD3 | KEY_EQUAL
 #endif
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 configure.ac |   20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 9c2fd9ded993c4cae9c01da9d7060c9a4385cfba
Author: Tor Lillqvist 
AuthorDate: Tue Oct 8 14:46:19 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Oct 8 16:40:33 2019 +0200

The --with-lo-path is not necessary when building for iOS or Android

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

diff --git a/configure.ac b/configure.ac
index dd71eda5e..fb54564c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -506,15 +506,17 @@ AS_IF([test -n "$LOKIT_PATH"],
   [CPPFLAGS="$CPPFLAGS -I${LOKIT_PATH}"])
 lokit_msg="$LOKIT_PATH"
 
-AC_MSG_CHECKING([for LibreOffice path])
-if test -n "$with_lo_path"; then
-# strip trailing '/' from LO_PATH, 'ln -s' with such path will otherwise 
fail
-LO_PATH="${with_lo_path%/}"
-AC_MSG_RESULT([found])
-else
-AC_MSG_RESULT([not found])
-AC_MSG_ERROR([LibreOffice path must be configured: --with-lo-path])
-fi
+AS_IF([test "$ENABLE_IOSAPP" != "true" -a "$ENABLE_ANDROIDAPP" != "true"],
+  [AC_MSG_CHECKING([for LibreOffice path])
+  if test -n "$with_lo_path"; then
+  # strip trailing '/' from LO_PATH, 'ln -s' with such path will 
otherwise fail
+  LO_PATH="${with_lo_path%/}"
+  AC_MSG_RESULT([found])
+  else
+  AC_MSG_RESULT([not found])
+  AC_MSG_ERROR([LibreOffice path must be configured: --with-lo-path])
+  fi
+  ])
 
 JAIL_PATH=not-set
 SYSTEMPLATE_PATH=not-set
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung (via logerrit)]

 vcl/source/gdi/CommonSalLayout.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 266bd146ccee4f0f9d3cd786a9074eab1a13b403
Author: Mark Hung 
AuthorDate: Sun Jun 2 10:00:41 2019 +0800
Commit: Tor Lillqvist 
CommitDate: Tue Oct 8 16:35:22 2019 +0200

tdf#107487 fix font fallback for non-BMP characters.

Non-BMP characters use two sal_Unicodes. It is necessary
to advnace with OUString::iterateCodePoints safely instead of
nCharPos + 1.

Change-Id: Iea1005f05421b1021a9b3ff611439357d4dcba9e
Reviewed-on: https://gerrit.libreoffice.org/73326
Tested-by: Jenkins
Reviewed-by: Khaled Hosny 
(cherry picked from commit 16faad3657fad114aa984f92a14a5f212a2f8ff5)
Reviewed-on: https://gerrit.libreoffice.org/80467
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 3a7969547742..88e97527ab5c 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -440,12 +440,14 @@ void CommonSalLayout::SetNeedFallback(ImplLayoutArgs& 
rArgs, sal_Int32 nCharPos,
 //mark all glyphs as missing so the whole thing is rendered with the same
 //font
 sal_Int32 nDone;
-sal_Int32 nGraphemeStartPos =
-mxBreak->previousCharacters(rArgs.mrStr, nCharPos + 1, aLocale,
-i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
 sal_Int32 nGraphemeEndPos =
 mxBreak->nextCharacters(rArgs.mrStr, nCharPos, aLocale,
 i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
+// Safely advance nCharPos in case it is a non-BMP character.
+rArgs.mrStr.iterateCodePoints(&nCharPos);
+sal_Int32 nGraphemeStartPos =
+mxBreak->previousCharacters(rArgs.mrStr, nCharPos, aLocale,
+i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
 
 rArgs.NeedFallback(nGraphemeStartPos, nGraphemeEndPos, bRightToLeft);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/vcl sc/source solenv/sanitizers test/source vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/screenshotannotationdlg.cxx |  115 --
 cui/source/factory/dlgfact.cxx |6 
 cui/source/factory/dlgfact.hxx |2 
 cui/source/inc/screenshotannotationdlg.hxx |4 
 cui/uiconfig/ui/screenshotannotationdialog.ui  |5 
 include/vcl/abstdlg.hxx|2 
 include/vcl/dialog.hxx |5 
 include/vcl/layout.hxx |2 
 include/vcl/weld.hxx   |   26 +++
 sc/source/ui/attrdlg/scdlgfact.hxx |7 
 solenv/sanitizers/ui/cui.suppr |4 
 test/source/screenshot_test.cxx|5 
 vcl/source/app/salvtables.cxx  |   97 +++
 vcl/source/window/dialog.cxx   |   22 ++
 vcl/source/window/layout.cxx   |  158 ---
 vcl/unx/gtk3/gtk3gtkinst.cxx   |  203 +
 16 files changed, 411 insertions(+), 252 deletions(-)

New commits:
commit 64fc5986607eaba5db627c546cb1321f00abc501
Author: Caolán McNamara 
AuthorDate: Mon Oct 7 16:43:59 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 8 16:31:21 2019 +0200

implement gtk dialog screenshotting

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

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index b99a87e9689d..582e6cf1c474 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -103,31 +103,6 @@ namespace
 }
 }
 
-class ControlDataEntry
-{
-public:
-ControlDataEntry(
-const vcl::Window& rControl,
-const basegfx::B2IRange& rB2IRange)
-: mrControl(rControl),
-maB2IRange(rB2IRange)
-{
-}
-
-const basegfx::B2IRange& getB2IRange() const
-{
-return maB2IRange;
-}
-
-OString const & GetHelpId() const { return mrControl.GetHelpId(); }
-
-private:
-const vcl::Window&  mrControl;
-basegfx::B2IRange   maB2IRange;
-};
-
-typedef std::vector< ControlDataEntry > ControlDataCollection;
-
 class Picture : public weld::CustomWidgetController
 {
 private:
@@ -156,7 +131,7 @@ public:
 ScreenshotAnnotationDlg_Impl(
 weld::Window* pParent,
 weld::Builder& rParent,
-Dialog& rParentDialog);
+weld::Dialog& rParentDialog);
 ~ScreenshotAnnotationDlg_Impl();
 
 private:
@@ -167,10 +142,10 @@ private:
 void CollectChildren(
 const vcl::Window& rCurrent,
 const basegfx::B2IPoint& rTopLeft,
-ControlDataCollection& rControlDataCollection);
-ControlDataEntry* CheckHit(const basegfx::B2IPoint& rPosition);
-void PaintControlDataEntry(
-const ControlDataEntry& rEntry,
+weld::ScreenShotCollection& rControlDataCollection);
+weld::ScreenShotEntry* CheckHit(const basegfx::B2IPoint& rPosition);
+void PaintScreenShotEntry(
+const weld::ScreenShotEntry& rEntry,
 const Color& rColor,
 double fLineWidth,
 double fTransparency);
@@ -182,7 +157,7 @@ private:
 
 // local variables
 weld::Window*   mpParentWindow;
-Dialog& mrParentDialog;
+weld::Dialog&   mrParentDialog;
 BitmapExmaParentDialogBitmap;
 BitmapExmaDimmedDialogBitmap;
 SizemaParentDialogSize;
@@ -191,11 +166,11 @@ private:
 VclPtr   mxVirtualBufferDevice;
 
 // all detected children
-ControlDataCollection   maAllChildren;
+weld::ScreenShotCollection  maAllChildren;
 
 // highlighted/selected children
-ControlDataEntry*   mpHilighted;
-std::set< ControlDataEntry* >
+weld::ScreenShotEntry*   mpHilighted;
+std::set< weld::ScreenShotEntry* >
 maSelected;
 
 // list of detected controls
@@ -221,12 +196,9 @@ OUString ScreenshotAnnotationDlg_Impl::maLastFolderURL = 
OUString();
 ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
 weld::Window* pParent,
 weld::Builder& rParentBuilder,
-Dialog& rParentDialog)
+weld::Dialog& rParentDialog)
 :   mpParentWindow(pParent),
 mrParentDialog(rParentDialog),
-maParentDialogBitmap(rParentDialog.createScreenshot()),
-maDimmedDialogBitmap(maParentDialogBitmap),
-maParentDialogSize(maParentDialogBitmap.GetSizePixel()),
 mxVirtualBufferDevice(nullptr),
 maAllChildren(),
 mpHilighted(nullptr),
@@ -234,6 +206,12 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
 maPicture(this),
 maSaveAsText(CuiResId(RID_SVXSTR_SAVE_SCREENSHOT_AS))
 {
+VclPtr 
xParentDialogSurface(VclPtr::Create(DeviceFormat::DEFAULT));
+rParentDialog.d

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

[Marco Cecchetti (via logerrit)]

 loleaflet/images/lc_centerpara.svg   |1 
 loleaflet/images/lc_fontcolor.svg|1 
 loleaflet/images/lc_hangingindent.svg|1 
 loleaflet/images/lc_incrementindent.svg  |1 
 loleaflet/images/lc_insertauthorfield.svg|   79 +++
 loleaflet/images/lc_insertshape.svg  |1 
 loleaflet/images/lc_justifypara.svg  |1 
 loleaflet/images/lc_leftpara.svg |1 
 loleaflet/images/lc_linespacing.svg  |1 
 loleaflet/images/lc_paralefttoright.svg  |1 
 loleaflet/images/lc_pararighttoleft.svg  |1 
 loleaflet/images/lc_paraspacedecrease.svg|1 
 loleaflet/images/lc_paraspaceincrease.svg|1 
 loleaflet/images/lc_rightpara.svg|1 
 loleaflet/images/lc_styleapply.svg   |1 
 loleaflet/images/lc_stylenewbyexample.svg|1 
 loleaflet/images/lc_styleupdatebyexample.svg |1 
 loleaflet/src/control/Control.Menubar.js |2 
 18 files changed, 96 insertions(+), 1 deletion(-)

New commits:
commit 40d2e7ab48e34cb151ffa0f97e627c88ab7f20db
Author: Marco Cecchetti 
AuthorDate: Tue Oct 8 16:09:47 2019 +0200
Commit: Marco Cecchetti 
CommitDate: Tue Oct 8 16:29:57 2019 +0200

loleaflet: more icons for mobile wizard

Change-Id: If5112719a055ba059d95cff3b1d96df5fb9f39ae

diff --git a/loleaflet/images/lc_centerpara.svg 
b/loleaflet/images/lc_centerpara.svg
new file mode 100644
index 0..17c2a2433
--- /dev/null
+++ b/loleaflet/images/lc_centerpara.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_fontcolor.svg 
b/loleaflet/images/lc_fontcolor.svg
new file mode 100644
index 0..4a656f78b
--- /dev/null
+++ b/loleaflet/images/lc_fontcolor.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
diff --git a/loleaflet/images/lc_hangingindent.svg 
b/loleaflet/images/lc_hangingindent.svg
new file mode 100644
index 0..ee1660b53
--- /dev/null
+++ b/loleaflet/images/lc_hangingindent.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_incrementindent.svg 
b/loleaflet/images/lc_incrementindent.svg
new file mode 100644
index 0..879eb2869
--- /dev/null
+++ b/loleaflet/images/lc_incrementindent.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertauthorfield.svg 
b/loleaflet/images/lc_insertauthorfield.svg
new file mode 100644
index 0..3c1447860
--- /dev/null
+++ b/loleaflet/images/lc_insertauthorfield.svg
@@ -0,0 +1,79 @@
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   viewBox="0 0 24 24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="lc_dbviewaliases.svg">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+  
+
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+
diff --git a/loleaflet/images/lc_insertshape.svg 
b/loleaflet/images/lc_insertshape.svg
new file mode 100644
index 0..d552ed400
--- /dev/null
+++ b/loleaflet/images/lc_insertshape.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_justifypara.svg 
b/loleaflet/images/lc_justifypara.svg
new file mode 100644
index 0..027ebcef8
--- /dev/null
+++ b/loleaflet/images/lc_justifypara.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_leftpara.svg b/loleaflet/images/lc_leftpara.svg
new file mode 100644
index 0..db2f3714c
--- /dev/null
+++ b/loleaflet/images/lc_leftpara.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_linespacing.svg 
b/loleaflet/images/lc_linespacing.svg
new file mode 100644
index 0..d01105bc2
--- /dev/null
+++ b/loleaflet/images/lc_linespacing.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_paralefttoright.svg 
b/loleaflet/images/lc_paralefttoright.svg
new file mode 100644
index 0..b886d9026
--- /dev/null
+++ b/loleaflet/images/lc_paralefttoright.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
diff --git a/loleaflet/images/lc_pararighttoleft.svg 
b/loleaflet/images/lc_pararighttoleft.svg
new file mode 100644
index 0..3a5bb91e2
--- /dev/null
+++ b/loleaflet/images/lc_pararighttoleft.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
diff --git a/loleaflet/images/lc_paraspacedecrease.svg 
b/loleaflet/images/lc_paraspacedecrease.svg
new file mode 100644
index 0..c68a99ab4
--- /dev/null
++

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

[Samuel Mehrbrodt (via logerrit)]

 vcl/unx/gtk3/gtk3gtksalmenu.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 1c68ab312c5473ce642f75fc35a1edd6be187489
Author: Samuel Mehrbrodt 
AuthorDate: Mon Oct 7 12:28:21 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Oct 8 16:26:01 2019 +0200

tdf#124391 Fix doubled menu in global menu

Regression from 3bedbfd9b3cee5a8d2da6ee0486859bd725979ba

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

diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 81d5d650dd26..5431ea4010ac 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -223,8 +223,12 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool 
bRemoveDisabledEntries)
 if (mbMenuBar && maUpdateMenuBarIdle.IsActive())
 {
 maUpdateMenuBarIdle.Stop();
-maUpdateMenuBarIdle.Invoke();
-return;
+// tdf#124391 Prevent doubled menus in global menu
+if (!bUnityMode)
+{
+maUpdateMenuBarIdle.Invoke();
+return;
+}
 }
 }
 
___
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' - desktop/source

[Muhammet Kara (via logerrit)]

 desktop/source/lib/init.cxx |   12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 4d4205311709450e378a2672b9d58ed2f430634d
Author: Muhammet Kara 
AuthorDate: Tue Oct 8 16:44:09 2019 +0300
Commit: Muhammet Kara 
CommitDate: Tue Oct 8 16:24:09 2019 +0200

lok: Avoid accidental removal of filter options

Change-Id: I178bcb19aa3073ea72a3bc8712e5e904665b1510
Reviewed-on: https://gerrit.libreoffice.org/80462
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1707cad91d5c..cf59037fcb3f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2175,15 +2175,9 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 {
 int bIndex = aFilterOptions.indexOf("WATERMARKEND");
 watermarkText = aFilterOptions.copy(aIndex+11, bIndex-(aIndex+11));
-if(aIndex > 0)
-{
-OUString temp = aFilterOptions.copy(0, aIndex);
-aFilterOptions = temp + aFilterOptions.copy(bIndex+12);
-}
-else
-{
-aFilterOptions.clear();
-}
+
+OUString temp = aFilterOptions.copy(0, aIndex);
+aFilterOptions = temp + aFilterOptions.copy(bIndex+12);
 }
 
 aIndex = -1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 configure.ac |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit ea3d4e806cbdde18173da92187329f1ac2177e14
Author: Stephan Bergmann 
AuthorDate: Tue Oct 8 12:30:20 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 15:56:19 2019 +0200

Fix CXX_BASE for clang-cl builds on Windows

...where the configure messages confusingly mentioned cl.exe instead of
clang.exe (but the actual checks correctly used $CXX being clang)

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

diff --git a/configure.ac b/configure.ac
index 5d90f3e2d7d6..0943619e7701 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3518,7 +3518,6 @@ if test "$_os" = "WINNT"; then
 
 # This gives us a posix path with 8.3 filename restrictions
 MSVC_CXX=`win_short_path_for_make "$MSVC_CXX"`
-CXX_BASE=`first_arg_basename "$MSVC_CXX"`
 fi
 
 if test -z "$CC"; then
@@ -3529,6 +3528,10 @@ if test "$_os" = "WINNT"; then
 dnl since MSVC 2012, default for x86 is -arch:SSE2:
 MSVC_CXX="$MSVC_CXX -arch:SSE"
 fi
+if test -z "$CXX"; then
+CXX=$MSVC_CXX
+CXX_BASE=`first_arg_basename "$CXX"`
+fi
 
 if test -n "$CC"; then
 # Remove /cl.exe from CC case insensitive
@@ -5876,11 +5879,6 @@ if test "$_os" != "WINNT"; then
 if test -z "$CXX_BASE"; then
 CXX_BASE=`first_arg_basename "$CXX"`
 fi
-else
-if test -n "$CC" -a -z "$CXX"; then
-CXX="$CC"
-CXX_BASE="$CC_BASE"
-fi
 fi
 
 dnl check for GNU C++ compiler version
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara (via logerrit)]

 wsd/LOOLWSD.cpp |   30 +++---
 1 file changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 2c167a2df29f358478a801d10a3c09bfad2381bf
Author: Muhammet Kara 
AuthorDate: Mon Oct 7 22:51:38 2019 +0300
Commit: Muhammet Kara 
CommitDate: Tue Oct 8 15:33:37 2019 +0200

wsd: Add FullSheetPreview support for convert-to endpoint

This requires commit 28eb367a3743002ecb1037e2dd2ca3c709f6893d
on core distro/collabora/cp-6.2

Change-Id: I02a5616810a930c6add3c3a0373b5e25e863236c
Reviewed-on: https://gerrit.libreoffice.org/80418
Reviewed-by: Muhammet Kara 
Tested-by: Muhammet Kara 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 4559f4c80..d0dd39878 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2501,6 +2501,18 @@ private:
 return "application/octet-stream";
 }
 
+static bool isSpreadsheet(const std::string& fileName)
+{
+std::string sContentType = getContentType(fileName);
+
+if (sContentType == "application/vnd.oasis.opendocument.spreadsheet"
+|| sContentType == 
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+|| sContentType == "application/vnd.ms-excel")
+return true;
+else
+return false;
+}
+
 void handlePostRequest(const Poco::Net::HTTPRequest& request,
Poco::MemoryInputStream& message,
SocketDisposition &disposition)
@@ -2531,7 +2543,10 @@ private:
 ConvertToPartHandler handler(/*convertTo =*/ true);
 HTMLForm form(request, message, handler);
 
+std::string sOptions("");
 std::string format = (form.has("format") ? form.get("format") : 
"");
+std::string sFullSheetPreview = (form.has("FullSheetPreview") ? 
form.get("FullSheetPreview") : "");
+bool bFullSheetPreview = sFullSheetPreview == "true" ? true : 
false;
 
 // prefer what is in the URI
 if (tokens.count() > 3)
@@ -2545,6 +2560,15 @@ private:
 Poco::URI uriPublic = DocumentBroker::sanitizeURI(fromPath);
 const std::string docKey = 
DocumentBroker::getDocKey(uriPublic);
 
+if (bFullSheetPreview && format == "pdf" && 
isSpreadsheet(fromPath))
+{
+sOptions += std::string(",FullSheetPreview=") + 
sFullSheetPreview + std::string("FULLSHEETPREVEND");
+}
+else
+{
+bFullSheetPreview = false;
+}
+
 // This lock could become a bottleneck.
 // In that case, we can use a pool and index by publicPath.
 std::unique_lock 
docBrokersLock(DocBrokersMutex);
@@ -2566,7 +2590,7 @@ private:
 nullptr, _id, uriPublic, docBroker, isReadOnly, 
"nocliphost");
 if (clientSession)
 {
-disposition.setMove([docBroker, clientSession, format]
+disposition.setMove([docBroker, clientSession, format, 
sOptions]
 (const std::shared_ptr 
&moveSocket)
 {
 // Perform all of this after removing the socket
@@ -2577,7 +2601,7 @@ private:
 // We no longer own this socket.
 moveSocket->setThreadOwner(std::thread::id(0));
 
-docBroker->addCallback([docBroker, moveSocket, 
clientSession, format]()
+docBroker->addCallback([docBroker, moveSocket, 
clientSession, format, sOptions]()
 {
 auto streamSocket = 
std::static_pointer_cast(moveSocket);
 clientSession->setSaveAsSocket(streamSocket);
@@ -2603,7 +2627,7 @@ private:
 URI::encode(toJailURL, "", encodedTo);
 
 // Convert it to the requested format.
-const auto saveas = "saveas url=" + encodedTo + " 
format=" + format + " options=";
+const auto saveas = "saveas url=" + encodedTo + " 
format=" + format + " options=" + sOptions;
 std::vector saveasRequest(saveas.begin(), 
saveas.end());
 clientSession->handleMessage(true, WSOpCode::Text, 
saveasRequest);
 });
___
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' - desktop/source

[Muhammet Kara (via logerrit)]

 desktop/source/lib/init.cxx |   36 +++-
 1 file changed, 31 insertions(+), 5 deletions(-)

New commits:
commit 673726fd8b24bd9e5ae0eeb697703b4e7aa29b24
Author: Muhammet Kara 
AuthorDate: Mon Oct 7 22:08:56 2019 +0300
Commit: Muhammet Kara 
CommitDate: Tue Oct 8 15:17:46 2019 +0200

Add FullSheetPreview support for convert-to endpoint of online

Change-Id: I31e4f3cbcf0cf49c5446d9460bd42965ce756c0d
Reviewed-on: https://gerrit.libreoffice.org/80397
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 017152e77352..1707cad91d5c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2169,7 +2169,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 
 // Check if watermark for pdf is passed by filteroptions..
 // It is not a real filter option so it must be filtered out.
-OUString watermarkText;
+OUString watermarkText, sFullSheetPreview;
 int aIndex = -1;
 if ((aIndex = aFilterOptions.indexOf(",Watermark=")) >= 0)
 {
@@ -2186,6 +2186,18 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 }
 }
 
+aIndex = -1;
+if ((aIndex = aFilterOptions.indexOf(",FullSheetPreview=")) >= 0)
+{
+int bIndex = aFilterOptions.indexOf("FULLSHEETPREVEND");
+sFullSheetPreview = aFilterOptions.copy(aIndex+18, 
bIndex-(aIndex+18));
+
+OUString temp = aFilterOptions.copy(0, aIndex);
+aFilterOptions = temp + aFilterOptions.copy(bIndex+16);
+}
+
+bool bFullSheetPreview = sFullSheetPreview == "true" ? true : false;
+
 // 'TakeOwnership' == this is a 'real' SaveAs (that is, the document
 // gets a new name).  When this is not provided, the meaning of
 // saveAs() is more like save-a-copy, which allows saving to any
@@ -2211,11 +2223,25 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 auto aFilteredOptionSeq = 
comphelper::containerToSequence(aFilteredOptionVec);
 aFilterOptions = 
comphelper::string::convertCommaSeparated(aFilteredOptionSeq);
 aSaveMediaDescriptor[MediaDescriptor::PROP_FILTEROPTIONS()] <<= 
aFilterOptions;
-if(!watermarkText.isEmpty())
+
+if(!watermarkText.isEmpty() || bFullSheetPreview)
 {
-uno::Sequence< beans::PropertyValue > aFilterData( 1 );
-aFilterData[ 0 ].Name = "TiledWatermark";
-aFilterData[ 0 ].Value <<= watermarkText;
+uno::Sequence< beans::PropertyValue > aFilterData( 
bFullSheetPreview + !watermarkText.isEmpty() );
+
+if (!watermarkText.isEmpty())
+{
+aFilterData[ 0 ].Name = "TiledWatermark";
+aFilterData[ 0 ].Value <<= watermarkText;
+}
+
+if (bFullSheetPreview)
+{
+int nOptIndex = !watermarkText.isEmpty();
+
+aFilterData[ nOptIndex ].Name = "SinglePageSheets";
+aFilterData[ nOptIndex ].Value <<= true;
+}
+
 aSaveMediaDescriptor["FilterData"] <<= aFilterData;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro (via logerrit)]

 loleaflet/css/toolbar.css |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cebab1aef3ebad86e1630863653615bf06fd0d4c
Author: Pedro 
AuthorDate: Tue Oct 8 14:14:19 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 15:16:49 2019 +0200

Separation between title row and the body content

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

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 0760bd99a..56b85ac3d 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -935,6 +935,7 @@ tr.useritem > td > img {
background-color: white;
height: 48px;
color: #636363;
+   border-bottom: 1px solid #dd !important;
 }
 
 .ui-content.mobile-wizard {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro (via logerrit)]

 loleaflet/css/toolbar.css|9 ++-
 loleaflet/images/lc_numberformatcurrency.svg |   62 +++
 loleaflet/images/sc_alignbottom.svg  |1 
 loleaflet/images/sc_aligntop.svg |1 
 loleaflet/images/sc_alignverticalcenter.svg  |1 
 5 files changed, 71 insertions(+), 3 deletions(-)

New commits:
commit 359750358c04841181a1cbf4da43f13cde3ab13e
Author: Pedro 
AuthorDate: Tue Oct 8 13:55:56 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 15:16:09 2019 +0200

Align text: add missing icons and style its elements and alignment

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

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 769793fc8..0760bd99a 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -18,7 +18,7 @@
#buttonnone + label, #buttonbefore + label, #buttonafter + label, 
#buttonoptimal + label, #buttonparallel + label, #buttonnone + label, 
#buttonthrough + label{
padding-left: 0;
}
-   #buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel, 
#buttonnone, #buttonthrough{
+   #buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel, 
#buttonnone, #buttonthrough, #bottom, #top, #standard{
margin: 0;
 padding: 0;
 -webkit-appearance: none;
@@ -27,7 +27,7 @@
padding: 24px 32px 24px 32px;
background-size: 24px !important;
}
-   #buttonbefore:focus, #buttonafter:focus, #buttonoptimal:focus, 
#buttonparallel:focus, #buttonnone:focus, #buttonthrough:focus{
+   #buttonbefore:focus, #buttonafter:focus, #buttonoptimal:focus, 
#buttonparallel:focus, #buttonnone:focus, #buttonthrough:focus,  #bottom:focus, 
#top:focus, #standard:focus{
border-radius: 4px;
 outline: none;
 background-color: #e5f1ff;
@@ -38,6 +38,9 @@
#buttonparallel{background: url(images/sc_wrapmenu.svg) no-repeat 
center;}
#buttonnone{background: url(images/sc_wrapoff.svg) no-repeat center;}
#buttonthrough{background: url(images/sc_wrapthrough.svg) no-repeat 
center;}
+   #top{background: url(images/sc_aligntop.svg) no-repeat center;}
+   #bottom{background: url(images/sc_alignbottom.svg) no-repeat center;}
+   #standard{background: url(images/sc_alignverticalcenter.svg) no-repeat 
center;}
 
#enablecontour{
float: left;
@@ -1003,4 +1006,4 @@ tr.useritem > td > img {
 menu-entry-with-icon.padding-left + menu-entry-icon.width */
 .menu-entry-no-icon {
padding-left: 42px;
-}
\ No newline at end of file
+}
diff --git a/loleaflet/images/lc_numberformatcurrency.svg 
b/loleaflet/images/lc_numberformatcurrency.svg
new file mode 100644
index 0..0677d52ae
--- /dev/null
+++ b/loleaflet/images/lc_numberformatcurrency.svg
@@ -0,0 +1,62 @@
+http://www.w3.org/2000/svg";>
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
diff --git a/loleaflet/images/sc_alignbottom.svg 
b/loleaflet/images/sc_alignbottom.svg
new file mode 100644
index 0..b832d2dcf
--- /dev/null
+++ b/loleaflet/images/sc_alignbottom.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/sc_aligntop.svg b/loleaflet/images/sc_aligntop.svg
new file mode 100644
index 0..ccb171cc6
--- /dev/null
+++ b/loleaflet/images/sc_aligntop.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/sc_alignverticalcenter.svg 
b/loleaflet/images/sc_alignverticalcenter.svg
new file mode 100644
index 0..5b6f19fac
--- /dev/null
+++ b/loleaflet/images/sc_alignverticalcenter.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 ucb/source/core/ucb.cxx |   44 
 ucb/source/core/ucb.hxx |   24 ++--
 2 files changed, 6 insertions(+), 62 deletions(-)

New commits:
commit 9f981916f21ac38bb81d14b55ac031961ee732fd
Author: Noel Grandin 
AuthorDate: Mon Oct 7 15:12:51 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 8 14:45:27 2019 +0200

use cppu::WeakImplHelper in UniversalContentBroker

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

diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index d10780047e2b..cc2490120173 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -248,50 +248,6 @@ UniversalContentBroker::~UniversalContentBroker()
 }
 
 
-// XInterface methods.
-void SAL_CALL UniversalContentBroker::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL UniversalContentBroker::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL UniversalContentBroker::queryInterface( const 
css::uno::Type & rType )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
-   static_cast< 
XUniversalContentBroker* >(this),
-   static_cast< XTypeProvider* 
>(this),
-   static_cast< XComponent* 
>(this),
-   static_cast< XServiceInfo* 
>(this),
-   static_cast< XInitialization* 
>(this),
-   static_cast< 
XContentProviderManager* >(this),
-   static_cast< XContentProvider* 
>(this),
-   static_cast< 
XContentIdentifierFactory* >(this),
-   static_cast< XCommandProcessor* 
>(this)
-   );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_9( UniversalContentBroker,
-  XUniversalContentBroker,
-  XTypeProvider,
-  XComponent,
-  XServiceInfo,
-  XInitialization,
-  XContentProviderManager,
-  XContentProvider,
-  XContentIdentifierFactory,
-  XCommandProcessor );
-
-
 // XComponent methods.
 
 
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index a5edcc770a7b..f4236bc7ebbe 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -31,7 +31,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include "providermap.hxx"
 #include 
@@ -50,28 +50,16 @@ namespace com { namespace sun { namespace star { namespace 
ucb {
 } } } }
 
 class UniversalContentBroker :
-public cppu::OWeakObject,
-public css::ucb::XUniversalContentBroker,
-public css::lang::XTypeProvider,
-public css::lang::XServiceInfo,
-public css::lang::XInitialization,
-public css::util::XChangesListener
+public cppu::WeakImplHelper<
+css::ucb::XUniversalContentBroker,
+css::lang::XServiceInfo,
+css::lang::XInitialization,
+css::util::XChangesListener>
 {
 public:
 explicit UniversalContentBroker( const css::uno::Reference< 
css::uno::XComponentContext >& xContext );
 virtual ~UniversalContentBroker() override;
 
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType ) override;
-virtual void SAL_CALL acquire()
-throw() override;
-virtual void SAL_CALL release()
-throw() override;
-
-// XTypeProvider
-virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 
override;
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 vcl/qa/cppunit/outdev.cxx|   32 
 vcl/source/outdev/bitmap.cxx |   15 ++-
 2 files changed, 46 insertions(+), 1 deletion(-)

New commits:
commit dd4a67084853a030bf4b9f1f85d728620e0604a5
Author: Miklos Vajna 
AuthorDate: Tue Oct 8 09:16:27 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 8 14:31:32 2019 +0200

vcl: avoid downscale && upscale in DrawTransformedBitmapEx()

If we rotate a bitmap and put it to a metafile, we'll create a
MetaBmpExScaleAction. But just because we need to store a transformed
bitmap for rotation purposes, it doesn't mean we also need to scale it.

This helps in case later the metafile is upscaled and the downscaled
bitmap would look blurry.

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

diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 0484e4a4143d..53f2424f5dbe 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -13,6 +13,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -27,6 +29,7 @@ public:
 void testWindowBackgroundColor();
 void testGetReadableFontColorPrinter();
 void testGetReadableFontColorWindow();
+void testDrawTransformedBitmapEx();
 
 CPPUNIT_TEST_SUITE(VclOutdevTest);
 CPPUNIT_TEST(testVirtualDevice);
@@ -35,6 +38,7 @@ public:
 CPPUNIT_TEST(testWindowBackgroundColor);
 CPPUNIT_TEST(testGetReadableFontColorPrinter);
 CPPUNIT_TEST(testGetReadableFontColorWindow);
+CPPUNIT_TEST(testDrawTransformedBitmapEx);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -132,6 +136,34 @@ void VclOutdevTest::testUseAfterDispose()
 pVDev->GetViewTransformation();
 }
 
+void VclOutdevTest::testDrawTransformedBitmapEx()
+{
+// Create a virtual device, and connect a metafile to it.
+// Also create a 16x16 bitmap.
+ScopedVclPtrInstance pVDev;
+Bitmap aBitmap(Size(16, 16), 24);
+BitmapEx aBitmapEx(aBitmap);
+basegfx::B2DHomMatrix aMatrix;
+aMatrix.scale(8, 8);
+aMatrix.rotate(M_PI / 2);
+GDIMetaFile aMtf;
+aMtf.Record(pVDev.get());
+
+// Draw the rotated bitmap on the vdev.
+pVDev->DrawTransformedBitmapEx(aMatrix, aBitmapEx);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), aMtf.GetActionSize());
+MetaAction* pAction = aMtf.GetAction(0);
+CPPUNIT_ASSERT_EQUAL(MetaActionType::BMPEXSCALE, pAction->GetType());
+auto pBitmapAction = static_cast(pAction);
+const BitmapEx& rBitmapEx = pBitmapAction->GetBitmapEx();
+Size aTransformedSize = rBitmapEx.GetSizePixel();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 16x16
+// - Actual  : 8x8
+// I.e. the bitmap before scaling was already scaled down, just because it 
was rotated.
+CPPUNIT_ASSERT_EQUAL(Size(16, 16), aTransformedSize);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(VclOutdevTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 7959b13f8f68..2cbdb2fdb2b3 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1208,7 +1208,7 @@ void OutputDevice::DrawTransformedBitmapEx(
 const bool bInvert(RasterOp::Invert == meRasterOp);
 const bool bBitmapChangedColor(mnDrawMode & (DrawModeFlags::BlackBitmap | 
DrawModeFlags::WhiteBitmap | DrawModeFlags::GrayBitmap ));
 bool bDone(false);
-const basegfx::B2DHomMatrix aFullTransform(GetViewTransformation() * 
rTransformation);
+basegfx::B2DHomMatrix aFullTransform(GetViewTransformation() * 
rTransformation);
 const bool bTryDirectPaint(!bInvert && !bBitmapChangedColor && !bMetafile 
);
 
 if(bTryDirectPaint)
@@ -1272,6 +1272,19 @@ void OutputDevice::DrawTransformedBitmapEx(
 aTransformed = BitmapEx(aContent, aMaskBmp);
 }
 
+// Remove scaling from aFulltransform: we transform due to 
shearing or rotation, scaling
+// will happen according to aDestSize.
+basegfx::B2DVector aFullScale, aFullTranslate;
+double fFullRotate, fFullShearX;
+aFullTransform.decompose(aFullScale, aFullTranslate, fFullRotate, 
fFullShearX);
+if (aFullScale.getX() != 0 && aFullScale.getY() != 0)
+{
+basegfx::B2DHomMatrix aTransform = 
basegfx::utils::createScaleB2DHomMatrix(
+rOriginalSizePixel.getWidth() / aFullScale.getX(),
+rOriginalSizePixel.getHeight() / aFullScale.getY());
+aFullTransform *= aTransform;
+}
+
 aTransformed = aTransformed.getTransformed(
 aFullTransform,
 aVisibleRange,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/li

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

[Mike Kaganski (via logerrit)]

 editeng/source/misc/svxacorr.cxx   |   54 --
 include/editeng/svxacorr.hxx   |   10 +
 sw/inc/editsh.hxx  |6 -
 sw/source/core/edit/edws.cxx   |   27 +++--
 sw/source/uibase/docvw/edtwin.cxx  |  196 ++---
 sw/source/uibase/inc/edtwin.hxx|5 
 sw/source/uibase/inc/gloslst.hxx   |3 
 sw/source/uibase/utlui/gloslst.cxx |   61 +--
 8 files changed, 249 insertions(+), 113 deletions(-)

New commits:
commit ef2ec07b4113fdadf863352c832af657b5ae205c
Author: Mike Kaganski 
AuthorDate: Mon Oct 7 17:46:36 2019 +0300
Commit: Mike Kaganski 
CommitDate: Tue Oct 8 14:30:55 2019 +0200

tdf#128009: Allow spaces in AutoText suggestions

Currently autotext entries with long names starting with spaces, or
containing spaces after first or second character, would never be
suggested when SvxAutoCorrCfg::IsAutoTextTip() gives true (set in
Tools -> AutoCorrect -> [x] Display remainder of name as suggestion
while typing), because only a single word no less than 3 chars long
left to cursor is considered a candidate for the name matching.

This change allows to consider multiple chunks of text left to the
cursor as the candidates for name matching. The chunks are 3-9
characters long, may start only between words, and have spaces,
including leading. Thus, AutoText entries with long names like
"  Dr Foo" will now be suggested for an entry like "lorem  dr f".

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

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 1e3f8f680194..8b46f0f8e043 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1548,12 +1548,12 @@ bool SvxAutoCorrect::AddWrtSttException( const 
OUString& rNew,
 return pLists && pLists->AddToWrdSttExceptList(rNew);
 }
 
-bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc const & rDoc,
-const OUString& rTxt, sal_Int32 nPos,
-OUString& rWord )
+OUString SvxAutoCorrect::GetPrevAutoCorrWord(SvxAutoCorrDoc const& rDoc, const 
OUString& rTxt,
+ sal_Int32 nPos)
 {
+OUString sRet;
 if( !nPos )
-return false;
+return sRet;
 
 sal_Int32 nEnde = nPos;
 
@@ -1561,7 +1561,7 @@ bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc 
const & rDoc,
 if( ( nPos < rTxt.getLength() &&
 !IsWordDelim( rTxt[ nPos ])) ||
 IsWordDelim( rTxt[ --nPos ]))
-return false;
+return sRet;
 
 while( nPos && !IsWordDelim( rTxt[ --nPos ]))
 ;
@@ -1574,20 +1574,54 @@ bool SvxAutoCorrect::GetPrevAutoCorrWord( 
SvxAutoCorrDoc const & rDoc,
 
 while( lcl_IsInAsciiArr( sImplSttSkipChars, rTxt[ nCapLttrPos ]) )
 if( ++nCapLttrPos >= nEnde )
-return false;
+return sRet;
 
 if( 3 > nEnde - nCapLttrPos )
-return false;
+return sRet;
 
 const LanguageType eLang = GetDocLanguage( rDoc, nCapLttrPos );
 
 CharClass& rCC = GetCharClass(eLang);
 
 if( lcl_IsSymbolChar( rCC, rTxt, nCapLttrPos, nEnde ))
-return false;
+return sRet;
 
-rWord = rTxt.copy( nCapLttrPos, nEnde - nCapLttrPos );
-return true;
+sRet = rTxt.copy( nCapLttrPos, nEnde - nCapLttrPos );
+return sRet;
+}
+
+// static
+std::vector SvxAutoCorrect::GetChunkForAutoText(const OUString& rTxt,
+  const sal_Int32 nPos)
+{
+constexpr sal_Int32 nMinLen = 3;
+constexpr sal_Int32 nMaxLen = 9;
+std::vector aRes;
+if (nPos >= nMinLen)
+{
+sal_Int32 nBegin = std::max(nPos - nMaxLen, 0);
+// TODO: better detect word boundaries (not only whitespaces, but also 
e.g. punctuation)
+if (nBegin > 0 && !IsWordDelim(rTxt[nBegin-1]))
+{
+while (nBegin + nMinLen <= nPos && !IsWordDelim(rTxt[nBegin]))
+++nBegin;
+}
+if (nBegin + nMinLen <= nPos)
+{
+OUString sRes = rTxt.copy(nBegin, nPos - nBegin);
+aRes.push_back(sRes);
+bool bLastStartedWithDelim = IsWordDelim(sRes[0]);
+for (sal_Int32 i = 1; i <= sRes.getLength() - nMinLen; ++i)
+{
+bool bAdd = bLastStartedWithDelim;
+bLastStartedWithDelim = IsWordDelim(sRes[i]);
+bAdd = bAdd || bLastStartedWithDelim;
+if (bAdd)
+aRes.push_back(sRes.copy(i));
+}
+}
+}
+return aRes;
 }
 
 bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool 
bNewFile )
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 5803938ce966..46c3df27f18f 

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

[Noel Grandin (via logerrit)]

 include/ucbhelper/contentinfo.hxx |   17 ---
 ucbhelper/source/provider/contentinfo.cxx |   32 --
 2 files changed, 1 insertion(+), 48 deletions(-)

New commits:
commit cf1b5ae4c5f7c9111a745199ac993742f9007263
Author: Noel Grandin 
AuthorDate: Mon Oct 7 14:38:57 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 8 14:23:08 2019 +0200

use cppu::WeakImplHelper in CommandProcessorInfo

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

diff --git a/include/ucbhelper/contentinfo.hxx 
b/include/ucbhelper/contentinfo.hxx
index f3f455af98ff..405b1057b3a3 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -86,9 +86,7 @@ public:
   * ucb::ContentImplHelper.
   */
 class CommandProcessorInfo :
-public cppu::OWeakObject,
-public css::lang::XTypeProvider,
-public css::ucb::XCommandInfo
+public cppu::WeakImplHelper
 {
 css::uno::Reference< css::ucb::XCommandEnvironment >
 m_xEnv;
@@ -108,19 +106,6 @@ public:
  ContentImplHelper* pContent );
 virtual ~CommandProcessorInfo() override;
 
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType ) override;
-virtual void SAL_CALL acquire()
-throw() override;
-virtual void SAL_CALL release()
-throw() override;
-
-// XTypeProvider
-virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-getImplementationId() override;
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-getTypes() override;
-
 // XCommandInfo
 virtual css::uno::Sequence<
 css::ucb::CommandInfo > SAL_CALL
diff --git a/ucbhelper/source/provider/contentinfo.cxx 
b/ucbhelper/source/provider/contentinfo.cxx
index 64feb16e2b74..a0a26745b758 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -191,38 +191,6 @@ CommandProcessorInfo::~CommandProcessorInfo()
 }
 
 
-// XInterface methods.
-
-
-void SAL_CALL CommandProcessorInfo::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL CommandProcessorInfo::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL CommandProcessorInfo::queryInterface( const 
css::uno::Type & rType )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
-   static_cast< 
lang::XTypeProvider* >(this),
-   static_cast< 
css::ucb::XCommandInfo* >(this)
-);
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_2( CommandProcessorInfo,
- lang::XTypeProvider,
- css::ucb::XCommandInfo );
-
-
 // XCommandInfo methods.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 ucb/source/cacher/cacheddynamicresultsetstub.cxx |   33 ---
 ucb/source/cacher/cacheddynamicresultsetstub.hxx |   21 +++---
 2 files changed, 5 insertions(+), 49 deletions(-)

New commits:
commit ed1f20d2f1674261c30a503c5b429ad35dabf033
Author: Noel Grandin 
AuthorDate: Mon Oct 7 15:09:58 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 8 14:16:04 2019 +0200

use cppu::WeakImplHelper in CachedDynamicResultSetStubFactory

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

diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx 
b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index da240c2d6635..330d159bca67 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -152,39 +152,6 @@ 
CachedDynamicResultSetStubFactory::~CachedDynamicResultSetStubFactory()
 {
 }
 
-
-// CachedDynamicResultSetStubFactory XInterface methods.
-void SAL_CALL CachedDynamicResultSetStubFactory::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL CachedDynamicResultSetStubFactory::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL CachedDynamicResultSetStubFactory::queryInterface( 
const css::uno::Type & rType )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
-   static_cast< XTypeProvider* 
>(this),
-   static_cast< XServiceInfo* 
>(this),
-   static_cast< 
XCachedDynamicResultSetStubFactory* >(this)
-   );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// CachedDynamicResultSetStubFactory XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory,
-  XTypeProvider,
- XServiceInfo,
-  XCachedDynamicResultSetStubFactory );
-
-
 // CachedDynamicResultSetStubFactory XServiceInfo methods.
 
 XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetStubFactory,
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx 
b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index 868701127ef2..e6ca57a94070 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define CACHED_DRS_STUB_SERVICE_NAME 
"com.sun.star.ucb.CachedDynamicResultSetStub"
 #define CACHED_DRS_STUB_FACTORY_NAME 
"com.sun.star.ucb.CachedDynamicResultSetStubFactory"
@@ -68,11 +69,10 @@ public:
 };
 
 
-class CachedDynamicResultSetStubFactory final
-: public cppu::OWeakObject
-, public css::lang::XTypeProvider
-, public css::lang::XServiceInfo
-, public css::ucb::XCachedDynamicResultSetStubFactory
+class CachedDynamicResultSetStubFactory final :
+public cppu::WeakImplHelper<
+css::lang::XServiceInfo,
+css::ucb::XCachedDynamicResultSetStubFactory>
 {
 css::uno::Reference< css::uno::XComponentContext >m_xContext;
 
@@ -83,17 +83,6 @@ public:
 
 virtual ~CachedDynamicResultSetStubFactory() override;
 
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType ) override;
-virtual void SAL_CALL acquire()
-throw() override;
-virtual void SAL_CALL release()
-throw() override;
-
-// XTypeProvider
-virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 
override;
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 include/ucbhelper/resultset.hxx |   34 +++-
 ucbhelper/source/provider/resultset.cxx |   45 
 2 files changed, 10 insertions(+), 69 deletions(-)

New commits:
commit 7426fd34b3979ce546f749dba15f58e299b62eac
Author: Noel Grandin 
AuthorDate: Mon Oct 7 14:48:02 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 8 14:08:36 2019 +0200

use cppu::WeakImplHelper in ResultSet

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

diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 7dcdce8cb8d4..2c5e99bdc2a9 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -32,7 +32,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -58,16 +58,15 @@ struct ResultSet_Impl;
  * @see ResultSetDataSupplier
  */
 class UCBHELPER_DLLPUBLIC ResultSet :
-public cppu::OWeakObject,
-public css::lang::XTypeProvider,
-public css::lang::XServiceInfo,
-public css::lang::XComponent,
-public css::ucb::XContentAccess,
-public css::sdbc::XResultSet,
-public css::sdbc::XResultSetMetaDataSupplier,
-public css::sdbc::XRow,
-public css::sdbc::XCloseable,
-public css::beans::XPropertySet
+public cppu::WeakImplHelper<
+css::lang::XServiceInfo,
+css::lang::XComponent,
+css::ucb::XContentAccess,
+css::sdbc::XResultSet,
+css::sdbc::XResultSetMetaDataSupplier,
+css::sdbc::XRow,
+css::sdbc::XCloseable,
+css::beans::XPropertySet>
 {
 std::unique_ptr m_pImpl;
 
@@ -101,19 +100,6 @@ public:
 const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv 
);
 virtual ~ResultSet() override;
 
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType ) override;
-virtual void SAL_CALL acquire()
-throw() override;
-virtual void SAL_CALL release()
-throw() override;
-
-// XTypeProvider
-virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-getImplementationId() override;
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-getTypes() override;
-
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
override;
diff --git a/ucbhelper/source/provider/resultset.cxx 
b/ucbhelper/source/provider/resultset.cxx
index 64991e0a4c7c..133b66a1da56 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -208,51 +208,6 @@ ResultSet::~ResultSet()
 }
 
 
-// XInterface methods.
-
-void SAL_CALL ResultSet::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL ResultSet::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL ResultSet::queryInterface( const css::uno::Type & rType 
)
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
-   static_cast< 
lang::XTypeProvider* >(this),
-   static_cast< 
lang::XServiceInfo* >(this),
-   static_cast< lang::XComponent* 
>(this),
-   static_cast< 
css::ucb::XContentAccess* >(this),
-   static_cast< sdbc::XResultSet* 
>(this),
-   static_cast< 
sdbc::XResultSetMetaDataSupplier* >(this),
-   static_cast< sdbc::XRow* 
>(this),
-   static_cast< sdbc::XCloseable* 
>(this),
-   static_cast< 
beans::XPropertySet* >(this)
-   );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_9( ResultSet,
-  lang::XTypeProvider,
-  lang::XServiceInfo,
-  lang::XComponent,
-  css::ucb::XContentAccess,
-  sdbc::XResultSet,
-  sdbc::XResultSetMetaDataSupplier,
-  sdbc::XRow,
-  sdbc::XCloseable,
-  beans::XPropertySet );
-
-
 // XServiceInfo methods.
 
 OUString SAL_CALL ResultSet::getImplementationName()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org

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

[Tor Lillqvist (via logerrit)]

 kit/Kit.cpp |4 
 1 file changed, 4 insertions(+)

New commits:
commit e51d0a642d34e00e1167ca1a8c94395beead46ef
Author: Tor Lillqvist 
AuthorDate: Tue Oct 8 14:49:35 2019 +0300
Commit: Michael Meeks 
CommitDate: Tue Oct 8 14:08:23 2019 +0200

Fix build for MOBILEAPP where we don't have Log::shutdown()

(Because a mobile app is not supposed to ever exit voluntarily and
cleanly anyway.)

Perhaps we should call abort() in thse cases, though, and not just
continue as if nothing is wrong?

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

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index fbe42a7f1..b40577878 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2115,14 +2115,18 @@ public:
 catch (const std::exception& exc)
 {
 LOG_FTL("QueueHandler::run: Exception: " << exc.what());
+#if !MOBILEAPP
 Log::shutdown();
 std::_Exit(Application::EXIT_SOFTWARE);
+#endif
 }
 catch (...)
 {
 LOG_FTL("QueueHandler::run: Unknown exception");
+#if !MOBILEAPP
 Log::shutdown();
 std::_Exit(Application::EXIT_SOFTWARE);
+#endif
 }
 }
 
___
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.JSDialogBuilder.js |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5f3ead32983ac35b0f354e06230e018fed979a57
Author: Szymon Kłos 
AuthorDate: Tue Oct 8 14:05:24 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 14:05:40 2019 +0200

jsdialogs: move id to the container of img

Change-Id: Id0343ddeb64e1b60262ff792f83d3a199842d1a8

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index a3f920b48..138a4eb9a 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -337,14 +337,17 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
if (data.command) {
var id = data.command.substr('.uno:'.length);
+   div.id = id;
+
var icon = 
builder._createIconPathFronUnoCommand(data.command);
+   var buttonId = id + 'img';
 
button = L.DomUtil.create('img', 'ui-content 
unobutton', div);
button.src = icon;
-   button.id = id;
+   button.id = buttonId;
 
var label = L.DomUtil.create('span', 'ui-content 
unolabel', div);
-   label.for = id;
+   label.for = buttonId;
label.innerHTML = data.text;
} else {
button = L.DomUtil.create('label', 'ui-content 
unolabel', div);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 ucb/source/ucp/file/bc.cxx |   51 -
 ucb/source/ucp/file/bc.hxx |   42 +
 2 files changed, 11 insertions(+), 82 deletions(-)

New commits:
commit 41772463ca1ab22b213dbf1cb7449ec695b2f457
Author: Noel Grandin 
AuthorDate: Mon Oct 7 15:14:41 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 8 13:59:53 2019 +0200

use cppu::WeakImplHelper in fileaccess::BaseContent

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

diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 34ce91c146f5..fe00d74c8533 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -126,43 +126,6 @@ BaseContent::~BaseContent( )
 }
 
 
-// XInterface
-
-
-void SAL_CALL
-BaseContent::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-
-void SAL_CALL
-BaseContent::release()
-throw()
-{
-OWeakObject::release();
-}
-
-
-Any SAL_CALL
-BaseContent::queryInterface( const Type& rType )
-{
-Any aRet = cppu::queryInterface( rType,
- static_cast< lang::XComponent* >(this),
- static_cast< lang::XTypeProvider* >(this),
- static_cast< lang::XServiceInfo* >(this),
- static_cast< XCommandProcessor* >(this),
- static_cast< container::XChild* >(this),
- static_cast< 
beans::XPropertiesChangeNotifier* >(this),
- static_cast< beans::XPropertyContainer* 
>(this),
- static_cast< XContentCreator* >(this),
- static_cast< 
beans::XPropertySetInfoChangeNotifier* >(this),
- static_cast< XContent* >(this) );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-
 // XComponent
 
 
@@ -241,20 +204,6 @@ BaseContent::getSupportedServiceNames()
 return ret;
 }
 
-//  XTypeProvider
-XTYPEPROVIDER_IMPL_10( BaseContent,
-   lang::XComponent,
-   lang::XTypeProvider,
-   lang::XServiceInfo,
-   XCommandProcessor,
-   XContentCreator,
-   XContent,
-   container::XChild,
-   beans::XPropertiesChangeNotifier,
-   beans::XPropertyContainer,
-   beans::XPropertySetInfoChangeNotifier )
-
-
 //  XCommandProcessor
 
 
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 4bfd72abc4de..5d6e36d88957 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -22,7 +22,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -54,17 +54,16 @@ namespace fileaccess {
 class TaskManager;
 
 class BaseContent:
-public cppu::OWeakObject,
-public css::lang::XComponent,
-public css::lang::XServiceInfo,
-public css::lang::XTypeProvider,
-public css::ucb::XCommandProcessor,
-public css::beans::XPropertiesChangeNotifier,
-public css::beans::XPropertyContainer,
-public css::beans::XPropertySetInfoChangeNotifier,
-public css::ucb::XContentCreator,
-public css::container::XChild,
-public css::ucb::XContent,
+public cppu::WeakImplHelper<
+css::lang::XComponent,
+css::lang::XServiceInfo,
+css::ucb::XCommandProcessor,
+css::beans::XPropertiesChangeNotifier,
+css::beans::XPropertyContainer,
+css::beans::XPropertySetInfoChangeNotifier,
+css::ucb::XContentCreator,
+css::container::XChild,
+css::ucb::XContent>,
 public fileaccess::Notifier// implementation class
 {
 private:
@@ -82,19 +81,6 @@ namespace fileaccess {
 
 virtual ~BaseContent() override;
 
-// XInterface
-virtual css::uno::Any SAL_CALL
-queryInterface( const css::uno::Type& aType ) override;
-
-virtual void SAL_CALL
-acquire()
-throw() override;
-
-virtual void SAL_CALL
-release()
-throw() override;
-
-
 // XComponent
 virtual void SAL_CALL
 dispose() override;
@@ -107,12 +93,6 @@ namespace fileaccess {
 removeEventListener( const css::uno::Reference< 
css::lang::XEventListener >& aListener ) override;
 
 
-// XTypeProvider
-
-virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 
override;
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() 
override;
-
-
 // XServiceInfo
 virtual OUString SAL_CALL
 get

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

[Tamás Zolnai (via logerrit)]

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

New commits:
commit d30533d204705d187ced4778873332ba0e43e2e7
Author: Tamás Zolnai 
AuthorDate: Tue Oct 8 13:30:03 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Oct 8 13:30:09 2019 +0200

mobile: Merge Style and Text Properties panels in mobile wizard

Change-Id: I5f15f1da4ab157bb77220311bcb2744f72ae3b72

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 1609b9ed0..eeadda445 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -756,10 +756,52 @@ L.TileLayer = L.GridLayer.extend({
_onJSDialogMsg: function (textMsg) {
if (window.mode.isMobile() && window.mobileWizard === true) {
var msgData = 
JSON.parse(textMsg.substring('jsdialog:'.length + 1));
+   this._mergeStylesAndTextPropertyPanels(msgData);
this._openMobileWizard(msgData);
}
},
 
+   _mergeStylesAndTextPropertyPanels: function (data) {
+   var stylesChildren = this._removeStylesPanelAndGetContent(data);
+   this._addChildrenToTextPanel(data, stylesChildren);
+   },
+
+   _removeStylesPanelAndGetContent: function (data) {
+   if (data.children) {
+   for (var i = 0; i < data.children.length; i++) {
+   if (data.children[i].type === 'panel' && 
data.children[i].children &&
+   data.children[i].children.length > 0 && 
data.children[i].children[0].id === 'SidebarStylesPanel') {
+   var ret = 
data.children[i].children[0].children;
+   data.children.splice(i, 1);
+   return ret;
+   }
+
+   var childReturn = 
this._removeStylesPanelAndGetContent(data.children[i]);
+   if (childReturn !== null) {
+   return childReturn;
+   }
+   }
+   }
+   return null;
+   },
+
+   _addChildrenToTextPanel: function (data, children) {
+   if (data.id === 'SidebarTextPanel') {
+   data.children = children.concat(data.children);
+   return 'success';
+   }
+
+   if (data.children) {
+   for (var i = 0; i < data.children.length; i++) {
+   var childReturn = 
this._addChildrenToTextPanel(data.children[i], children);
+   if (childReturn !== null) {
+   return childReturn;
+   }
+   }
+   }
+   return null;
+   },
+
_onGraphicSelectionMsg: function (textMsg) {
if (textMsg.match('EMPTY')) {
this._resetSelectionRanges();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro (via logerrit)]

 loleaflet/css/toolbar.css |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit d7fb1e1f603d438856bd6bced34bcc89dec392f0
Author: Pedro 
AuthorDate: Tue Oct 8 12:35:55 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 13:25:11 2019 +0200

Add generic label and div styling and add exception to the rule for 
wrapping options

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

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 39a884f51..769793fc8 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -7,6 +7,17 @@
.w2ui-icon.users{
background-size: 20px !important;
}
+   .ui-content > div{
+   margin:16px 0px;
+   }
+   .ui-content label{
+   line-height: 44px;
+   vertical-align: top;
+   padding-left: 24px;
+   }
+   #buttonnone + label, #buttonbefore + label, #buttonafter + label, 
#buttonoptimal + label, #buttonparallel + label, #buttonnone + label, 
#buttonthrough + label{
+   padding-left: 0;
+   }
#buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel, 
#buttonnone, #buttonthrough{
margin: 0;
 padding: 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro (via logerrit)]

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

New commits:
commit a18a15481b2c847eb8f5d7027315266af0731de7
Author: Pedro 
AuthorDate: Tue Oct 8 12:02:35 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 13:24:24 2019 +0200

Apply new generic checkbox and button styles only to mobile-wizard (it 
avoids problems with calc spreadsheet tabs..)

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

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 021a98d3c..39a884f51 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -32,11 +32,11 @@
float: left;
margin: 16px 0px;
}
-   input[type=checkbox]:disabled{
+   #mobile-wizard input[type=checkbox]:disabled{
border: 2px solid #ddd;
box-shadow: none;
}
-   input[type=checkbox]{
+   #mobile-wizard input[type=checkbox]{
appearance: none;
width: 24px;
height: 24px;
@@ -50,7 +50,7 @@
 outline: none;
 box-shadow: #0015 0px 0px 2px 1px;
}
-   input[type=checkbox]:checked{
+   #mobile-wizard input[type=checkbox]:checked{
background: url(images/lc_ok_white.svg) no-repeat center;
background-color: #0b87e7;
border-radius: 2px;
@@ -58,11 +58,11 @@
 outline: none;
 box-shadow: none;
}
-   input[type=checkbox]:before{
+   #mobile-wizard input[type=checkbox]:before{
width: 20px;
height: 20px;
}
-   input[type=checkbox]:after{
+   #mobile-wizard input[type=checkbox]:after{
top: -20px;
width: 16px;
}
@@ -71,7 +71,7 @@
vertical-align: baseline;
padding-left: 24px;
}
-   button{
+   #mobile-wizard button{
height: 38px;
 border-radius: 4px;
 color: #0b87e7 !important;
@@ -80,10 +80,10 @@
 text-transform: uppercase;
 border: 1px solid #0b87e7;
}
-   button:focus{
+   #mobile-wizard button:focus{
outline: none;
}
-   button:active{
+   #mobile-wizard button:active{
outline: none;
border: none;
background-color: #ebf2fb;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |   57 +++
 loleaflet/src/control/Control.Toolbar.js |   13 --
 loleaflet/src/layer/tile/CalcTileLayer.js|2 
 loleaflet/src/layer/tile/ImpressTileLayer.js |4 -
 loleaflet/src/layer/tile/WriterTileLayer.js  |4 -
 5 files changed, 34 insertions(+), 46 deletions(-)

New commits:
commit ec85fa7550738609bfaeca04da7d019a0dcf76e8
Author: Michael Meeks 
AuthorDate: Tue Oct 8 11:56:47 2019 +0100
Commit: Michael Meeks 
CommitDate: Tue Oct 8 12:01:38 2019 +0100

mobile: disable more irrelevant items.

Change-Id: I929eaa4d855a2723ee19762ff74e8501b16443f9

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 5ebadeb57..a37a555d2 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -62,19 +62,18 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:EditStyle'}
]},
{name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 
'menu', menu: [
-   {name: _UNO('.uno:FullScreen', 'text'), id: 
'fullscreen', type: 'action', mobileapp: false},
+   {name: _UNO('.uno:FullScreen', 'text'), id: 
'fullscreen', type: 'action', mobileapp: false, mobile: false},
{type: 'separator', mobileapp: false},
-   {name: _UNO('.uno:ZoomPlus', 'text'), id: 
'zoomin', type: 'action'},
-   {name: _UNO('.uno:ZoomMinus', 'text'), id: 
'zoomout', type: 'action'},
-   {name: _('Reset zoom'), id: 'zoomreset', type: 
'action'},
+   {name: _UNO('.uno:ZoomPlus', 'text'), id: 
'zoomin', type: 'action', mobile: false},
+   {name: _UNO('.uno:ZoomMinus', 'text'), id: 
'zoomout', type: 'action', mobile: false},
+   {name: _('Reset zoom'), id: 'zoomreset', type: 
'action', mobile:false },
{name: _('Show Ruler'), id: 'showruler', type: 
'action'},
-   {type: 'separator'},
+   {type: 'separator', mobile: false},
{uno: '.uno:ControlCodes'},
-   {type: 'separator'},
+   {type: 'separator', mobile: false},
{name: _UNO('.uno:ShowResolvedAnnotations', 
'text'), id: 'showresolved', type: 'action'},
{type: 'separator'},
{uno: '.uno:Sidebar', mobile: false},
-   {id: 'mobile-wizard',  type: 'action', name: 
_('Mobile Wizard'), mobile: true, desktop: false}
]
},
{name: _UNO('.uno:InsertMenu', 'text'), id: 'insert', 
mobile: false, type: 'menu', menu: [
@@ -284,13 +283,12 @@ L.Control.Menubar = L.Control.extend({
]},
{name: _UNO('.uno:ViewMenu', 'presentation'), id: 
'view', type: 'menu', menu: [
{name: _UNO('.uno:FullScreen', 'presentation'), 
id: 'fullscreen', type: 'action', mobileapp: false},
-   {type: 'separator', mobileapp: false},
-   {name: _UNO('.uno:ZoomPlus', 'presentation'), 
id: 'zoomin', type: 'action'},
-   {name: _UNO('.uno:ZoomMinus', 'presentation'), 
id: 'zoomout', type: 'action'},
-   {name: _('Reset zoom'), id: 'zoomreset', type: 
'action'},
-   {uno: '.uno:Sidebar'},
-   {id: 'mobile-wizard',  type: 'action', name: 
_('Mobile Wizard'), mobile: true, desktop: false}]
-   },
+   {type: 'separator', mobileapp: false, mobile: 
false},
+   {name: _UNO('.uno:ZoomPlus', 'presentation'), 
id: 'zoomin', type: 'action', mobile: false },
+   {name: _UNO('.uno:ZoomMinus', 'presentation'), 
id: 'zoomout', type: 'action', mobile: false},
+   {name: _('Reset zoom'), id: 'zoomreset', type: 
'action', mobile: false},
+   {uno: '.uno:Sidebar', mobile: false}
+   ]},
{name: _UNO('.uno:InsertMenu', 'presentation'), id: 
'insert', mobile: false, type: 'menu', menu: [
{name: _('Local Image...'), id: 
'insertgraphic', type: 'action'},
{name: _UNO('.uno:InsertGraphic', 
'presentation'), id: 'insertgraphicremote', type: 'action'},
@@ -303,7 +301,7 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
   

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

[Marco Cecchetti (via logerrit)]

 sfx2/source/view/ipclient.cxx |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit 3672ca8c34f5de4692fdc7ca205babff14a91990
Author: Marco Cecchetti 
AuthorDate: Tue Oct 8 12:09:21 2019 +0200
Commit: Marco Cecchetti 
CommitDate: Tue Oct 8 12:45:06 2019 +0200

lok: re-enabling chart editing on mobile

Change-Id: I0e05cc2c41ba045e62ad87203f7000f2b568add3

diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 55fbdbaea2eb..9dd4503eff7f 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -932,17 +932,6 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
 {
 m_xImp->m_xObject->setClientSite( m_xImp->m_xClient );
 
-// Disable embedded object editing (e.g. chart) on mobile
-if ( comphelper::LibreOfficeKit::isActive() && 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())
-&& m_xImp->m_xObject->getCurrentState() == 
embed::EmbedStates::RUNNING )
-{
-// Also check next state
-// Needs to be embed::EmbedStates::UI_ACTIVE or 
embed::EmbedStates::INPLACE_ACTIVE
-// Conversion table is in 
embeddedobj/source/commonembedding/miscobj.cxx
-if (nVerb != embed::EmbedVerbs::MS_OLEVERB_OPEN && 
nVerb != embed::EmbedVerbs::MS_OLEVERB_HIDE)
-return nError;
-}
-
 m_xImp->m_xObject->doVerb( nVerb );
 }
 catch ( embed::UnreachableStateException& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti (via logerrit)]

 loleaflet/css/toolbar.css|   22 +-
 loleaflet/images/lc_hyperlinkdialog.svg  |1 +
 loleaflet/images/lc_insertauthoritiesentry.svg   |1 +
 loleaflet/images/lc_insertcolumnbreak.svg|   14 ++
 loleaflet/images/lc_insertcomment.svg|2 +-
 loleaflet/images/lc_insertdatefield.svg  |1 +
 loleaflet/images/lc_insertendnote.svg|1 +
 loleaflet/images/lc_insertfootnote.svg   |1 +
 loleaflet/images/lc_insertgraphic.svg|1 +
 loleaflet/images/lc_insertgraphicremote.svg  |1 +
 loleaflet/images/lc_insertindexesentry.svg   |1 +
 loleaflet/images/lc_insertmultiindex.svg |1 +
 loleaflet/images/lc_insertobjectchart.svg|1 +
 loleaflet/images/lc_insertpagebreak.svg  |1 +
 loleaflet/images/lc_insertpagecountfield.svg |1 +
 loleaflet/images/lc_insertpagenumberfield.svg|1 +
 loleaflet/images/lc_insertsection.svg|1 +
 loleaflet/images/lc_inserttimefield.svg  |1 +
 loleaflet/images/lc_inserttitlefield.svg |1 +
 loleaflet/images/lc_inserttopicfield.svg |1 +
 loleaflet/src/control/Control.JSDialogBuilder.js |   18 +++---
 loleaflet/src/control/Control.Menubar.js |8 
 22 files changed, 72 insertions(+), 9 deletions(-)

New commits:
commit 172c9ca384b5e579cd6de35c6d7ca6e80142f54e
Author: Marco Cecchetti 
AuthorDate: Tue Oct 8 08:50:08 2019 +0200
Commit: Marco Cecchetti 
CommitDate: Tue Oct 8 12:43:32 2019 +0200

loleaflet: adding icons to insert menu entries

Change-Id: I24664aa41f208ccd70331f37a8e1d031eefc43fd

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index ccbd50fdf..021a98d3c 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -935,7 +935,7 @@ tr.useritem > td > img {
margin: 0px;
padding: 0px;
border: solid 1px #fff;
-   padding-left: 74px !important;
+   padding-left: 32px !important;
display: flex;
flex-direction: row;
align-items: center;
@@ -966,6 +966,10 @@ tr.useritem > td > img {
vertical-align: middle;
 }
 
+.sub-menu-title {
+   padding-left: 42px;
+}
+
 .sub-menu-arrow {
margin-right: 40px;
background: transparent;
@@ -973,3 +977,19 @@ tr.useritem > td > img {
font-weight: bold;
color: #aaa !important;
 }
+
+.menu-entry-icon {
+   width: 32px;
+   height: 32px;
+   background: transparent;
+}
+
+.menu-entry-with-icon {
+   padding-left: 10px;
+}
+
+/* Don't forget to update it when you change one of the two above!
+menu-entry-with-icon.padding-left + menu-entry-icon.width */
+.menu-entry-no-icon {
+   padding-left: 42px;
+}
\ No newline at end of file
diff --git a/loleaflet/images/lc_hyperlinkdialog.svg 
b/loleaflet/images/lc_hyperlinkdialog.svg
new file mode 100644
index 0..0aab5a02d
--- /dev/null
+++ b/loleaflet/images/lc_hyperlinkdialog.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertauthoritiesentry.svg 
b/loleaflet/images/lc_insertauthoritiesentry.svg
new file mode 100644
index 0..4c999760f
--- /dev/null
+++ b/loleaflet/images/lc_insertauthoritiesentry.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertcolumnbreak.svg 
b/loleaflet/images/lc_insertcolumnbreak.svg
new file mode 100644
index 0..eda22cde9
--- /dev/null
+++ b/loleaflet/images/lc_insertcolumnbreak.svg
@@ -0,0 +1,14 @@
+http://www.w3.org/2000/svg";>
+  
+  
+  
+
diff --git a/loleaflet/images/lc_insertcomment.svg 
b/loleaflet/images/lc_insertcomment.svg
index ac434b08d..e449feccd 100644
--- a/loleaflet/images/lc_insertcomment.svg
+++ b/loleaflet/images/lc_insertcomment.svg
@@ -63,4 +63,4 @@
d="M 21.99,4 C 21.99,2.9 21.1,2 20,2 H 4 C 2.9,2 2,2.9 2,4 v 12 c 0,1.1 
0.9,2 2,2 h 14 l 4,4 z M 17,11 h -4 v 4 H 11 V 11 H 7 V 9 h 4 V 5 h 2 v 4 h 4 z"
id="path1613" />
   
-
+
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertdatefield.svg 
b/loleaflet/images/lc_insertdatefield.svg
new file mode 100644
index 0..c0091b903
--- /dev/null
+++ b/loleaflet/images/lc_insertdatefield.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertendnote.svg 
b/loleaflet/images/lc_insertendnote.svg
new file mode 100644
index 0..021c56344
--- /dev/null
+++ b/loleaflet/images/lc_insertendnote.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertfootnote.svg 
b/loleaflet/images/lc_insertfootnote.svg
new file mode 100644
index 0..fb87e5561
--- /dev/null
+++ b/loleaflet/images/lc_insertfootnote.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf115719.docx  |binary
 sw/qa/extras/ooxmlimport/data/tdf115719b.docx |binary
 sw/qa/extras/ooxmlimport/data/tdf124600.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |   11 +++
 writerfilter/source/dmapper/GraphicImport.cxx |   11 ++-
 5 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit f9ad3ce992f9d9d29384612759cb3f4533dbe134
Author: Miklos Vajna 
AuthorDate: Tue Sep 17 11:30:26 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Oct 8 12:07:39 2019 +0200

Related: tdf#124600 DOCX import: ignore left wrap on left-aligned shapes

The DOC import does the same in
SwWW8ImplReader::AdjustLRWrapForWordMargins(). This fixes one
sub-problem of the bugdoc, so now the shape anchored in the header has a
correct position.

This made it necessary to re-visit the tdf#115719 testcases, which are
minimal reproducers. The original document had from-left alignment
(instead of align-to-left), but this did not matter before. Bring the
test documents closer to the original large document, so the tests still
pass and don't depend on LO mis-handling the above mentioned
left-aligned situation. (The interesting property of tdf115719.docx,
where Word 2010 and Word 2013 handles the document differently is
preserved after this change.)

(cherry picked from commit 4883da6fd25e4645a3b30cb58212a2f666dae75a)

Change-Id: I973c13df47b0867e2c4756f0c448495257b7c9d5
Reviewed-on: https://gerrit.libreoffice.org/80041
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit 6de9cff1f918b6fc3ef58d9e080388c741e84b55)
Reviewed-on: https://gerrit.libreoffice.org/80106
Reviewed-by: Mike Kaganski 
Reviewed-by: Eike Rathke 
Tested-by: Xisco Faulí 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf115719.docx 
b/sw/qa/extras/ooxmlexport/data/tdf115719.docx
index f98f8b4a05dc..4eda09a98fa2 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf115719.docx and 
b/sw/qa/extras/ooxmlexport/data/tdf115719.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/tdf115719b.docx 
b/sw/qa/extras/ooxmlimport/data/tdf115719b.docx
index 8c552baf76c1..4cb13228443a 100644
Binary files a/sw/qa/extras/ooxmlimport/data/tdf115719b.docx and 
b/sw/qa/extras/ooxmlimport/data/tdf115719b.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/tdf124600.docx 
b/sw/qa/extras/ooxmlimport/data/tdf124600.docx
new file mode 100644
index ..d5dfa313665e
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf124600.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index e5c6e182a02e..a186e34db0f1 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -103,6 +103,17 @@ DECLARE_OOXMLIMPORT_TEST(testGroupShapeFontName, 
"groupshape-fontname.docx")
 getProperty(getRun(getParagraphOfText(1, xText), 1), 
"CharFontNameAsian"));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf124600, "tdf124600.docx")
+{
+uno::Reference xShape = getShape(1);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 0
+// - Actual  : 318
+// i.e. the shape had an unexpected left margin, but not in Word.
+CPPUNIT_ASSERT_EQUAL(static_cast(0),
+ getProperty(xShape, "HoriOrientPosition"));
+}
+
 DECLARE_OOXMLIMPORT_TEST(testTdf120548, "tdf120548.docx")
 {
 // Without the accompanying fix in place, this test would have failed with 
'Expected: 00ff;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 1d5bcbf97e74..97cc3c78fe92 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -970,7 +970,6 @@ void GraphicImport::ProcessShapeOptions(Value const & 
rValue)
 switch( m_pImpl->nShapeOptionType )
 {
 case NS_ooxml::LN_CT_Anchor_distL:
-//todo: changes have to be applied depending on the orientation, 
see SwWW8ImplReader::AdjustLRWrapForWordMargins()
 m_pImpl->nLeftMargin = nIntValue / 360;
 break;
 case NS_ooxml::LN_CT_Anchor_distT:
@@ -1065,6 +1064,16 @@ void GraphicImport::lcl_sprm(Sprm& rSprm)
 m_pImpl->nHoriRelation = pHandler->relation();
 m_pImpl->nHoriOrient = pHandler->orientation();
 m_pImpl->nLeftPosition = pHandler->position();
+
+// Left adjustments: if horizontally aligned to left of 
margin, then remove the
+// left wrapping.
+if (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT)
+{
+if (m_pImpl->nHoriRelation == 
text::RelOrientation::PAGE_PRINT_AREA)
+{
+m_pImpl->nLeftMargin = 0;
+

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - include/vcl vcl/headless vcl/inc vcl/qt5 vcl/unx

[Caolán McNamara (via logerrit)]

 include/vcl/sysdata.hxx   |4 +
 vcl/headless/svpinst.cxx  |   10 +++-
 vcl/headless/svpvd.cxx|   84 +-
 vcl/inc/headless/svpvd.hxx|5 +-
 vcl/qt5/Qt5Instance.cxx   |   12 +++--
 vcl/qt5/Qt5SvpSurface.cxx |   20 -
 vcl/qt5/Qt5SvpVirtualDevice.hxx   |5 +-
 vcl/unx/gtk/gtkinst.cxx   |6 +-
 vcl/unx/gtk3/cairo_gtk3_cairo.cxx |   22 +
 9 files changed, 115 insertions(+), 53 deletions(-)

New commits:
commit cc03bfe99271f33a38b50778c078f66497bf11f5
Author: Caolán McNamara 
AuthorDate: Thu Oct 3 17:04:10 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 8 11:56:16 2019 +0200

tdf#127529 vertical text not drawn in slideshow canvas

because the canvas text drawing impl falls back to using an OutputDevice 
view
of the canvas to use the vcl text drawing apis to achieve vertical text

To get an OutputDevice view of the canvas there is a specific VirtualDevice
ctor available to create a VirtualDevice that, unlike the normal case, 
doesn't
have its own specific backing buffer, but instead draws to the underlying 
target
provided via the SystemGraphicsData arg

The svp/gtk impl missed that understanding and provided an ordinary
VirtualDevice with its own backing buffer, not a VirtualDevice that would 
draw
to the expected target surface of the canvas. So the vertical text was 
drawn to
a different surface than the intended one, and was just discarded.

The cairo use in the canvas long precedes the use of cairo in vcl itself.

Seeing as text is now rendered with cairo in all cases where the canvas uses
cairo its probably now pointless for canvas to have its own text rendering
path.

Change-Id: Ie3b0a43ca2b746cbfe25e2d0415315b3d5403cd2
Reviewed-on: https://gerrit.libreoffice.org/80192
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 4b7b562da519..03dd3d148087 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -143,7 +143,8 @@ struct SystemGraphicsData
 longhDrawable;  // a drawable
 void*   pVisual;// the visual in use
 int nScreen;// the current screen of the drawable
-void*   pXRenderFormat;  // render format for drawable
+void*   pXRenderFormat; // render format for drawable
+void*   pSurface;   // the cairo surface when using svp-based 
backends
 #endif
 SystemGraphicsData()
 : nSize( sizeof( SystemGraphicsData ) )
@@ -162,6 +163,7 @@ struct SystemGraphicsData
 , pVisual( nullptr )
 , nScreen( 0 )
 , pXRenderFormat( nullptr )
+, pSurface( nullptr )
 #endif
 { }
 };
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 02e332b92fbf..e46e341200ce 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -235,14 +235,18 @@ void SvpSalInstance::DestroyObject( SalObject* pObject )
 
 #ifndef IOS
 
-std::unique_ptr SvpSalInstance::CreateVirtualDevice( 
SalGraphics* pGraphics,
+std::unique_ptr 
SvpSalInstance::CreateVirtualDevice(SalGraphics* pGraphics,
long &nDX, long &nDY,
DeviceFormat eFormat,
-   const 
SystemGraphicsData* /* pData */ )
+   const 
SystemGraphicsData* pGd)
 {
 SvpSalGraphics *pSvpSalGraphics = dynamic_cast(pGraphics);
 assert(pSvpSalGraphics);
-std::unique_ptr pNew(new SvpSalVirtualDevice(eFormat, 
pSvpSalGraphics->getSurface()));
+// tdf#127529 normally pPreExistingTarget is null and we are a true 
virtualdevice drawing to a backing buffer.
+// Occasionally, for canvas/slideshow, pPreExistingTarget is pre-provided 
as a hack to use the vcl drawing
+// apis to render onto a preexisting cairo surface. The necessity for that 
precedes the use of cairo in vcl proper
+cairo_surface_t* pPreExistingTarget = pGd ? 
static_cast(pGd->pSurface) : nullptr;
+std::unique_ptr pNew(new SvpSalVirtualDevice(eFormat, 
pSvpSalGraphics->getSurface(), pPreExistingTarget));
 pNew->SetSize( nDX, nDY );
 return pNew;
 }
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index a1e415739d6b..70ac5785ec71 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -31,17 +31,19 @@
 
 using namespace basegfx;
 
-SvpSalVirtualDevice::SvpSalVirtualDevice(DeviceFormat eFormat, 
cairo_surface_t* pRefSurface)
+SvpSalVirtualDevice::SvpSalVirtualDevice(DeviceFormat eFormat, 
cairo_surface_t* pRefSurface, cairo_surface_t* pPreExistingTarget)
 : m_eFormat(eFormat)
 , m_pRefSurface(pRefSurface)
-, m_pSurface(nullptr)
+, m_pSurface(pPreExist

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

[Eike Rathke (via logerrit)]

 i18nlangtag/source/languagetag/languagetag.cxx |   30 -
 1 file changed, 20 insertions(+), 10 deletions(-)

New commits:
commit 5fec105e6de0005918e9f6f69aafe7ec51a9998f
Author: Eike Rathke 
AuthorDate: Fri Sep 27 22:35:13 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 8 11:51:57 2019 +0200

Resolves: tdf#127786 cache Glibc locale string in LanguageTagImpl

... for non-simple @modifier strings that are constructed using
liblangtag, as loading resource strings needs it over and over and
over again.

Change-Id: Ib6a74e5ddb44508aa41f101c200a508bfa4a13bd
Reviewed-on: https://gerrit.libreoffice.org/79770
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 24c7c12224f1c1d66f335f6fe085595352137646)
Reviewed-on: https://gerrit.libreoffice.org/79775
Reviewed-by: Xisco Faulí 
(cherry picked from commit 99782b52c3cc25a32661c382ca98a32f6ec87003)
Reviewed-on: https://gerrit.libreoffice.org/79787
(cherry picked from commit e7b8101cf7643d612393079d7f1cea07d8b1c774)
Reviewed-on: https://gerrit.libreoffice.org/80105
Reviewed-by: Thorsten Behrens 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index c0e27492f912..ef34402d02de 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -252,11 +252,12 @@ private:
 
 mutable css::lang::Locale   maLocale;
 mutable OUStringmaBcp47;
-mutable OUStringmaCachedLanguage;   ///< cache 
getLanguage()
-mutable OUStringmaCachedScript; ///< cache 
getScript()
-mutable OUStringmaCachedCountry;///< cache 
getCountry()
-mutable OUStringmaCachedVariants;   ///< cache 
getVariants()
-mutable lt_tag_t*   mpImplLangtag;  ///< 
liblangtag pointer
+mutable OUStringmaCachedLanguage;///< cache 
getLanguage()
+mutable OUStringmaCachedScript;  ///< cache 
getScript()
+mutable OUStringmaCachedCountry; ///< cache 
getCountry()
+mutable OUStringmaCachedVariants;///< cache 
getVariants()
+mutable OUStringmaCachedGlibcString; ///< cache 
getGlibcLocaleString()
+mutable lt_tag_t*   mpImplLangtag;   ///< 
liblangtag pointer
 mutable LanguageTypemnLangID;
 mutable LanguageTag::ScriptType meScriptType;
 mutable DecisionmeIsValid;
@@ -271,6 +272,7 @@ private:
 mutable boolmbCachedScript  : 1;
 mutable boolmbCachedCountry : 1;
 mutable boolmbCachedVariants: 1;
+mutable boolmbCachedGlibcString : 1;
 
 OUString const &getBcp47() const;
 OUString const &getLanguage() const;
@@ -384,7 +386,8 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTag & 
rLanguageTag )
 mbCachedLanguage( false),
 mbCachedScript( false),
 mbCachedCountry( false),
-mbCachedVariants( false)
+mbCachedVariants( false),
+mbCachedGlibcString( false)
 {
 }
 
@@ -397,6 +400,7 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTagImpl & 
rLanguageTagImpl )
 maCachedScript( rLanguageTagImpl.maCachedScript),
 maCachedCountry( rLanguageTagImpl.maCachedCountry),
 maCachedVariants( rLanguageTagImpl.maCachedVariants),
+maCachedGlibcString( rLanguageTagImpl.maCachedGlibcString),
 mpImplLangtag( rLanguageTagImpl.mpImplLangtag ?
 lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : nullptr),
 mnLangID( rLanguageTagImpl.mnLangID),
@@ -412,7 +416,8 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTagImpl & 
rLanguageTagImpl )
 mbCachedLanguage( rLanguageTagImpl.mbCachedLanguage),
 mbCachedScript( rLanguageTagImpl.mbCachedScript),
 mbCachedCountry( rLanguageTagImpl.mbCachedCountry),
-mbCachedVariants( rLanguageTagImpl.mbCachedVariants)
+mbCachedVariants( rLanguageTagImpl.mbCachedVariants),
+mbCachedGlibcString( rLanguageTagImpl.mbCachedGlibcString)
 {
 if (mpImplLangtag)
 theDataRef::get().init();
@@ -430,6 +435,7 @@ LanguageTagImpl& LanguageTagImpl::operator=( const 
LanguageTagImpl & rLanguageTa
 maCachedScript  = rLanguageTagImpl.maCachedScript;
 maCachedCountry = rLanguageTagImpl.maCachedCountry;
 maCachedVariants= rLanguageTagImpl.maCachedVariants;
+maCachedGlibcString = rLanguageTagImpl.maCachedGlibcString;
 lt_tag_t * oldTag = mpImplLa

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit c2bf646672a0d534cdb4d0a223a312aba734e1f7
Author: Caolán McNamara 
AuthorDate: Mon Oct 7 09:13:41 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 8 11:48:22 2019 +0200

openssl 1.0.2t

Change-Id: Ideb980a07632e75e2bc7fffa851b8419e727c13b
Reviewed-on: https://gerrit.libreoffice.org/80341
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/download.lst b/download.lst
index 8a5caa5243d8..19e6e9a747b9 100644
--- a/download.lst
+++ b/download.lst
@@ -192,8 +192,8 @@ export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
-export OPENSSL_SHA256SUM := 
ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6
-export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz
+export OPENSSL_SHA256SUM := 
14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc
+export OPENSSL_TARBALL := openssl-1.0.2t.tar.gz
 export ORCUS_SHA256SUM := 
3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f
 export ORCUS_TARBALL := liborcus-0.14.1.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
___
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' - cui/source cui/uiconfig

[Caolán McNamara (via logerrit)]

 cui/source/inc/autocdlg.hxx|1 +
 cui/source/tabpages/autocdlg.cxx   |8 
 cui/uiconfig/ui/acorreplacepage.ui |   11 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 0784008e111efbc9e66f91fc97ecbe4407fd970f
Author: Caolán McNamara 
AuthorDate: Mon Sep 30 14:18:29 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 8 11:46:15 2019 +0200

autocorrect dialog width grows on change of new to replace

the sizegroup isn't working as I'd expect, so just make the replace button
visible, get the preferred width of the buttonbox, lock that down then hide 
the
place button and the container will stay at the max width that will be
wanted

Change-Id: Idfe632aa5af404abb92fc8f7267f0dda5cdbe295
Reviewed-on: https://gerrit.libreoffice.org/79863
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index bcb283f154e6..cf97ece51d7f 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -188,6 +188,7 @@ private:
 std::unique_ptr m_xNewReplacePB;
 std::unique_ptr m_xReplacePB;
 std::unique_ptr m_xDeleteReplacePB;
+std::unique_ptr m_xButtonBox;
 
 DECL_LINK(SelectHdl, weld::TreeView&, void);
 DECL_LINK(NewDelButtonHdl, weld::Button&, void);
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 6573e3b43e0b..aa299fb3ca46 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -669,9 +669,17 @@ 
OfaAutocorrReplacePage::OfaAutocorrReplacePage(TabPageParent pParent,
 , m_xNewReplacePB(m_xBuilder->weld_button("new"))
 , m_xReplacePB(m_xBuilder->weld_button("replace"))
 , m_xDeleteReplacePB(m_xBuilder->weld_button("delete"))
+, m_xButtonBox(m_xBuilder->weld_container("buttonbox"))
 {
 sNew = m_xNewReplacePB->get_label();
 sModify = m_xReplacePB->get_label();
+
+// lock down the width of the button box to its max
+// desired width
+auto nMaxWidth = m_xButtonBox->get_preferred_size().Width();
+m_xButtonBox->set_size_request(nMaxWidth, -1);
+m_xReplacePB->hide();
+
 // tdf#125348 set some small but fixed initial width size, final width will
 // depend on the size of the entry boxes
 m_xReplaceTLB->set_size_request(42, m_xReplaceTLB->get_height_rows(10));
diff --git a/cui/uiconfig/ui/acorreplacepage.ui 
b/cui/uiconfig/ui/acorreplacepage.ui
index 36808eb4ec4d..b099bf079991 100644
--- a/cui/uiconfig/ui/acorreplacepage.ui
+++ b/cui/uiconfig/ui/acorreplacepage.ui
@@ -21,12 +21,11 @@
 6
 12
 
-  
+  
 True
 False
 vertical
 12
-start
 
   
 gtk-new
@@ -45,6 +44,7 @@
 
   
 _Replace
+True
 True
 True
 True
@@ -233,11 +233,4 @@
   
 
   
-  
-
-  
-  
-  
-
-  
 
___
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' - desktop/source

[Caolán McNamara (via logerrit)]

 desktop/source/deployment/gui/dp_gui_theextmgr.cxx |   58 +
 desktop/source/deployment/gui/dp_gui_theextmgr.hxx |3 -
 2 files changed, 50 insertions(+), 11 deletions(-)

New commits:
commit cb5be6961e071ea2b9efd66cd62b98ffda5a058f
Author: Caolán McNamara 
AuthorDate: Fri Sep 20 11:38:00 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 8 11:44:58 2019 +0200

Related: tdf#127645 update dialog has a slave extension dialog

when the update dialog is shown, the extension dialog was created but not
executed, so there isn't a dialog execution context to end, just the 
unexecuted
dialog to "close"

Change-Id: If4b522ca5f880d3ece8403b5350c846bd14a2992
Reviewed-on: https://gerrit.libreoffice.org/79283
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx 
b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 65b4e1c0592c..0ee63dabc400 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -59,7 +59,8 @@ TheExtensionManager::TheExtensionManager( const 
uno::Reference< awt::XWindow > &
   const uno::Reference< 
uno::XComponentContext > &xContext ) :
 m_xContext( xContext ),
 m_xParent( xParent ),
-m_bModified(false)
+m_bModified(false),
+m_bExtMgrDialogExecuting(false)
 {
 m_xExtensionManager = deployment::ExtensionManager::get( xContext );
 m_xExtensionManager->addModifyListener( this );
@@ -106,7 +107,15 @@ TheExtensionManager::~TheExtensionManager()
 m_xUpdReqDialog->response(RET_CANCEL);
 assert(!m_xUpdReqDialog);
 if (m_xExtMgrDialog)
-m_xExtMgrDialog->response(RET_CANCEL);
+{
+if (m_bExtMgrDialogExecuting)
+m_xExtMgrDialog->response(RET_CANCEL);
+else
+{
+m_xExtMgrDialog->Close();
+m_xExtMgrDialog.reset();
+}
+}
 assert(!m_xExtMgrDialog);
 }
 
@@ -136,7 +145,10 @@ void TheExtensionManager::Show()
 {
 const SolarMutexGuard guard;
 
+m_bExtMgrDialogExecuting = true;
+
 weld::DialogController::runAsync(m_xExtMgrDialog, [this](sal_Int32 
/*nResult*/) {
+m_bExtMgrDialogExecuting = false;
 auto xExtMgrDialog = m_xExtMgrDialog;
 m_xExtMgrDialog.reset();
 xExtMgrDialog->Close();
@@ -158,17 +170,19 @@ void TheExtensionManager::ToTop()
 getDialog()->present();
 }
 
-
-bool TheExtensionManager::Close()
+void TheExtensionManager::Close()
 {
 if (m_xExtMgrDialog)
-m_xExtMgrDialog->response(RET_CANCEL);
+{
+if (m_bExtMgrDialogExecuting)
+m_xExtMgrDialog->response(RET_CANCEL);
+else
+m_xExtMgrDialog->Close();
+}
 else if (m_xUpdReqDialog)
 m_xUpdReqDialog->response(RET_CANCEL);
-return true;
 }
 
-
 sal_Int16 TheExtensionManager::execute()
 {
 sal_Int16 nRet = 0;
@@ -255,7 +269,15 @@ void TheExtensionManager::terminateDialog()
 {
 const SolarMutexGuard guard;
 if (m_xExtMgrDialog)
-m_xExtMgrDialog->response(RET_CANCEL);
+{
+if (m_bExtMgrDialogExecuting)
+m_xExtMgrDialog->response(RET_CANCEL);
+else
+{
+m_xExtMgrDialog->Close();
+m_xExtMgrDialog.reset();
+}
+}
 assert(!m_xExtMgrDialog);
 if (m_xUpdReqDialog)
 m_xUpdReqDialog->response(RET_CANCEL);
@@ -424,7 +446,15 @@ void TheExtensionManager::disposing( lang::EventObject 
const & rEvt )
 {
 const SolarMutexGuard guard;
 if (m_xExtMgrDialog)
-m_xExtMgrDialog->response(RET_CANCEL);
+{
+if (m_bExtMgrDialogExecuting)
+m_xExtMgrDialog->response(RET_CANCEL);
+else
+{
+m_xExtMgrDialog->Close();
+m_xExtMgrDialog.reset();
+}
+}
 assert(!m_xExtMgrDialog);
 if (m_xUpdReqDialog)
 m_xUpdReqDialog->response(RET_CANCEL);
@@ -450,7 +480,15 @@ void TheExtensionManager::queryTermination( 
::lang::EventObject const & )
 {
 clearModified();
 if (m_xExtMgrDialog)
-m_xExtMgrDialog->response(RET_CANCEL);
+{
+if (m_bExtMgrDialogExecuting)
+m_xExtMgrDialog->response(RET_CANCEL);
+else
+{
+m_xExtMgrDialog->Close();
+m_xExtMgrDialog.reset();
+}
+}
 if (m_xUpdReqDialog)
 m_xUpdReqDialog->response(RET_CANCEL);
 }
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx 
b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index c75ec34872b0..db862a5f388d 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.

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

[Caolán McNamara (via logerrit)]

 sw/uiconfig/swriter/ui/insertautotextdialog.ui |   27 -
 1 file changed, 26 insertions(+), 1 deletion(-)

New commits:
commit f1a6dd01cf659c1e3e85cc246feb080434fcd8f0
Author: Caolán McNamara 
AuthorDate: Mon Sep 23 10:20:39 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 8 11:43:40 2019 +0200

missing treeview model

Change-Id: Id1a405bb8f5c3d71b48c54e12b1e8ba23a27d842
Reviewed-on: https://gerrit.libreoffice.org/79405
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/insertautotextdialog.ui 
b/sw/uiconfig/swriter/ui/insertautotextdialog.ui
index f7eb03e1ca35..faf4c9b6ef95 100644
--- a/sw/uiconfig/swriter/ui/insertautotextdialog.ui
+++ b/sw/uiconfig/swriter/ui/insertautotextdialog.ui
@@ -2,6 +2,14 @@
 
 
   
+  
+
+  
+  
+  
+  
+
+  
   
 False
 6
@@ -101,11 +109,28 @@
   
 True
 True
+True
 True
 True
+liststore1
+False
+False
+0
 False
 
-  
+  
+
+
+  
+True
+6
+
+  
+  
+0
+  
+
+  
 
   
 
___
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

[Caolán McNamara (via logerrit)]

 vcl/source/window/dialog.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 00aaada667af4d7138e3ddca153c37afd5f61f23
Author: Caolán McNamara 
AuthorDate: Fri Sep 20 12:05:48 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 8 11:42:20 2019 +0200

Resolves: tdf#127645 ignore floating windows like we do tooltips

Change-Id: I727e10a1e884841554437e376bde2ff483d278a4
Reviewed-on: https://gerrit.libreoffice.org/79284
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1f1c3721583d..622004df141a 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1602,8 +1602,13 @@ void TopLevelWindowLocker::incBusy(const weld::Widget* 
pIgnore)
 if (pCandidate->GetType() == WindowType::BORDERWINDOW)
 pCandidate = pCandidate->GetWindow(GetWindowType::FirstChild);
 // tdf#125266 ignore HelpTextWindows
-if (pCandidate && pCandidate->GetType() != WindowType::HELPTEXTWINDOW 
&& pCandidate->GetFrameWeld() != pIgnore)
+if (pCandidate &&
+pCandidate->GetType() != WindowType::HELPTEXTWINDOW &&
+pCandidate->GetType() != WindowType::FLOATINGWINDOW &&
+pCandidate->GetFrameWeld() != pIgnore)
+{
 aTopLevels.push_back(pCandidate);
+}
 pTopWin = Application::GetNextTopLevelWindow(pTopWin);
 }
 for (auto& a : aTopLevels)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

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

New commits:
commit a4b84a25f6e921a166cb70cf1e440853bce63642
Author: Eike Rathke 
AuthorDate: Wed Oct 2 12:41:07 2019 +0200
Commit: Caolán McNamara 
CommitDate: Tue Oct 8 11:41:41 2019 +0200

Resolves: tdf#127873 accept ',' comma group separator in number entities 
again

Existing documents unwittingly may have used that as decimal
separator in such locales (though it never was as this is always
the en-US locale).

"Regression" from

commit 9336286a7ea5385541344f444e6f8702c85bdacb
CommitDate: Fri Nov 30 22:15:22 2018 +0100

[API CHANGE] Resolves: tdf#42518 new 
KParseTokens::GROUP_SEPARATOR_IN_NUMBER

Change-Id: I0ffc1b8ec7c1820fccd8277036c64093dddf82fe
Reviewed-on: https://gerrit.libreoffice.org/80023
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 2caa9d7ddcff3f6e380c306b737e9b5e9cdaf4c2)
Reviewed-on: https://gerrit.libreoffice.org/80046
Reviewed-by: Xisco Faulí 
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 3cd64af729db..90e356505cbf 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -376,8 +376,13 @@ void SmParser::NextToken()
 KParseTokens::IGNORE_LEADING_WS;
 
 // Continuing characters for numbers, may be any numeric or dot.
+// tdf#127873: additionally accept ',' comma group separator as too many
+// existing documents unwittingly may have used that as decimal separator
+// in such locales (though it never was as this is always the en-US locale
+// and the group separator is only parsed away).
 static const sal_Int32 coNumContFlags =
-coNumStartFlags & ~KParseTokens::IGNORE_LEADING_WS;
+(coNumStartFlags & ~KParseTokens::IGNORE_LEADING_WS) |
+KParseTokens::GROUP_SEPARATOR_IN_NUMBER;
 
 sal_Int32   nBufLen = m_aBufferString.getLength();
 ParseResult aRes;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 3e24e1a27b420d5efb83a39c7e9e71c4d7128638
Author: Michael Stahl 
AuthorDate: Fri Sep 27 15:18:25 2019 +0200
Commit: Caolán McNamara 
CommitDate: Tue Oct 8 11:40:54 2019 +0200

filter: XHTML: make "calc-heading-digit" a little faster

Exporting OpenDocument-v1.3-csd01-part3-schema.odt to XHTML fails with:

runtime error: file share/xslt/export/xhtml/body.xsl line 1404 element 
variable
xsltApplySequenceConstructor: A potential infinite template recursion was 
detected.
You can adjust xsltMaxDepth (--maxdepth) in order to raise the maximum 
number of nested template calls and variables/params (currently set to 3000).

Unfortunately the document contains this many headings, and the
calc-heading-digit computes the value by recursively looking at every
preceding heading in the document, without TCO apparently...

Try to improve this by using XPath to filter early the headings that are
effectively ignored in the 3rd xsl:when case anyway: the ones with a
level lower than the one for which the number is requested; this limits
the recursive calls to the number of headings on the same level.

Change-Id: Iddf5a91664402a57a0138731ddc9cebb06b0a126
Reviewed-on: https://gerrit.libreoffice.org/79720
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 86cca6b40ced4031dec4b708ac67b5cbe70cddf9)
Reviewed-on: https://gerrit.libreoffice.org/79841
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 059fff471b05c0e26589a1a621b467af5bc6a159)
Reviewed-on: https://gerrit.libreoffice.org/80008
Reviewed-by: Miklos Vajna 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index c21840e1689e..63357d1e9b38 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1401,9 +1401,10 @@
 
 
 
-
+
+
 
-
+
 
 
 
@@ -1421,11 +1422,7 @@
 
 
 
-
-
-
-
-
+this should not 
happen
 
 
 
___
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' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/inc/cuitabarea.hxx   |2 --
 cui/source/tabpages/tpcolor.cxx |7 +++
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 500ccb7d03e589268d02c8614479a81473337eaf
Author: Caolán McNamara 
AuthorDate: Sun Sep 22 19:16:52 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 8 11:41:20 2019 +0200

should use DialogController here

Change-Id: Ie0ad42e98d574d15172c6ed3a58714c3f87593cd
Reviewed-on: https://gerrit.libreoffice.org/79356
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 4b2dd2f3ac84..ba6fbc482197 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -660,8 +660,6 @@ class SvxColorTabPage : public SfxTabPage
 using TabPage::DeactivatePage;
 
 private:
-VclPtr mpTopDlg;
-
 const SfxItemSet&   rOutAttrs;
 
 XColorListRef pColorList;
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 4264f7cda73a..8e19d7262767 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -57,7 +57,6 @@ using namespace com::sun::star;
 
 SvxColorTabPage::SvxColorTabPage(TabPageParent pParent, const SfxItemSet& 
rInAttrs)
 : SfxTabPage(pParent, "cui/ui/colorpage.ui", "ColorPage", &rInAttrs)
-, mpTopDlg( GetParentDialog() )
 , rOutAttrs   ( rInAttrs )
 // All the horrific pointers we store and should not
 , pnColorListState( nullptr )
@@ -166,7 +165,6 @@ SvxColorTabPage::~SvxColorTabPage()
 
 void SvxColorTabPage::dispose()
 {
-mpTopDlg.clear();
 m_xValSetRecentListWin.reset();
 m_xValSetRecentList.reset();
 m_xValSetColorListWin.reset();
@@ -463,8 +461,9 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, 
weld::ComboBox&, void)
 pList->SetName(maPaletteManager.GetPaletteName());
 if(pList->Load())
 {
-SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( 
mpTopDlg.get() );
-SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( 
mpTopDlg.get() );
+SfxOkDialogController* pController = GetDialogController();
+SvxAreaTabDialog* pArea = 
dynamic_cast(pController);
+SvxLineTabDialog* pLine = 
dynamic_cast(pController);
 pColorList = pList;
 if( pArea )
 pArea->SetNewColorList(pList);
___
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' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/cuigaldlg.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d7dda384405487ae7edb3519201222cb12c08e26
Author: Caolán McNamara 
AuthorDate: Sat Sep 21 20:07:18 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 8 11:40:42 2019 +0200

set wait on the dialog, not the page parent

Change-Id: If782e774fee91a427d4bda575b2f404fd636f534
Reviewed-on: https://gerrit.libreoffice.org/79320
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 799440789bb2..18b16b9c227a 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -898,9 +898,8 @@ void TPGalleryThemeProperties::DoPreview()
 
 if (!m_aWndPreview.SetGraphic(_aURL))
 {
-GetParent()->LeaveWait();
+weld::WaitObject aWaitObject(GetDialogFrameWeld());
 ErrorHandler::HandleError(ERRCODE_IO_NOTEXISTSPATH, 
GetDialogFrameWeld());
-GetParent()->EnterWait();
 }
 #if HAVE_FEATURE_AVMEDIA
 else if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( 
INetURLObject::DecodeMechanism::Unambiguous ), "" ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/classmemaccess.cxx  |  133 ++
 compilerplugins/clang/test/classmemaccess.cxx |   36 +++
 include/basic/sbxvar.hxx  |7 -
 3 files changed, 173 insertions(+), 3 deletions(-)

New commits:
commit 8f4fdb405a8470b9d06ab14ced120da89b213e82
Author: Stephan Bergmann 
AuthorDate: Mon Oct 7 17:31:02 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 11:30:17 2019 +0200

New loplugin:classmemaccess

...to complement and improve upon GCC's -Wclass-memaccess.  See the comment 
at
the head of compilerplugins/clang/classmemaccess.cxx for details.  (It is 
not
yet clear to me whether we would want to get this upstreamed into Clang.)

35d21e4bf6f66b3bbc7a44fcf184cb721b524a94 "Remove redundant memsets" was a 
case
that benefited from looking through toplevel casts to void*.  (Though the 
code
in include/basic/sbxvar.hxx needs a slightly more verbose way to 
deliberately
silence the warning now.)

d03041e19215592f21ba1222d3cfa29e1f94260a "Drop bogus memsets" is one 
example of
various cases that GCC -Wclass-memaccess failed to catch due to the use of 
array
instead of pointer types.

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

diff --git a/compilerplugins/clang/classmemaccess.cxx 
b/compilerplugins/clang/classmemaccess.cxx
new file mode 100644
index ..56fe3fe39ab0
--- /dev/null
+++ b/compilerplugins/clang/classmemaccess.cxx
@@ -0,0 +1,133 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef LO_CLANG_SHARED_PLUGINS
+
+#include "check.hxx"
+#include "plugin.hxx"
+
+// Similar to GCC "warning: ‘void* memset(void*, int, size_t)’ writing to an 
object of non-trivial
+// type ‘...’; use assignment instead [-Wclass-memaccess]", but looking 
through toplevel cast to
+// void* and taking arrays into account in addition to pointers.  (Clang has
+// -Wdynamic-class-memaccess, but that only warns about memset overwriting a 
vtable pointer.  GCC
+// deliberately does not warn when there is a toplevel cast to void*, see
+//  "[8 Regression] cast 
to void* does not
+// suppress -Wclass-memaccess".)
+
+namespace
+{
+class ClassMemAccess final : public loplugin::FilteringPlugin
+{
+public:
+explicit ClassMemAccess(loplugin::InstantiationData const& data)
+: FilteringPlugin(data)
+{
+}
+
+bool VisitCallExpr(CallExpr* expr)
+{
+if (ignoreLocation(expr))
+{
+return true;
+}
+auto const fdecl = expr->getDirectCallee();
+if (fdecl == nullptr)
+{
+return true;
+}
+auto dc = loplugin::DeclCheck(fdecl).Function("memset");
+if (!(dc.GlobalNamespace() || dc.StdNamespace()))
+{
+return true;
+}
+if (expr->getNumArgs() != 3)
+{
+if (isDebugMode())
+{
+report(DiagnosticsEngine::Fatal,
+   "unexpected call to %0 with %1 instead of 3 arguments", 
expr->getExprLoc())
+<< fdecl << expr->getNumArgs() << expr->getSourceRange();
+report(DiagnosticsEngine::Note, "%0 declared here", 
fdecl->getLocation())
+<< fdecl << fdecl->getSourceRange();
+}
+return true;
+}
+auto e = expr->getArg(0)->IgnoreParenImpCasts();
+while (auto const cast = dyn_cast(e))
+{
+if 
(!loplugin::TypeCheck(cast->getTypeAsWritten()).Pointer().Void())
+{
+break;
+}
+e = cast->getSubExprAsWritten()->IgnoreParenImpCasts();
+}
+QualType t;
+if (auto const t1 = e->getType()->getAs())
+{
+t = t1->getPointeeType();
+}
+else if (e->getType()->isArrayType())
+{
+t = e->getType();
+while (auto const t2 = t->getAsArrayTypeUnsafe())
+{
+t = t2->getElementType();
+}
+}
+else
+{
+if (isDebugMode())
+{
+report(DiagnosticsEngine::Fatal,
+   "unexpected call to %0 with first argument of 
non-pointer type %1",
+   expr->getExprLoc())
+<< fdecl << e->getType() << expr->getSourceRange();
+report(DiagnosticsEngine::Note, "%0 declared here", 
fdecl->getLocation())
+<< f

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/.gitignore|2 ++
 compilerplugins/Makefile-clang.mk |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit c18280e6b2b22936f00e1c88606eadc6dfd9e100
Author: Stephan Bergmann 
AuthorDate: Tue Oct 8 08:19:19 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 8 11:29:46 2019 +0200

More generated files to take care of

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

diff --git a/compilerplugins/.gitignore b/compilerplugins/.gitignore
index d6a06791de79..0527f41e81f8 100644
--- a/compilerplugins/.gitignore
+++ b/compilerplugins/.gitignore
@@ -15,5 +15,7 @@
 /clang/sharedvisitor/sharedvisitor.d
 /clang/sharedvisitor/sharedvisitor.o
 /clang/sources-new.txt
+/clang/sources-shared-new.txt
+/clang/sources-shared.txt
 /clang/sources.txt
 obj
diff --git a/compilerplugins/Makefile-clang.mk 
b/compilerplugins/Makefile-clang.mk
index a132df918b50..0d599dcef59a 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -143,6 +143,8 @@ compilerplugins-clean:
 $(CLANGOUTDIR)/sharedvisitor/sharedvisitor.{cxx,d,o} \
 
$(CLANGOUTDIR)/sharedvisitor/{analyzer,generator}{$(CLANG_EXE_EXT),.d,.o} \
 $(CLANGOUTDIR)/sources-new.txt \
+$(CLANGOUTDIR)/sources-shared-new.txt \
+$(CLANGOUTDIR)/sources-shared.txt \
 $(CLANGOUTDIR)/sources.txt
 
 $(CLANGOUTDIR):
___
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' - cui/source svx/source

[Jim Raykowski (via logerrit)]

 cui/source/tabpages/paragrph.cxx|6 --
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx |4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit fe3c08b5905a837cb63f57cefc8e43787c96b9c6
Author: Jim Raykowski 
AuthorDate: Tue Jun 4 15:49:12 2019 -0800
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 8 11:19:53 2019 +0200

tdf#83618 Make line spacing values agree

Change-Id: I372a673bbad442d28314498248b12ce7f86fce09
Reviewed-on: https://gerrit.libreoffice.org/73737
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 
(cherry picked from commit 849b837d1a3b185a8dd893a8f6eaed53605bcab1)
Reviewed-on: https://gerrit.libreoffice.org/80314
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 9c9bca1963c8..67e1817b1c0e 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -54,6 +54,8 @@
 #include 
 #include 
 
+#include 
+
 const sal_uInt16 SvxStdParagraphTabPage::pStdRanges[] =
 {
 SID_ATTR_PARA_LINESPACE,// 10033
@@ -228,7 +230,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* 
rOutSet )
m_xLineDistAtMetricBox->get_value_changed_from_saved() ) )
 {
 nWhich = GetWhich( SID_ATTR_PARA_LINESPACE );
-MapUnit eUnit = pPool->GetMetric( nWhich );
+MapUnit eUnit = SfxViewFrame::Current()->GetPool().GetMetric( nWhich );
 SvxLineSpacingItem aSpacing(
 static_cast(GetItemSet().Get( nWhich )) 
);
 
@@ -719,7 +721,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl
 const SvxLineSpacingItem &rAttr
 )
 {
-MapUnit eUnit = GetItemSet().GetPool()->GetMetric( rAttr.Which() );
+MapUnit eUnit = SfxViewFrame::Current()->GetPool().GetMetric( 
rAttr.Which() );
 
 switch( rAttr.GetLineSpaceRule() )
 {
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx 
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 7bd655740926..2f582d9d8335 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -30,6 +30,8 @@
 #include 
 #include 
 
+#include 
+
 #define DEFAULT_LINE_SPACING  200
 #define FIX_DIST_DEF  283
 #define LINESPACE_1   100
@@ -125,7 +127,7 @@ void ParaLineSpacingControl::Initialize()
 
 if( eState >= SfxItemState::DEFAULT )
 {
-MapUnit eUnit = MapUnit::Map100thMM;
+MapUnit eUnit = SfxViewFrame::Current()->GetPool().GetMetric( 
currSPItem->Which() );
 meLNSpaceUnit = eUnit;
 
 switch( currSPItem->GetLineSpaceRule() )
___
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' - sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/qa/extras/ww8import/data/tdf124601.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx  |8 
 sw/source/filter/ww8/ww8graf.cxx  |   21 +
 sw/source/filter/ww8/ww8scan.cxx  |   10 ++
 sw/source/filter/ww8/ww8scan.hxx  |2 ++
 5 files changed, 37 insertions(+), 4 deletions(-)

New commits:
commit ea3a53adcb39b55fa1793136a3c579d774bc1354
Author: Miklos Vajna 
AuthorDate: Thu Sep 26 15:28:20 2019 +0200
Commit: Mike Kaganski 
CommitDate: Tue Oct 8 11:15:35 2019 +0200

Related: tdf#124601 DOC import: improve fLayoutInCell handling

There were 3 problems here:

First, SwWW8ImplReader::IsObjectLayoutInTableCell() should not use
m_nProduct to determine the Word version. It depends on an undocumented
field of the [MS-DOC] format and the bugdoc shows how it interprets a
Word 2007-produced document as a Word 97 one. Instead, parse the cswNew
field of the file header, which is a more or less documented way to find
out if this file was produced by >=2000 or 97.

See e.g.


where the Dop structure maps cswNew values to Word versions.

Second, parse the fLayoutInCell correctly: it's part of a bitfield, with
two variables: a bool and an other one which decides if the bool should
be read at all. The bugdoc's case was evaluated as false, so do the
proper parsing in that case and leave the existing logic as-is for now.

Third, there doesn't seem to be a reason to exclude the wrap-through
case for the fLayoutInCell -> follows-text-flow mapping. The bugdoc
shows that Word interprects fLayoutInCell the same way for wrap-though
objects, too.

(cherry picked from commit d630f69d90f15bc652a62648b05ea515de78d16a)

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

diff --git a/sw/qa/extras/ww8import/data/tdf124601.doc 
b/sw/qa/extras/ww8import/data/tdf124601.doc
new file mode 100644
index ..f617d4b26702
Binary files /dev/null and b/sw/qa/extras/ww8import/data/tdf124601.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 41b97b098951..363d6b76ee46 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -86,6 +86,14 @@ DECLARE_WW8IMPORT_TEST(testTdf107773, "tdf107773.doc")
 CPPUNIT_ASSERT_EQUAL(static_cast(0), xDrawPage->getCount());
 }
 
+DECLARE_WW8IMPORT_TEST(testTdf124601, "tdf124601.doc")
+{
+// Without the accompanying fix in place, this test would have failed, as 
the importer lost the
+// fLayoutInCell shape property for wrap-though shapes.
+CPPUNIT_ASSERT(getProperty(getShapeByName("Grafik 18"), 
"IsFollowingTextFlow"));
+CPPUNIT_ASSERT(getProperty(getShapeByName("Grafik 19"), 
"IsFollowingTextFlow"));
+}
+
 DECLARE_WW8IMPORT_TEST(testTdf112535, "tdf112535.doc")
 {
 SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 58f72514f147..050d2fae53e9 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2464,7 +2464,17 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const 
sal_uInt32 nLayoutInTable
 
 if ( m_bVer8 )
 {
-const sal_uInt16 nWWVersion = m_xWwFib->m_nProduct & 0xE000;
+sal_uInt16 nWWVersion = m_xWwFib->m_nProduct & 0xE000;
+if (nWWVersion == 0)
+{
+// 0 nProduct can happen for Word >97 as well, check cswNew in 
this case instead.
+if (m_xWwFib->m_cswNew > 0)
+{
+// This is Word >=2000.
+nWWVersion = 0x2000;
+}
+}
+
 switch ( nWWVersion )
 {
 case 0x: // version 8 aka Microsoft Word 97
@@ -2492,7 +2502,10 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const 
sal_uInt32 nLayoutInTable
 }
 else
 {
-bIsObjectLayoutInTableCell = false;
+// Documented in [MS-ODRAW], 2.3.4.44 "Group Shape Boolean 
Properties".
+bool fUsefLayoutInCell = (nLayoutInTableCell & 0x8000) 
>> 31;
+bool fLayoutInCell = (nLayoutInTableCell & 0x8000) >> 15;
+bIsObjectLayoutInTableCell = fUsefLayoutInCell && 
fLayoutInCell;
 }
 }
 break;
@@ -2693,8 +2706,8 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long 
nGrafAnchorCp )
 m_nInTable && IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell );
 
 // #i18732# - Switch on 'follow text flow', if object is laid out
-// inside table cell and its wrapping isn't 'SURROUND_THR

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

[Pedro (via logerrit)]

 loleaflet/css/toolbar.css |   34 --
 1 file changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 63c1f323526f89921c4d7e6f573d2f3c4cb8f4e5
Author: Pedro 
AuthorDate: Tue Oct 8 10:49:27 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 10:59:43 2019 +0200

Add generic checkbox and button styles for mobile

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

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index a3306b946..ccbd50fdf 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -32,11 +32,15 @@
float: left;
margin: 16px 0px;
}
-   input[type=checkbox]#enablecontour{
+   input[type=checkbox]:disabled{
+   border: 2px solid #ddd;
+   box-shadow: none;
+   }
+   input[type=checkbox]{
appearance: none;
width: 24px;
height: 24px;
-   margin: 10px 0px;
+   margin: 10px 0px !important;
-webkit-appearance: none;
 -moz-appearance: none;
 -o-appearance: none;
@@ -46,7 +50,7 @@
 outline: none;
 box-shadow: #0015 0px 0px 2px 1px;
}
-   input[type=checkbox]#enablecontour:checked{
+   input[type=checkbox]:checked{
background: url(images/lc_ok_white.svg) no-repeat center;
background-color: #0b87e7;
border-radius: 2px;
@@ -54,11 +58,11 @@
 outline: none;
 box-shadow: none;
}
-   input[type=checkbox]#enablecontour:before{
+   input[type=checkbox]:before{
width: 20px;
height: 20px;
}
-   input[type=checkbox]#enablecontour:after{
+   input[type=checkbox]:after{
top: -20px;
width: 16px;
}
@@ -67,17 +71,27 @@
vertical-align: baseline;
padding-left: 24px;
}
-   #enablecontour + button {
-   float: right;
-   margin: 24px 0px;
-height: 38px;
+   button{
+   height: 38px;
 border-radius: 4px;
-color: #0b87e7;
+color: #0b87e7 !important;
 font-weight: bold;
 background-color: #fff;
 text-transform: uppercase;
 border: 1px solid #0b87e7;
}
+   button:focus{
+   outline: none;
+   }
+   button:active{
+   outline: none;
+   border: none;
+   background-color: #ebf2fb;
+   }
+   #enablecontour + button {
+   float: right;
+   margin: 24px 0px;
+   }
#enablecontour + button + p {clear: both;}
#formulabar {
padding: 0px !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heiko Tietze (via logerrit)]

 cui/inc/tipoftheday.hrc |  377 +++-
 1 file changed, 185 insertions(+), 192 deletions(-)

New commits:
commit 7fef6c0fed10a3457f520689fa129926636c3103
Author: Heiko Tietze 
AuthorDate: Mon Oct 7 13:06:09 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Oct 8 10:57:59 2019 +0200

Tip of the day randomized

Necessary because of serial presentation after
I69b72b80d6d6afa25a1c4f01fa05bc60b5741db8

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

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index b0e8b11f23a2..def9fa36100b 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -43,222 +43,215 @@
 
 const std::tuple TIPOFTHEDAY_STRINGARRAY[] =
 {
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can open and save files stored 
on remote servers per CMIS."), "fps/ui/remotefilesdialog/RemoteFilesDialog", 
""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/guide/cmis-remote-files.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Tools > AutoCorrect > AutoCorrect Options… 
> Replace provides a list of common substitutions. Take a look and complete 
with your own replacements."), "cui/ui/acoroptionspage/AutocorrectOptionsPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/06040100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Writer can handle styles conditionally: 
paragraph styles that have different properties depending on the context."), 
"modules/swriter/ui/conditionpage/ConditionPage", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/01/05130100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "With File > Versions you can store multiple 
versions of the document in the same file. You can also open, delete, and 
compare previous versions."), "sfx/ui/versionsofdialog/VersionsOfDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/0119.html
- { NC_("RID_CUI_TIPOFTHEDAY", "You can create an illustration index from 
object names, not only from captions."), 
"cui/ui/objectnamedialog/ObjectNameDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/0519.html
- { NC_("RID_CUI_TIPOFTHEDAY", "To temporarily start with a fresh user 
profile, or to restore a non-working %PRODUCTNAME instance, go to Help > 
Restart in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/profile_safe_mode.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined 
template or current document per Tools > Options > %PRODUCTNAME Writer > Basic 
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/01040300.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Define texts that you often use as 
AutoText. You will be able to insert them by their name, shortcut or toolbar in 
any Writer document."), "modules/swriter/ui/autotext/AutoTextDialog", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/autotext.html
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can automatically add a 
numbered caption when you insert objects. See Tools > Options > %PRODUCTNAME 
Writer > AutoCaption."), "modules/swriter/ui/optcaptionpage/OptCaptionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/01041100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "You can sort paragraphs or table rows 
alphabetically or numerically per Tools > Sort."), 
"modules/swriter/ui/sortdialog/SortDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/01/0610.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Sections in %PRODUCTNAME Writer to 
protect part of a text, show/hide text, reuse parts from other documents, use 
different column layout."), "modules/swriter/ui/sectionpage/SectionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/01/04020100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Sheet > Fill Cells > Random Number to 
generate a random series based on various distributions."), 
"modules/scalc/ui/randomnumbergenerator/RandomNumberGeneratorDialog", 
"tipoftheday_c.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/02140700.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Format > Conditional Formatting > 
Manage in Calc to find out which cells have been defined with conditional 
formatting."), 
"modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog", 
"tipoftheday_c.png"}, 
//https://help.libreoffic

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

[Pedro (via logerrit)]

 loleaflet/css/toolbar.css |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 2eb98ee6f82be0ebd92c262f01c29e02468f26a3
Author: Pedro 
AuthorDate: Tue Oct 8 10:23:59 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 10:57:05 2019 +0200

Fix wrapping icon width when using smaller devices

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

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 494845995..a3306b946 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -1,3 +1,8 @@
+@media (max-width: 407px), (max-device-height: 407px) {
+   #buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel, 
#buttonnone, #buttonthrough{
+   padding: 18px 28px 18px 28px !important;
+   }
+}
 @media (max-width: 767px), (max-device-height: 767px) {
.w2ui-icon.users{
background-size: 20px !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro (via logerrit)]

 loleaflet/css/loleaflet.css|2 +-
 loleaflet/css/menubar.css  |8 
 loleaflet/css/toolbar.css  |   15 +++
 loleaflet/images/contacts-dark.svg |   32 +++-
 4 files changed, 47 insertions(+), 10 deletions(-)

New commits:
commit 25572e7e2510de7e8adf1cbf0704c225915599e3
Author: Pedro 
AuthorDate: Tue Oct 8 10:09:41 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 8 10:55:53 2019 +0200

Decrease toolbar-up icon spacing, update contacts svg color, fix icon 
alignment, tweak hamburger

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

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 4bf8b7f44..5858b19dc 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -238,7 +238,7 @@ body {
top: 41px !important;
}
#toolbar-hamburger {
-   width: 41px;
+   width: 36px;
}
#closebuttonwrapper {
display: none;
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index 47712c52f..50c7cee28 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -213,9 +213,9 @@
 margin: 2px 10px;
 position: relative;
 display: none;
-width: 21px;
+width: 17px;
 height: 21px;
-text-indent: 21px;
+text-indent: 17px;
 white-space: nowrap;
 overflow: hidden;
 cursor: pointer;
@@ -230,9 +230,9 @@
 .main-menu-btn-icon:after {
 position: absolute;
 top: 50%;
-left: 2px;
+left: 1px;
 height: 2px;
-width: 20px;
+width: 17px;
 background: #555;
 -webkit-transition: all 0.25s;
 transition: all 0.25s;
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 5dcbe05a7..494845995 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -1,4 +1,7 @@
 @media (max-width: 767px), (max-device-height: 767px) {
+   .w2ui-icon.users{
+   background-size: 20px !important;
+   }
#buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel, 
#buttonnone, #buttonthrough{
margin: 0;
 padding: 0;
@@ -99,10 +102,13 @@
border-right: none;
height: 35px !important;
}
-   #tb_actionbar_item_undo .w2ui-tb-image, #tb_actionbar_item_redo 
.w2ui-tb-image, #tb_actionbar_item_userlist, #tb_actionbar_item_mobile_wizard 
.w2ui-tb-image, #tb_actionbar_item_prev  .w2ui-tb-image, 
#tb_actionbar_item_next  .w2ui-tb-image, 
#tb_actionbar_item_insertion_mobile_wizard .w2ui-tb-image{
- min-width: 48px;
+   #tb_actionbar_item_undo .w2ui-tb-image, #tb_actionbar_item_redo 
.w2ui-tb-image, #tb_actionbar_item_mobile_wizard .w2ui-tb-image, 
#tb_actionbar_item_prev  .w2ui-tb-image, #tb_actionbar_item_next  
.w2ui-tb-image, #tb_actionbar_item_insertion_mobile_wizard .w2ui-tb-image, 
#tb_actionbar_item_insertcomment .w2ui-tb-image{
+ min-width: 38px;
+   }
+
+   #tb_actionbar_item_userlist table{
+   margin: -1px 0px auto 3px !important;
}
-   #tb_actionbar_item_userlist table{margin: auto !important;}
#toolbar-up .checked{
border-color: #fff;
}
@@ -114,6 +120,7 @@
left: 0;
right: 0;
padding-left: 9px;
+   padding-right: 0px;
text-align: center;
z-index: 999;
overflow: visible !important;
@@ -727,7 +734,7 @@ button.leaflet-control-search-next
 .w2ui-icon.sortascending{ background: url('images/lc_sortascending.svg') 
no-repeat center !important; }
 .w2ui-icon.sortdescending{ background: url('images/lc_sortdescending.svg') 
no-repeat center !important; }
 .w2ui-icon.selected{ background: url('images/lc_ok.svg') no-repeat center 
!important; }
-.w2ui-icon.users{ background: url('images/contacts-dark.svg') no-repeat center 
!important; }
+.w2ui-icon.users{ background: url('images/contacts-dark.svg') no-repeat 
center; }
 .w2ui-icon.fullscreen{ background: url('images/lc_fullscreen.svg') no-repeat 
center !important; }
 .w2ui-icon.closemobile{ background: url('images/lc_closedocmobile.svg') 
no-repeat center !important; }
 .w2ui-icon.closetoolbar{ background: url('images/close_toolbar.svg') no-repeat 
center !important; }
diff --git a/loleaflet/images/contacts-dark.svg 
b/loleaflet/images/contacts-dark.svg
index 227e76272..5ec3747e5 100644
--- a/loleaflet/images/contacts-dark.svg
+++ b/loleaflet/images/contacts-dark.svg
@@ -1 +1,31 @@
-http://www.w3.org/2000/svg"; viewbox="0 0 16 16" height="16" 
width="16" version="1.1">
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   id="svg4"

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py

[Xisco Fauli (via logerrit)]

 esc-reporting/esc-analyze.py |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 20612c555d2f96a3616d27fade27d2acbc14a020
Author: Xisco Fauli 
AuthorDate: Tue Oct 8 10:47:20 2019 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 8 10:47:20 2019 +0200

ESC: Compress archive files

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index 3326360..8085393 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -54,7 +54,8 @@ import datetime
 import json
 import xmltodict
 import re
-
+import gzip
+from shutil import copyfile
 
 
 def util_load_file(fileName, isJson=True):
@@ -876,7 +877,14 @@ def analyze_final():
 sFile = cfg['homedir'] + 'stats.json'
 util_dump_file(sFile, statList)
 x = myDay.strftime('%Y-%m-%d')
-os.system('cp '+ sFile + ' ' + cfg['homedir'] + 'archive/stats_' + x + 
'.json')
+
+sArchiveFile = cfg['homedir'] + 'archive/stats_' + x + '.json'
+copyfile(sFile, sArchiveFile)
+with open(sArchiveFile, 'rb') as f_in:
+  with gzip.open(sArchiveFile + '.gz', 'wb') as f_out:
+f_out.writelines(f_in)
+os.remove(sArchiveFile)
+
 if myDay.strftime('%w') == '4':
   if 'people' in statList:
 del statList['people']
@@ -950,7 +958,8 @@ def runAnalyze():
 global openhubData, bugzillaData, bugzillaESCData, gerritData, gitData, 
crashData, weekList, automateData, committersNames
 
 x = (cfg['nowDate'] - datetime.timedelta(days=7)).strftime('%Y-%m-%d')
-weekList = util_load_file(cfg['homedir'] + 'archive/stats_' + x + '.json')
+with gzip.open(cfg['homedir'] + 'archive/stats_' + x + '.json.gz', 'rb'):
+  weekList = util_load_file(x + '.json')
 
 openhubData = util_load_data_file(cfg['homedir'] + 
'dump/openhub_dump.json')
 bugzillaData = util_load_data_file(cfg['homedir'] + 
'dump/bugzilla_dump.json')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits