filter/source/pdf/impdialog.cxx | 12 +++---------
sw/source/core/view/printdata.cxx | 3 +--
2 files changed, 4 insertions(+), 11 deletions(-)
New commits:
commit bbfca9be383caa53eb182313d35bde2cc9b690ab
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Sep 5 11:02:29 2022 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Sep 5 13:55:18 2022 +0200
trac#34306 Revert "tdf#54908 Make selection active if there's a selection
(Writer)"
Turns out pre-selecting to only print the selection
by default causes some confusion, in particular in
combination with those WollMux forms that cause
something to be pre-selected in the doc by default.
Other applications like Firefox or Word also
don't only print selection by default.
This reverts commit f50363c7008c239d302944144beb256de6a55f38.
on this branch for now to preselect "All pages" by default
again.
Change-Id: I9a5a89cf7789412fc4d206c061ba99b2a35b891f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139407
Tested-by: Michael Weghorn <m.wegh...@posteo.de>
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 60495f90ec65..e50592a6d87f 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -515,9 +515,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;
@@ -620,12 +619,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 );
- }
- else
+ if( !mbIsWriter )
{
mxCbExportPlaceholders->set_active(false);
}
diff --git a/sw/source/core/view/printdata.cxx
b/sw/source/core/view/printdata.cxx
index a2da5005cc38..a92f3661c990 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -301,8 +301,7 @@ SwPrintUIOptions::SwPrintUIOptions(
aWidgetIds[4] = "rbRangeSelection";
m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds,
OUString(),
aHelpIds,
aPrintRangeName,
- aChoices,
- bHasSelection ? 4 : 0,
+ aChoices, 0 /* always
default to 'All pages' */,
aChoicesDisabled);
// show an Edit dependent on "Pages" selected
