diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 20:28:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 20:28:18 +0000 |
| commit | 5222e04d9e5d584464aa4f4ff5934ab7362fddc1 (patch) | |
| tree | 2a067add53b63cc600c7f35b0479e628ddef5b7d /svtools | |
| parent | accb74a6b36a71c33b04e89882a242e6bf3b4be8 (diff) | |
INTEGRATION: CWS warnings01 (1.6.62); FILE MERGED
2006/04/07 19:17:42 sb 1.6.62.2: RESYNC: (1.6-1.7); FILE MERGED
2005/11/15 19:56:06 pl 1.6.62.1: #i55991# removed warnings
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/uno/genericunodialog.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 510eb4d01935..e1adb4be0c17 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -4,9 +4,9 @@ * * $RCSfile: genericunodialog.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2006-03-14 11:37:39 $ + * last change: $Author: hr $ $Date: 2006-06-19 21:28:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -205,7 +205,6 @@ sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& } return sal_False; } - break; } return OPropertyContainer::convertFastPropertyValue(rConvertedValue, rOldValue, nHandle, rValue); } @@ -261,7 +260,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException) // high on the stack, with no mutex locked above, so we try to behave the same way here { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); pDialogToExecute = createDialog(pParent); OSL_ENSURE( pDialogToExecute, "OGenericUnoDialog::execute: createDialog returned nonsense!" ); // do some initialisations |