diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-12 14:01:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-12 14:04:16 +0200 |
| commit | ee8dc096aa5e3700985b5ad619edc6c565b5787b (patch) | |
| tree | df150900c49814d05bb2384508b96e17594abf58 | |
| parent | 6e73cc6b08f149bc99c67a0b7522a45bc1f628a0 (diff) | |
fix ambiguous base-class problem
Change-Id: I7cf34ceebc656e0ca507521bfdaaf8beac67644c
| -rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.mm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index c611ec541d4e..119c00d7d22d 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -233,7 +233,9 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException ) break; default: - throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The dialog returned with an unknown result!")), static_cast< XFilePicker* >( this )); + throw uno::RuntimeException( + rtl::OUString("The dialog returned with an unknown result!"), + static_cast<XFilePicker*>( static_cast<XFilePicker3*>( this ) )); break; } @@ -495,15 +497,15 @@ throw( uno::Exception, uno::RuntimeException ) // parameter checking uno::Any aAny; if( 0 == aArguments.getLength() ) - throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), - static_cast<XFilePicker*>( this ), 1 ); + throw lang::IllegalArgumentException(rtl::OUString("no arguments"), + static_cast<XFilePicker*>( static_cast<XFilePicker3*>(this) ), 1 ); aAny = aArguments[0]; if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) && (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) - throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), - static_cast<XFilePicker*>( this ), 1 ); + throw lang::IllegalArgumentException(rtl::OUString( "invalid argument type" ), + static_cast<XFilePicker*>( static_cast<XFilePicker3*>(this) ), 1 ); sal_Int16 templateId = -1; aAny >>= templateId; @@ -555,8 +557,8 @@ throw( uno::Exception, uno::RuntimeException ) OSL_TRACE( "Template: FILESAVE_AUTOEXTENSION" ); break; default: - throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), - static_cast< XFilePicker* >( this ), + throw lang::IllegalArgumentException(rtl::OUString("Unknown template"), + static_cast<XFilePicker*>( static_cast<XFilePicker3*>(this) ), 1 ); } |