Tag: cws_src680_dba30 User: fs Date: 05/10/13 08:11:25 Modified: /dba/dbaccess/source/ui/browser/ genericcontroller.cxx
Log: RESYNC: (1.65-1.66); FILE MERGED 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.14.3&r2=1.63.14.4 Delta lines: +16 -3 -------------------- --- genericcontroller.cxx 30 Sep 2005 07:00:44 -0000 1.63.14.3 +++ genericcontroller.cxx 13 Oct 2005 15:11:22 -0000 1.63.14.4 @@ -153,6 +153,7 @@ return sConfirmDeletionURL; } +DBG_NAME(OGenericUnoController) // ------------------------------------------------------------------------- OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFactory >& _rM) :OGenericUnoController_COMPBASE(m_aMutex) @@ -168,6 +169,8 @@ ,m_bDescribingSupportedFeatures( false ) #endif { + DBG_CTOR(OGenericUnoController,NULL); + try { m_xUrlTransformer = Reference< XURLTransformer > (_rM->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")), UNO_QUERY); @@ -180,6 +183,8 @@ // ----------------------------------------------------------------------------- OGenericUnoController::~OGenericUnoController() { + + DBG_DTOR(OGenericUnoController,NULL); } // ----------------------------------------------------------------------------- @@ -252,7 +257,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" ) ) ) @@ -279,6 +284,8 @@ } Construct( pParentWin ); + if ( !getView() ) + throw Exception(::rtl::OUString::createFromAscii("Window is null"),*this); } else { @@ -724,6 +731,7 @@ sLog += ::rtl::OString( "' )" ); RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "[EMAIL PROTECTED]", sLog.getStr() ); #endif + executeUnChecked(_aURL,aArgs); } @@ -803,6 +811,10 @@ // check out from all the objects we are listening // the frame stopFrameListening( ); + m_xMasterDispatcher = NULL; + m_xSlaveDispatcher = NULL; + m_xCurrentFrame = NULL; + m_xMultiServiceFacatory = NULL; } // ----------------------------------------------------------------------- @@ -1297,6 +1309,7 @@ aIter != m_aSupportedFeatures.end(); ++aIter ) + if ( aIter->second.GroupId != CommandGroup::INTERNAL ) aCmdHashMap.insert( CommandHashMap::value_type( aIter->second.GroupId, 0 )); Sequence< sal_Int16 > aCommandGroups( aCmdHashMap.size() ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
