[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/ui/sidebar/SlideBackground.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit d1734718ae5b4e739b1db711479c6e969902fc7c
Author: Xisco Fauli
AuthorDate: Mon Nov 19 14:28:57 2018 +0100
Commit: Xisco Faulí
CommitDate: Thu Nov 22 13:30:01 2018 +0100
tdf#117108: do not show the master view button after updating the sidebar
Change-Id: I3e6af9c2a99e4aa288b8d6e99b43b09d35a6
Reviewed-on: https://gerrit.libreoffice.org/63570
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
(cherry picked from commit 60e6593f042e3e2869ece89cc43390b3254b3205)
Reviewed-on: https://gerrit.libreoffice.org/63698
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index cf5fea5e708e..16a16ff4c14d 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -281,6 +281,7 @@ void SlideBackground::HandleContextChange(
if (maContext == maDrawOtherContext)
{
+mpEditMaster->Hide();
mpFillStyle->Show();
mpBackgroundLabel->Show();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 86d6ef3371b425d8ec1347902c54597c2749cae7 Author: Xisco Fauli AuthorDate: Tue Nov 6 12:01:34 2018 +0100 Commit: Xisco Faulí CommitDate: Thu Nov 8 14:16:46 2018 +0100 tdf#121198: fix crash in SdrPage::GetPageNum() Regression from 9348b322a5c230dfcc2231661b73e480b130fcd9 Change-Id: Ibf9d6b65f0dbcc3a751e3ac5f3dbc28d908d6c25 Reviewed-on: https://gerrit.libreoffice.org/62952 Tested-by: Jenkins (cherry picked from commit ebd24b39eee5ac72d33ad731e31469cf8f330631) Reviewed-on: https://gerrit.libreoffice.org/62965 Reviewed-by: Xisco Faulí diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index acd93d26aec1..4d468944 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -220,7 +220,7 @@ bool InsertionIndicatorHandler::IsInsertionTrivial ( // to check that the insertion position is not directly in front or // directly behind the selection and thus moving the selection there // would not change the model. -return nInsertionIndex >= nFirstIndex && nInsertionIndex < nLastIndex; +return nInsertionIndex >= nFirstIndex && nInsertionIndex <= (nLastIndex+1); } bool InsertionIndicatorHandler::IsInsertionTrivial (const sal_Int8 nDndAction) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/core/stlpool.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 8bef4f3033fff8eb12a58d3fa4cdd49076e18cf2
Author: Michael Stahl
AuthorDate: Sat Oct 27 19:56:00 2018 +0200
Commit: Michael Stahl
CommitDate: Sun Oct 28 11:33:44 2018 +0100
tdf#120376 sd: fix duplicated styles on copy/paste
Unfortunately the comparison was inverted, so a style is copied
iff it already exists, which is clearly the reviewer's fault...
(regression from 57db6e24b5ad43d447c30e44a112c74c7e75b46b)
Change-Id: I3425982feb08e980eca9243cc16120897b65a70f
Reviewed-on: https://gerrit.libreoffice.org/62436
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit be9f3db2306150a37ef18e4ccc8d8f4a1934c5c1)
Reviewed-on: https://gerrit.libreoffice.org/62449
Reviewed-by: Armin Le Grand
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 884c9ffa1e68..43d66378f80a 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -652,7 +652,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool&
rSourcePool, SfxStyleFamily
pExistingSheet =
GetStyleSheetByPositionInIndex(aSheetsWithName.front()).get();
if (!rRenameSuffix.isEmpty() &&
-pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(),
false))
+!pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(),
false))
{
// we have found a sheet with the same name, but different
contents. Try to find a new name.
// If we already have a sheet with the new name, and it is
equal to the one in the source pool,
@@ -664,7 +664,8 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool&
rSourcePool, SfxStyleFamily
aTmpName = aName + rRenameSuffix +
OUString::number(nSuffix);
pExistingSheet = Find(aTmpName, eFamily);
nSuffix++;
-} while( pExistingSheet &&
pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), false) );
+} while (pExistingSheet &&
+
!pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), false));
aName = aTmpName;
bAddToList = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/filter/eppt/pptx-epptooxml.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8b09fbc6db3527e0de0af37e9efa43eda377fa05 Author: Caolán McNamara AuthorDate: Fri Oct 19 10:06:37 2018 +0100 Commit: Michael Stahl CommitDate: Fri Oct 26 22:04:28 2018 +0200 index validity check looks dubious Change-Id: Iccbbeab3b52d1d7369c19e333756713b42e83830 Reviewed-on: https://gerrit.libreoffice.org/62021 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index d90ea3a60d7b..a4e95a6224ee 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -2082,7 +2082,7 @@ void PowerPointExport::ImplWriteNotes(sal_uInt32 nPageNum) .makeStringAndClear()); // add slide implicit relation to notes -if (mpSlidesFSArray.size() >= nPageNum) +if (nPageNum < mpSlidesFSArray.size()) addRelation(mpSlidesFSArray[ nPageNum ]->getOutputStream(), oox::getRelationship(Relationship::NOTESSLIDE), OUStringBuffer() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/ui/view/ToolBarManager.cxx | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 45519023aa44940a68f40643fdff6551a2b7adb3
Author: Caolán McNamara
AuthorDate: Tue Oct 16 21:10:22 2018 +0100
Commit: Noel Grandin
CommitDate: Thu Oct 18 16:20:13 2018 +0200
Resolves: tdf#119997 toolbar layout unlock doesn't refresh ui
because lock was taken when toolbar layout wasn't set yet
Change-Id: I695493d4fb637210c72b9ce53af9f089c79b0c7b
Reviewed-on: https://gerrit.libreoffice.org/61849
Tested-by: Jenkins
Tested-by: Xisco Faulí
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/view/ToolBarManager.cxx
b/sd/source/ui/view/ToolBarManager.cxx
index 91db27743b2a..dab18fdf8316 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -59,12 +59,10 @@ class ToolBarRules;
/** Lock of the frame::XLayoutManager.
*/
-class LayouterLock
+struct LayouterLock
{
-public:
explicit LayouterLock (const Reference& rxLayouter);
~LayouterLock();
-private:
Reference mxLayouter;
};
@@ -579,6 +577,10 @@ void ToolBarManager::Implementation::SetValid (bool bValid)
Reference xFrameProperties (xFrame,
UNO_QUERY_THROW);
Any aValue
(xFrameProperties->getPropertyValue("LayoutManager"));
aValue >>= mxLayouter;
+// tdf#119997 if mpSynchronousLayouterLock was created before
mxLayouter was
+// set then update it now that its available
+if (mpSynchronousLayouterLock &&
!mpSynchronousLayouterLock->mxLayouter)
+mpSynchronousLayouterLock->mxLayouter = mxLayouter;
}
catch (const RuntimeException&)
{
@@ -821,11 +823,14 @@ void ToolBarManager::Implementation::Update (
// Note that the lock count may have been increased since
// entering this method. In that case one of the next
// UnlockUpdate() calls will post the UpdateCallback.
-if (mnPendingUpdateCall==nullptr && mnLockCount==0)
+if (mnLockCount==0)
{
mpAsynchronousLayouterLock = std::move(pLocalLayouterLock);
-mnPendingUpdateCall = Application::PostUserEvent(
-LINK(this,ToolBarManager::Implementation,UpdateCallback));
+if (mnPendingUpdateCall==nullptr)
+{
+mnPendingUpdateCall = Application::PostUserEvent(
+
LINK(this,ToolBarManager::Implementation,UpdateCallback));
+}
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/ui/sidebar/SlideBackground.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit dd7fd51a053be6e664a1a358501dd27e0118f221
Author: Xisco Fauli
AuthorDate: Sun Sep 23 11:37:33 2018 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Sun Sep 23 22:58:55 2018 +0200
tdf#120069: Do not crash changing background color in draw
Regression from c57f10b67fceef47d304d74dce93be7389a7720c,
where I disabled the master background in Impress but not in Draw,
and both share some common code.
Besides, disable master background in draw as well. Follow-up of bug
tdf#111306
Change-Id: I772382b5ed8eff3a35d001ea498810613137d172
Reviewed-on: https://gerrit.libreoffice.org/60914
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index 4e9a7a1bee04..cf5fea5e708e 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -278,6 +278,17 @@ void SlideBackground::HandleContextChange(
else if ( IsDraw() )
{
mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_LABEL));
+
+if (maContext == maDrawOtherContext)
+{
+mpFillStyle->Show();
+mpBackgroundLabel->Show();
+}
+else if (maContext == maDrawMasterContext)
+{
+mpFillStyle->Hide();
+mpBackgroundLabel->Hide();
+}
}
}
@@ -285,7 +296,7 @@ void SlideBackground::Update()
{
eFillStyle nPos =
static_cast(mpFillStyle->GetSelectedEntryPos());
-if(maContext != maImpressOtherContext)
+if(maContext != maImpressOtherContext && maContext != maDrawOtherContext)
nPos = NONE;
SfxObjectShell* pSh = SfxObjectShell::Current();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/ui/sidebar/SlideBackground.cxx | 20 +---
1 file changed, 5 insertions(+), 15 deletions(-)
New commits:
commit 955eb9d196bdb626f876f02b3961aac79cce3849
Author: Xisco Fauli
AuthorDate: Sat Jul 14 20:37:56 2018 +0200
Commit: Tamás Zolnai
CommitDate: Mon Aug 13 11:24:20 2018 +0200
tdf#111306: Hide background widget in sidebar in master and notes view
Background is lost if it's changed from the sidebar in master or
notes view, thus hide the widget for now, until the real issue is fixed.
Keep the insert image button visible as it works.
The background can be changed from the page properties dialog
Change-Id: Ic3f6116cb0997024096343cb20ec40ac07307918
Reviewed-on: https://gerrit.libreoffice.org/57440
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
(cherry picked from commit c57f10b67fceef47d304d74dce93be7389a7720c)
Reviewed-on: https://gerrit.libreoffice.org/58184
Reviewed-by: Tamás Zolnai
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index 7ce4bb4e6aa7..4e9a7a1bee04 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -243,11 +243,11 @@ void SlideBackground::HandleContextChange(
mpMasterSlide->Disable();
mpDspMasterBackground->Disable();
mpDspMasterObjects->Disable();
-mpFillStyle->Show();
-mpBackgroundLabel->Show();
+mpFillStyle->Hide();
+mpBackgroundLabel->Hide();
mpInsertImage->Show();
}
-else if ( maContext == maImpressHandoutContext )
+else if ( maContext == maImpressHandoutContext || maContext ==
maImpressNotesContext )
{
mpCloseMaster->Hide();
mpEditMaster->Hide();
@@ -269,17 +269,7 @@ void SlideBackground::HandleContextChange(
mpBackgroundLabel->Show();
mpInsertImage->Show();
}
-else if (maContext == maImpressNotesContext)
-{
-mpCloseMaster->Hide();
-mpEditMaster->Hide();
-mpMasterSlide->Disable();
-mpDspMasterBackground->Disable();
-mpDspMasterObjects->Disable();
-mpFillStyle->Show();
-mpBackgroundLabel->Show();
-mpInsertImage->Hide();
-}
+
// Need to do a relayouting, otherwise the panel size is not updated
after show / hide controls
sfx2::sidebar::Panel* pPanel =
dynamic_cast(GetParent());
if(pPanel)
@@ -295,7 +285,7 @@ void SlideBackground::Update()
{
eFillStyle nPos =
static_cast(mpFillStyle->GetSelectedEntryPos());
-if(maContext == maImpressHandoutContext)
+if(maContext != maImpressOtherContext)
nPos = NONE;
SfxObjectShell* pSh = SfxObjectShell::Current();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/ui/unoidl/unopage.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f8e408f03039e8bbaa70158a8fae200927bc4b67
Author: Noel Grandin
AuthorDate: Fri Jul 27 21:20:13 2018 +0200
Commit: Noel Grandin
CommitDate: Sun Jul 29 23:07:07 2018 +0200
tdf#118948 - Date format in Impress header/footer is lost when saving
regression from
commit 7d14555ef7e867c5b1a0e195e3ef056885697c59
convert SvxDateFormat to scoped enum
Change-Id: I9d365c710a20054e249433f54635068f713afa72
Reviewed-on: https://gerrit.libreoffice.org/58202
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 93baa280670367ef6246d837080706f2c80eab0b)
Reviewed-on: https://gerrit.libreoffice.org/58289
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 657a23ddc7ce..2e9f5dd128d1 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1280,7 +1280,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const
OUString& PropertyName )
case WID_PAGE_DATETIMEFORMAT:
{
auto const & rSettings = GetPage()->getHeaderFooterSettings();
-sal_Int32 x = static_cast(rSettings.meDateFormat) &
(static_cast(rSettings.meTimeFormat) << 4);
+sal_Int32 x = static_cast(rSettings.meDateFormat) |
(static_cast(rSettings.meTimeFormat) << 4);
aAny <<= x;
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/ui/func/fuscale.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4cf90e58fe2319a2017e51499817d0866829bd28
Author: Caolán McNamara
AuthorDate: Mon Jul 16 12:00:24 2018 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Jul 16 17:31:12 2018 +0200
tdf#118769 parent of modal dialog not set
Change-Id: Ie3b1a626eb0ca4f39e015a18fede935b36ed194e
Reviewed-on: https://gerrit.libreoffice.org/57493
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 5b2505985d27..e1b2dba2a4bc 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -108,7 +108,7 @@ void FuScale::DoExecute( SfxRequest& rReq )
aNewAttr.Put( *pZoomItem );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-ScopedVclPtr pDlg(pFact ?
pFact->CreateSvxZoomDialog(nullptr, aNewAttr) : nullptr);
+ScopedVclPtr pDlg(pFact ?
pFact->CreateSvxZoomDialog(rReq.GetFrameWeld(), aNewAttr) : nullptr);
if (pDlg)
{
pDlg->SetLimits( static_cast(mpWindow->GetMinZoom()),
static_cast(mpWindow->GetMaxZoom()) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/ui/view/drtxtob.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit bee7d89904b1547185e1e7be4fb731d7fe7d8563
Author: Ilhan Yesil
AuthorDate: Fri Jun 8 10:49:41 2018 +0200
Commit: Thorsten Behrens
CommitDate: Fri Jul 13 19:13:46 2018 +0200
tdf#118063 Impress: Deselected spacing remained checked
The state of the attributes for spacing are now read and set
correctly.
Change-Id: I661c00e247b55c64ea39c03db77dab9fa0775852
Reviewed-on: https://gerrit.libreoffice.org/55455
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 5b72382516d94bc27321461297ded92f8af8112d)
Reviewed-on: https://gerrit.libreoffice.org/57388
Tested-by: Jenkins
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index ad3bb02d0c16..f31169e959dd 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -567,12 +567,18 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
{
case 100:
rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, true ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, false ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, false ) );
break;
case 150:
rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, true ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, false ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, false ) );
break;
case 200:
rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, true ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, false ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, false ) );
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/ui/inc/DrawViewShell.hxx |4
sd/source/ui/view/drviews4.cxx |9 +
sd/source/ui/view/drviewsa.cxx |2 ++
sd/source/ui/view/drviewsh.cxx |5 -
4 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 85ba2c3193d83c84e584ea8c008fdd4019cb8e2b
Author: Justin Luth
Date: Tue May 22 19:32:25 2018 +0300
tdf#109190 sd: only MakeVisible on mouseclick-up
Since MakeVisible() is called on both
mousebuttom-down and mousebuttom-up,
this also eliminates useless double-processing.
In the problematic use case, the user pressed Ctrl-A to select
a tall table. When clicking to de-select the cells, the contents
moved around in unexpected ways because the rectangle is at the
end of the selection during down-click, not at the cursor location.
The re-arrangment of the screen invalidates the mouse-up,
so the intended cursor position shifted.
In the bug's calendar example, position the screen so that items
20-31 are hidden, select the whole month, and then click
on 5. Before, it would move the screen down to show 31, and
the cursor would be placed at the screen position where 5
had originally been. Solved by only repositioning on
mouse-click up.
However, mouseButtonDown must still be honoured while
selecting, otherwise you can't select off-screen content
with the mouse.
This backport contains part of NFC commit b25f5909,
missing initialization commit
93bfc16d7d520042f58fa26968a2a9adbbe2afbe
and cancel MouseSelecting commit
e1bab58778fd501f2d2aff7e5dc61eefdc229c9a
Change-Id: I41c90a7b113dc59a3c8c385139a5bb41993646fa
Reviewed-on: https://gerrit.libreoffice.org/56262
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-on: https://gerrit.libreoffice.org/56799
Tested-by: Justin Luth
Reviewed-by: Christian Lohmaier
diff --git a/sd/source/ui/inc/DrawViewShell.hxx
b/sd/source/ui/inc/DrawViewShell.hxx
index 1db285351c1b..92d02af8b7f9 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -116,6 +116,8 @@ public:
virtual voidMouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
override;
virtual voidMouseButtonDown(const MouseEvent& rMEvt, ::sd::Window*
pWin) override;
virtual voidCommand(const CommandEvent& rCEvt, ::sd::Window* pWin)
override;
+boolIsMouseButtonDown() { return mbMouseButtonDown; }
+boolIsMouseSelecting() { return mbMouseSelecting; }
virtual voidResize() override;
@@ -445,6 +447,8 @@ private:
css::uno::Reference< css::lang::XEventListener > mxScannerListener;
rtl::Reference mxClipEvtLstnr;
bool mbPastePossible;
+bool mbMouseButtonDown;
+bool mbMouseSelecting;
virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint) override;
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index a8e2621a1834..5ac6d84df981 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -269,6 +269,9 @@ void DrawViewShell::FreshNavigatrTree()
void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt,
::sd::Window* pWin)
{
+mbMouseButtonDown = true;
+mbMouseSelecting = false;
+
// We have to check if a context menu is shown and we have an UI
// active inplace client. In that case we have to ignore the mouse
// button down event. Otherwise we would crash (context menu has been
@@ -300,6 +303,9 @@ void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt,
void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
{
+if ( IsMouseButtonDown() )
+mbMouseSelecting = true;
+
if ( !IsInputLocked() )
{
if ( mpDrawView->IsAction() )
@@ -409,6 +415,8 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt,
::sd::Window* pWin)
void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
{
+mbMouseButtonDown = false;
+
if ( !IsInputLocked() )
{
bool bIsSetPageOrg = mpDrawView->IsSetPageOrg();
@@ -446,6 +454,7 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt,
::sd::Window* pWin)
//else the corresponding entry is set false .
FreshNavigatrTree();
}
+mbMouseSelecting = false;
}
void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index f894b074bd8f..7b8c1ce2b194 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -112,6 +112,8 @@ DrawViewShell::DrawViewShell( ViewShellBase&
rViewShellBase, vcl::Window* pParen
[this] () { return this->GetSidebarContextName(); },
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/ui/view/drviewsh.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9c18b25f19855709cf4adddeefe4c9765f2f4f4f
Author: Justin Luth
Date: Fri Jun 1 08:55:26 2018 +0300
tdf#109190 sd MakeVisible: fix flattened loop logic error
There is a bug in the conversion from
while(rRect.Bottom() > aNewPos.Y() + aVisAreaSize.Height())
to
const long distBottom(rRect.Bottom() - aNewPos.Y() + aVisAreaSize.Height());
While the bottom of the object is lower on the page than
the visual Top position plus the height of the screen,
(in other words, it isn't in the visible range of the screen),
move the screen down by the size of the object and try again.
The loop could first be finished when the shape bottom is
exactly at the bottom of the screen:
rRect.Bottom() = aNewPos.Y() + screen Height.
or rRect.Bottom() - (aNewPos.Y() + aVisAreaSize.Height()) = 0
or rRect.Bottom() - aNewPos.Y() - aVisAreaSize.Height() = 0
Change-Id: I762a39df3cdcd5689c8f6742797a9f7b38ddb384
Reviewed-on: https://gerrit.libreoffice.org/55156
Reviewed-by: Justin Luth
Tested-by: Justin Luth
Reviewed-by: Armin Le Grand
(cherry picked from commit 13328a36d68c4141219d9cc549e6d76e108e6076)
Reviewed-on: https://gerrit.libreoffice.org/55393
Tested-by: Jenkins
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index e8b4d3185a58..40454bc331c6 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -133,7 +133,7 @@ void DrawViewShell::MakeVisible(const ::tools::Rectangle&
rRect, vcl::Window& rW
}
else
{
-const long distRight(rRect.Right() - aNewPos.X() +
aVisAreaSize.Width());
+const long distRight(rRect.Right() - aNewPos.X() -
aVisAreaSize.Width());
if(distRight > 0)
{
@@ -178,7 +178,7 @@ void DrawViewShell::MakeVisible(const ::tools::Rectangle&
rRect, vcl::Window& rW
}
else
{
-const long distBottom(rRect.Bottom() - aNewPos.Y() +
aVisAreaSize.Height());
+const long distBottom(rRect.Bottom() - aNewPos.Y() -
aVisAreaSize.Height());
if(distBottom > 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-1' - sd/source
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |4 1 file changed, 4 insertions(+) New commits: commit 23eb3e106ad17608c79a35cdde251e037f1a2373 Author: Caolán McNamara Date: Mon Jun 11 12:31:08 2018 +0100 tdf#118068 InsertionIndicator should be temporary its original use is during a drag/drop operation so its expected to be in use just for a temporary scope, so End after Start Change-Id: I3efdc4079ef7e1466b49e027fed0698715b5fd58 Reviewed-on: https://gerrit.libreoffice.org/55620 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 7dc9488a8e61..79738a04389d 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -1095,12 +1095,16 @@ bool NormalModeHandler::ProcessButtonDownEvent ( pInsertionIndicatorHandler->UpdatePosition( rDescriptor.maMousePosition, InsertionIndicatorHandler::MoveMode); + mrSlideSorter.GetController().GetSelectionManager()->SetInsertionPosition( pInsertionIndicatorHandler->GetInsertionPageIndex()); mrSlideSorter.GetViewShell()->GetDispatcher()->Execute( SID_INSERTPAGE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); + +pInsertionIndicatorHandler->End(Animator::AM_Immediate); + break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source
sd/source/ui/view/drviews2.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 1c0e0646321e276c6be22a13a70e37fdf93430e1
Author: Caolán McNamara
Date: Tue Jun 5 10:59:23 2018 +0100
tdf#117940 setting resize shape while text edit active not recorded in undo
Change-Id: I0887a1caea96f3efe897c304cde0520d59da6c59
Reviewed-on: https://gerrit.libreoffice.org/55325
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index e6b9b92604fa..c0d53ba92a55 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1657,6 +1657,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_TEXTATTR_DLG:
{
+if (mpDrawView->IsTextEdit())
+mpDrawView->SdrEndTextEdit();
SetCurrentFunction( FuTextAttrDlg::Create( this,
GetActiveWindow(), mpDrawView.get(), GetDoc(), rReq ) );
Cancel();
rReq.Ignore ();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
