[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
sd/source/ui/dlg/animobjs.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c1e7da2ce1b7705514ca09ace5a53e86474e5fd2 Author: Caolán McNamara AuthorDate: Thu Jul 9 11:39:43 2020 +0100 Commit: Michael Stahl CommitDate: Fri Jul 10 10:26:08 2020 +0200 Resolves: tdf#134674 object inserting using dialogs SdrModel not the target Documents one Change-Id: I07088bddc7c15109e7d377f86c6d0a7819faa658 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98348 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index f2807c71e570..c9a7e49bd596 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -1062,7 +1062,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) // the clone remains in the animation; we insert a clone of the // clone into the group pClone = pPage->GetObj(i); -SdrObject* pCloneOfClone(pClone->CloneSdrObject(pPage->getSdrModelFromSdrPage())); +SdrObject* pCloneOfClone(pClone->CloneSdrObject(pTargetSdPage->getSdrModelFromSdrPage())); //SdrObject* pCloneOfClone = pPage->GetObj(i)->Clone(); pObjList->InsertObject(pCloneOfClone); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
sd/source/ui/dlg/dlgsnap.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit c086788c05dc389d1742e70cb552ac9cfdca172b Author: Stephan Bergmann AuthorDate: Tue Jun 16 17:10:19 2020 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Wed Jun 17 07:55:09 2020 +0200 tdf#132093: Take aUIScale into account again ...which had inadvertently gone missing with bbab991c70e2a1867493d701168f49a0d0dcbd48 "Avoid -fsanitize=implicit-signed-integer-truncation in weld::MetricSpinButton" Change-Id: Idaccb7d1d088f1a3183f19deb3d8ca413d8b1440 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96470 Tested-by: Jenkins Reviewed-by: Stephan Bergmann (cherry picked from commit 5e3ac497193794b4db22d23c8efa9065786d1b9f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96490 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index c07fa83552e4..b5e54a878e64 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -81,9 +81,11 @@ SdSnapLineDlg::SdSnapLineDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, auto const n4 = msb->convert_value_to(n3, FieldUnit::NONE); return n4; }; -m_xMtrFldX->set_range(map(m_xMtrFldX, aLeftTop.X()), map(m_xMtrFldX, aRightBottom.X()), +m_xMtrFldX->set_range(map(m_xMtrFldX, sal_Int32(aLeftTop.X() / aUIScale)), + map(m_xMtrFldX, sal_Int32(aRightBottom.X() / aUIScale)), FieldUnit::NONE); -m_xMtrFldY->set_range(map(m_xMtrFldY, aLeftTop.Y()), map(m_xMtrFldY, aRightBottom.Y()), +m_xMtrFldY->set_range(map(m_xMtrFldY, sal_Int32(aLeftTop.Y() / aUIScale)), + map(m_xMtrFldY, sal_Int32(aRightBottom.Y() / aUIScale)), FieldUnit::NONE); // set values ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
sd/source/filter/eppt/epptso.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 8bf8808c066704b55d518e807b645b7df11f1b5f Author: Aron Budea AuthorDate: Mon Apr 13 05:14:13 2020 +0200 Commit: Michael Stahl CommitDate: Thu Apr 16 11:06:29 2020 +0200 tdf#131193: MSO PP complains about an ODP saved as PPT pPara was supposed to be the first paragraph, as before the below commit. Regression from d458adeed0c34fae26fe7f3d6ecc9b75b431922f Change-Id: I50b993ff8f37fd5572d60fe5d103c3cf5e636a6b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92105 Reviewed-by: Arkadiy Illarionov Reviewed-by: Mike Kaganski Tested-by: Jenkins (cherry picked from commit b267650fd097f16d1b31c87a11a497294ad4ee42) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92287 Reviewed-by: Michael Stahl diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index e03db4c9ddd3..952a8275cbe8 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1180,9 +1180,9 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u pPara = aTextObj.GetParagraph(0); sal_uInt32 nParaFlags = 0x1f; sal_Int16 nMask, nNumberingRule[ 10 ]; -sal_uInt32 nTextOfs = pPara->nTextOfs; -sal_uInt32 nTabs = pPara->maTabStop.getLength(); -const css::style::TabStop* pTabStop = pPara->maTabStop.getConstArray(); +const sal_uInt32 nTextOfs = pPara->nTextOfs; +const sal_uInt32 nTabs = pPara->maTabStop.getLength(); +const auto& rTabStops = pPara->maTabStop; for ( sal_uInt32 i = 0; i < aTextObj.ParagraphCount(); ++i ) { @@ -1219,7 +1219,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u const sal_uInt32 nDefaultTabSize = MapSize( awt::Size( nDefaultTabSizeSrc, 1 ) ).Width; sal_uInt32 nDefaultTabs = std::abs( maRect.GetWidth() ) / nDefaultTabSize; if ( nTabs ) -nDefaultTabs -= static_cast( ( ( pTabStop[ nTabs - 1 ].Position / 4.40972 ) + nTextOfs ) / nDefaultTabSize ); +nDefaultTabs -= static_cast( ( ( rTabStops[ nTabs - 1 ].Position / 4.40972 ) + nTextOfs ) / nDefaultTabSize ); if ( static_cast(nDefaultTabs) < 0 ) nDefaultTabs = 0; @@ -1246,7 +1246,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u if ( nTextRulerAtomFlags & 4 ) { pRuleOut->WriteUInt16( nTabCount ); -for ( const css::style::TabStop& rTabStop : std::as_const(pPara->maTabStop) ) +for ( const css::style::TabStop& rTabStop : rTabStops ) { sal_uInt16 nPosition = static_cast( ( rTabStop.Position / 4.40972 ) + nTextOfs ); sal_uInt16 nType; @@ -1265,7 +1265,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u sal_uInt32 nWidth = 1; if ( nTabs ) -nWidth += static_cast( ( pTabStop[ nTabs - 1 ].Position / 4.40972 + nTextOfs ) / nDefaultTabSize ); +nWidth += static_cast( ( rTabStops[ nTabs - 1 ].Position / 4.40972 + nTextOfs ) / nDefaultTabSize ); nWidth *= nDefaultTabSize; for ( i = 0; i < nDefaultTabs; i++, nWidth += nDefaultTabSize ) pRuleOut->WriteUInt32( nWidth ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
sd/source/filter/html/pubdlg.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit d44dba1a56052e87b879ac986ad14a63bbca357d Author: Caolán McNamara AuthorDate: Thu Apr 9 11:46:05 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Thu Apr 16 07:22:00 2020 +0200 Resolves: tdf#131996 set_sensitive should be set_active search and replace went wrong in: commit b94214350e6e3d0252c09f203a3ce7807a179f90 Date: Thu Jul 25 14:09:09 2019 +0100 weld SdPublishingDlg Change-Id: I10af85633758a6e4c354f6fc957624122dd01f3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91901 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 7623d34a115d..3a31202e5e71 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -644,7 +644,7 @@ void SdPublishingDlg::SetDefaults() SetDesign(&aDefault); m_xPage1_NewDesign->set_active(true); -m_xPage1_OldDesign->set_sensitive(false); +m_xPage1_OldDesign->set_active(false); UpdatePage(); } @@ -828,7 +828,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, weld::Button&, rButton, void ) if (&rButton == m_xPage1_NewDesign.get()) { m_xPage1_NewDesign->set_active(true); // because of DesignDeleteHdl -m_xPage1_OldDesign->set_sensitive(false); +m_xPage1_OldDesign->set_active(false); m_xPage1_Designs->set_sensitive(false); m_xPage1_DelDesign->set_sensitive(false); m_pDesign = nullptr; @@ -838,7 +838,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, weld::Button&, rButton, void ) } else { -m_xPage1_NewDesign->set_sensitive(false); +m_xPage1_NewDesign->set_active(false); m_xPage1_Designs->set_sensitive(true); m_xPage1_DelDesign->set_sensitive(true); @@ -946,7 +946,7 @@ IMPL_LINK( SdPublishingDlg, ResolutionHdl, weld::Button&, rButton, void ) IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl, SvtValueSet*, void) { // if one bitmap-button is chosen, then disable TextOnly -m_xPage5_TextOnly->set_sensitive(false); +m_xPage5_TextOnly->set_active(false); } // Fill the SfxItemSet with the settings of the dialog ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
sd/source/ui/animations/CustomAnimationPane.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fd95dfdbe28d033596d65c517e12ee91e49c8a7c Author: Caolán McNamara AuthorDate: Sun Apr 5 20:33:31 2020 +0100 Commit: Michael Stahl CommitDate: Mon Apr 6 11:28:04 2020 +0200 attempt to deref end() iterator seen when dragging last animation in animation pane up one position Change-Id: I2c5163a58bb67fc7982c41546559207977e8b7c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91714 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index c63e4d0e8712..8a839475f3ec 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2457,7 +2457,7 @@ void CustomAnimationPane::onDragNDropComplete(std::vector< CustomAnimationEffect mpMainSequence->moveToBeforeEffect( pEffect, pEffectInsertBefore ); // Done moving effect and its hidden sub-effects when *next* effect is visible. -if ( mpCustomAnimationList->isVisible( *aIter ) ) +if (aIter != aEnd && mpCustomAnimationList->isVisible(*aIter)) 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-4' - sd/source
sd/source/ui/view/drtxtob1.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 8daf9336b0991d756c8fe2eeea6543bfeb8ce245 Author: Julien Nabet AuthorDate: Wed Mar 25 23:28:47 2020 +0100 Commit: Michael Stahl CommitDate: Wed Apr 1 10:36:52 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 Reviewed-by: Caolán McNamara (cherry picked from commit 83ae778d2e7350a15db2f8fbfde7521ab905d0aa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91115 Reviewed-by: Michael Stahl diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 3d0367e6b2b9..3d2c68960752 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -416,6 +416,9 @@ void TextObjectBar::Execute( SfxRequest &rReq ) 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-4' - sd/source
sd/source/ui/view/DocumentRenderer.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit f8e2fe46fa7cd2df90853b0aca31cfda49a06d3d Author: Caolán McNamara AuthorDate: Tue Mar 24 14:51:09 2020 + Commit: Adolfo Jayme Barrientos CommitDate: Mon Mar 30 21:56:54 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 diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 30fe413e5d83..5faa56a82140 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -616,6 +616,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-4' - sd/source vcl/qa
sd/source/ui/unoidl/unomodel.cxx |8 + vcl/qa/cppunit/pdfexport/data/link-wrong-page.odp |binary vcl/qa/cppunit/pdfexport/pdfexport.cxx| 34 ++ 3 files changed, 42 insertions(+) New commits: commit d61012dd84dc418c8cd4e90122f431997aafa634 Author: Miklos Vajna AuthorDate: Tue Mar 10 18:10:07 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Sat Mar 21 15:02:19 2020 +0100 tdf#61274 sd PDF export: fix links ending up on wrong pages with hidden slides SdPage::IsExcluded() decides if a slide is hidden, SdXImpressDocument::render() checks for this and returns early if needed. In that case PDFExport::ExportSelection() detects that the produced metafile has no actions and avoids creating a PDF page. Then Impress links are created using the vcl::PDFExtOutDevData::CreateLink() call in drawinglayer::processor2d::VclMetafileProcessor2D::processTextHierarchyFieldPrimitive2D(), not specifying the PDF page number explicitly. This means the link is created on the "current" page number, set in vcl::PDFExtOutDevData::SetCurrentPageNumber(), called by PDFExport::ExportSelection(), but that filter/ code can't know about hidden slides in sd/. Fix the problem by setting the page number again in SdXImpressDocument::render(), that way the link created by drawinglayer will end on the correct page. (cherry picked from commit 01dbb38680aa39a4d3bc7afd05d44a4b2c9bc6ab) Conflicts: vcl/qa/cppunit/pdfexport/pdfexport.cxx Change-Id: Ic29e345d45bc7c944d65e6e450f1d742dd0e9f8c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90551 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 6f7510488a30..8bc98bbc6693 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1884,6 +1884,14 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r (pPDFExtOutDevData && pPDFExtOutDevData->GetIsExportHiddenSlides())) ) return; +if (pPDFExtOutDevData) +{ +// Calculate the page number in the PDF output, which may be smaller than the page number in +// case of hidden slides. +sal_Int32 nOutputPageNum = CalcOutputPageNum(pPDFExtOutDevData, mpDoc, nPageNumber); +pPDFExtOutDevData->SetCurrentPageNumber(nOutputPageNum); +} + std::unique_ptr<::sd::ClientView> pView( new ::sd::ClientView( mpDocShell, pOut ) ); ::tools::Rectangle aVisArea( Point(), mpDoc->GetSdPage( static_cast(nPageNumber) - 1, ePageKind )->GetSize() ); vcl::Region aRegion( aVisArea ); diff --git a/vcl/qa/cppunit/pdfexport/data/link-wrong-page.odp b/vcl/qa/cppunit/pdfexport/data/link-wrong-page.odp new file mode 100644 index ..b6787aff6684 Binary files /dev/null and b/vcl/qa/cppunit/pdfexport/data/link-wrong-page.odp differ diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 9b95717d4349..48f12080f74b 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -137,6 +137,7 @@ public: void testTdf121615(); void testTocLink(); void testPdfImageResourceInlineXObjectRef(); +void testLinkWrongPage(); CPPUNIT_TEST_SUITE(PdfExportTest); CPPUNIT_TEST(testTdf106059); @@ -174,6 +175,7 @@ public: CPPUNIT_TEST(testTdf121615); CPPUNIT_TEST(testTocLink); CPPUNIT_TEST(testPdfImageResourceInlineXObjectRef); +CPPUNIT_TEST(testLinkWrongPage); CPPUNIT_TEST_SUITE_END(); }; @@ -1861,6 +1863,38 @@ void PdfExportTest::testTocLink() CPPUNIT_ASSERT(FPDFLink_Enumerate(pPdfPage.get(), &nStartPos, &pLinkAnnot)); } +bool HasLinksOnPage(PageHolder& pPdfPage) +{ +int nStartPos = 0; +FPDF_LINK pLinkAnnot = nullptr; +return FPDFLink_Enumerate(pPdfPage.get(), &nStartPos, &pLinkAnnot); +} + +void PdfExportTest::testLinkWrongPage() +{ +// Import the bugdoc and export as PDF. +OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "link-wrong-page.odp"; +utl::MediaDescriptor aMediaDescriptor; +aMediaDescriptor["FilterName"] <<= OUString("impress_pdf_Export"); +DocumentHolder pPdfDocument = exportAndParse(aURL, aMediaDescriptor); + +// The document has 2 pages. +CPPUNIT_ASSERT_EQUAL(2, FPDF_GetPageCount(pPdfDocument.get())); + +// First page should have 1 link (2nd slide, 1st was hidden). +PageHolder pPdfPage(FPDF_LoadPage(pPdfDocument.get(), /*page_index=*/0)); +CPPUNIT_ASSERT(pPdfPage.get()); + +// Without the accompanying fix in place, this test would have failed, as the link of the first +// page went to the second page due to the hidden first slide. +CPPUNIT_ASSERT(HasLinksOnPage(pPdfPage)); + +// Second page should have no
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
sd/source/ui/view/drtxtob1.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5e503630895c7c213bef503cfed69e71e312ff88 Author: Jim Raykowski AuthorDate: Sun Mar 8 21:47:40 2020 -0800 Commit: Xisco Faulí CommitDate: Tue Mar 10 15:18:43 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/+/90266 Reviewed-by: Xisco Faulí diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index f41a6a91a544..3d0367e6b2b9 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -827,7 +827,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) 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-4' - sd/source sd/uiconfig
sd/source/ui/dlg/tpoption.cxx| 12 sd/source/ui/inc/tpoption.hxx|2 +- sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) New commits: commit f96d0ae4a0e768995ce5a27ccc524112163dff80 Author: Julien Nabet AuthorDate: Thu Mar 5 18:40:42 2020 +0100 Commit: Caolán McNamara CommitDate: Sun Mar 8 15:13:21 2020 +0100 tdf#131137: Fix Checkbox "Do not distort objects in curve" does nothing includes too: https://cgit.freedesktop.org/libreoffice/core/commit/?id=9e8839c934da9744b8f584debc0ad026e49f4a28 which was just an oops. See https://bugs.documentfoundation.org/show_bug.cgi?id=131137#c3 and above all https://bugs.documentfoundation.org/show_bug.cgi?id=131137#c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90054 Tested-by: Jenkins Reviewed-by: Julien Nabet (cherry picked from commit 6d9930f307f08d2c32ee1bcca577cf643955cec9) Change-Id: Ibd38d13be7ef6956d6c26e6f5f71a6751a56b25e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90029 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 2adcd977111f..2331510efb5c 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -198,7 +198,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage, weld::DialogController* , m_xHeightLb(m_xBuilder->weld_label("heightlbl")) , m_xFiInfo2(m_xBuilder->weld_label("info2")) , m_xMtrFldOriginalHeight(m_xBuilder->weld_metric_spin_button("metricHeightFields", FieldUnit::MM)) -, m_xCbxDistrot(m_xBuilder->weld_check_button("distrotcb")) +, m_xCbxDistort(m_xBuilder->weld_check_button("distortcb")) , m_xMtrFldInfo1(m_xBuilder->weld_metric_spin_button("metricInfo1Fields", FieldUnit::MM)) , m_xMtrFldInfo2(m_xBuilder->weld_metric_spin_button("metricInfo2Fields", FieldUnit::MM)) { @@ -219,7 +219,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage, weld::DialogController* SetFieldUnit( *m_xMtrFldTabstop , eFUnit ); // Impress is default mode, let' hide the entire scale frame etc. -m_xCbxDistrot->hide(); +m_xCbxDistort->hide(); m_xScaleFrame->hide(); // fill ListBox with metrics @@ -342,7 +342,8 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) m_xCbxEnableSdremote->get_state_changed_from_saved()|| m_xCbxEnablePresenterScreen->get_state_changed_from_saved() || m_xCbxCompatibility->get_state_changed_from_saved() || -m_xCbxUsePrinterMetrics->get_state_changed_from_saved() ) +m_xCbxUsePrinterMetrics->get_state_changed_from_saved() || +m_xCbxDistort->get_state_changed_from_saved()) { SdOptionsMiscItem aOptsItem; @@ -359,6 +360,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) m_xCbxUsePrinterMetrics->get_active() ? css::document::PrinterIndependentLayout::DISABLED : css::document::PrinterIndependentLayout::ENABLED); +aOptsItem.GetOptionsMisc().SetCrookNoContortion( m_xCbxDistort->get_active() ); rAttrs->Put( aOptsItem ); bModified = true; @@ -410,6 +412,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) m_xCbxEnablePresenterScreen->set_active( aOptsItem.GetOptionsMisc().IsEnablePresenterScreen() ); m_xCbxCompatibility->set_active( aOptsItem.GetOptionsMisc().IsSummationOfParagraphs() ); m_xCbxUsePrinterMetrics->set_active( aOptsItem.GetOptionsMisc().GetPrinterIndependentLayout()==1 ); +m_xCbxDistort->set_active( aOptsItem.GetOptionsMisc().IsCrookNoContortion() ); m_xCbxStartWithTemplate->save_state(); m_xCbxMarkedHitMovesAlways->save_state(); m_xCbxQuickEdit->save_state(); @@ -421,6 +424,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) m_xCbxEnablePresenterScreen->save_state(); m_xCbxCompatibility->save_state(); m_xCbxUsePrinterMetrics->save_state(); +m_xCbxDistort->save_state(); // metric sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); @@ -519,7 +523,7 @@ void SdTpOptionsMisc::SetDrawMode() m_xMtrFldOriginalWidth->show(); m_xFiInfo2->show(); m_xMtrFldOriginalHeight->show(); -m_xCbxDistrot->show(); +m_xCbxDistort->show(); m_xCbxCompatibility->hide(); } diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 1cc5a88f2ffa..d66a5317e6b1 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -102,7 +102,7 @@ private: std::unique_ptr m_xHeightLb; std::unique_ptr m_xFiInfo2; std::unique_ptr m_xMtrFldOriginalHeight; -std::unique_ptr m_xCbxDistrot; +std::unique_ptr m_xCbxDistort; std::unique_ptr m_xMtrFldInfo1; std::unique_ptr m_xMtrFldInfo2; diff --git a/sd/uiconfig/si
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
sd/source/ui/app/sdxfer.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8ebb41ba032ac341f1b0e8fcfe79581488ef75bd Author: Mike Kaganski AuthorDate: Mon Mar 2 12:37:17 2020 +0300 Commit: Xisco Faulí CommitDate: Tue Mar 3 08:52:17 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/+/89798 Reviewed-by: Xisco Faulí diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index a48721c3f888..c1c112008b05 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-4' - sd/source
sd/source/ui/slidesorter/controller/SlideSorterController.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8130bd0bd25db1d9b0517b08c40640f3a96aea2b Author: Caolán McNamara AuthorDate: Wed Feb 19 11:46:50 2020 + Commit: Xisco Faulí CommitDate: Mon Feb 24 12:46:58 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í diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 0d1c019229e9..0d927b0d263f 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -363,7 +363,7 @@ bool SlideSorterController::Command ( if (!rEvent.IsMouseEvent()) pDispatcher->ExecutePopup(aPopupId, pWindow, &aMenuLocation); 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-4' - sd/source
sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 10dac1012b065e5e37ebb42f13d7fbdbda376786 Author: Xisco Fauli AuthorDate: Tue Feb 11 12:11:32 2020 +0100 Commit: Xisco Faulí CommitDate: Wed Feb 12 12:57:36 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/+/88404 Reviewed-by: Michael Stahl Tested-by: Jenkins diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index 9eaa7b50c8a2..4dc2ac08d387 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -126,7 +126,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-4' - 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 4abdcf7c73d16f6fee28dd0502f06a8385ebf019 Author: Caolán McNamara AuthorDate: Mon Feb 10 16:46:22 2020 + Commit: Michael Stahl CommitDate: Tue Feb 11 11:01:41 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/+/88388 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 d61784d28921..7e928cbfea36 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -141,13 +141,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) @@ -156,9 +158,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 bacf5fdf0323..9eaa7b50c8a2 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -121,16 +121,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 6a8dec636a7c..0455206ebfcc 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 indicator 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-4' - sd/source
sd/source/ui/dlg/BulletAndPositionDlg.cxx |9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) New commits: commit 153dafe1147bc29fc0e656d0cb8994112ecea1a0 Author: Onur Yilmaz AuthorDate: Tue Feb 4 16:27:38 2020 +0300 Commit: Xisco Faulí CommitDate: Mon Feb 10 12:40:36 2020 +0100 tdf#130148 Gallery drop-down list in Impress B&N 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/+/88299 Reviewed-by: Xisco Faulí diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index 7ce6a227fe3f..498ea1befcc5 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -897,12 +897,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-4' - sd/source
sd/source/ui/view/drtxtob1.cxx |8 1 file changed, 8 insertions(+) New commits: commit fc64cd7d85354fe2d554711974593e2866e38427 Author: Jim Raykowski AuthorDate: Wed Jan 15 21:49:18 2020 -0900 Commit: Xisco Faulí CommitDate: Tue Jan 21 09:16:36 2020 +0100 tdf#129481 Combine outliner indent and spacing undos Makes one undo when indent or spacing attribute is applied to outliner Change-Id: I1aefff746022552dec96f7cf76a5cb9540c84fc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86903 Tested-by: Jenkins Reviewed-by: Jim Raykowski (cherry picked from commit d6628ddaf6e2acf53c5a7cbbcb201d700cd95f54) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87094 Reviewed-by: Xisco Faulí diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 6f6f84a3f753..f41a6a91a544 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -175,6 +175,8 @@ void TextObjectBar::Execute( SfxRequest &rReq ) nStartPara = 0; nEndPara = pOLV->GetOutliner()->GetParagraphCount() - 1; } + +pOLV->GetOutliner()->UndoActionStart( OLUNDO_ATTR ); for( sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++ ) { SfxStyleSheet* pStyleSheet = nullptr; @@ -204,6 +206,8 @@ void TextObjectBar::Execute( SfxRequest &rReq ) pOLV->GetOutliner()->SetParaAttribs( nPara, aNewAttrs ); } } +pOLV->GetOutliner()->UndoActionEnd(); +mpViewShell->Invalidate( SID_UNDO ); } rReq.Done(); @@ -228,6 +232,8 @@ void TextObjectBar::Execute( SfxRequest &rReq ) nStartPara = 0; nEndPara = pOLV->GetOutliner()->GetParagraphCount() - 1; } + +pOLV->GetOutliner()->UndoActionStart( OLUNDO_ATTR ); for( sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++ ) { SfxStyleSheet* pStyleSheet = nullptr; @@ -267,6 +273,8 @@ void TextObjectBar::Execute( SfxRequest &rReq ) pOLV->GetOutliner()->SetParaAttribs( nPara, aNewAttrs ); } } +pOLV->GetOutliner()->UndoActionEnd(); +mpViewShell->Invalidate( SID_UNDO ); } 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-4' - sd/source
sd/source/ui/view/drtxtob1.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 5d2f65b299f849f4ca12c744945433569095cc1f Author: Jim Raykowski AuthorDate: Sat Dec 28 21:20:05 2019 -0900 Commit: Xisco Faulí CommitDate: Fri Jan 17 11:29:20 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/+/86956 Reviewed-by: Xisco Faulí diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 0b06a88c267b..6f6f84a3f753 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -815,16 +815,16 @@ void TextObjectBar::Execute( SfxRequest &rReq ) // 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-4' - sd/source
sd/source/ui/func/fupage.cxx |9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) New commits: commit cfe24288e43779019bf755dfdff9163e0be2e4e2 Author: Aron Budea AuthorDate: Sun Dec 22 08:10:25 2019 +0100 Commit: Ashod Nakashian CommitDate: Sun Dec 22 22:10:08 2019 +0100 tdf#128449 Set graphic when setting background in Impress Regression from 905e6bd3ae0ca5c5ac7083430d7aa126c6526fd7 Change-Id: If0510967a339b6b46da2b7f798f478a46bd10b48 Reviewed-on: https://gerrit.libreoffice.org/85688 Tested-by: Jenkins Reviewed-by: Ashod Nakashian (cherry picked from commit 8304c671b19365e61d88a9133631775846a172a5) Reviewed-on: https://gerrit.libreoffice.org/85703 diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 7c2654e0bba0..95dc91b232f2 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -293,8 +293,6 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& } else if (nId == SID_SELECT_BACKGROUND) { -OUString aFileName; -OUString aFilterName; Graphic aGraphic; ErrCode nError = ERRCODE_GRFILTER_OPENERROR; @@ -303,7 +301,8 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& if (pArgs && pArgs->GetItemState(SID_SELECT_BACKGROUND, true, &pItem) == SfxItemState::SET) { -aFileName = static_cast(pItem)->GetValue(); +OUString aFileName(static_cast(pItem)->GetValue()); +OUString aFilterName; if (pArgs->GetItemState(FN_PARAM_FILTER, true, &pItem) == SfxItemState::SET) aFilterName = static_cast(pItem)->GetValue(); @@ -316,11 +315,9 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& SvxOpenGraphicDialog aDlg(SdResId(STR_SET_BACKGROUND_PICTURE), pParent); nError = aDlg.Execute(); -if (nError != ERRCODE_NONE) +if (nError == ERRCODE_NONE) { nError = aDlg.GetGraphic(aGraphic); -aFileName = aDlg.GetPath(); -aFilterName = aDlg.GetDetectedFilter(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
sd/source/ui/dlg/PaneChildWindows.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 04ad06533c933b2190b05f42beb50d85a795c3c6 Author: Caolán McNamara AuthorDate: Fri Dec 13 14:31:33 2019 + Commit: Caolán McNamara CommitDate: Sat Dec 14 20:34:29 2019 +0100 Resolves: tdf#129347 ensure impress docking window has enabled input the default inputmode is taken from the parent, if the templates dialog is open when the sidebar is created then the template dialog has set the toplevel window disabled-input Change-Id: I27cd0a6d6127cc2033a2304c27d72b88f16b0b1a Reviewed-on: https://gerrit.libreoffice.org/85120 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index d4d4bab39d5d..b44e128823bf 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -50,7 +50,9 @@ PaneChildWindow::PaneChildWindow ( pParentWindow, SdResId(pTitleBarResId))); SetAlignment(SfxChildAlignment::LEFT); -static_cast(GetWindow())->Initialize(pInfo); +SfxDockingWindow* pDockingWindow = static_cast(GetWindow()); +pDockingWindow->EnableInput(); +pDockingWindow->Initialize(pInfo); SetHideNotDelete(true); ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 5f7987cef5133d7207b09c0c523289bff06f6241 Author: Caolán McNamara AuthorDate: Fri Dec 13 12:47:54 2019 + Commit: Xisco Faulí CommitDate: Fri Dec 13 19:24:22 2019 +0100 Resolves: tdf#129346 if nothing currently selected, select something in the slidesorter Change-Id: I66853ba56eab93dfb18de7496212eb64e97cd2bf Reviewed-on: https://gerrit.libreoffice.org/85109 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 0d4b23ff8dfe..bacf5fdf0323 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -112,7 +112,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) @@ -121,6 +121,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-4' - sd/source
sd/source/ui/sidebar/SlideBackground.cxx | 66 +-- sd/source/ui/sidebar/SlideBackground.hxx |6 ++ 2 files changed, 51 insertions(+), 21 deletions(-) New commits: commit 6ea6f61d4fabc81ac482ead028259a64608f0c48 Author: Caolán McNamara AuthorDate: Tue Dec 10 17:00:31 2019 + Commit: Caolán McNamara CommitDate: Wed Dec 11 12:29:55 2019 +0100 Related: tdf#129267 draw also has a similar panel combobox Change-Id: Icde8c951ba3a0672cbc20989c90783e7c1606965 Reviewed-on: https://gerrit.libreoffice.org/84896 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 98e57e7d594e..958970f49390 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -121,6 +121,7 @@ SlideBackground::SlideBackground( m_nPageRightMargin(0), m_nPageTopMargin(0), m_nPageBottomMargin(0), +meFUnit(GetModuleFieldUnit()), maCustomEntry(), mpBindings(pBindings) { @@ -143,27 +144,6 @@ SlideBackground::SlideBackground( get(mpMasterLabel, "masterlabel"); get(mpMarginSelectBox, "marginLB"); -::sd::DrawDocShell* pDocSh = dynamic_cast<::sd::DrawDocShell*>( SfxObjectShell::Current() ); -SdDrawDocument* pDoc = pDocSh ? pDocSh->GetDoc() : nullptr; -if (pDoc) -{ -SdOptions* pOptions = SD_MOD()->GetSdOptions(pDoc->GetDocumentType()); -if (pOptions) -{ -FieldUnit eMetric = static_cast(pOptions->GetMetric()); -if (IsInch(eMetric)) -{ -for (size_t i = 0; i < SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_INCH); ++i) - mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_INCH[i])); -} -else -{ -for (size_t i = 0; i < SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_CM); ++i) - mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_CM[i])); -} -} -} - maCustomEntry = get("customlabel")->GetText(); addListener(); @@ -189,8 +169,41 @@ bool SlideBackground::IsImpress() maContext == maImpressNotesContext ); } +FieldUnit SlideBackground::GetCurrentUnit(SfxItemState eState, const SfxPoolItem* pState) +{ +FieldUnit eUnit; + +if (pState && eState >= SfxItemState::DEFAULT) +eUnit = static_cast(static_cast(pState)->GetValue()); +else +eUnit = GetModuleFieldUnit(); + +return eUnit; +} + +void SlideBackground::SetMarginsFieldUnit() +{ +auto nSelected = mpMarginSelectBox->GetSelectedEntryPos(); +mpMarginSelectBox->Clear(); + +if (IsInch(meFUnit)) +{ +for (size_t i = 0; i < SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_INCH); ++i) + mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_INCH[i])); +} +else +{ +for (size_t i = 0; i < SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_CM); ++i) + mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_CM[i])); +} + +mpMarginSelectBox->SelectEntryPos(nSelected); +} + void SlideBackground::Initialize() { +SetMarginsFieldUnit(); + mpPaperSizeBox->FillPaperSizeEntries( PaperSizeApp::Draw ); mpPaperSizeBox->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl)); mpPaperOrientation->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl)); @@ -943,6 +956,17 @@ void SlideBackground::NotifyItemUpdate( } } break; +case SID_ATTR_METRIC: +{ +FieldUnit eFUnit = GetCurrentUnit(eState, pState); +if (meFUnit != eFUnit) +{ +meFUnit = eFUnit; +SetMarginsFieldUnit(); +UpdateMarginBox(); +} +} +break; default: break; } diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index 3a48860b7d78..f27184985af4 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -21,6 +21,8 @@ #define INCLUDED_SD_SOURCE_UI_SIDEBAR_SLIDEBACKGROUND_HXX #include +#include +#include #include #include #include @@ -132,6 +134,7 @@ private: long m_nPageRightMargin; long m_nPageTopMargin; long m_nPageBottomMargin; +FieldUnit meFUnit; OUString maCustomEntry; SfxBindings* const mpBindings; @@ -153,6 +156,7 @@ private: void Update(); void UpdateMarginBox(); void SetPanelTitle(const OUString& rTitle); +void SetMarginsFieldUnit(); Color const & GetColorSetOrDefault(); XGradient const & GetGradientSetOrDefault(); @@ -167,6 +171,8 @@ private: void ExecuteMarginULChange(const long mnPageTopMargin, const long mnPageBottomMargin);
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit ba7aa8b9282631623e64c64072399f9034f59f18 Author: Samuel Mehrbrodt AuthorDate: Tue Dec 3 07:40:03 2019 +0100 Commit: Samuel Mehrbrodt CommitDate: Tue Dec 3 12:03:20 2019 +0100 Disable slide copy/cut when LockContentExtraction is set Change-Id: I7bf9ba907a152fab81a9472bc7baf00331753828 Reviewed-on: https://gerrit.libreoffice.org/84291 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 43db80c7ec45..99be5ad168bb 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -763,6 +763,13 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet) } } +ViewShellBase* pBase = mrSlideSorter.GetViewShellBase(); +if (pBase && pBase->isContentExtractionLocked()) +{ +rSet.DisableItem(SID_COPY); +rSet.DisableItem(SID_CUT); +} + // Cut, copy, and delete page are disabled when there is no selection. if (!(rSet.GetItemState(SID_CUT) == SfxItemState::DEFAULT || rSet.GetItemState(SID_COPY) == SfxItemState::DEFAULT ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
sd/source/ui/view/drviews2.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 54445260817c51bc00bfeba2e49b4019105299c2 Author: Samuel Mehrbrodt AuthorDate: Thu Nov 21 15:45:26 2019 +0100 Commit: Thorsten Behrens CommitDate: Mon Nov 25 10:10:35 2019 +0100 tdf#128932 Disable spellcheck while converting shape to bitmap To not have red underline in the resulting bitmap Change-Id: I5d6ae5767df8e8caf295955bdc0e5a5b6b79d45d Reviewed-on: https://gerrit.libreoffice.org/83404 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 30e0deb5d0282491af51ef1f533e738194a2d97d) Reviewed-on: https://gerrit.libreoffice.org/83640 diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 664609e87597..2be1ccd2c6c2 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1108,6 +1108,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) break; case SID_CONVERT_TO_BITMAP: { +// Disable spelling during conversion +bool bOnlineSpell = GetDoc()->GetOnlineSpell(); +GetDoc()->SetOnlineSpell(false); + // switch on undo for the next operations mpDrawView->BegUndo(SdResId(STR_UNDO_CONVERT_TO_BITMAP)); bool bDone(false); @@ -1134,6 +1138,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { aGraphic = Graphic(mpDrawView->GetMarkedObjBitmapEx()); } +// Restore online spelling +GetDoc()->SetOnlineSpell(bOnlineSpell); } 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-4' - sd/source
sd/source/ui/func/fupage.cxx | 10 ++ 1 file changed, 10 insertions(+) New commits: commit c00775925325b04b3d707df0d494464f864f6fc0 Author: Katarina Behrens AuthorDate: Tue Nov 12 00:08:25 2019 +0100 Commit: Xisco Faulí CommitDate: Tue Nov 19 17:47:28 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í diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index bad262357f47..7c2654e0bba0 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -387,6 +388,15 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& } } +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( &aMigrateSet, 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