cui/source/options/optchart.cxx | 11 ++++++++++- cui/source/options/optinet2.cxx | 6 ++++++ sc/source/ui/optdlg/tpcalc.cxx | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-)
New commits: commit 6b9837ebe40b44bdd6e5940b9a5a457cb350c546 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Mon Jun 20 19:17:00 2022 +0200 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Tue Jun 21 10:07:15 2022 +0200 tdf#58134 Reset Button in Options Dialogs fixed a couple of these. Change-Id: Ibef29afee1d702af2812996093deb7204c74e32c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136195 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> (cherry picked from commit b95142c11e80c58b70dff68bfd7f3792657b9ee2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136167 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index af9b92322802..9b1e6c9c92f2 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -157,7 +157,16 @@ bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs ) void SvxDefaultColorOptPage::Reset( const SfxItemSet* ) { - m_xLbChartColors->select( 0 ); + if( m_SvxChartColorTableUniquePtr ) + { + m_SvxChartColorTableUniquePtr->useDefault(); + + FillBoxChartColorLB(); + + m_xLbChartColors->grab_focus(); + m_xLbChartColors->select( 0 ); + m_xPBRemove->set_sensitive(true); + } } void SvxDefaultColorOptPage::FillPaletteLB() diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 3ce4df88cb59..a3dd5826f6f3 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -204,6 +204,8 @@ void SvxProxyTabPage::ReadConfigData_Impl() nIntValue = *x; m_xHttpPortED->set_text( OUString::number( nIntValue )); } + else + m_xHttpPortED->set_text( "" ); m_xHttpsProxyED->set_text( officecfg::Inet::Settings::ooInetHTTPSProxyName::get() ); x = officecfg::Inet::Settings::ooInetHTTPSProxyPort::get(); @@ -212,6 +214,8 @@ void SvxProxyTabPage::ReadConfigData_Impl() nIntValue = *x; m_xHttpsPortED->set_text( OUString::number( nIntValue )); } + else + m_xHttpsPortED->set_text( "" ); m_xFtpProxyED->set_text( officecfg::Inet::Settings::ooInetFTPProxyName::get() ); x = officecfg::Inet::Settings::ooInetFTPProxyPort::get(); @@ -220,6 +224,8 @@ void SvxProxyTabPage::ReadConfigData_Impl() nIntValue = *x; m_xFtpPortED->set_text( OUString::number( nIntValue )); } + else + m_xFtpPortED->set_text( "" ); m_xNoProxyForED->set_text( officecfg::Inet::Settings::ooInetNoProxy::get() ); } diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 4974dcb3a519..ae767043f73b 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#undef SC_DLLIMPLEMENTATION + #undef SC_DLLIMPLEMENTATION #include <vcl/svapp.hxx> #include <vcl/weld.hxx> @@ -143,6 +143,7 @@ void ScTpCalcOptions::Reset(const SfxItemSet* rCoreAttrs) m_xFtPrec->set_sensitive(false); m_xEdPrec->set_sensitive(false); m_xBtnGeneralPrec->set_active(false); + m_xEdPrec->set_value(0); } else {