[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/source
sd/source/ui/view/DocumentRenderer.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit a834a0251f53a561e450fd3c58059bdcfaad8584
Author: Caolán McNamara
AuthorDate: Tue Mar 24 14:51:09 2020 +
Commit: Michael Weghorn
CommitDate: Wed Apr 8 15:40:40 2020 +0200
selecting multiple slides and using "print..." doesn't set selection as
range
start impress, copy the default slide a few times, select more than
one slide and use "print..."
"slides" is selected, but just the first selected slide is shown in the
range
since...
commit 76e22667625ce8d16dfaa8617a199b774e987a70
Date: Thu Jun 14 23:29:34 2018 -0300
Configures page range in print dialog
where
aPageRange = aBuf.getStr()
was removed, but if that line is removed then the surrounding loop
of "for (auto pPage: *pPageSelection)" just accumulates text
in the OUStringBuffer to then discard it and no longer makes sense
perhaps this was an oversight rather than a planned change.
Change-Id: I39e76c70714ee39d189016179fb1d13a71ec74ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91169
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit f8e2fe46fa7cd2df90853b0aca31cfda49a06d3d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91395
Reviewed-by: Michael Weghorn
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index c8a1456d1c7b..cf0f50e03a3c 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -617,6 +617,7 @@ namespace {
else
aBuf.append(',');
aBuf.append(OUString::number(pPage->GetPageNum() / 2 +
1));
+aPageRange = aBuf.getStr();
}
nPrintRange = 1;
}
___
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' - sd/source
sd/source/ui/view/drtxtob1.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 6677c1e6aa3465bc4eb39897447391ac1ac0a0eb
Author: Julien Nabet
AuthorDate: Wed Mar 25 23:28:47 2020 +0100
Commit: Michael Stahl
CommitDate: Wed Apr 1 10:37:55 2020 +0200
tdf#131571: fix crash when clicking the "Text direction from top to bottom"
See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=159006
cause of invalidation of pOLV here:
https://bugs.documentfoundation.org/show_bug.cgi?id=131571#c4
Change-Id: Ibf79e1fa4ebe94470afb2042cdc007bc05010b28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91078
Tested-by: Jenkins
(cherry picked from commit 83ae778d2e7350a15db2f8fbfde7521ab905d0aa)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91116
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index dee90a13098c..3cc41d104bbb 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -382,6 +382,9 @@ void TextObjectBar::Execute( SfxRequest )
case SID_TEXTDIRECTION_TOP_TO_BOTTOM:
{
mpView->SdrEndTextEdit();
+// tdf#131571: SdrEndTextEdit invalidates pTextEditOutlinerView,
the pointer retrieved for pOLV
+// so reinitialize pOLV
+pOLV=mpView->GetTextEditOutlinerView();
SfxItemSet aAttr( mpView->GetDoc().GetPool(),
svl::Items{} );
aAttr.Put( SvxWritingModeItem(
nSlot == SID_TEXTDIRECTION_LEFT_TO_RIGHT ?
___
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' - sd/source
sd/source/ui/view/drtxtob1.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cdc438e60ffb96ca85e9dd7060ba2b68db3821d4
Author: Jim Raykowski
AuthorDate: Sun Mar 8 21:47:40 2020 -0800
Commit: Xisco Faulí
CommitDate: Wed Mar 11 15:11:16 2020 +0100
tdf#131208 Don't try to set cursor focus after style apply
It seems after a style is applied, the outliner view pointer points to
an OutlinerView that has been removed. This results in a crash when
trying to access OutlinerView functions to set cursor focus to the
document. Avoid this by checking if a style has just been applied.
Change-Id: Idda11567506fcc60a830dce70b86e12e2079c7a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90198
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
(cherry picked from commit b39c08773db9bea776001c6ccf043684c2dfe08d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90267
Reviewed-by: Xisco Faulí
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 01b30cbe35ff..dee90a13098c 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -759,7 +759,7 @@ void TextObjectBar::Execute( SfxRequest )
break;
}
-if ( pOLV )
+if ( nSlot != SID_STYLE_APPLY && pOLV )
{
pOLV->ShowCursor();
pOLV->GetWindow()->GrabFocus();
___
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' - sd/source
sd/source/ui/app/sdxfer.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7282aecb75c813317e2038c3bae961698ef9f75d Author: Mike Kaganski AuthorDate: Mon Mar 2 12:37:17 2020 +0300 Commit: Xisco Faulí CommitDate: Tue Mar 3 08:52:06 2020 +0100 tdf#118893: avoid nullptr dereference Change-Id: I56ada18348ed1b1ebe5e1d6f000391965d822b4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89815 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit 788ffc0360e44c54947bdead6d1eb368e5283915) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89799 Reviewed-by: Xisco Faulí diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index fbee5519085e..4afe432599d4 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -243,7 +243,7 @@ void SdTransferable::CreateData() SdPage* pPage = mpSdDrawDocument->GetSdPage(0, PageKind::Standard); -if( 1 == pPage->GetObjCount() ) +if( pPage && 1 == pPage->GetObjCount() ) CreateObjectReplacement( pPage->GetObj( 0 ) ); mpVDev = VclPtr::Create( *Application::GetDefaultDevice() ); ___ 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' - sd/source
sd/source/ui/slidesorter/controller/SlideSorterController.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ef8d3dbc1126923e1b08f528f0eab5b980d97876 Author: Caolán McNamara AuthorDate: Wed Feb 19 11:46:50 2020 + Commit: Caolán McNamara CommitDate: Mon Feb 24 16:44:10 2020 +0100 Resolves: tdf#129446 explicitly pass the mouse event window instead of letting it pick the main-window as the event window Change-Id: I953968025717ac5ba6f41e8f2db90c9f4d24800f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88954 Tested-by: Jenkins Reviewed-by: Xisco Faulí (cherry picked from commit 8130bd0bd25db1d9b0517b08c40640f3a96aea2b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89281 Reviewed-by: Caolán McNamara diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index bb4f44ce0649..eda20c8edb7a 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -375,7 +375,7 @@ bool SlideSorterController::Command ( if (!rEvent.IsMouseEvent()) pDispatcher->ExecutePopup(aPopupId, pWindow, ); else -pDispatcher->ExecutePopup(aPopupId); +pDispatcher->ExecutePopup(aPopupId, pWindow); mbContextMenuOpen = false; mrSlideSorter.GetView().UpdatePageUnderMouse(); ::rtl::Reference pFunction(GetCurrentSelectionFunction()); ___ 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' - sd/source
sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e2aa8de67c3bf0cc09160b256c825fb586947ce6 Author: Xisco Fauli AuthorDate: Tue Feb 11 12:11:32 2020 +0100 Commit: Michael Stahl CommitDate: Wed Feb 12 11:49:12 2020 +0100 tdf#130440 only select first page if no other page is selected Found while implementing the UItest. See https://gerrit.libreoffice.org/c/core/+/88437 it asserts on line 34 AssertionError: 2 != 1 as the first and second slides are selected Change-Id: I249dc0ac6faa55f0f15deedb848beabbc64aeed4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88439 Tested-by: Xisco Faulí Reviewed-by: Xisco Faulí (cherry picked from commit 7ed602a3b8c0ffe922b4f082cd4cdaa5a8f0d64c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88405 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index e146ee0a960c..81403c7bc1d8 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -130,7 +130,7 @@ void SelectionObserver::EndObservation() bool bSuccess = mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage(); // tdf#129346 nothing currently selected, select something, if possible // but (tdf#129346) only if setting focus to current page failed -if (!bSuccess && rSelector.GetPageCount()) +if (!bSuccess && rSelector.GetPageCount() && rSelector.GetSelectedPageCount() == 0) rSelector.SelectPage(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' - sd/source
sd/source/ui/slidesorter/controller/SlsFocusManager.cxx |8 --
sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx | 13 ---
sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx |4 +--
3 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit f12e4ecd595625f67865887824643c6608688ccc
Author: Caolán McNamara
AuthorDate: Mon Feb 10 16:46:22 2020 +
Commit: Michael Stahl
CommitDate: Tue Feb 11 11:02:54 2020 +0100
tdf#130440 only select first page fallback if seting to current page failed
Change-Id: Iee4f9cef9659837e9ce131e3bfc8da3e8d87bf84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88389
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
index ba8273d7628a..b8d400c2bea2 100644
--- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
@@ -143,13 +143,15 @@ model::SharedPageDescriptor
FocusManager::GetFocusedPageDescriptor() const
return mrSlideSorter.GetModel().GetPageDescriptor(mnPageIndex);
}
-void FocusManager::SetFocusedPage (const model::SharedPageDescriptor&
rpDescriptor)
+bool FocusManager::SetFocusedPage (const model::SharedPageDescriptor&
rpDescriptor)
{
if (rpDescriptor.get() != nullptr)
{
FocusHider aFocusHider (*this);
mnPageIndex = (rpDescriptor->GetPage()->GetPageNum()-1)/2;
+return true;
}
+return false;
}
void FocusManager::SetFocusedPage (sal_Int32 nPageIndex)
@@ -158,9 +160,9 @@ void FocusManager::SetFocusedPage (sal_Int32 nPageIndex)
mnPageIndex = nPageIndex;
}
-void FocusManager::SetFocusedPageToCurrentPage()
+bool FocusManager::SetFocusedPageToCurrentPage()
{
-
SetFocusedPage(mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide());
+return
SetFocusedPage(mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide());
}
bool FocusManager::IsFocusShowing() const
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index 29bc46c71789..e146ee0a960c 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -125,16 +125,13 @@ void SelectionObserver::EndObservation()
}
maInsertedPages.clear();
}
-else
-{
-// tdf#129346 nothing currently selected, select something, if possible
-if (rSelector.GetPageCount())
-rSelector.SelectPage(0);
-}
aUpdateLock.Release();
-
mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage();
-
+bool bSuccess =
mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage();
+// tdf#129346 nothing currently selected, select something, if possible
+// but (tdf#129346) only if setting focus to current page failed
+if (!bSuccess && rSelector.GetPageCount())
+rSelector.SelectPage(0);
}
} } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
index 0269690f1451..7d5b96afde86 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
@@ -115,7 +115,7 @@ public:
One of the page descriptors that are currently managed by the
SlideSorterModel.
*/
-void SetFocusedPage (const model::SharedPageDescriptor& rDescriptor);
+bool SetFocusedPage (const model::SharedPageDescriptor& rDescriptor);
/** Set the focused page to the one described by the given page
index. The visibility of the focus indicator is not modified.
@@ -124,7 +124,7 @@ public:
*/
void SetFocusedPage (sal_Int32 nPageIndex);
-void SetFocusedPageToCurrentPage();
+bool SetFocusedPageToCurrentPage();
/** Return when the focus inidcator is currently shown. A
prerequisite is that the window managed by this focus manager has
___
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' - sd/source
sd/source/ui/dlg/BulletAndPositionDlg.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 4328e3a449d11f1ebcaa91d7852ffdb984e01266
Author: Onur Yilmaz
AuthorDate: Tue Feb 4 16:27:38 2020 +0300
Commit: Caolán McNamara
CommitDate: Mon Feb 10 20:21:31 2020 +0100
tdf#130148 Gallery drop-down list in Impress B dialog shows only start...
Change-Id: Ieb8d79d7b3d291ffb36a7daaee0716d4ed8c9a85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87972
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 5088e6d34b0ffba423f8633ee83673a9c1d40036)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88300
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index f6eb2d709c76..261ab3cef9d4 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -978,12 +978,9 @@ IMPL_LINK_NOARG(SvxBulletAndPositionDlg,
PopupActivateHdl_Impl, weld::ToggleButt
pVD->DrawBitmapEx(Point(), aBitmap);
// We want to show only icon names not full path.
-// That part finds the last index of the slash and
-// gets the part before .gif
-
-sal_Int32 last = sGrfName.lastIndexOf("/");
-last++;
-OUString sIconName = sGrfName.getToken(0, '.', last);
+aObj.removeExtension();
+OUString sIconName
+=
aObj.GetLastName(INetURLObject::DecodeMechanism::WithCharset);
m_xGalleryMenu->append(sItemId, sIconName, *pVD);
}
___
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' - sd/source
sd/source/ui/view/drtxtob1.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 9b4ffa3a111dd91842ae53e74454f0c752ba4ffe
Author: Jim Raykowski
AuthorDate: Sat Dec 28 21:20:05 2019 -0900
Commit: Xisco Faulí
CommitDate: Fri Jan 17 13:29:08 2020 +0100
tdf#129680 Make text edit outliner view show cursor
Better placement of tdf#50530 fix
80f18e7e028e9ca431aef281ab98bea99ad19fa3
Change-Id: If6a83d94ebd52ada34d800f8270fa82b4260fdbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86099
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
(cherry picked from commit 1840ed1ede481d28c1a75e2767357866f6f1c55a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86957
Reviewed-by: Xisco Faulí
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 53f5e4ce8114..01b30cbe35ff 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -755,16 +755,16 @@ void TextObjectBar::Execute( SfxRequest )
// to refresh preview (in outline mode), slot has to be
invalidated:
mpViewShell->GetViewFrame()->GetBindings().Invalidate(
SID_PREVIEW_STATE, true );
-
-if ( pOLV )
-{
-pOLV->ShowCursor();
-pOLV->GetWindow()->GrabFocus();
-}
}
break;
}
+if ( pOLV )
+{
+pOLV->ShowCursor();
+pOLV->GetWindow()->GrabFocus();
+}
+
Invalidate( SID_OUTLINE_LEFT );
Invalidate( SID_OUTLINE_RIGHT );
Invalidate( SID_OUTLINE_UP );
___
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' - sd/source
sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 63c5b6114b9a29dc691818f96b0f695ceaa2c693
Author: Caolán McNamara
AuthorDate: Fri Dec 13 12:47:54 2019 +
Commit: Xisco Faulí
CommitDate: Mon Dec 16 12:16:19 2019 +0100
Resolves: tdf#129346 if nothing currently selected, select something
in the slidesorter
Change-Id: I66853ba56eab93dfb18de7496212eb64e97cd2bf
Reviewed-on: https://gerrit.libreoffice.org/85131
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index d6daf3dd0826..29bc46c71789 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -116,7 +116,7 @@ void SelectionObserver::EndObservation()
PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector());
PageSelector::UpdateLock aUpdateLock (mrSlideSorter);
rSelector.DeselectAllPages();
-if ( ! maInsertedPages.empty())
+if (!maInsertedPages.empty())
{
// Select the inserted pages.
for (const auto& rpPage : maInsertedPages)
@@ -125,6 +125,12 @@ void SelectionObserver::EndObservation()
}
maInsertedPages.clear();
}
+else
+{
+// tdf#129346 nothing currently selected, select something, if possible
+if (rSelector.GetPageCount())
+rSelector.SelectPage(0);
+}
aUpdateLock.Release();
mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage();
___
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' - sd/source
sd/source/ui/func/fupage.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 308249b43f8d62967f7bfa974f3e4f3f6182a010
Author: Katarina Behrens
AuthorDate: Tue Nov 12 00:08:25 2019 +0100
Commit: Xisco Faulí
CommitDate: Wed Nov 20 23:46:06 2019 +0100
tdf#125449 follow-up: unique gradient names in Impress area dlg
as seen in tdf#94300 chart prefers to name anonymous (non-preset)
gradients all by itself
However tdf#99908 shows that ODF import doesn't like anonymous
gradients. This is a bug in xmloff style import and should eventually
be fixed there. Here we implement the same band-aid solution
tdf#99908 implements for Impress sidebar
Change-Id: Ia39f581aee875ac95faa5c502a3479ed5d7974d8
Reviewed-on: https://gerrit.libreoffice.org/82522
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
(cherry picked from commit 34a3afecaaab3dc4898b33e0981d8b231351fe37)
Reviewed-on: https://gerrit.libreoffice.org/83185
Reviewed-by: Xisco Faulí
(cherry picked from commit c00775925325b04b3d707df0d494464f864f6fc0)
Reviewed-on: https://gerrit.libreoffice.org/83286
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index ba77b29c54ef..b5d73efa4367 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -347,6 +348,15 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window*
pParent)
( aMergedAttr.GetItem( XATTR_FILLSTYLE
)->GetValue() == drawing::FillStyle_NONE ) ) )
mbPageBckgrdDeleted = true;
+const XFillGradientItem* pTempGradItem =
pTempSet->GetItem(XATTR_FILLGRADIENT);
+if (pTempGradItem && pTempGradItem->GetName().isEmpty())
+{
+// MigrateItemSet guarantees unique gradient names
+SfxItemSet aMigrateSet( mpDoc->GetPool(),
svl::Items{} );
+aMigrateSet.Put( XFillGradientItem("gradient",
pTempGradItem->GetGradientValue()) );
+SdrModel::MigrateItemSet( , pTempSet.get(), mpDoc);
+}
+
if( !mbMasterPage && bChanges && mbPageBckgrdDeleted )
{
mpBackgroundObjUndoAction.reset( new
SdBackgroundObjUndoAction(
___
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' - sd/source
sd/source/core/CustomAnimationCloner.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 947e9ffba8e5a8b18b46efcf06de998cea6edaa6
Author: Muhammet Kara
AuthorDate: Sat Nov 9 00:14:11 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Nov 9 17:21:09 2019 +0100
Fix tdf#124708: CRASH: Selecting all and deleting
Change-Id: I0de912dad97f266a56ab52a351b0676f17675ed5
Reviewed-on: https://gerrit.libreoffice.org/82332
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
(cherry picked from commit 8023a613e978be42758c88d23f1973f7b9661676)
Reviewed-on: https://gerrit.libreoffice.org/82354
diff --git a/sd/source/core/CustomAnimationCloner.cxx
b/sd/source/core/CustomAnimationCloner.cxx
index 281ad7f7affe..154e8ab6ecac 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -294,9 +294,13 @@ namespace sd
Reference< XAnimationNode > CustomAnimationClonerImpl::getClonedNode(
const Reference< XAnimationNode >& xSource ) const
{
-sal_Int32 nNode, nNodeCount = maSourceNodeVector.size();
+std::size_t nNodeCount = maSourceNodeVector.size();
+std::size_t nCloneNodeCount = maCloneNodeVector.size();
-for( nNode = 0; nNode < nNodeCount; nNode++ )
+if (nNodeCount != nCloneNodeCount)
+SAL_WARN("sd.core", "Sizes of maSourceNodeVector and
maCloneNodeVector mismatch!");
+
+for( std::size_t nNode = 0; nNode < nNodeCount && nNode <
nCloneNodeCount; ++nNode )
{
if( maSourceNodeVector[nNode] == xSource )
return maCloneNodeVector[nNode];
___
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' - sd/source
sd/source/ui/func/fudraw.cxx | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 6294a9cf96ea562cc6aac43cfc15761e1188a951
Author: Caolán McNamara
AuthorDate: Wed Nov 6 15:00:55 2019 +
Commit: Xisco Faulí
CommitDate: Thu Nov 7 10:58:13 2019 +0100
Resolves: tdf#128631 dispatch active ole async
like we do for the other things that might create dialogs
Change-Id: I31ca267526ddeac8d0c7163af45c11be7750cb4c
Reviewed-on: https://gerrit.libreoffice.org/82144
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 45a5629609bd..c2f141a85abe 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -686,15 +686,12 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_OLE2)
{
-DrawDocShell* pDocSh = mpDoc->GetDocSh();
-
-if ( !pDocSh->IsUIActive() )
-{
-/**
-* activate OLE-object
-**/
-mpViewShell->ActivateObject(
static_cast(pObj), 0);
-}
+// activate OLE-object
+SfxInt16Item aItem(SID_OBJECT, 0);
+mpViewShell->GetViewFrame()->
+GetDispatcher()->ExecuteList(SID_OBJECT,
+ SfxCallMode::ASYNCHRON |
SfxCallMode::RECORD,
+ { });
}
else if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_GRAF
&& pObj->IsEmptyPresObj() )
{
___
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' - sd/source
sd/source/ui/docshell/docshel4.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 30db36c3afcd796fe15a06869cd43ef74c3ffc36
Author: Julien Nabet
AuthorDate: Tue Oct 8 22:47:01 2019 +0200
Commit: Xisco Faulí
CommitDate: Wed Oct 9 12:21:35 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
(cherry picked from commit 1dc4c8266d45eb2f5c3de303eaa9233e3b52f058)
Reviewed-on: https://gerrit.libreoffice.org/80506
Reviewed-by: Xisco Faulí
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index d9b9ff6e8e42..e261a6e0775a 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, { });
+if (pDrawViewShell->GetDispatcher())
+{
+// show page
+SvxZoomItem aZoom;
+aZoom.SetType( SvxZoomType::WHOLEPAGE );
+pDrawViewShell->GetDispatcher()->ExecuteList(SID_ATTR_ZOOM,
SfxCallMode::ASYNCHRON, { });
+}
if (pObj != nullptr)
{
___
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' - sd/source
sd/source/ui/unoidl/unolayer.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit a955330e052cc12c622982f38c5f5d138484013a
Author: Regina Henschel
AuthorDate: Fri Sep 27 14:12:39 2019 +0200
Commit: Xisco Faulí
CommitDate: Sat Sep 28 14:22:30 2019 +0200
tdf#125585 write default layer status for OLE objects
The layer status is taken from the active view, when saving the
document. But embedded documents have no view. Error was, that for
all layers value 'false' was written in that case. With this patch
the defaults (visible, printable, not locked) (true, true, false)
are written.
Change-Id: I2388ce31cc208fba075083889ec1bb2f874ef482
Reviewed-on: https://gerrit.libreoffice.org/79701
Tested-by: Jenkins
Reviewed-by: Regina Henschel
(cherry picked from commit 12f9a9f341fd8f8a98f7cd98f296a8729d279e0d)
Reviewed-on: https://gerrit.libreoffice.org/79785
Reviewed-by: Xisco Faulí
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index d1750c7eaca8..a7a4f46a9823 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -264,6 +264,15 @@ bool SdLayer::get( LayerAttribute what ) throw()
case LOCKED:return
pFrameView->GetLockedLayers().IsSet(pLayer->GetID());
}
}
+
+// no view at all, e.g. Draw embedded as OLE in text document, ODF
default values
+switch(what)
+{
+case VISIBLE: return true;
+case PRINTABLE: return true;
+case LOCKED:return false;
+}
+
}
return false; //TODO: uno::Exception?
}
___
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' - sd/source
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a3216f41684ff039d96d0f6fce1e0ec9da65d91e Author: Stephan Bergmann AuthorDate: Mon Sep 9 11:54:04 2019 +0200 Commit: Stephan Bergmann CommitDate: Wed Sep 25 21:02:56 2019 +0200 Fix stack-use-after-return when moving a slide in the list ...very far, so that the list needs to scroll: > ==1676==ERROR: AddressSanitizer: stack-use-after-return on address 0x7f039a1e6420 at pc 0x7f03c34e0658 bp 0x7ffede26b140 sp 0x7ffede26b138 > READ of size 8 at 0x7f039a1e6420 thread T0 > #0 in Point::X() const at include/tools/gen.hxx:78:44 (instdir/program/libvcllo.so +0x5cf6657) > #1 in OutputDevice::PixelToLogic(Point const&) const at vcl/source/outdev/map.cxx:1191:47 > #2 in sd::slidesorter::controller::DragAndDropContext::UpdatePosition(Point const&, sd::slidesorter::controller::InsertionIndicatorHandler::Mode, bool) at sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx:84:47 > #3 in sd::slidesorter::controller::DragAndDropContext::UpdatePosition(Point const&, sd::slidesorter::controller::InsertionIndicatorHandler::Mode, bool)::$_0::operator()() const at sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx:92:34 > #4 in void std::__invoke_impl(std::__invoke_other, sd::slidesorter::controller::DragAndDropContext::UpdatePosition(Point const&, sd::slidesorter::controller::InsertionIndicatorHandler::Mode, bool)::$_0&) at gcc/x86_64-pc-linux-gnu/10.0.0/../../../../include/c++/10.0.0/bits/invoke.h:60:14 > #5 in std::enable_if, void>::type std::__invoke_r(sd::slidesorter::controller::DragAndDropContext::UpdatePosition(Point const&, sd::slidesorter::controller::InsertionIndicatorHandler::Mode, bool)::$_0&) at gcc/x86_64-pc-linux-gnu/10.0.0/../../../../include/c++/10.0.0/bits/invoke.h:110:2 > #6 in std::_Function_handler::_M_invoke(std::_Any_data const&) at gcc/x86_64-pc-linux-gnu/10.0.0/../../../../include/c++/10.0.0/bits/std_function.h:291:9 > #7 in std::function::operator()() const at gcc/x86_64-pc-linux-gnu/10.0.0/../../../../include/c++/10.0.0/bits/std_function.h:622:14 > #8 in sd::slidesorter::controller::ScrollBarManager::RepeatAutoScroll() at sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx:518:17 > #9 in sd::slidesorter::controller::ScrollBarManager::AutoScrollTimeoutHandler(Timer*) at sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx:539:5 > #10 in sd::slidesorter::controller::ScrollBarManager::LinkStubAutoScrollTimeoutHandler(void*, Timer*) at sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx:537:1 > #11 in Link::Call(Timer*) const at include/tools/link.hxx:112:45 > #12 in Timer::Invoke() at vcl/source/app/timer.cxx:75:21 > #13 in Scheduler::ProcessTaskScheduling() at vcl/source/app/scheduler.cxx:479:20 > #14 in Scheduler::CallbackTaskScheduling() at vcl/source/app/scheduler.cxx:287:5 > #15 in SalTimer::CallCallback() at vcl/inc/saltimer.hxx:54:13 > #16 in sal_gtk_timeout_dispatch(_GSource*, int (*)(void*), void*) at vcl/unx/gtk3/gtk3gtkdata.cxx:761:45 > #17 in g_main_dispatch at ../glib/gmain.c:3189:28 > [...] > Address 0x7f039a1e6420 is located in stack of thread T0 at offset 32 in frame > #0 in sd::slidesorter::controller::SelectionFunction::MouseDragged(AcceptDropEvent const&, signed char) at sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx:630 (instdir/program/../program/libsdlo.so +0x5c22e1f) > This frame has 1 object(s): > [32, 104) 'aEventDescriptor' (line 631) <== Memory access at offset 32 is inside this variable > HINT: this may be a false positive if your program uses some custom stack unwind mechanism, swapcontext or vfork > (longjmp and C++ exceptions *are* supported) Presumably a regression introduced with 26912eea7521dd2b84bfac56b322cf0f8b142450 "sd: replace boost::bind with C++11 lambdas and for loops", assuming that boost::bind bound rMousePosition by value. Change-Id: I4cefc5974b7377ff4918d59b51fc8cda41292702 Reviewed-on: https://gerrit.libreoffice.org/78774 Tested-by: Jenkins Reviewed-by: Stephan Bergmann (cherry picked from commit 833c23264b532e34e050e3b8747c02ede6bf7350) Reviewed-on: https://gerrit.libreoffice.org/79553 Reviewed-by: Michael Stahl diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 770fb1ba6cf5..73dac8561b07 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -96,7 +96,7 @@ void DragAndDropContext::UpdatePosition ( bool bDoAutoScroll = bAllowAutoScroll && mpTargetSlideSorter->GetController().GetScrollBarManager().AutoScroll(
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/source
sd/source/ui/func/fuolbull.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 8c8b29c3f42686bf14ed84582dd02784867527f5
Author: Gülşah Köse
AuthorDate: Sat Aug 31 00:24:40 2019 +0300
Commit: Gülşah Köse
CommitDate: Tue Sep 3 11:13:05 2019 +0200
tdf#126656 Remove unnecessary items from itemset.
Change-Id: I62fc660ea061fe9665e0166a08871ba0a592fc41
Reviewed-on: https://gerrit.libreoffice.org/78332
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
(cherry picked from commit 438430904064e667b688275525b317fd7989af2e)
Reviewed-on: https://gerrit.libreoffice.org/78414
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 7c9b8657f0f2..cdd8fd33ece9 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -81,8 +81,14 @@ void FuBulletAndPosition::DoExecute( SfxRequest& rReq )
SfxItemSet aEditAttr( mpDoc->GetPool() );
mpView->GetAttributes( aEditAttr );
-SfxItemSet aNewAttr( mpViewShell->GetPool(),
- svl::Items{} );
+static const sal_uInt16 aAttrMap[] =
+{
+EE_PARA_NUMBULLET,
+EE_PARA_BULLET,
+0
+};
+
+SfxItemSet aNewAttr( mpViewShell->GetPool(), aAttrMap );
aNewAttr.Put( aEditAttr, false );
auto pView = mpView;
___
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' - sd/source
sd/source/ui/dlg/BulletAndPositionDlg.cxx | 11 +++
sd/source/ui/inc/BulletAndPositionDlg.hxx |3 +++
2 files changed, 14 insertions(+)
New commits:
commit 7558ad766b8a03ef3d16205a506dbeb414b3328f
Author: Gülşah Köse
AuthorDate: Thu Jul 25 21:40:48 2019 +0300
Commit: Xisco Faulí
CommitDate: Tue Aug 13 18:03:08 2019 +0200
tdf#125923 Fix reset button.
Reset/Revert button worked as cancel, not reset.
That commit provides reset button to do its own job.
Reviewed-on: https://gerrit.libreoffice.org/76341
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
(cherry picked from commit 15664117ef4db51bdcabb46b7990573509da0d73)
Change-Id: I82d3e838bff3fd690cb5a901232ecb5f76257b95
Reviewed-on: https://gerrit.libreoffice.org/76345
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index c09c6a79987f..f6eb2d709c76 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -34,6 +34,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -115,6 +117,7 @@ class SdDrawDocument;
SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const
SfxItemSet& rSet,
::sd::View* pView)
: GenericDialogController(pWindow, "cui/ui/bulletandposition.ui",
"BulletAndPosition")
+, rFirstStateSet(rSet)
, bLastWidthModified(false)
, bModified(false)
, bPreset(false)
@@ -162,6 +165,7 @@
SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf
, m_xSlideRB(m_xBuilder->weld_radio_button("sliderb"))
, m_xSelectionRB(m_xBuilder->weld_radio_button("selectionrb"))
, m_xApplyToMaster(m_xBuilder->weld_toggle_button("applytomaster"))
+, m_xReset(m_xBuilder->weld_button("reset"))
{
m_xBulColLB->SetSlotId(SID_ATTR_CHAR_COLOR);
m_xBulRelSizeMF->set_min(SVX_NUM_REL_SIZE_MIN, FieldUnit::PERCENT);
@@ -187,6 +191,8 @@
SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf
LINK(this, SvxBulletAndPositionDlg, SelectCenterAlignmentHdl_Impl));
m_xRightTB->connect_toggled(LINK(this, SvxBulletAndPositionDlg,
SelectRightAlignmentHdl_Impl));
m_xApplyToMaster->connect_toggled(LINK(this, SvxBulletAndPositionDlg,
ApplyToMasterHdl_Impl));
+m_xReset->set_label(SfxResId(STR_RESET));
+m_xReset->connect_clicked(LINK(this, SvxBulletAndPositionDlg,
ResetHdl_Impl));
aInvalidateTimer.SetInvokeHandler(
LINK(this, SvxBulletAndPositionDlg, PreviewInvalidateHdl_Impl));
@@ -1193,6 +1199,11 @@ IMPL_LINK(SvxBulletAndPositionDlg,
ApplyToMasterHdl_Impl, weld::ToggleButton&, r
bApplyToMaster = rButton.get_active();
}
+IMPL_LINK_NOARG(SvxBulletAndPositionDlg, ResetHdl_Impl, weld::Button&, void)
+{
+Reset();
+}
+
IMPL_LINK(SvxBulletAndPositionDlg, EditModifyHdl_Impl, weld::Entry&, rEdit,
void)
{
EditModifyHdl_Impl();
diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx
b/sd/source/ui/inc/BulletAndPositionDlg.hxx
index 54fe2abcd057..5dd28638fedc 100644
--- a/sd/source/ui/inc/BulletAndPositionDlg.hxx
+++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx
@@ -57,6 +57,7 @@ class SvxBulletAndPositionDlg : public
weld::GenericDialogController
std::unique_ptr pActNum;
std::unique_ptr pSaveNum;
+const SfxItemSet& rFirstStateSet;
Size aInitSize[SVX_MAX_NUM];
@@ -116,6 +117,7 @@ class SvxBulletAndPositionDlg : public
weld::GenericDialogController
std::unique_ptr m_xSlideRB;
std::unique_ptr m_xSelectionRB;
std::unique_ptr m_xApplyToMaster;
+std::unique_ptr m_xReset;
void InitControls();
/** To switch between the numbering type
@@ -143,6 +145,7 @@ class SvxBulletAndPositionDlg : public
weld::GenericDialogController
DECL_LINK(SelectCenterAlignmentHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(SelectRightAlignmentHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(ApplyToMasterHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(ResetHdl_Impl, weld::Button&, void);
void EditModifyHdl_Impl(const weld::Entry*);
void InitPosAndSpaceMode();
void SetAlignmentHdl_Impl(SvxAdjust);
___
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' - sd/source
sd/source/ui/view/DocumentRenderer.cxx | 38 ++---
1 file changed, 31 insertions(+), 7 deletions(-)
New commits:
commit c542a385ce100f8f52a4aff6ab12312f9fbb674e
Author: Gabor Kelemen
AuthorDate: Mon Jul 22 00:49:03 2019 +0200
Commit: Xisco Faulí
CommitDate: Fri Aug 2 16:37:56 2019 +0200
tdf#39742 tdf#44786 Consider Impress/Draw default printing settings
Default settings can be set under Options - APP - Print but
Impress/Draw has not used these as defaults unlike other apps
Change-Id: I7d430f8fb24f9626cd628b4fe9e0520d9d42b848
Reviewed-on: https://gerrit.libreoffice.org/76079
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 844be49e7e511f0c397e1faebca10b4fa25ea937)
Reviewed-on: https://gerrit.libreoffice.org/76565
Reviewed-by: Xisco Faulí
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 3750db72e59d..c8a1456d1c7b 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -60,6 +60,9 @@
#include
#include
+#include
+#include
+
#include
#include
@@ -436,7 +439,7 @@ namespace {
SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_NAME),
".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ,
"IsPrintName" ,
-false
+
officecfg::Office::Impress::Print::Other::PageName::get()
)
);
}
@@ -446,7 +449,7 @@ namespace {
SdResId(STR_DRAW_PRINT_UI_IS_PRINT_NAME),
".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ,
"IsPrintName" ,
-false
+
officecfg::Office::Draw::Print::Other::PageName::get()
)
);
}
@@ -455,7 +458,12 @@ namespace {
SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_DATE),
".HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox" ,
"IsPrintDateTime" ,
-false
+// Separate settings for time and date in
Impress/Draw -> Print page, check that both are set
+mbImpress ?
+
officecfg::Office::Impress::Print::Other::Date::get() &&
+
officecfg::Office::Impress::Print::Other::Time::get() :
+
officecfg::Office::Draw::Print::Other::Date::get() &&
+
officecfg::Office::Draw::Print::Other::Time::get()
)
);
@@ -465,7 +473,7 @@ namespace {
SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN),
".HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox" ,
"IsPrintHidden" ,
-false
+
officecfg::Office::Impress::Print::Other::HiddenPage::get()
)
);
}
@@ -487,7 +495,9 @@ namespace {
aHelpIds,
"Quality" ,
CreateChoice(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES,
SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES)),
-0)
+mbImpress ?
officecfg::Office::Impress::Print::Other::Quality::get() :
+
officecfg::Office::Draw::Print::Other::Quality::get() )
+
);
AddDialogControl(
vcl::PrinterOptionsHelper::setSubgroupControlOpt("pagesizes",
@@ -504,6 +514,19 @@ namespace {
aWidgetIds[2] = "distributeonmultiple";
aWidgetIds[3] = "tilesheet";
+// Mutually exclusive page options settings are stored in separate
config keys...
+// TODO: There is no config key to set the distributeonmultiple
option as default
+sal_Int32 nDefaultChoice = 0;
+if ( mbImpress ?
officecfg::Office::Impress::Print::Page::PageSize::get() :
+
officecfg::Office::Draw::Print::Page::PageSize::get() )
+{
+nDefaultChoice = 1;
+}
+else if ( mbImpress ?
officecfg::Office::Impress::Print::Page::PageTile::get() :
+
officecfg::Office::Draw::Print::Page::PageTile::get() )
+{
+nDefaultChoice =
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/source
sd/source/ui/dlg/BulletAndPositionDlg.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 485faf158a904baa07206313e0c234e5421f9739
Author: Gülşah Köse
AuthorDate: Tue Jul 30 23:26:27 2019 +0300
Commit: Xisco Faulí
CommitDate: Thu Aug 1 11:13:31 2019 +0200
tdf#126511 Show only icon names instead of full path.
This commit shows only icon names insead of the full
path of icon on Bullet and Numbering dialog graphic case
on Impress.
Change-Id: Iba72bf7c413993bad88add669035765aae521a59
Reviewed-on: https://gerrit.libreoffice.org/76716
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
(cherry picked from commit 7c973ea77438273deda909ce0563d8c5c37dad00)
Reviewed-on: https://gerrit.libreoffice.org/76745
Reviewed-by: Xisco Faulí
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 034babf11666..c09c6a79987f 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -970,7 +970,16 @@ IMPL_LINK_NOARG(SvxBulletAndPositionDlg,
PopupActivateHdl_Impl, weld::ToggleButt
}
pVD->SetOutputSizePixel(aBitmap.GetSizePixel(), false);
pVD->DrawBitmapEx(Point(), aBitmap);
-m_xGalleryMenu->append(sItemId, sGrfName, *pVD);
+
+// We want to show only icon names not full path.
+// That part finds the last index of the slash and
+// gets the part before .gif
+
+sal_Int32 last = sGrfName.lastIndexOf("/");
+last++;
+OUString sIconName = sGrfName.getToken(0, '.', last);
+
+m_xGalleryMenu->append(sItemId, sIconName, *pVD);
}
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-3' - sd/source
sd/source/ui/dlg/BulletAndPositionDlg.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit f27e33eb981d1c8dbae2b52985c847b6a6923a30 Author: Caolán McNamara AuthorDate: Fri Jul 26 09:36:27 2019 +0100 Commit: Michael Stahl CommitDate: Fri Jul 26 14:53:15 2019 +0200 cid#1448222 Out-of-bounds read possibly gold Change-Id: I170d9ae52e7e2b2869655d6649496fce8661a20b Reviewed-on: https://gerrit.libreoffice.org/76369 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index b0511c20e8e7..034babf11666 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -541,6 +541,7 @@ void SvxBulletAndPositionDlg::InitControls() nNumberingType = SVX_NUM_NUMBER_NONE; bAllLevel = false; bSameDistBorderNum = false; +bSameIndent = false; bSameBulRelSize = false; bSameBulColor = false; bSameStart = false; ___ 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' - sd/source
sd/source/ui/dlg/BulletAndPositionDlg.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 55059c98262bdc21cac97d09cdf8b2a263f2c6d3
Author: Caolán McNamara
AuthorDate: Wed Jul 24 11:51:10 2019 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 25 09:26:46 2019 +0200
cid#1448222 Out-of-bounds read
possibly coverity gold
Change-Id: I6443225482eab5be31e1e12d282e420e767f23b2
Reviewed-on: https://gerrit.libreoffice.org/76276
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 60a97f87c996..69a459f99b01 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -540,6 +540,7 @@ void SvxBulletAndPositionDlg::InitControls()
{
nNumberingType = SVX_NUM_NUMBER_NONE;
bAllLevel = false;
+bSameDistBorderNum = false;
bSameBulRelSize = false;
bSameBulColor = false;
bSameStart = false;
___
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' - sd/source
sd/source/ui/dlg/BulletAndPositionDlg.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 95308943748bd650ee52e6e7570090f9c6a940b1
Author: Gülşah Köse
AuthorDate: Wed Jul 17 13:57:58 2019 +0300
Commit: Miklos Vajna
CommitDate: Mon Jul 22 09:09:00 2019 +0200
tdf#126334 Fix number format array in init controls.
Customization changings need only selected number format object but
Position changings on bullet need all existing number format array.
After merge the customization and position keeping all numbering format
objects (10 item) make sense.
Change-Id: Iade1e154243deaed43b9d243f2ebd0c5298b42a4
Reviewed-on: https://gerrit.libreoffice.org/75784
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
(cherry picked from commit 1f6c4328bfa00da5cf351dd050a80b75e0f1acde)
Reviewed-on: https://gerrit.libreoffice.org/75945
Reviewed-by: Miklos Vajna
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 2905170627a4..60a97f87c996 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -488,9 +488,10 @@ void SvxBulletAndPositionDlg::InitControls()
bool bBullRelSize =
pActNum->IsFeatureSupported(SvxNumRuleFlags::BULLET_REL_SIZE);
for (sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
{
+aNumFmtArr[i] = >GetLevel(i);
+
if (nActNumLvl & nMask)
{
-aNumFmtArr[i] = >GetLevel(i);
bShowBullet &= aNumFmtArr[i]->GetNumberingType() ==
SVX_NUM_CHAR_SPECIAL;
bShowBitmap &= (aNumFmtArr[i]->GetNumberingType() & (~LINK_TOKEN))
== SVX_NUM_BITMAP;
eFirstAdjust = aNumFmtArr[i]->GetNumAdjust();
@@ -527,8 +528,6 @@ void SvxBulletAndPositionDlg::InitControls()
}
nHighestLevel = i;
}
-else
-aNumFmtArr[i] = nullptr;
nMask <<= 1;
}
___
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' - sd/source
sd/source/ui/view/drawview.cxx | 89 -
1 file changed, 44 insertions(+), 45 deletions(-)
New commits:
commit 8d9ab38937ead9cefbbdc8fc3dfda6e1f82136cd
Author: Gülşah Köse
AuthorDate: Tue Jul 16 10:18:44 2019 +0300
Commit: Gülşah Köse
CommitDate: Tue Jul 16 09:23:23 2019 +0200
Follow up patch tdf#126067 Correct indentation.
Change-Id: Idfe608afb8b02f8b9f56b9da76e3f2009617b183
Reviewed-on: https://gerrit.libreoffice.org/75676
Reviewed-by: Gülşah Köse
Tested-by: Gülşah Köse
(cherry picked from commit 910c65fc640b3e422f3c660ba71844552fa426b3)
Reviewed-on: https://gerrit.libreoffice.org/75678
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index c4c8ad3a3546..8c3d49bde085 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -366,60 +366,59 @@ void DrawView::SetMasterAttributes( SdrObject* pObject,
SdPage& rPage, SfxItemSe
{
if (bMaster)
{
-// Presentation object outline
-for (sal_uInt16 nLevel = 9; nLevel > 0; nLevel--)
-{
-OUString aName = rPage.GetLayoutName() + " " +
-OUString::number(nLevel);
-SfxStyleSheet* pSheet = static_cast(pStShPool->
-Find(aName, SfxStyleFamily::Page));
-DBG_ASSERT(pSheet, "StyleSheet not found");
+// Presentation object outline
+for (sal_uInt16 nLevel = 9; nLevel > 0; nLevel--)
+{
+OUString aName = rPage.GetLayoutName() + " " +
+OUString::number(nLevel);
+SfxStyleSheet* pSheet =
static_cast(pStShPool->
+Find(aName, SfxStyleFamily::Page));
+DBG_ASSERT(pSheet, "StyleSheet not found");
-SfxItemSet aTempSet( pSheet->GetItemSet() );
+SfxItemSet aTempSet( pSheet->GetItemSet() );
-if( nLevel > 1 )
-{
-// for all levels over 1, clear all items that will be
-// hard set to level 1
-SfxWhichIter aWhichIter(rSet);
-sal_uInt16 nWhich(aWhichIter.FirstWhich());
-while( nWhich )
+if( nLevel > 1 )
{
-if( SfxItemState::SET == rSet.GetItemState( nWhich ) )
-aTempSet.ClearItem( nWhich );
-nWhich = aWhichIter.NextWhich();
-}
-
-}
-else
-{
-// put the items hard into level one
-aTempSet.Put( rSet );
-}
+// for all levels over 1, clear all items that will be
+// hard set to level 1
+SfxWhichIter aWhichIter(rSet);
+sal_uInt16 nWhich(aWhichIter.FirstWhich());
+while( nWhich )
+{
+if( SfxItemState::SET == rSet.GetItemState( nWhich
) )
+aTempSet.ClearItem( nWhich );
+nWhich = aWhichIter.NextWhich();
+}
-aTempSet.ClearInvalidItems();
+}
+else
+{
+// put the items hard into level one
+aTempSet.Put( rSet );
+}
-// Undo-Action
-mpDocSh->GetUndoManager()->AddUndoAction(
-std::make_unique(, pSheet,
));
+aTempSet.ClearInvalidItems();
-pSheet->GetItemSet().Set(aTempSet,false);
-pSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
-}
+// Undo-Action
+mpDocSh->GetUndoManager()->AddUndoAction(
+std::make_unique(, pSheet,
));
-// remove all hard set items from shape that are now set in style
-SfxWhichIter aWhichIter(rSet);
-sal_uInt16 nWhich(aWhichIter.FirstWhich());
-while( nWhich )
-{
-if( SfxItemState::SET == rSet.GetItemState( nWhich ) )
-pObject->ClearMergedItem( nWhich );
-nWhich = aWhichIter.NextWhich();
-}
+pSheet->GetItemSet().Set(aTempSet,false);
+pSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
+}
+// remove all hard set items from shape that are now set in
style
+SfxWhichIter aWhichIter(rSet);
+sal_uInt16 nWhich(aWhichIter.FirstWhich());
+while( nWhich )
+{
+
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/source
sd/source/ui/view/drawview.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit ee2f74f480874620b35db95e2e310f16264a3ddc
Author: Gülşah Köse
AuthorDate: Tue Jul 16 00:48:01 2019 +0300
Commit: Gülşah Köse
CommitDate: Tue Jul 16 09:22:35 2019 +0200
tdf#126067 Fix slide scope feature.
Change-Id: I6e2450572b9c6a30526a8a2a91a6e0bf89103475
Reviewed-on: https://gerrit.libreoffice.org/75669
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
(cherry picked from commit 40bb9ac690d979ef544d5aa759bd734a176912a0)
Reviewed-on: https://gerrit.libreoffice.org/75674
Tested-by: Gülşah Köse
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index b67fb350ca3a..c4c8ad3a3546 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -315,7 +315,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
return bOk;
}
-void DrawView::SetMasterAttributes( SdrObject* pObject, SdPage& rPage,
SfxItemSet rSet, SfxStyleSheetBasePool* pStShPool, bool& bOk, bool /*bMaster*/,
bool bSlide )
+void DrawView::SetMasterAttributes( SdrObject* pObject, SdPage& rPage,
SfxItemSet rSet, SfxStyleSheetBasePool* pStShPool, bool& bOk, bool bMaster,
bool bSlide )
{
SdrInventor nInv= pObject->GetObjInventor();
@@ -364,6 +364,8 @@ void DrawView::SetMasterAttributes( SdrObject* pObject,
SdPage& rPage, SfxItemSe
}
else if (eObjKind == OBJ_OUTLINETEXT)
{
+if (bMaster)
+{
// Presentation object outline
for (sal_uInt16 nLevel = 9; nLevel > 0; nLevel--)
{
@@ -415,6 +417,10 @@ void DrawView::SetMasterAttributes( SdrObject* pObject,
SdPage& rPage, SfxItemSe
nWhich = aWhichIter.NextWhich();
}
+}
+
+pObject->SetMergedItemSet(rSet);
+
bOk = 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-3' - sd/source
sd/source/ui/view/drtxtob1.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit f8ba3e24a48752414c5f69faec7d71ba387e1441
Author: Jim Raykowski
AuthorDate: Sun Jun 23 16:00:19 2019 -0800
Commit: Xisco Faulí
CommitDate: Thu Jul 4 10:50:22 2019 +0200
tdf#50530 Make text edit outliner view show cursor
Change-Id: I73b4dcacdf068daff02b8fe8156c58debfcdf704
Reviewed-on: https://gerrit.libreoffice.org/74613
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
(cherry picked from commit 80f18e7e028e9ca431aef281ab98bea99ad19fa3)
Reviewed-on: https://gerrit.libreoffice.org/75048
Reviewed-by: Xisco Faulí
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index fb89f6290d6f..53f5e4ce8114 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -755,6 +755,12 @@ void TextObjectBar::Execute( SfxRequest )
// to refresh preview (in outline mode), slot has to be
invalidated:
mpViewShell->GetViewFrame()->GetBindings().Invalidate(
SID_PREVIEW_STATE, true );
+
+if ( pOLV )
+{
+pOLV->ShowCursor();
+pOLV->GetWindow()->GrabFocus();
+}
}
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-3' - sd/source
sd/source/ui/view/sdwindow.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit d51cabce47914a44a5145f2ebf89f920a4c38cb2
Author: Jim Raykowski
AuthorDate: Sun Jun 23 17:54:49 2019 -0800
Commit: Xisco Faulí
CommitDate: Wed Jul 3 16:27:56 2019 +0200
tdf#126061 Make text edit outliner view show cursor
Change-Id: Ic4e8b5984d5b21c3b789eba943d35d4cad1ba867
Reviewed-on: https://gerrit.libreoffice.org/74676
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
(cherry picked from commit 3a662445a0e337e5eb140b106a1347f050eb)
Reviewed-on: https://gerrit.libreoffice.org/75028
Reviewed-by: Xisco Faulí
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 06840e6345c5..7a30096c52fd 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -265,6 +265,16 @@ void Window::Command(const CommandEvent& rCEvt)
//pass at least alt press/release to parent impl
if (rCEvt.GetCommand() == CommandEventId::ModKeyChange)
vcl::Window::Command(rCEvt);
+//show the text edit outliner view cursor
+else if (!HasFocus() && rCEvt.GetCommand() == CommandEventId::CursorPos)
+{
+OutlinerView* pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
+if (pOLV && this == pOLV->GetWindow())
+{
+GrabFocus();
+pOLV->ShowCursor();
+}
+}
}
bool Window::EventNotify( NotifyEvent& rNEvt )
___
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' - sd/source
sd/source/ui/view/ViewShellImplementation.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 153e0cacb9a8bdabbf6eb1cd84b6aa87ee45b44f Author: Caolán McNamara AuthorDate: Fri Jun 21 15:28:17 2019 +0100 Commit: Caolán McNamara CommitDate: Fri Jun 21 22:16:02 2019 +0200 SvxIMapDlg is welded Change-Id: Ie244312cd3b2b291f0ab8f6ed223a50fb7d2ffe9 Reviewed-on: https://gerrit.libreoffice.org/74527 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index b6d4369cfc91..a7d67677277e 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -319,7 +319,7 @@ SvxIMapDlg* ViewShell::Implementation::GetImageMapDialog() SfxChildWindow* pChildWindow = SfxViewFrame::Current()->GetChildWindow( SvxIMapDlgChildWindow::GetChildWindowId()); if (pChildWindow != nullptr) -pDialog = dynamic_cast(pChildWindow->GetWindow()); +pDialog = dynamic_cast(pChildWindow->GetController().get()); return pDialog; } ___ 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' - sd/source
sd/source/ui/dlg/BulletAndPositionDlg.cxx | 13 +
1 file changed, 1 insertion(+), 12 deletions(-)
New commits:
commit 2ab93756963727b8dde43b405e2daee3e1bf9deb
Author: Gülşah Köse
AuthorDate: Mon Jun 10 10:23:40 2019 +0300
Commit: Andras Timar
CommitDate: Sat Jun 15 07:33:02 2019 +0200
tdf#125774 Remove double call SvTreeListBox::Select for non-gtk backends
Change-Id: Ic8238d91f1cddb8fe627fafb0587751de308f6ac
Reviewed-on: https://gerrit.libreoffice.org/73747
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
(cherry picked from commit 8c0e209ddb40f4fd5419dd2190a40d1670c16a3d)
Reviewed-on: https://gerrit.libreoffice.org/74084
Reviewed-by: Andras Timar
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index a9fc0adcd9b8..2905170627a4 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -747,19 +747,8 @@ IMPL_LINK(SvxBulletAndPositionDlg, LevelHdl_Impl,
weld::TreeView&, rBox, void)
rBox.unselect(pActNum->GetLevelCount());
}
else
-{
nActNumLvl = nSaveNumLvl;
-sal_uInt16 nMask = 1;
-for (sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
-{
-if (nActNumLvl & nMask)
-{
-rBox.select(i);
-break;
-}
-nMask <<= 1;
-}
-}
+
InitControls();
}
___
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' - sd/source
sd/source/filter/ppt/pptin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a927744c3ec8e5ed0c3990ae25993e888272eda8
Author: Noel Grandin
AuthorDate: Thu Jun 6 13:31:52 2019 +0200
Commit: Noel Grandin
CommitDate: Thu Jun 6 21:17:15 2019 +0200
tdf#125556 URL fragment leaked from one object..
to another when importing Powerpoint ppt file
regression from
commit 4245454d0c3d6df2d0e0a75aed6f22f0a26ce3e2
Date: Wed Feb 28 15:50:29 2018 +0200
loplugin:useuniqueptr in SdrPowerPointImport
Change-Id: I5f415dfa1f6125629b9f3be1d799cb596c64c605
Reviewed-on: https://gerrit.libreoffice.org/73606
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 1e1ba2722922..793d26eabe88 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -378,9 +378,9 @@ bool ImplSdPPTImport::Import()
nPropCount /= 6;// 6 properties per
hyperlink
-SdHyperlinkEntry aHyperlink;
for ( i = 0; i < nPropCount; i++ )
{
+SdHyperlinkEntry aHyperlink;
aHyperlink.nIndex = 0;
aPropItem.ReadUInt32( nType );
if ( nType != VT_I4 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
