Kaydet (Commit) 9759bbde authored tarafından Matúš Kukan's avatar Matúš Kukan

Revert "warn if people havn't source the environment after linkoo"

This reverts commit b0eeac20.
Linkoo is now dead, whatever the problem was.

Conflicts:
	desktop/source/app/app.cxx

Change-Id: Ic8fce7db9ac8b5e9661b2b767bfba9f7cdd84e9a
üst f5b840a3
......@@ -1325,23 +1325,6 @@ void Desktop::AppEvent( const ApplicationEvent& rAppEvent )
HandleAppEvent( rAppEvent );
}
namespace {
void SetDocumentExtendedStyle( const Reference< ::com::sun::star::awt::XWindow > &xContainerWindow )
{
// set the WB_EXT_DOCUMENT style. Normally, this is done by the TaskCreator service when a "_blank"
// frame/window is created. Since we do not use the TaskCreator here, we need to mimic its behavior,
// otherwise documents loaded into this frame will later on miss functionality depending on the style.
Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
SAL_WARN_IF( !pContainerWindow, "desktop.app", "Desktop::Main: no implementation access to the frame's container window!" );
if (!pContainerWindow) {
fprintf (stderr, "Error: It very much looks as if you have used 'linkoo' (or bin/ooinstall -l)\n"
"but have then forgotten to source 'ooenv' into your shell before running !\n"
"to save a crash, we will exit now with an error - please '. ./ooenv' first.\n");
exit (1);
}
pContainerWindow->SetExtendedStyle( pContainerWindow->GetExtendedStyle() | WB_EXT_DOCUMENT );
}
}
struct ExecuteGlobals
{
......@@ -2903,7 +2886,12 @@ void Desktop::ShowBackingComponent(Desktop * progress)
xContainerWindow = xBackingFrame->getContainerWindow();
if (xContainerWindow.is())
{
SetDocumentExtendedStyle(xContainerWindow);
// set the WB_EXT_DOCUMENT style. Normally, this is done by the TaskCreator service when a "_blank"
// frame/window is created. Since we do not use the TaskCreator here, we need to mimic its behavior,
// otherwise documents loaded into this frame will later on miss functionality depending on the style.
Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
SAL_WARN_IF( !pContainerWindow, "desktop.app", "Desktop::Main: no implementation access to the frame's container window!" );
pContainerWindow->SetExtendedStyle( pContainerWindow->GetExtendedStyle() | WB_EXT_DOCUMENT );
if (progress != 0)
{
progress->SetSplashScreenProgress(75);
......
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