sb135: #i116045# removed performQueryForUnknownType; cleaned up
This commit is contained in:
parent
a690719d2e
commit
2edaed16dd
3 changed files with 522 additions and 558 deletions
File diff suppressed because it is too large
Load diff
|
@ -159,7 +159,7 @@ public:
|
|||
{}
|
||||
virtual ~Test_Impl()
|
||||
{
|
||||
OSL_TRACE( "> scalar Test_Impl dtor <\n" );
|
||||
OSL_TRACE( "> scalar Test_Impl dtor <" );
|
||||
}
|
||||
|
||||
void SAL_CALL acquire() throw ()
|
||||
|
|
|
@ -50,8 +50,8 @@ namespace {
|
|||
|
||||
namespace css = ::com::sun::star;
|
||||
|
||||
static char const key[] = "testtools.bridgetest.Key";
|
||||
static char const value[] = "good";
|
||||
static char const KEY[] = "testtools.bridgetest.Key";
|
||||
static char const VALUE[] = "good";
|
||||
|
||||
class CurrentContext:
|
||||
public ::osl::DebugBase< CurrentContext >,
|
||||
|
@ -77,8 +77,8 @@ CurrentContext::~CurrentContext() {}
|
|||
css::uno::Any CurrentContext::getValueByName(::rtl::OUString const & Name)
|
||||
throw (css::uno::RuntimeException)
|
||||
{
|
||||
return Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(key))
|
||||
? css::uno::makeAny(::rtl::OUString::createFromAscii(value))
|
||||
return Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(KEY))
|
||||
? css::uno::makeAny(::rtl::OUString::createFromAscii(VALUE))
|
||||
: css::uno::Any();
|
||||
}
|
||||
|
||||
|
@ -115,13 +115,13 @@ bool testtools::bridgetest::CurrentContextChecker::performCheck(
|
|||
return false;
|
||||
}
|
||||
css::uno::Any a(
|
||||
context->getValueByName(::rtl::OUString::createFromAscii(key)));
|
||||
context->getValueByName(::rtl::OUString::createFromAscii(KEY)));
|
||||
if (a.getValueType() != ::cppu::UnoType< ::rtl::OUString >::get()) {
|
||||
return false;
|
||||
}
|
||||
::rtl::OUString s;
|
||||
OSL_VERIFY(a >>= s);
|
||||
return s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(value));
|
||||
return s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(VALUE));
|
||||
} else {
|
||||
return other->perform(
|
||||
this, setSteps >= 0 ? setSteps - 1 : -1, checkSteps - 1);
|
||||
|
|
Loading…
Reference in a new issue