Kaydet (Commit) ee8dc096 authored tarafından Noel Grandin's avatar Noel Grandin

fix ambiguous base-class problem

Change-Id: I7cf34ceebc656e0ca507521bfdaaf8beac67644c
üst 6e73cc6b
...@@ -233,7 +233,9 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException ) ...@@ -233,7 +233,9 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
break; break;
default: 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; break;
} }
...@@ -495,15 +497,15 @@ throw( uno::Exception, uno::RuntimeException ) ...@@ -495,15 +497,15 @@ throw( uno::Exception, uno::RuntimeException )
// parameter checking // parameter checking
uno::Any aAny; uno::Any aAny;
if( 0 == aArguments.getLength() ) if( 0 == aArguments.getLength() )
throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), throw lang::IllegalArgumentException(rtl::OUString("no arguments"),
static_cast<XFilePicker*>( this ), 1 ); static_cast<XFilePicker*>( static_cast<XFilePicker3*>(this) ), 1 );
aAny = aArguments[0]; aAny = aArguments[0];
if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) && if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) &&
(aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) )
throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), throw lang::IllegalArgumentException(rtl::OUString( "invalid argument type" ),
static_cast<XFilePicker*>( this ), 1 ); static_cast<XFilePicker*>( static_cast<XFilePicker3*>(this) ), 1 );
sal_Int16 templateId = -1; sal_Int16 templateId = -1;
aAny >>= templateId; aAny >>= templateId;
...@@ -555,8 +557,8 @@ throw( uno::Exception, uno::RuntimeException ) ...@@ -555,8 +557,8 @@ throw( uno::Exception, uno::RuntimeException )
OSL_TRACE( "Template: FILESAVE_AUTOEXTENSION" ); OSL_TRACE( "Template: FILESAVE_AUTOEXTENSION" );
break; break;
default: default:
throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), throw lang::IllegalArgumentException(rtl::OUString("Unknown template"),
static_cast< XFilePicker* >( this ), static_cast<XFilePicker*>( static_cast<XFilePicker3*>(this) ),
1 ); 1 );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment