Tag: cws_src680_dba201 User: oj Date: 05/04/25 08:05:24 Modified: /dba/dbaccess/source/ui/browser/ genericcontroller.cxx /dba/dbaccess/source/ui/querydesign/ querycontroller.cxx
Log: #i42067# throw exception when frame or view aren't valid File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.63&r2=1.63.28.1 Delta lines: +6 -4 ------------------- --- genericcontroller.cxx 10 Mar 2005 16:45:35 -0000 1.63 +++ genericcontroller.cxx 25 Apr 2005 15:05:20 -0000 1.63.28.1 @@ -2,9 +2,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.63.28.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 16:45:35 $ + * last change: $Author: oj $ $Date: 2005/04/25 15:05:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -275,7 +275,7 @@ { if ( ( *pIter >>= aValue ) && ( 0 == aValue.Name.compareToAscii( "Frame" ) ) ) { - aValue.Value >>= xFrame; + xFrame.set(aValue.Value,UNO_QUERY_THROW); } /* #i42316# else if ( ( *pIter >>= aValue ) && ( 0 == aValue.Name.compareToAscii( "ReadOnly" ) ) ) @@ -302,6 +302,8 @@ } Construct( pParentWin ); + if ( !getView() ) + throw Exception(::rtl::OUString::createFromAscii("Window is null"),*this); } else { 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.99&r2=1.99.28.1 Delta lines: +4 -4 ------------------- --- querycontroller.cxx 10 Mar 2005 16:53:56 -0000 1.99 +++ querycontroller.cxx 25 Apr 2005 15:05:21 -0000 1.99.28.1 @@ -2,9 +2,9 @@ * * $RCSfile: querycontroller.cxx,v $ * - * $Revision: 1.99 $ + * $Revision: 1.99.28.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 16:53:56 $ + * last change: $Author: oj $ $Date: 2005/04/25 15:05:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -931,7 +931,7 @@ { Reference< XSQLQueryComposerFactory > xFactory(getConnection(), UNO_QUERY); OSL_ENSURE(xFactory.is(),"Connection doesn't support a querycomposer"); - if (xFactory.is()) + if ( xFactory.is() && getContainer() ) { try { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
