From c16ebca652eabe2c966787aa3445dd04f0dc0923 Mon Sep 17 00:00:00 2001
From: RĂ¼diger Timm <rt@openoffice.org>
Date: Thu, 4 Sep 2008 06:07:37 +0000
Subject: 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

---
 desktop/win32/source/setup/setup_main.cxx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'desktop/win32/source')

diff --git a/desktop/win32/source/setup/setup_main.cxx b/desktop/win32/source/setup/setup_main.cxx
index dd50e9b2ad6b..ea6ad57ce25c 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();
 
-- 
cgit