INTEGRATION: CWS gh15 (1.36.8); FILE MERGED

2008/04/24 11:09:07 gh 1.36.8.1: #i85772#initially disable button and marking the OOProgramDir as Path
This commit is contained in:
Vladimir Glazounov 2008-08-19 11:47:49 +00:00
parent 16efda3cd4
commit c0dc9e33c2

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dialogs.cxx,v $
* $Revision: 1.36 $
* $Revision: 1.37 $
*
* This file is part of OpenOffice.org.
*
@ -671,7 +671,8 @@ void MiscOptions::Save( Config &aConfig )
aConfig.WriteKey( "MaxLRU", ByteString::CreateFromInt64( aTFMaxLRU.GetValue() ) );
aConfig.SetGroup("OOoProgramDir");
aConfig.WriteKey( "Current", ByteString( aEDProgDir.GetText(), RTL_TEXTENCODING_UTF8 ) );
aConfig.WriteKey( C_KEY_AKTUELL, ByteString( aEDProgDir.GetText(), RTL_TEXTENCODING_UTF8 ) );
aConfig.WriteKey( C_KEY_TYPE, ByteString( "PATH" ) );
}
@ -844,6 +845,7 @@ void GenericOptions::ShowSelectPath( const String aType )
nMoveButtons += nDelta;
aMoveTimer.Start();
bShowSelectPath = TRUE;
aPbSelectPath.Show( TRUE );
aPbSelectPath.Enable( TRUE );
}
else if ( !aType.EqualsIgnoreCaseAscii( "PATH" ) && bShowSelectPath )
@ -860,7 +862,7 @@ IMPL_LINK( GenericOptions, MoveButtons, AutoTimer*, aTimer )
if ( nMoveButtons == 0 )
{
aTimer->Stop();
// aPbSelectPath.Enable( bShowSelectPath );
aPbSelectPath.Show( bShowSelectPath );
return 0;
}