2 files changed, 16 insertions, 1 deletions
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() );
 }