officecfg/registry/data/org/openoffice/VCL.xcu | 7 ------- vcl/source/window/printdlg.cxx | 4 +--- 2 files changed, 1 insertion(+), 10 deletions(-)
New commits: commit 1988a527d469ee59e6588128705dd4726514b7ed Author: Gabor Kelemen <[email protected]> AuthorDate: Sat May 10 23:03:58 2025 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Sat Jun 21 11:11:57 2025 +0200 [API CHANGE] Replace VCL Settings (PrintDialog/CollateBox) in order to simplify code. Drop this config key entirely, it was used for lockdown of the Collate checkbox depending on a non-default value. Change-Id: Ied93bd3ce531c15b7ca4b2b23da110e051bcf74c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185177 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index bfe5f94f6aec..e68b0c54bf0f 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -18,13 +18,6 @@ --> <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd"> <oor:component-data xmlns:oor="http://openoffice.org/2001/registry"; xmlns:install="http://openoffice.org/2004/installation"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="VCL" oor:package="org.openoffice"> - <node oor:name="Settings"> - <node oor:name="PrintDialog" oor:op="replace"> - <prop oor:name="CollateBox" oor:op="replace" oor:type="xs:string"> - <value>Default</value> - </prop> - </node> - </node> <node oor:name="DefaultFonts"> <node oor:name="en" oor:op="replace"> <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace"> diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 5d5539ade673..4d7c74392a6d 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -809,9 +809,7 @@ void PrintDialog::readFromSettings() m_xDialog->set_window_state(aValue); // collate - aValue = pItem->getValue( u"PrintDialog"_ustr, - u"CollateBox"_ustr ); - if( aValue.equalsIgnoreAsciiCase("alwaysoff") ) + if( officecfg::VCL::VCLSettings::PrintDialog::Collate::isReadOnly() ) { mbCollateAlwaysOff = true; mxCollateBox->set_active( false );
