Tag: cws_src680_dba30 User: fs Date: 05/03/24 02:48:43 Modified: /dba/dbaccess/source/filter/xml/ dbloader2.cxx
Log: #i45921# File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: dbloader2.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/dbloader2.cxx?r1=1.7&r2=1.7.6.1 Delta lines: +14 -9 -------------------- --- dbloader2.cxx 17 Feb 2005 11:05:28 -0000 1.7 +++ dbloader2.cxx 24 Mar 2005 10:48:40 -0000 1.7.6.1 @@ -2,9 +2,9 @@ * * $RCSfile: dbloader2.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.6.1 $ * - * last change: $Author: vg $ $Date: 2005/02/17 11:05:28 $ + * last change: $Author: fs $ $Date: 2005/03/24 10:48:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,6 +83,9 @@ #ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> #endif +#ifndef _COM_SUN_STAR_FRAME_XFRAMESSUPPLIER_HPP_ +#include <com/sun/star/frame/XFramesSupplier.hpp> +#endif #ifndef _COM_SUN_STAR_FRAME_XFRAMELOADER_HPP_ #include <com/sun/star/frame/XFrameLoader.hpp> #endif @@ -446,14 +449,16 @@ Sequence< Any > aArgs(2); Reference< ::com::sun::star::awt::XWindow> xWindow; // get the top most window - if ( rFrame.is() ) + Reference < XFramesSupplier > xDesktop( m_xServiceFactory->createInstance( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ) ), UNO_QUERY ); + Reference < XFrame > xActiveFrame = xDesktop->getActiveFrame(); + if ( xActiveFrame.is() ) { - xWindow = rFrame->getContainerWindow(); - Reference<XFrame> xFrame = rFrame; + xWindow = xActiveFrame->getContainerWindow(); + Reference<XFrame> xFrame = xActiveFrame; while ( xFrame.is() && !xFrame->isTop() ) - { xFrame.set(xFrame->getCreator(),UNO_QUERY); - } + if ( xFrame.is() ) xWindow = xFrame->getContainerWindow(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
