diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-17 18:49:33 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-17 19:37:43 +0200 |
commit | 9759bbde8939263fb308f7f8a7315354945f859b (patch) | |
tree | f71e01c819328c336055d1f3dda734530a882828 /desktop | |
parent | f5b840a3ee14a2086647596246d3491a58bf33bb (diff) |
Revert "warn if people havn't source the environment after linkoo"
This reverts commit b0eeac20a1c1db422eaf152c353a4101cb200de9.
Linkoo is now dead, whatever the problem was.
Conflicts:
desktop/source/app/app.cxx
Change-Id: Ic8fce7db9ac8b5e9661b2b767bfba9f7cdd84e9a
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/app.cxx | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 70036d75abe2..2e3ee0e20efb 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -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); |