strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automated merge with ssh://hg@hg.services.openoffice.org/cws/undoapi

Browse source
This commit is contained in:
Frank Schoenheit [fs] 2011-01-07 12:31:15 +01:00
commit 0c0ec7651c
4 changed files with 522 additions and 559 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qadevOOo/prj/build.lst
View file

@ -4,4 +4,3 @@ qa qadevOOo nmake - all qa_runner_ant_build NULL
qa qadevOOo\runner nmake - all qa_make_package qa_runner_ant_build NULL
qa qadevOOo\qa\unoapi nmake - all qa_qa_unoapi qa_make_package NULL
qa qadevOOo\qa\complex\junitskeleton nmake - all qa_complex_junitskel qa_make_package NULL

1066
testtools/source/bridgetest/bridgetest.cxx
View file

File diff suppressed because it is too large Load diff

2
testtools/source/bridgetest/cppobj.cxx
View file

@ -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 ()

12
testtools/source/bridgetest/currentcontextchecker.cxx
View file

@ -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);