diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-13 17:38:43 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-13 20:05:14 +0100 |
| commit | 31cba7d34694f50ddf015b405688635b591ce2c0 (patch) | |
| tree | 8ad14a5279a4c878834fe1640242028429b7b708 /unotest | |
| parent | d843d64283c311f02ff663cb02d7ac5a4e744bfc (diff) | |
fixes for previous commit
Change-Id: Ic4f2d36ce901b88b47b43fdebba197daf8bd0373
Diffstat (limited to 'unotest')
| -rw-r--r-- | unotest/source/cpp/bootstrapfixturebase.cxx | 5 | ||||
| -rw-r--r-- | unotest/source/cpp/macros_test.cxx | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index fce13e364b97..988d9bd3172d 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -68,6 +68,11 @@ OUString test::BootstrapFixtureBase::getURLFromSrc( const char *pPath ) return m_aSrcRootURL + OUString::createFromAscii( pPath ); } +OUString test::BootstrapFixtureBase::getURLFromSrc( const OUString& rPath ) +{ + return m_aSrcRootURL + rPath; +} + OUString test::BootstrapFixtureBase::getPathFromSrc( const char *pPath ) { return m_aSrcRootPath + OUString::createFromAscii( pPath ); diff --git a/unotest/source/cpp/macros_test.cxx b/unotest/source/cpp/macros_test.cxx index e0376ccb9bd1..9305a68b5a89 100644 --- a/unotest/source/cpp/macros_test.cxx +++ b/unotest/source/cpp/macros_test.cxx @@ -19,7 +19,7 @@ using namespace com::sun::star; namespace unotest { -uno::Reference< com::sun::star::lang::XComponent > MacrosTest::loadFromDesktop(const OUString& rURL, const char* pDocService) +uno::Reference< com::sun::star::lang::XComponent > MacrosTest::loadFromDesktop(const OUString& rURL, const OUString& rDocService) { CPPUNIT_ASSERT_MESSAGE("no desktop", mxDesktop.is()); uno::Reference< com::sun::star::frame::XComponentLoader> xLoader = uno::Reference< com::sun::star::frame::XComponentLoader >( mxDesktop, uno::UNO_QUERY ); @@ -31,12 +31,12 @@ uno::Reference< com::sun::star::lang::XComponent > MacrosTest::loadFromDesktop(c com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN; args[0].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; - if (pDocService) + if (!rDocService.isEmpty()) { args.realloc(2); args[1].Name = "DocumentService"; args[1].Handle = -1; - args[1].Value <<= OUString::createFromAscii(pDocService); + args[1].Value <<= rDocService; args[1].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; } |