User: hr Date: 06/06/19 19:53:27 Modified: /dba/dbaccess/source/ui/app/ AppController.cxx
Log: INTEGRATION: CWS warnings01 (1.25.24); FILE MERGED 2006/05/23 23:47:21 sb 1.25.24.3: RESYNC: (1.28-1.29); FILE MERGED 2006/04/07 20:49:25 sb 1.25.24.2: RESYNC: (1.25-1.28); FILE MERGED 2006/03/24 15:35:59 fs 1.25.24.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) 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&r2=1.30 Delta lines: +41 -44 --------------------- --- AppController.cxx 19 Apr 2006 13:19:19 -0000 1.29 +++ AppController.cxx 20 Jun 2006 02:53:25 -0000 1.30 @@ -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 @@ -319,14 +322,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); @@ -363,16 +366,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(); @@ -905,17 +901,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; } @@ -1001,7 +989,7 @@ { if ( pIter->Name.equalsAscii("FormatStringId") ) { - SotFormatStringId nFormatId = -1; + SotFormatStringId nFormatId = 0; if ( pIter->Value >>= nFormatId ) pasteFormat(nFormatId); break; @@ -1284,17 +1272,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); } @@ -1440,6 +1420,8 @@ containerFound(xSubContainer); } break; + default: + break; } getContainer()->elementAdded(eType,sName,_rEvent.Element,getConnection()); } @@ -1473,6 +1455,8 @@ } } break; + default: + break; } getContainer()->elementRemoved(eType,sName,getConnection()); } @@ -1517,6 +1501,8 @@ } } break; + default: + break; } // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName,xConnection); } @@ -1684,6 +1670,8 @@ } } break; + default: + break; } return xRet; } @@ -1749,6 +1737,8 @@ } } break; + case E_NONE: + break; } } @@ -1791,6 +1781,8 @@ } } break; + default: + break; } } // ----------------------------------------------------------------------------- @@ -1890,6 +1882,8 @@ m_xMetaData, getConnection(), *aList.begin(), SAD_TITLE_RENAME) ); } break; + default: + break; } if ( xRename.is() && aDlg.get() ) @@ -1960,7 +1954,7 @@ } } // ----------------------------------------------------------------------------- -void OApplicationController::onEntryDeSelect(SvTreeListBox* _pTree) +void OApplicationController::onEntryDeSelect(SvTreeListBox* /*_pTree*/) { InvalidateAll(); } @@ -2001,9 +1995,8 @@ if ( xConnection.is() ) pView->showPreview(getDatabaseName(),xConnection,sName,sal_False); } - return; } - break; + return; case E_TABLE: { SharedConnection xConnection( ensureConnection() ); @@ -2015,6 +2008,8 @@ } } break; + default: + break; } } catch(SQLException e) @@ -2044,6 +2039,8 @@ case FrameAction_FRAME_UI_DEACTIVATING: m_bFrameUiActive = sal_False; break; + default: + break; } } //------------------------------------------------------------------------------ @@ -2061,21 +2058,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; @@ -2100,19 +2097,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]
