Tag: cws_src680_odbmacros2 User: fs Date: 2007-12-13 11:22:20+0000 Modified: dba/dbaccess/source/ui/querydesign/querycontroller.cxx
Log: #i49133# some refactoring, mostly related to the m_xCurrentFrame->m_aCurrentFrame change File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: querycontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querycontroller.cxx?r1=1.112&r2=1.112.2.1 Delta lines: +12 -13 --------------------- --- querycontroller.cxx 2007-11-21 17:12:55+0000 1.112 +++ querycontroller.cxx 2007-12-13 11:22:17+0000 1.112.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: querycontroller.cxx,v $ * - * $Revision: 1.112 $ + * $Revision: 1.112.2.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 17:12:55 $ + * last change: $Author: fs $ $Date: 2007/12/13 11:22:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -986,15 +986,14 @@ { ::vos::OGuard aGuard(Application::GetSolarMutex()); - Reference< XFrame > xSource(Source.Source, UNO_QUERY); - if (xSource.is() && getContainer()) + if ( getContainer() && Source.Source.is() ) { - if (xSource.get() == m_xCurrentFrame.get()) + if ( Source.Source == m_aCurrentFrame.getFrame() ) { // our frame is beeing disposed -> close the preview window (if we have one) - Reference<XFrame> xXFrame( getContainer()->getPreviewFrame()); - ::comphelper::disposeComponent( xXFrame ); + Reference< XFrame > xPreviewFrame( getContainer()->getPreviewFrame() ); + ::comphelper::disposeComponent( xPreviewFrame ); } - else if (xSource.get() == getContainer()->getPreviewFrame().get()) + else if ( Source.Source == getContainer()->getPreviewFrame() ) { getContainer()->disposingPreview(); } @@ -1141,7 +1140,7 @@ { try { - getContainer()->showPreview(m_xCurrentFrame); + getContainer()->showPreview( getFrame() ); InvalidateFeature(SID_DB_QUERY_PREVIEW); URL aWantToDispatch; @@ -1151,10 +1150,10 @@ sal_Int32 nSearchFlags = FrameSearchFlag::CHILDREN; Reference< XDispatch> xDisp; - Reference< XDispatchProvider> xProv(m_xCurrentFrame->findFrame(sFrameName,nSearchFlags),UNO_QUERY); + Reference< XDispatchProvider> xProv( getFrame()->findFrame( sFrameName, nSearchFlags ), UNO_QUERY ); if(!xProv.is()) { - xProv.set(m_xCurrentFrame,UNO_QUERY); + xProv.set( getFrame(), UNO_QUERY ); if (xProv.is()) xDisp = xProv->queryDispatch(aWantToDispatch, sFrameName, nSearchFlags); } @@ -1198,7 +1197,7 @@ xDisp->dispatch(aWantToDispatch, aProps); // check the state of the beamer // be notified when the beamer frame is closed - Reference< XComponent > xComponent(m_xCurrentFrame->findFrame(sFrameName,nSearchFlags), UNO_QUERY); + Reference< XComponent > xComponent( getFrame()->findFrame( sFrameName, nSearchFlags ), UNO_QUERY ); if (xComponent.is()) { OSL_ENSURE(Reference< XFrame >(xComponent, UNO_QUERY).get() == getContainer()->getPreviewFrame().get(), --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
