diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-09-04 06:07:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-09-04 06:07:37 +0000 |
| commit | b6af6dca1fd9ce6ff0904e5a4f54b180327dbe66 (patch) | |
| tree | 696ced342a412b68fd47d7e8f23cfb1db0836dab /desktop | |
| parent | a9855dba68b69b3a33fdabdc66a7907c1f30738d (diff) | |
INTEGRATION: CWS native190_DEV300 (1.7.130); FILE MERGED
2008/09/01 14:19:38 dv 1.7.130.2: #i93250# DON'T look for *.msp files when doing an administrative install
2008/09/01 06:00:09 dv 1.7.130.1: #i93250# Look for *.msp files and prepare patch install
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/win32/source/setup/setup_main.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/desktop/win32/source/setup/setup_main.cxx b/desktop/win32/source/setup/setup_main.cxx index 7c8fdb2468..1e873547ab 100644 --- a/desktop/win32/source/setup/setup_main.cxx +++ b/desktop/win32/source/setup/setup_main.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: setup_main.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -68,6 +68,7 @@ SetupApp::SetupApp() m_nMinorVersion = sInfoOS.dwMinorVersion; m_bIsWin9x = ( VER_PLATFORM_WIN32_NT != sInfoOS.dwPlatformId ); m_bNeedReboot = false; + m_bAdministrative = false; } //-------------------------------------------------------------------------- @@ -110,6 +111,10 @@ extern "C" int __stdcall WinMain( HINSTANCE hInst, HINSTANCE, LPSTR, int ) if ( ! pSetup->ReadProfile() ) throw pSetup->GetError(); + if ( ! pSetup->IsAdminInstall() ) + if ( ! pSetup->GetPatches() ) + throw pSetup->GetError(); + if ( ! pSetup->CheckVersion() ) throw pSetup->GetError(); |