Kaydet (Commit) bfe2ac4e authored tarafından Mikhail Voitenko's avatar Mikhail Voitenko

#100120# use new service only for 6.1

üst 2f0cd6bc
...@@ -337,8 +337,14 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height ) ...@@ -337,8 +337,14 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height )
if( !SUCCEEDED( hr ) ) return hr; if( !SUCCEEDED( hr ) ) return hr;
// create frame // create frame
hr = GetIDispByFunc( mpDispFactory, L"createInstance", &CComVariant( L"com.sun.star.frame.Task" ), 1, mpDispFrame );
if( !SUCCEEDED( hr ) || !mpDispFrame )
{
// the interface com.sun.star.frame.Task is removed in 6.1
// but the interface com.sun.star.frame.Frame has some bugs in 6.0
hr = GetIDispByFunc( mpDispFactory, L"createInstance", &CComVariant( L"com.sun.star.frame.Frame" ), 1, mpDispFrame ); hr = GetIDispByFunc( mpDispFactory, L"createInstance", &CComVariant( L"com.sun.star.frame.Frame" ), 1, mpDispFrame );
if( !SUCCEEDED( hr ) ) return hr; if( !SUCCEEDED( hr ) ) return hr;
}
// initialize frame // initialize frame
CComVariant dummyResult; CComVariant dummyResult;
......
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