[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 22 commits - android/Bootstrap chart2/source external/libpng framework/source officecfg/registry sc/source sd/source sfx2/inc store/source svx/source unotools/source
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Sat May 16 18:43:12 UTC 2020
android/Bootstrap/Makefile.shared | 4
chart2/source/controller/main/ChartWindow.cxx | 1
chart2/source/controller/sidebar/ChartColorWrapper.cxx | 5
chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx | 7
chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx | 7
external/libpng/StaticLibrary_libpng.mk | 2
framework/source/services/ContextChangeEventMultiplexer.cxx | 24 ++-
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 11 +
sc/source/ui/undo/undoblk3.cxx | 4
sc/source/ui/view/gridwin3.cxx | 25 +++
sc/source/ui/view/spelldialog.cxx | 8 +
sc/source/ui/view/tabvwshe.cxx | 21 ++
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/func/fusel.cxx | 16 +-
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 23 +-
sd/source/ui/view/Outliner.cxx | 40 ++---
sfx2/inc/SfxRedactionHelper.hxx | 4
store/source/lockbyte.cxx | 1
store/source/storbase.hxx | 1
svx/source/dialog/hdft.cxx | 79 +++++-----
svx/source/tbxctrls/tbxcolor.cxx | 7
svx/source/tbxctrls/tbxcolorupdate.cxx | 2
unotools/source/i18n/resmgr.cxx | 8 +
23 files changed, 212 insertions(+), 90 deletions(-)
New commits:
commit b94a77b4efeda9802b21a3fb86e03b168f251a66
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Apr 30 13:05:28 2020 +0300
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:41:16 2020 +0100
Include <cstdlib> for std::malloc() and std::free()
Change-Id: Ice6964858f39709dfd7e55ed8d7fe2d71da6acad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93205
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index dfc7ad920a99..42662b8a4633 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -29,6 +29,7 @@
#include "object.hxx"
#include "storbase.hxx"
+#include <cstdlib>
#include <memory>
#include <string.h>
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 0c21acbb3ad3..0c9f9c77d974 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -33,6 +33,7 @@
#include <store/types.h>
+#include <cstdlib>
#include <memory>
#include <utility>
commit 7b1903ce4a1818f71943850cd76ba88b7d710ace
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sat Aug 10 11:33:58 2019 -0400
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:29:57 2020 +0100
sc: correctly update spelling markers on undo/redo
(cherry picked from commit 62eb6210895b24855b077fb0d89f182beac4a43c)
Reviewed-on: https://gerrit.libreoffice.org/85005
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
(cherry picked from commit a05fd0eb30767471c6d20c93e0fb8b3ff7c7eaee)
Change-Id: I946cede7967f454813f717273c4114d31167c8c6
Reviewed-on: https://gerrit.libreoffice.org/85681
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 1459e4dd482d..dbf07d4daabe 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -1234,6 +1234,10 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo
pRefDoc->CopyToDocument( 0, 0, 0,
rDoc.MaxCol(), rDoc.MaxRow(), nTabCount-1,
InsertDeleteFlags::CONTENTS, bMulti, rDoc, &aMarkData );
+
+ // Reset the spell checking results to re-check on paint, otherwise
+ // we show the previous spelling markers (or lack thereof on misspellings).
+ ScDocShell::GetViewData()->GetActiveWin()->ResetAutoSpell();
pDocShell->PostPaintGridAll();
}
else
commit b310c4ebee2753211230265a7cba546f6a9c2a3e
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sat Aug 10 12:26:40 2019 -0400
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:29:39 2020 +0100
sc: clear the spell checking markers after applying corrections
Change-Id: Ia3fc3b5a21d21b9b945ce72f397350a57859f107
(cherry picked from commit afa5f2b0edb43b36b1b4f0ab8f70ecbe638435e5)
Reviewed-on: https://gerrit.libreoffice.org/85006
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
(cherry picked from commit e1ca2b989bf4d124588c35f7f4a0bc3da3c1f58e)
Reviewed-on: https://gerrit.libreoffice.org/85682
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index b3dd30f436c3..719a00b5e48f 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -92,7 +92,12 @@ void ScSpellDialogChildWindow::ApplyChangedSentence( const svx::SpellPortions& r
{
if( mxEngine.get() && mpViewData )
if( EditView* pEditView = mpViewData->GetSpellingView() )
+ {
mxEngine->ApplyChangedSentence( *pEditView, rChanged, bRecheck );
+
+ // Reset the spell checking results to clear the markers.
+ mpViewData->GetActiveWin()->ResetAutoSpell();
+ }
}
void ScSpellDialogChildWindow::GetFocus()
commit 0d86287ab8b42ba66f19404fe8ff55fc10ddc7bf
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sat Jul 27 20:35:14 2019 -0400
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:29:24 2020 +0100
sc: spelldialog: lock before resetting the editview
Painting also resets the view and that can happen
asynchronously. When the spelldialog gets focus
it resets the editview if it detects it has changed,
which happens when, for example, another view is created.
(cherry picked from commit d91d940ad0319e0cc6e0080a903ac0a7e9f6ba88)
Reviewed-on: https://gerrit.libreoffice.org/85003
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
(cherry picked from commit 550c0a666e119c911b311c96f9185c11d8465dcb)
Change-Id: Ib23e332e4ba069e05787d1cc03ae23fe657b12c8
Reviewed-on: https://gerrit.libreoffice.org/85679
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index 4e48cf7698cb..b3dd30f436c3 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -34,6 +34,7 @@
#include <undoblk.hxx>
#include <gridwin.hxx>
#include <refupdatecontext.hxx>
+#include <vcl/svapp.hxx>
SFX_IMPL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow, SID_SPELL_DIALOG )
@@ -96,6 +97,8 @@ void ScSpellDialogChildWindow::ApplyChangedSentence( const svx::SpellPortions& r
void ScSpellDialogChildWindow::GetFocus()
{
+ SolarMutexGuard aGuard;
+
if( IsSelectionChanged() )
{
Reset();
commit 44f0ec8a385adbe27dc922fa06e0034096e61092
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Jan 21 13:52:31 2020 +0200
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:29:00 2020 +0100
tdf#129388: Avoid any actual painting of the slide sorter in the LOKit case
The JS code in Online creates its own slides sorter thing anyway, the
one is core is only needed as a data structure.
Change-Id: I0eeb79c523b72f7b616f11443198d5af82b70643
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87184
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88444
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 5923eb59dd97..a2ae43dae84d 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -41,6 +41,7 @@
#include <sdpage.hxx>
#include <Window.hxx>
+#include <comphelper/lok.hxx>
#include <vcl/svapp.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
@@ -568,14 +569,18 @@ void SlideSorterView::CompleteRedraw (
sdr::contact::ViewObjectContactRedirector* pRedirector)
{
(void)pRedirector;
+
+ if (comphelper::LibreOfficeKit::isActive())
+ return;
+
+ if (pDevice == nullptr || pDevice!=mrSlideSorter.GetContentWindow())
+ return;
+
#ifdef DEBUG_TIMING
const double nStartTime (gaTimer.getElapsedTime());
SAL_INFO("sd.timing", "SlideSorterView::CompleteRedraw start" << (mnLockRedrawSmph ? " locked" : ""));
#endif
- if (pDevice == nullptr || pDevice!=mrSlideSorter.GetContentWindow())
- return;
-
// The parent implementation of CompleteRedraw is called only when
// painting is locked. We do all the painting ourself. When painting
// is locked the parent implementation keeps track of the repaint
commit 5770302e36ec2ca60ea72ff725cbfeb44db73340
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Jan 21 13:43:07 2020 +0200
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:28:40 2020 +0100
Unbreak code compiled conditionally with DEBUG_TIMING
But it will no doubt break eventually again, and not be noticed until
next time somebody wants to try to see the information that defining
DEBUG_TIMING produces in this file. This kind of conditionally
compiled debug code is IMHO counter-productive. It is trivial to
temporarily add timing information output to any function
just locally in your own build. So I am not opposed to killing
this DEBUG_TIMING stuff here.
Change-Id: I940e0a40cf2bd9f319c53a6ccff7a2413d1323e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87183
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
(cherry picked from commit b81aa8a9930da5f93c074e7dd349c32ce49268de)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87255
Tested-by: Jenkins
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 32a8e8c2bc6b..5923eb59dd97 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -558,7 +558,7 @@ static const size_t gFrameTimeCount (10);
static size_t gFrameTimeIndex (0);
static ::std::vector<double> gFrameTimes (gFrameTimeCount, 0);
static double gFrameTimeSum (0);
-static const Rectangle gFrameTimeBox (10,10,150,20);
+static const ::tools::Rectangle gFrameTimeBox (10,10,150,20);
static double gnLastFrameStart = 0;
#endif
@@ -570,9 +570,7 @@ void SlideSorterView::CompleteRedraw (
(void)pRedirector;
#ifdef DEBUG_TIMING
const double nStartTime (gaTimer.getElapsedTime());
- SAL_INFO("sd",("SlideSorterView::CompleteRedraw start at %f, %s",
- nStartTime,
- mnLockRedrawSmph ? "locked" : "");
+ SAL_INFO("sd.timing", "SlideSorterView::CompleteRedraw start" << (mnLockRedrawSmph ? " locked" : ""));
#endif
if (pDevice == nullptr || pDevice!=mrSlideSorter.GetContentWindow())
@@ -597,16 +595,16 @@ void SlideSorterView::CompleteRedraw (
#ifdef DEBUG_TIMING
const double nEndTime (gaTimer.getElapsedTime());
- SAL_INFO("sd",("SlideSorterView::CompleteRedraw end at %f after %fms", nEndTime, (nEndTime-nStartTime)*1000);
+ SAL_INFO("sd.timing", "SlideSorterView::CompleteRedraw end after " << (nEndTime-nStartTime)*1000 << " ms");
gFrameTimeSum -= gFrameTimes[gFrameTimeIndex];
gFrameTimes[gFrameTimeIndex] = nStartTime - gnLastFrameStart;
gnLastFrameStart = nStartTime;
gFrameTimeSum += gFrameTimes[gFrameTimeIndex];
gFrameTimeIndex = (gFrameTimeIndex+1) % gFrameTimeCount;
- mrSlideSorter.GetContentWindow()->SetFillCOL_BLUE);
+ mrSlideSorter.GetContentWindow()->SetFillColor(COL_BLUE);
mrSlideSorter.GetContentWindow()->DrawRect(gFrameTimeBox);
- mrSlideSorter.GetContentWindow()->SetTextCOL_WHITE);
+ mrSlideSorter.GetContentWindow()->SetTextColor(COL_WHITE);
mrSlideSorter.GetContentWindow()->DrawText(
gFrameTimeBox,
OUString::number(1 / (gFrameTimeSum / gFrameTimeCount)),
commit 764b7dd63551a3f9d973e7c02d9086835f54e7ec
Author: Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Wed Mar 18 13:17:32 2020 +0300
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:27:29 2020 +0100
mobile: fix hyperlinks are not clickable on impress
Change-Id: I77a0ef263814359607d9c1d863f93c55f3493dbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90687
Tested-by: Andras Timar <andras.timar at collabora.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92211
Tested-by: Jenkins
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index b425727b67af..18616775ac9e 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -266,6 +266,14 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
mpWindow->ReleaseMouse();
+ // If tiled rendering, let client handles URL execution and early returns.
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ SfxViewShell& rSfxViewShell = mpViewShell->GetViewShellBase();
+ rSfxViewShell.libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED, aVEvt.pURLField->GetURL().toUtf8().getStr());
+ return true;
+ }
+
if (!lcl_followHyperlinkAllowed(rMEvt))
return true;
@@ -275,14 +283,6 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
mpWindow->ReleaseMouse();
- // If tiled rendering, let client handles URL execution and early returns.
- if (comphelper::LibreOfficeKit::isActive())
- {
- SfxViewShell& rSfxViewShell = mpViewShell->GetViewShellBase();
- rSfxViewShell.libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED, aVEvt.pURLField->GetURL().toUtf8().getStr());
- return true;
- }
-
if (rMEvt.IsMod1())
{
// Open in new frame
commit 30a9c349e7b7db7a44c2f8bc7d282fb92d9c6766
Author: Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Sun Feb 23 22:38:15 2020 +0530
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:26:32 2020 +0100
chart2: Fix the color uno command in ChartColorWrapper
The uno command for color depends on the property name. For LineColor
it should be .uno:XLineColor and the only other case is FillColor for
which it should be .uno:FillColor. Without this fix, on selecting
the chart for editing the first time, the sidebar line-color control
is disabled as a side-effect.
Change-Id: Ia71ed2f6d9e0f31523f1415f3ee089fd9d7d1b2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89304
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 9a80969f3115fc33778005861442f91127344dc0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89677
Tested-by: Jenkins
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index 31808b1a292b..128fc6848342 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -96,12 +96,15 @@ void ChartColorWrapper::updateModel(const css::uno::Reference<css::frame::XModel
void ChartColorWrapper::updateData()
{
+ static const OUStringLiteral aLineColor = "LineColor";
+ static const OUStringLiteral aCommands[2] = {".uno:XLineColor", ".uno:FillColor"};
+
css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel);
if (!xPropSet.is())
return;
css::util::URL aUrl;
- aUrl.Complete = ".uno:FillColor";
+ aUrl.Complete = (maPropertyName == aLineColor) ? aCommands[0] : aCommands[1];
css::frame::FeatureStateEvent aEvent;
aEvent.FeatureURL = aUrl;
commit e3fe5d4e0e63d99cb984f431b2ae8e6e9dfb077d
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Dec 20 16:17:13 2019 +0200
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:24:58 2020 +0100
tdf#126966: Tweak to get the "color bar" below text color controls to show up
(In iOS-only code, for now.)
No idea where the size that the thing has to fit inside comes from;
possibly one could alternatively have made that larger?
(cherry picked from commit 4de843ee0de7f9211f536dc6c4ee0d05bf26cc52)
Change-Id: Ifc1bec4c08c279403127056ecc61db4b80c03f96
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 9465e9aad2f6..547ae1c42757 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -93,7 +93,7 @@ namespace svx
if (!mbWideButton)
{
// usually the normal size is 16
- const long nIOSSize = 40;
+ const long nIOSSize = 32;
if (aItemSize.getWidth() < nIOSSize)
{
aItemSize.setWidth(nIOSSize);
commit f355f6bc922cc633f20cae49c2560f77fb03c3d2
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Dec 20 16:36:31 2019 +0200
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:24:36 2020 +0100
Get rid of two pointless #defines
Change-Id: I7479f4f1c440bba1dd9f922c4df32ab877e0a803
Reviewed-on: https://gerrit.libreoffice.org/85619
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
(cherry picked from commit 83fedc02f2d831774c12d60097a99e968b56dc5e)
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 5336f070aadf..3a17e38820a4 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -34,11 +34,8 @@ namespace svx
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
- #define TOOLBAR_RESNAME "private:resource/toolbar/"
- #define PROPNAME_LAYOUTMANAGER "LayoutManager"
-
ToolboxAccess::ToolboxAccess( const OUString& rToolboxName ) :
- m_sToolboxResName ( TOOLBAR_RESNAME )
+ m_sToolboxResName ( "private:resource/toolbar/" )
{
m_sToolboxResName += rToolboxName;
@@ -50,7 +47,7 @@ namespace svx
Reference< XFrame > xFrame = SfxViewFrame::Current()->GetFrame().GetFrameInterface();
Reference< XPropertySet > xFrameProps( xFrame, UNO_QUERY );
if ( xFrameProps.is() )
- xFrameProps->getPropertyValue( PROPNAME_LAYOUTMANAGER ) >>= m_xLayouter;
+ xFrameProps->getPropertyValue( "LayoutManager" ) >>= m_xLayouter;
}
catch ( Exception const & )
{
commit e910d27a297c9d05945ff160b2aac559f8703df5
Author: Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Thu Dec 19 11:35:13 2019 +0300
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:24:16 2020 +0100
lok: Improve hyperlink insertion to cell with content
Change-Id: I520939dd5b44236cf835108ee2bc96c29f0a9677
Reviewed-on: https://gerrit.libreoffice.org/85509
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Marco Cecchetti <marco.cecchetti at collabora.com>
Tested-by: Marco Cecchetti <marco.cecchetti at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89707
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index fece06e7d8ec..d3fa448a6538 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -18,6 +18,7 @@
*/
#include <comphelper/string.hxx>
+#include <comphelper/lok.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/editview.hxx>
@@ -172,7 +173,11 @@ void ScTabViewShell::InsertURLField( const OUString& rName, const OUString& rURL
ScInputHandler* pHdl = pScMod->GetInputHdl( rViewData.GetViewShell() );
bool bSelectFirst = false;
- if ( !pScMod->IsEditMode() )
+ bool bIsEditMode = pScMod->IsEditMode();
+ int nSelInd = 1;
+ OUString sSeltext(GetSelectionText());
+
+ if ( !bIsEditMode )
{
if ( !SelectionEditable() )
{
@@ -189,12 +194,24 @@ void ScTabViewShell::InsertURLField( const OUString& rName, const OUString& rURL
EditView* pTableView = pHdl->GetTableView();
OSL_ENSURE( pTopView || pTableView, "No EditView" );
+ // Check if user selected a whole cell by single click,
+ // cell has content, and user didn't change the name/text
+ // of the link something different than the content via the hyperlink dialog.
+ // If true, assign the given hyperlink to the whole content
+ // instead of inserting a duplicate, or appending the url.
+ if (comphelper::LibreOfficeKit::isActive() && !bIsEditMode && !bSelectFirst
+ && pTableView && !sSeltext.isEmpty() && sSeltext == rName)
+ {
+ nSelInd = sSeltext.getLength();
+ bSelectFirst = true;
+ }
+
if ( bSelectFirst )
{
if ( pTopView )
pTopView->SetSelection( ESelection(0,0,0,1) );
if ( pTableView )
- pTableView->SetSelection( ESelection(0,0,0,1) );
+ pTableView->SetSelection( ESelection(0,0,0,nSelInd) );
}
pHdl->DataChanging();
commit 6e69240276aa8aa473e3417a819a7d5a8a6bc796
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Dec 18 23:07:11 2019 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:23:57 2020 +0100
android: Use correct path for the .mo resource files.
They are read by boost::locale, so we cannot have them as normal assets,
instead we have to have them in asset's 'unpack', so that they are
unpacked to the filesystem and can be read as normal files.
Change-Id: I5e902ee4b5294d1f693f51993b8bc2069f1c835a
Reviewed-on: https://gerrit.libreoffice.org/85442
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85458
Tested-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index 786c83df2e7b..197816b21fc3 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -51,6 +51,10 @@
#include <unordered_map>
#include <memory>
+#ifdef ANDROID
+#include <osl/detail/android-bootstrap.h>
+#endif
+
#if defined(_WIN32) && defined(DBG_UTIL)
#include <o3tl/char16_t2wchar_t.hxx>
#include <prewin.h>
@@ -123,11 +127,15 @@ namespace Translate
boost::locale::generator gen;
gen.characters(boost::locale::char_facet);
gen.categories(boost::locale::message_facet | boost::locale::information_facet);
+#if defined(ANDROID)
+ OString sPath(OString(lo_get_app_data_dir()) + "/program/resource");
+#else
OUString uri("$BRAND_BASE_DIR/$BRAND_SHARE_RESOURCE_SUBDIR/");
rtl::Bootstrap::expandMacros(uri);
OUString path;
osl::File::getSystemPathFromFileURL(uri, path);
OString sPath(OUStringToOString(path, osl_getThreadTextEncoding()));
+#endif
gen.add_messages_path(sPath.getStr());
#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID
// allow gettext to find these .mo files e.g. so gtk dialogs can use them
commit 8a1abb99996df357ea806248f6cc9e0ab476d4c1
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Wed Dec 11 18:19:43 2019 -0500
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:23:40 2020 +0100
chart2: clear listener parents in dispose
Change-Id: Icdab125589ab0f55255f683a1ea39e036de661b1
Reviewed-on: https://gerrit.libreoffice.org/84997
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index 2a3bd54a85e6..0971fd079ca1 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -74,6 +74,7 @@ ChartWindow::~ChartWindow()
void ChartWindow::dispose()
{
+ m_pWindowController = nullptr;
m_pViewShellWindow.clear();
vcl::Window::dispose();
}
diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx
index b000e55c5aa6..0fa0b793b5b6 100644
--- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx
+++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx
@@ -27,12 +27,17 @@ ChartSidebarModifyListener::~ChartSidebarModifyListener()
void ChartSidebarModifyListener::modified(const css::lang::EventObject& /*rEvent*/)
{
- mpParent->updateData();
+ if (mpParent)
+ mpParent->updateData();
}
void ChartSidebarModifyListener::disposing(const css::lang::EventObject& /*rEvent*/)
{
+ if (!mpParent)
+ return;
+
mpParent->modelInvalid();
+ mpParent = nullptr;
}
} }
diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
index e037fc39aa5f..e7d74c656a55 100644
--- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
+++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
@@ -41,6 +41,9 @@ ChartSidebarSelectionListener::~ChartSidebarSelectionListener()
void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObject& rEvent)
{
+ if (!mpParent)
+ return;
+
bool bCorrectObjectSelected = false;
css::uno::Reference<css::frame::XController> xController(rEvent.Source, css::uno::UNO_QUERY);
@@ -66,6 +69,10 @@ void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObjec
void ChartSidebarSelectionListener::disposing(const css::lang::EventObject& /*rEvent*/)
{
+ if (!mpParent)
+ return;
+
+ mpParent = nullptr;
}
void ChartSidebarSelectionListener::setAcceptedTypes(const std::vector<ObjectType>& aTypes)
commit 59d56949c6bb847e398489af00639f5144c288ff
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Mon Dec 9 10:48:15 2019 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:23:17 2020 +0100
lok: calc: zoom: object selection - is unreliable
Change-Id: Ic8e61c56bdf38bbb74f179fa36075bdd3a601249
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90068
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti <marco.cecchetti at collabora.com>
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 1fbc48e0ae6f..7c6c6ad9a55e 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -41,6 +41,11 @@ bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt)
FuPoor* pDraw = pViewData->GetView()->GetDrawFuncPtr();
if (pDraw && !pViewData->IsRefMode())
{
+ MapMode aDrawMode = GetDrawMapMode();
+ MapMode aOldMode = GetMapMode();
+ if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+ SetMapMode( aDrawMode );
+
pDraw->SetWindow( this );
Point aLogicPos = PixelToLogic(rMEvt.GetPosPixel());
if ( pDraw->IsDetectiveHit( aLogicPos ) )
@@ -54,6 +59,9 @@ bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt)
if ( bRet )
UpdateStatusPosSize();
}
+
+ if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+ SetMapMode( aOldMode );
}
// cancel draw with right key
@@ -73,6 +81,11 @@ bool ScGridWindow::DrawMouseButtonUp(const MouseEvent& rMEvt)
FuPoor* pDraw = pView->GetDrawFuncPtr();
if (pDraw && !pViewData->IsRefMode())
{
+ MapMode aDrawMode = GetDrawMapMode();
+ MapMode aOldMode = GetMapMode();
+ if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+ SetMapMode( aDrawMode );
+
pDraw->SetWindow( this );
bRet = pDraw->MouseButtonUp( rMEvt );
@@ -89,6 +102,9 @@ bool ScGridWindow::DrawMouseButtonUp(const MouseEvent& rMEvt)
if ( !pView->IsPaintBrushLocked() )
pView->ResetBrushDocument(); // end paint brush mode if not locked
}
+
+ if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+ SetMapMode( aOldMode );
}
return bRet;
@@ -99,10 +115,19 @@ bool ScGridWindow::DrawMouseMove(const MouseEvent& rMEvt)
FuPoor* pDraw = pViewData->GetView()->GetDrawFuncPtr();
if (pDraw && !pViewData->IsRefMode())
{
+ MapMode aDrawMode = GetDrawMapMode();
+ MapMode aOldMode = GetMapMode();
+ if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+ SetMapMode( aDrawMode );
+
pDraw->SetWindow( this );
bool bRet = pDraw->MouseMove( rMEvt );
if ( bRet )
UpdateStatusPosSize();
+
+ if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode )
+ SetMapMode( aOldMode );
+
return bRet;
}
else
commit 3ad3024b84e53753865387c0af4a63e98d2f0559
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Thu Aug 22 16:43:54 2019 -0400
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:22:29 2020 +0100
sd: define three columns for the slide transition pane
Instead of calculating extra space
Change-Id: I26e763e5db0ff05fb1bd6f64f3054d8ef88a2156
Reviewed-on: https://gerrit.libreoffice.org/82526
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Henry Castro <hcastro at collabora.com>
(cherry picked from commit 58a3e6ad29eb7b616f03737265ef7a25afe83a36)
Reviewed-on: https://gerrit.libreoffice.org/82673
Tested-by: Jenkins
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 0a7459b66fea..05c11354f4b4 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -379,7 +379,7 @@ public:
EnableFullItemMode( false );
set_hexpand( true );
set_vexpand( true );
- SetExtraSpacing( 2 );
+ SetColCount(3);
}
virtual ~TransitionPane() override { disposeOnce(); }
commit 9277ce2128f1aaacdcb41448797c83395603ca0c
Author: Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Fri Nov 22 13:16:25 2019 +0300
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:22:10 2020 +0100
Add command .uno:EditChart
This is an alias uno command which let's users
switch to edit mode for the selected object.
It is equivalent to the Edit > Object > Edit menu item,
which is a parameterized variation of the .uno:ObjectMenue
command, and is created dynamically each time user opens
the Edit menu.
Change-Id: I131fab1758d2689cecfa3adc79b7868abf67b5e0
Reviewed-on: https://gerrit.libreoffice.org/83463
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 28ec0c674e3a..08ff909b5db5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -7146,6 +7146,17 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:EditChart" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">~Edit Chart</value>
+ </prop>
+ <prop oor:name="TargetURL" oor:type="xs:string">
+ <value>.uno:ObjectMenue?VerbID:short=-1</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
</node>
</node>
</oor:component-data>
commit 2f32e19a6aca8e3361a05a4c333c39225775ef9e
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun May 26 14:59:53 2019 -0400
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:21:53 2020 +0100
svx: LOK: convert background child-dialogs to async
(cherry picked from commit 625a8c33bd95b4068838caef19af28c5404c59ce)
Reviewed-on: https://gerrit.libreoffice.org/83633
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit 46a1c0a733f1e664823dcb483796dbcc8a743f4a)
Change-Id: I682ab039ce3732aa973e0fe371c191f1ca1b9ef7
Reviewed-on: https://gerrit.libreoffice.org/85677
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index c936e91ee740..b92dc46e8deb 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -624,54 +624,59 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, weld::Button&, void)
*pBBSet,
mbEnableDrawingLayerFillStyles));
- if(RET_OK == pDlg->Execute() && pDlg->GetOutputItemSet())
- {
- SfxItemIter aIter(*pDlg->GetOutputItemSet());
-
- for (const SfxPoolItem* pItem = aIter.GetCurItem(); pItem; pItem = aIter.NextItem())
+ pDlg->StartExecuteAsync([&](sal_Int32 nResult) {
+ if (nResult == RET_OK && pDlg->GetOutputItemSet())
{
- if(!IsInvalidItem(pItem))
- {
- pBBSet->Put(*pItem);
- }
- }
+ SfxItemIter aIter(*pDlg->GetOutputItemSet());
- {
- drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
-
- if(mbEnableDrawingLayerFillStyles)
+ for (const SfxPoolItem* pItem = aIter.GetCurItem(); pItem; pItem = aIter.NextItem())
{
- // create FillAttributes directly from DrawingLayer FillStyle entries
- aFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(*pBBSet));
+ if(!IsInvalidItem(pItem))
+ {
+ pBBSet->Put(*pItem);
+ }
}
- else
+
{
- const sal_uInt16 nWhich = GetWhich(SID_ATTR_BRUSH);
+ drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
- if(pBBSet->GetItemState(nWhich) == SfxItemState::SET)
+ if (mbEnableDrawingLayerFillStyles)
{
- // create FillAttributes from SvxBrushItem
- const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(pBBSet->Get(nWhich));
- SfxItemSet aTempSet(*pBBSet->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
-
- setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
- aFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(aTempSet));
+ // create FillAttributes directly from DrawingLayer FillStyle entries
+ aFillAttributes.reset(
+ new drawinglayer::attribute::SdrAllFillAttributesHelper(*pBBSet));
+ }
+ else
+ {
+ const sal_uInt16 nWhich = GetWhich(SID_ATTR_BRUSH);
+
+ if (pBBSet->GetItemState(nWhich) == SfxItemState::SET)
+ {
+ // create FillAttributes from SvxBrushItem
+ const SvxBrushItem& rItem
+ = static_cast<const SvxBrushItem&>(pBBSet->Get(nWhich));
+ SfxItemSet aTempSet(*pBBSet->GetPool(),
+ svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
+
+ setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
+ aFillAttributes.reset(
+ new drawinglayer::attribute::SdrAllFillAttributesHelper(aTempSet));
+ }
}
- }
- if(SID_ATTR_PAGE_HEADERSET == nId)
- {
- //m_aBspWin.SetHdColor(rItem.GetColor());
- m_aBspWin.setHeaderFillAttributes(aFillAttributes);
- }
- else
- {
- //m_aBspWin.SetFtColor(rItem.GetColor());
- m_aBspWin.setFooterFillAttributes(aFillAttributes);
+ if (SID_ATTR_PAGE_HEADERSET == nId)
+ {
+ //m_aBspWin.SetHdColor(rItem.GetColor());
+ m_aBspWin.setHeaderFillAttributes(aFillAttributes);
+ }
+ else
+ {
+ //m_aBspWin.SetFtColor(rItem.GetColor());
+ m_aBspWin.setFooterFillAttributes(aFillAttributes);
+ }
}
}
-
- }
+ });
UpdateExample();
}
commit 08bf8101717ea293a1340b442c710de6a5dfc6dd
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sat May 25 12:15:00 2019 -0400
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:21:38 2020 +0100
sd: LOK: don't access null dispatcher
With SpellDialog invoked from multiple views
the dispatcher can indeed be null in some cases.
(cherry picked from commit b18c12f4dbe91379cef795d559c2d84341e32a75)
Reviewed-on: https://gerrit.libreoffice.org/83631
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit 188ff24ee209d4f5f8ec6a6ae82241e56f0be6d5)
Change-Id: Ic2950e70383a77d63438341fac174d369748b36a
Reviewed-on: https://gerrit.libreoffice.org/85676
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index d3bd66724c7b..e67d823e9a11 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1402,29 +1402,33 @@ void SdOutliner::EnterEditMode (bool bGrabFocus)
// Make FuText the current function.
SfxUInt16Item aItem (SID_TEXTEDIT, 1);
std::shared_ptr<sd::ViewShell> pViewShell (mpWeakViewShell.lock());
- pViewShell->GetDispatcher()->ExecuteList(SID_TEXTEDIT,
- SfxCallMode::SYNCHRON | SfxCallMode::RECORD, { &aItem });
-
- if (mpView->IsTextEdit())
+ if (pViewShell && pViewShell->GetDispatcher())
{
- // end text edition before starting it again
- mpView->SdrEndTextEdit();
- }
+ pViewShell->GetDispatcher()->ExecuteList(
+ SID_TEXTEDIT, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, {&aItem});
- // To be consistent with the usual behaviour in the Office the text
- // object that is put into edit mode would have also to be selected.
- // Starting the text edit mode is not enough so we do it here by
- // hand.
- mpView->UnmarkAllObj (pPV);
- mpView->MarkObj (mpSearchSpellTextObj, pPV);
+ if (mpView->IsTextEdit())
+ {
+ // end text edition before starting it again
+ mpView->SdrEndTextEdit();
+ }
- mpSearchSpellTextObj->setActiveText( mnText );
+ // To be consistent with the usual behaviour in the Office the text
+ // object that is put into edit mode would have also to be selected.
+ // Starting the text edit mode is not enough so we do it here by
+ // hand.
+ mpView->UnmarkAllObj(pPV);
+ mpView->MarkObj(mpSearchSpellTextObj, pPV);
- // Turn on the edit mode for the text object.
- mpView->SdrBeginTextEdit(mpSearchSpellTextObj, pPV, mpWindow, true, this, pOutlinerView, true, true, bGrabFocus);
+ mpSearchSpellTextObj->setActiveText(mnText);
- SetUpdateMode(true);
- mbFoundObject = true;
+ // Turn on the edit mode for the text object.
+ mpView->SdrBeginTextEdit(mpSearchSpellTextObj, pPV, mpWindow, true, this,
+ pOutlinerView, true, true, bGrabFocus);
+
+ SetUpdateMode(true);
+ mbFoundObject = true;
+ }
}
ESelection SdOutliner::GetSearchStartPosition() const
commit 0188224f0465856e19e861c637b41697ca828a8e
Author: Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Mon Nov 25 21:55:31 2019 +0300
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:20:59 2020 +0100
tdf#94288: Show chart props sidebar on activation
Change-Id: I2119b59e3b4e36a34c9925cb624558d2da49ecc7
Reviewed-on: https://gerrit.libreoffice.org/83715
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index b64a4e131717..c6da6be6b0d1 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -163,11 +163,29 @@ void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
// the current context.
if (rxEventFocus.is() && pFocusDescriptor!=nullptr)
{
+ if (pFocusDescriptor->msCurrentApplicationName.isEmpty() && pFocusDescriptor->msCurrentContextName.isEmpty()
+ && rxEventFocus.is())
+ {
+ Reference< lang::XServiceInfo > xServInfo( rxEventFocus, uno::UNO_QUERY_THROW );
+ if( xServInfo.is() && xServInfo->getImplementationName() == "com.sun.star.comp.chart2.ChartController")
+ {
+ css::ui::ContextChangeEventObject aEvent (
+ rxEventFocus,
+ "com.sun.star.chart2.ChartDocument",
+ "Chart");
+ rxListener->notifyContextChangeEvent(aEvent);
+
+ return;
+ }
+
+ }
+
css::ui::ContextChangeEventObject aEvent (
- nullptr,
- pFocusDescriptor->msCurrentApplicationName,
- pFocusDescriptor->msCurrentContextName);
+ nullptr,
+ pFocusDescriptor->msCurrentApplicationName,
+ pFocusDescriptor->msCurrentContextName);
rxListener->notifyContextChangeEvent(aEvent);
+
}
}
commit 9bc800ce75f0420ad279b67d2d1913bf62f772cc
Author: Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Tue Nov 26 14:53:44 2019 +0300
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:20:46 2020 +0100
Comment the searchInMetaFile method
Change-Id: Icbf1f852f8deb5392a820b46db4da19aef30f491
Reviewed-on: https://gerrit.libreoffice.org/83757
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
diff --git a/sfx2/inc/SfxRedactionHelper.hxx b/sfx2/inc/SfxRedactionHelper.hxx
index 65835d75f8eb..d30284791439 100644
--- a/sfx2/inc/SfxRedactionHelper.hxx
+++ b/sfx2/inc/SfxRedactionHelper.hxx
@@ -98,6 +98,10 @@ public:
* */
static PageMargins getPageMarginsForCalc(const css::uno::Reference<css::frame::XModel>& xModel);
+ /*
+ * Used to find the text portions to be redacted. Returns a list of rectangles to cover those
+ * areas to be redacted. Probably the most crucial part of the auto-redaction process.
+ * */
static void searchInMetaFile(const RedactionTarget* pRedactionTarget, const GDIMetaFile& rMtf,
std::vector<tools::Rectangle>& aRedactionRectangles,
const uno::Reference<XComponent>& xComponent);
commit f858556a21163c3b86072803ebf0b69676fd36c4
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Nov 1 17:57:17 2019 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:19:56 2020 +0100
android: Fix linking of liblo-native-code.so on aarch64.
Forces gold as the linker; but according to the switches that were used,
I suppose gold was used previously anyway, so hopefully not really a
problem.
Change-Id: I7bc54abf0d3b4b3d86d53e4ea6f01146cf196216
Reviewed-on: https://gerrit.libreoffice.org/81905
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
(cherry picked from commit fa145a035fbab652ec8f3ee870e44e43dd1d770a)
Reviewed-on: https://gerrit.libreoffice.org/81915
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 7126e9a2f506..00ad02285cf1 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -51,7 +51,7 @@ NSSLIBS = freebl3 \
WHOLELIBS = \
-Wl,--whole-archive \
$(addprefix -l,$(strip \
- juh \
+ $(if $(ENABLE_JAVA),juh) \
)) \
-Wl,--no-whole-archive
@@ -59,7 +59,7 @@ WHOLELIBS = \
$(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
@echo "Linking $@"
mkdir -p $(OBJLOCAL)
- $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi -landroid_support $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
+ $(CXX) -fuse-ld=gold -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi $(if $(filter-out arm64-v8a,$(ANDROID_APP_ABI)),-landroid_support) $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
$(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
commit 6fffa2d6ee64fce95fac204eb6d6db0f0cefc75d
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Nov 1 17:56:01 2019 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 16 19:19:42 2020 +0100
android: Add also aarch64 to avoid linking errors.
Change-Id: Ifdd696dc37de541bc722807054cd4ba7b862c175
Reviewed-on: https://gerrit.libreoffice.org/81904
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
(cherry picked from commit 620f39b816e3f10a4e047bb4f5ed5f4fdad2b364)
Reviewed-on: https://gerrit.libreoffice.org/81914
diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk
index cb8428ec4dae..fe2364141b3b 100644
--- a/external/libpng/StaticLibrary_libpng.mk
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
UnpackedTarball/libpng/pngwrite \
UnpackedTarball/libpng/pngwtran \
UnpackedTarball/libpng/pngwutil \
- $(if $(filter ARM ARM64,$(CPUNAME)),\
+ $(if $(filter ARM AARCH64 ARM64,$(CPUNAME)),\
UnpackedTarball/libpng/arm/arm_init \
UnpackedTarball/libpng/arm/filter_neon_intrinsics \
UnpackedTarball/libpng/arm/palette_neon_intrinsics \
More information about the Libreoffice-commits
mailing list