bin/lo-all-static-libs | 1 +
chart2/source/controller/main/ControllerCommandDispatch.cxx | 10 ++++++++++
sc/source/ui/view/tabvwshb.cxx | 5 ++++-
sw/source/uibase/shells/drwtxtsh.cxx | 2 +-
sw/source/uibase/uiview/viewdraw.cxx | 2 ++
5 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit acbb1b92d53ba77528b941254e5a08b3a39a89b4
Author: Dennis Francis <dennis.fran...@collabora.com>
AuthorDate: Tue Mar 24 18:26:16 2020 +0530
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Sat May 16 19:46:42 2020 +0100
lokit: Mark document as modified on chart insert/edit...
immediately at least in the case when LOKit is active.
This is to allow prompt emission of .uno:ModifiedStatus=true statechange
message from lokit to the client. Without this, in online the chart
insert/modify related changes may not get saved on client exit.
(cherry picked from commit 75adb624dfff4659e6f3099a1720fbd697560f9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91036
Tested-by: Jenkins
Reviewed-by: Dennis Francis <dennis.fran...@collabora.com>
Change-Id: I8c38a37cc455f74a70d43b6aaa3e5035b283d47f
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index f8474959a619..4508a83adb4d 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -36,6 +36,9 @@
#include <vcl/svapp.hxx>
#include <sal/log.hxx>
#include <tools/diagnose_ex.h>
+#include <comphelper/lok.hxx>
+#include <sfx2/viewsh.hxx>
+#include <sfx2/objsh.hxx>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/frame/XStorable.hpp>
@@ -806,6 +809,13 @@ void SAL_CALL ControllerCommandDispatch::modified( const
lang::EventObject& aEve
if( bUpdateCommandAvailability )
updateCommandAvailability();
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ if (SfxViewShell* pViewShell = SfxViewShell::Current())
+ if (SfxObjectShell* pObjSh = pViewShell->GetObjectShell())
+ pObjSh->SetModified();
+ }
+
CommandDispatch::modified( aEvent );
}
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 967f18f7f280..614dc1a3a083 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -362,7 +362,10 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
break;
case SID_INSERT_DIAGRAM:
- FuInsertChart(*this, pWin, pView, pDrModel, rReq, LINK( this,
ScTabViewShell, DialogClosedHdl ));
+ FuInsertChart(*this, pWin, pView, pDrModel, rReq,
+ LINK( this, ScTabViewShell, DialogClosedHdl ));
+ if (comphelper::LibreOfficeKit::isActive())
+ pDocSh->SetModified();
break;
case SID_INSERT_OBJECT:
commit 4306eb8775e322c6ff0fd52f9b099723ac1a35a5
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
AuthorDate: Sun Mar 22 11:45:08 2020 -0400
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Sat May 16 19:45:33 2020 +0100
sw: keep the cursor visible after creating SwDrawTextShell
For some mysterious reason the cursor was forced to
become hidden after creating SwDrawTextShell, which
is used to edit the text on shapes. Doing this
didn't have a negative effect on desktop, because
the cursor was shown anyway at a later point.
However, for LOK, the cursor was not restored. This
was unexpected as the clients didn't know editing
was possible (and on mobile wouldn't even show
the keyboard).
There doesn't seem to be any ill-effect to leaving
the cursor enabled in all cases after creating
an SwDrawTextShell instance.
Change-Id: Ifae8d533ef48b2146a451d58d729e46f5248be71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90897
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
(cherry picked from commit a50d20b114b4d418cebb968af4b40645dfac087a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90947
Tested-by: Jenkins
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx
b/sw/source/uibase/shells/drwtxtsh.cxx
index 674ed73378bf..9715313196e6 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -130,9 +130,9 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) :
SwWrtShell &rSh = GetShell();
SetPool(rSh.GetAttrPool().GetSecondaryPool());
+ // Initialize and show cursor to start editing.
Init();
- rSh.NoEdit();
SetName("ObjectText");
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::DrawText));
}
commit 82f79a4158ef5a6796f622bb535f15a0615aa29e
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
AuthorDate: Sat Mar 21 11:48:40 2020 -0400
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Sat May 16 19:45:20 2020 +0100
sw: check for null SdrObject before accessing
Change-Id: I30f1cc658450982232feea10dbe9c5bfefe07d91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90896
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
(cherry picked from commit 8ed4ac6152c96280616a784b47c4f75df147501a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90946
Tested-by: Jenkins
diff --git a/sw/source/uibase/uiview/viewdraw.cxx
b/sw/source/uibase/uiview/viewdraw.cxx
index 6866b31cd3b1..465ab3dfc82d 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -668,6 +668,8 @@ bool SwView::AreOnlyFormsSelected() const
{
// Except controls, are still normal draw objects selected?
SdrObject *pSdrObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
+ if (!pSdrObj)
+ continue;
if (!HasOnlyObj(pSdrObj, SdrInventor::FmForm))
{
commit fc39c16c9c901df3281f92230bfe7e7ab8812729
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Mon Apr 13 19:13:22 2020 +0300
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Sat May 16 19:44:25 2020 +0100
Add libepubgen
Change-Id: I2c3d19dff2da99b030f6a7e1a8b62be509e073da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92118
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92132
Tested-by: Jenkins
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 04d76cbe9a96..0fcea02eb53e 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -75,6 +75,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
$WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
$WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
$WORKDIR/UnpackedTarball/libcdr/src/lib/.libs/*.a \
+ $WORKDIR/UnpackedTarball/libepubgen/src/lib/.libs/*.a \
$WORKDIR/UnpackedTarball/libexttextcat/src/.libs/*.a \
$WORKDIR/UnpackedTarball/libmspub/src/lib/.libs/*.a \
$WORKDIR/UnpackedTarball/libmwaw/src/lib/.libs/*.a \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
