Attachment #58088 for issue #96279

View | Details | Raw Unified | Return to issue 96279
Collapse All | Expand All

Lines 651-657 Link Here

(-)openoffice.org.orig/swext/mediawiki/src/com/sun/star/wiki/Helper.java (-2 / +6 lines)
651		651
652	int nProxyType = AnyConverter.toInt( xNameAccess.getByName( "ooInetProxyType" ) );	652	int nProxyType = AnyConverter.toInt( xNameAccess.getByName( "ooInetProxyType" ) );
653	if ( nProxyType == 0 )	653	if ( nProxyType == 0 )
654	aHostConfig.setProxy( "", 0 );	654	aHostConfig.setProxyHost(null);
655	else	655	else
656	{	656	{
657	if ( nProxyType == 1 )	657	if ( nProxyType == 1 )
Lines 672-678 Link Here
672	String aNoProxyList = AnyConverter.toString( xNameAccess.getByName( "ooInetNoProxy" ) );	672	String aNoProxyList = AnyConverter.toString( xNameAccess.getByName( "ooInetNoProxy" ) );
673	String aProxyName = AnyConverter.toString( xNameAccess.getByName( aProxyNameProp ) );	673	String aProxyName = AnyConverter.toString( xNameAccess.getByName( aProxyNameProp ) );
674		674
675	int nProxyPort = AnyConverter.toInt( xNameAccess.getByName( aProxyPortProp ) );	675	int nProxyPort = 80;
		676
		677	Object aPortNo = xNameAccess.getByName( aProxyPortProp );
		678	if (!AnyConverter.isVoid(aPortNo))
		679	nProxyPort = AnyConverter.toInt(aPortNo);
676		680
677	if ( nProxyPort == -1 )	681	if ( nProxyPort == -1 )
678	nProxyPort = 80;	682	nProxyPort = 80;

Lines 284-289 Link Here

(-)openoffice.org.orig/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java (+1 lines)
284	if ( addMode )	284	if ( addMode )
285	{	285	{
286	// no cleaning of the settings is necessary	286	// no cleaning of the settings is necessary
		287	Settings.getSettings( m_xContext ).removeSettingByUrl( sMainURL );
287	Settings.getSettings( m_xContext ).addWikiCon( setting );	288	Settings.getSettings( m_xContext ).addWikiCon( setting );
288	Settings.getSettings( m_xContext ).storeConfiguration();	289	Settings.getSettings( m_xContext ).storeConfiguration();
289	}	290	}

Return to issue 96279