Tag: cws_src680_qiq User: fs Date: 2006/06/27 05:11:38 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: RESYNC: (1.29-1.30); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.29.12.4&r2=1.29.12.5 Delta lines: +44 -47 --------------------- --- AppController.cxx 19 Jun 2006 09:27:49 -0000 1.29.12.4 +++ AppController.cxx 27 Jun 2006 12:11:34 -0000 1.29.12.5 @@ -109,6 +109,9 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef SVTOOLS_URIHELPER_HXX #include <svtools/urihelper.hxx> #endif @@ -322,14 +325,14 @@ //-------------------------------------------------------------------- OApplicationController::OApplicationController(const Reference< XMultiServiceFactory >& _rxORB) :OApplicationController_CBASE( _rxORB ) - ,m_bSuspended( sal_False ) + ,m_aTableCopyHelper(this) ,m_pClipbordNotifier(NULL) ,m_nAsyncDrop(0) ,m_ePreviewMode(E_PREVIEWNONE) - ,m_bNeedToReconnect(sal_False) - ,m_bPreviewEnabled(sal_True) ,m_eOldType(E_NONE) - ,m_aTableCopyHelper(this) + ,m_bPreviewEnabled(sal_True) + ,m_bNeedToReconnect(sal_False) + ,m_bSuspended( sal_False ) { DBG_CTOR(OApplicationController,NULL); @@ -366,16 +369,9 @@ if ( xFlush.is() && m_xMetaData.is() && !m_xMetaData->isReadOnly() ) xFlush->flush(); } - catch( const Exception& e ) + catch( const Exception& ) { - #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "OApplicationController::disconnect: caught an exception!\n" ); - sMessage += "message:\n"; - sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), osl_getThreadTextEncoding() ); - OSL_ENSURE( false, sMessage ); - #else - e; // make compiler happy - #endif + DBG_UNHANDLED_EXCEPTION(); } m_xDataSourceConnection.clear(); @@ -908,17 +904,9 @@ aReturn = OApplicationController_CBASE::GetState(_nId); } } - catch(Exception& e) + catch(const Exception& ) { -#if DBG_UTIL - String sMessage("OApplicationController::GetState(", RTL_TEXTENCODING_ASCII_US); - sMessage += String::CreateFromInt32(_nId); - sMessage.AppendAscii(") : caught an exception ! message : "); - sMessage += (const sal_Unicode*)e.Message; - DBG_ERROR(ByteString(sMessage, gsl_getSystemTextEncoding()).GetBuffer()); -#else - e; // make compiler happy -#endif + DBG_UNHANDLED_EXCEPTION(); } return aReturn; } @@ -1004,7 +992,7 @@ { if ( pIter->Name.equalsAscii("FormatStringId") ) { - SotFormatStringId nFormatId = -1; + SotFormatStringId nFormatId = 0; if ( pIter->Value >>= nFormatId ) pasteFormat(nFormatId); break; @@ -1287,17 +1275,9 @@ break; } } - catch(Exception& e) + catch( const Exception& ) { -#if DBG_UTIL - String sMessage("OApplicationController::Execute(", RTL_TEXTENCODING_ASCII_US); - sMessage += String::CreateFromInt32(_nId); - sMessage.AppendAscii(") : caught an exception ! message : "); - sMessage += (const sal_Unicode*)e.Message; - DBG_ERROR(ByteString(sMessage, gsl_getSystemTextEncoding()).GetBuffer()); -#else - e; // make compiler happy -#endif + DBG_UNHANDLED_EXCEPTION(); } InvalidateFeature(_nId); } @@ -1443,6 +1423,8 @@ containerFound(xSubContainer); } break; + default: + break; } getContainer()->elementAdded(eType,sName,_rEvent.Element,getConnection()); } @@ -1476,6 +1458,8 @@ } } break; + default: + break; } getContainer()->elementRemoved(eType,sName,getConnection()); } @@ -1518,6 +1502,8 @@ } } break; + default: + break; } // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName,xConnection); } @@ -1685,6 +1671,8 @@ } } break; + default: + break; } return xRet; } @@ -1750,6 +1738,8 @@ } } break; + case E_NONE: + break; } } @@ -1792,6 +1782,8 @@ } } break; + default: + break; } } // ----------------------------------------------------------------------------- @@ -1892,6 +1884,8 @@ *aList.begin(), *pNameChecker, SAD_TITLE_RENAME ) ); } break; + default: + break; } if ( xRename.is() && aDialog.get() ) @@ -1962,7 +1956,7 @@ } } // ----------------------------------------------------------------------------- -void OApplicationController::onEntryDeSelect(SvTreeListBox* _pTree) +void OApplicationController::onEntryDeSelect(SvTreeListBox* /*_pTree*/) { InvalidateAll(); } @@ -2003,9 +1997,8 @@ if ( xConnection.is() ) pView->showPreview(getDatabaseName(),xConnection,sName,sal_False); } - return; } - break; + return; case E_TABLE: { SharedConnection xConnection( ensureConnection() ); @@ -2017,6 +2010,8 @@ } } break; + default: + break; } } catch(SQLException e) @@ -2046,6 +2041,8 @@ case FrameAction_FRAME_UI_DEACTIVATING: m_bFrameUiActive = sal_False; break; + default: + break; } } //------------------------------------------------------------------------------ @@ -2063,21 +2060,21 @@ return 0L; } // ----------------------------------------------------------------------------- -void OApplicationController::onCutEntry(SvLBoxEntry* _pEntry) +void OApplicationController::onCutEntry(SvLBoxEntry* /*_pEntry*/) { } // ----------------------------------------------------------------------------- -void OApplicationController::onCopyEntry(SvLBoxEntry* _pEntry) +void OApplicationController::onCopyEntry(SvLBoxEntry* /*_pEntry*/) { Execute(ID_BROWSER_COPY,Sequence<PropertyValue>()); } // ----------------------------------------------------------------------------- -void OApplicationController::onPasteEntry(SvLBoxEntry* _pEntry) +void OApplicationController::onPasteEntry(SvLBoxEntry* /*_pEntry*/) { Execute(ID_BROWSER_PASTE,Sequence<PropertyValue>()); } // ----------------------------------------------------------------------------- -void OApplicationController::onDeleteEntry(SvLBoxEntry* _pEntry) +void OApplicationController::onDeleteEntry(SvLBoxEntry* /*_pEntry*/) { ElementType eType = getContainer()->getElementType(); sal_uInt16 nId = 0; @@ -2102,19 +2099,19 @@ executeChecked(nId,Sequence<PropertyValue>()); } // ----------------------------------------------------------------------------- -sal_Bool OApplicationController::requestContextMenu( const CommandEvent& _rEvent ) +sal_Bool OApplicationController::requestContextMenu( const CommandEvent& /*_rEvent*/ ) { return sal_False; } // ----------------------------------------------------------------------------- -sal_Bool OApplicationController::requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const +sal_Bool OApplicationController::requestQuickHelp( const SvLBoxEntry* /*_pEntry*/, String& /*_rText*/ ) const { return sal_False; } // ----------------------------------------------------------------------------- -sal_Bool OApplicationController::requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ) +sal_Bool OApplicationController::requestDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ ) { TransferableHelper* pTransfer = NULL; if ( getContainer() && getContainer()->getSelectionCount() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
