summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:12:29 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:12:29 +0000
commit717b0976a59c8bd1aa1f53717cd4571da566411d (patch)
treeacd2c9fbe57d7af593ce0885c35c2b60c711722e
parent8505c4230940ef6e877076c719ac4cddd356d975 (diff)
INTEGRATION: CWS warnings01 (1.3.18); FILE MERGED
2005/11/16 12:07:40 pl 1.3.18.1: #i55991# removed warnings
-rw-r--r--fpicker/source/office/commonpicker.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index d5ef6ea5c1..409758e926 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: commonpicker.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 23:30:25 $
+ * last change: $Author: hr $ $Date: 2006-06-20 00:12:29 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -143,7 +143,7 @@ namespace svt
Application::RemoveUserEvent( m_nCancelEvent );
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ ::osl::MutexGuard aOwnGuard( m_aMutex );
if ( m_bExecuting && m_pDlg )
m_pDlg->EndDialog( RET_CANCEL );
}
@@ -382,12 +382,12 @@ namespace svt
getDialog()->SetText( m_aTitle );
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ ::osl::MutexGuard aOwnGuard( m_aMutex );
m_bExecuting = sal_True;
}
sal_Int16 nResult = implExecutePicker();
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ ::osl::MutexGuard aOwnGuard( m_aMutex );
m_bExecuting = sal_False;
}
@@ -420,7 +420,7 @@ namespace svt
}
//---------------------------------------------------------------------
- IMPL_LINK( OCommonPicker, OnCancelPicker, void*, NOTINTERESTEDIN )
+ IMPL_LINK( OCommonPicker, OnCancelPicker, void*, EMPTYARG )
{
// By definition, the solar mutex is locked when we arrive here. Note that this
// is important, as for instance the consistency of m_pDlg depends on this mutex.