filter/source/pdf/impdialog.cxx | 13 +++---------- oox/source/ppt/pptshape.cxx | 3 ++- sw/source/core/view/printdata.cxx | 3 +-- 3 files changed, 6 insertions(+), 13 deletions(-)
New commits: commit 35920332b4170cd4696941a74b06355af7147bf6 Author: Szymon Kłos <[email protected]> AuthorDate: Wed Aug 2 08:57:54 2023 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Aug 8 10:19:56 2023 +0200 oox: don't use master style by default By default a shape with empty type attribute in placeholder tag: <p:ph/> will get subtype = XML_obj (oox/source/drawingml/shapecontext.cxx:81) When it is not referencing any master style shape by idx attribute we shouldn't use master list style to be compatible with MSO. Change-Id: Ib695b695885892dbe659e70a28daff1799c5f50e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155232 Tested-by: Jenkins Reviewed-by: Szymon Kłos <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155415 diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index be7046c7498e..ddc3ea935a70 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -206,7 +206,8 @@ void PPTShape::addShape( case XML_obj : { sServiceName = sOutlinerShapeService; - aMasterTextListStyle = rSlidePersist.getMasterPersist() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); + if (getSubTypeIndex().has_value()) + aMasterTextListStyle = rSlidePersist.getMasterPersist() ? rSlidePersist.getMasterPersist()->getBodyTextStyle() : rSlidePersist.getBodyTextStyle(); } break; case XML_body : commit dbcbe2ad59b5403efab0947e3cc8da5c3f9958b6 Author: Khaled Hosny <[email protected]> AuthorDate: Mon Aug 7 12:59:40 2023 +0300 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Aug 8 10:19:42 2023 +0200 tdf#139164: Revert "tdf#54908 Make selection active if there's a selection (Writer)" This reverts commit 87d5c863109f7991e3f2f3a1eb970c00d5a27bd5. Making Writer print selection only by default is not something people expect, and it is not the default in any other application. Judging by the number of duplicates, it seems to have caught a lot of people by surprise, which is not a good UX. Change-Id: Ia7c8928c474d3390d7f7fee6e0c2e504a41d51b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155422 Tested-by: Jenkins Reviewed-by: خالد حسني <[email protected]> (cherry picked from commit 675a7c42bc7ed0c1f69d9d6ee91a9cb6527b4433) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155399 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 3279581eedd5..755f530eee27 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -586,9 +586,8 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent) mxRbAll->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleAllHdl ) ); TogglePagesHdl(); - const bool bSelectionPresent = pParent->mbSelectionPresent; - mxRbSelection->set_sensitive( bSelectionPresent ); - if ( bSelectionPresent ) + mxRbSelection->set_sensitive( pParent->mbSelectionPresent ); + if ( pParent->mbSelectionPresent ) mxRbSelection->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleSelectionHdl ) ); mbIsPresentation = pParent->mbIsPresentation; mbIsWriter = pParent->mbIsWriter; @@ -707,13 +706,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent) } mxCbExportPlaceholders->set_visible(mbIsWriter); - if( mbIsWriter ) - { - // tdf#54908 Make selection active if there is a selection in Writer's version - mxRbSelection->set_active( bSelectionPresent ); - mxCbExportNotesInMargin->set_active(pParent->mbExportNotesInMargin); - } - else + if( !mbIsWriter ) { mxCbExportPlaceholders->set_active(false); mxCbExportNotesInMargin->set_active(false); diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index a52473a6b8e8..790a6deeb5d5 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -284,8 +284,7 @@ SwPrintUIOptions::SwPrintUIOptions( uno::Sequence< OUString > aWidgetIds{ "rbAllPages", "rbRangePages", "rbRangeSelection" }; m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), aHelpIds, aPrintRangeName, - aChoices, - bHasSelection ? 2 : 0, + aChoices, 0 /* always default to 'All pages' */, aChoicesDisabled); // show an Edit dependent on "Pages" selected
