Kaydet (Commit) f6e2aa09 authored tarafından Rüdiger Timm's avatar Rüdiger Timm

INTEGRATION: CWS startcenterfix02 (1.217.2); FILE MERGED

2008/04/11 15:28:49 pl 1.217.2.2: #i87649# better solution: filter all env commands by using specialize rtl command line API
2008/04/11 14:01:54 pl 1.217.2.1: #i87051# remove unnecessary Update
üst ae706c30
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: app.cxx,v $ * $RCSfile: app.cxx,v $
* $Revision: 1.219 $ * $Revision: 1.220 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
...@@ -144,6 +144,8 @@ ...@@ -144,6 +144,8 @@
#include <ucbhelper/contentbroker.hxx> #include <ucbhelper/contentbroker.hxx>
#include <unotools/bootstrap.hxx> #include <unotools/bootstrap.hxx>
#include "vos/process.hxx"
#include <svtools/fontsubstconfig.hxx> #include <svtools/fontsubstconfig.hxx>
#include <svtools/accessibilityoptions.hxx> #include <svtools/accessibilityoptions.hxx>
#include <svtools/apearcfg.hxx> #include <svtools/apearcfg.hxx>
...@@ -332,8 +334,7 @@ CommandLineArgs* Desktop::GetCommandLineArgs() ...@@ -332,8 +334,7 @@ CommandLineArgs* Desktop::GetCommandLineArgs()
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !pArgs ) if ( !pArgs )
{ {
::vos::OExtCommandLine aArgs; pArgs = new CommandLineArgs( true );
pArgs = new CommandLineArgs( aArgs );
} }
} }
...@@ -1646,10 +1647,6 @@ void Desktop::Main() ...@@ -1646,10 +1647,6 @@ void Desktop::Main()
xBackingComp->attachFrame(xBackingFrame); xBackingComp->attachFrame(xBackingFrame);
CloseSplashScreen(); CloseSplashScreen();
xContainerWindow->setVisible(sal_True); xContainerWindow->setVisible(sal_True);
Window* pCompWindow = VCLUnoHelper::GetWindow(xBackingFrame->getComponentWindow());
if (pCompWindow)
pCompWindow->Update();
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment