diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-10-29 14:38:47 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-10-29 14:38:47 +0000 |
commit | 3e445b91b1ceddba7e0b844431526b5eb04abffe (patch) | |
tree | ac730f1bbad9b0e2e041861584afe17467c6e4ca /configmgr/qa | |
parent | 9e8816a0e1a8ce1e6c040c5e113cf0811d372719 (diff) |
CWS-TOOLING: integrate CWS sb99
Diffstat (limited to 'configmgr/qa')
-rw-r--r-- | configmgr/qa/unit/makefile.mk | 3 | ||||
-rw-r--r-- | configmgr/qa/unit/performance.cxx | 34 | ||||
-rw-r--r-- | configmgr/qa/unit/threading.cxx | 11 |
3 files changed, 21 insertions, 27 deletions
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk index 856849dc68d0..4b57dabac74d 100644 --- a/configmgr/qa/unit/makefile.mk +++ b/configmgr/qa/unit/makefile.mk @@ -55,9 +55,8 @@ ALLTAR: test $(MISC)$/$(TARGET).rdb .ERRREMOVE: $(COPY) $(SOLARBINDIR)$/types.rdb $@ regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/configmgr2.uno$(DLLPOST)) - regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/typeconverter.uno$(DLLPOST)) regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/sax.uno$(DLLPOST)) - regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/simplereg.uno$(DLLPOST)) + regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/stocservices.uno$(DLLPOST)) regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/streams.uno$(DLLPOST)) test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET).rdb diff --git a/configmgr/qa/unit/performance.cxx b/configmgr/qa/unit/performance.cxx index ebd7ffa638d4..a1e338bf16be 100644 --- a/configmgr/qa/unit/performance.cxx +++ b/configmgr/qa/unit/performance.cxx @@ -33,8 +33,6 @@ #include "common.hxx" -using namespace css; - void Test::setUp() { mpMagic = new Magic(); @@ -137,11 +135,11 @@ void Test::normalizePathKey (rtl::OString &rPath, rtl::OString &rKey) } } -uno::Any Test::getKey (const sal_Char *pPath, rtl::OUString aName) +css::uno::Any Test::getKey (const sal_Char *pPath, rtl::OUString aName) { - uno::Reference< container::XHierarchicalNameAccess > xNameAccess( + css::uno::Reference< css::container::XHierarchicalNameAccess > xNameAccess( createView(pPath, false), css::uno::UNO_QUERY_THROW); - uno::Any aVal; + css::uno::Any aVal; aVal = xNameAccess->getByHierarchicalName (aName); disposeComponent (xNameAccess); return aVal; @@ -149,11 +147,11 @@ uno::Any Test::getKey (const sal_Char *pPath, rtl::OUString aName) void Test::setKey (const sal_Char *pPath, rtl::OUString aName, css::uno::Any a) { - uno::Reference< util::XChangesBatch > xAppView; + css::uno::Reference< css::util::XChangesBatch > xAppView; - xAppView = uno::Reference< util::XChangesBatch > ( - createView(pPath, true), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameReplace > xSettings(xAppView, uno::UNO_QUERY_THROW); + xAppView = css::uno::Reference< css::util::XChangesBatch > ( + createView(pPath, true), css::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::container::XNameReplace > xSettings(xAppView, css::uno::UNO_QUERY_THROW); rtl::OUString aStr; // set key @@ -165,13 +163,13 @@ void Test::setKey (const sal_Char *pPath, rtl::OUString aName, css::uno::Any a) void Test::resetKey (const sal_Char *pPath, rtl::OUString aName) { - uno::Reference< util::XChangesBatch > xAppView; + css::uno::Reference< css::util::XChangesBatch > xAppView; // reset to default - xAppView = uno::Reference< util::XChangesBatch > ( createView(pPath, true), uno::UNO_QUERY_THROW ); - uno::Reference< container::XNameReplace > xSettings(xAppView, uno::UNO_QUERY_THROW); + xAppView = css::uno::Reference< css::util::XChangesBatch > ( createView(pPath, true), css::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::container::XNameReplace > xSettings(xAppView, css::uno::UNO_QUERY_THROW); - uno::Reference< beans::XPropertyState > xSettingsState(xSettings, uno::UNO_QUERY); + css::uno::Reference< css::beans::XPropertyState > xSettingsState(xSettings, css::uno::UNO_QUERY); xSettingsState->setPropertyToDefault(aName); xAppView->commitChanges(); @@ -194,7 +192,7 @@ void Test::keySet() try { setKey ("/org.openoffice.Setup/Test", rtl::OUString::createFromAscii("AString"), - uno::makeAny (rtl::OUString::createFromAscii("baa"))); + css::uno::makeAny (rtl::OUString::createFromAscii("baa"))); // check value rtl::OUString aStr; @@ -229,14 +227,14 @@ void Test::readCommands() rtl::OUString aPropProperties( RTL_CONSTASCII_USTRINGPARAM( "Properties" )); try { - uno::Reference< container::XNameAccess > xNameAccess ( + css::uno::Reference< css::container::XNameAccess > xNameAccess ( createView("/org.openoffice.UI.GenericCommands/UserInterface/Commands", false), css::uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE ("fetched UI generic commands", xNameAccess.is()); - uno::Any a; - uno::Sequence< rtl::OUString > aNameSeq = xNameAccess->getElementNames(); + css::uno::Any a; + css::uno::Sequence< rtl::OUString > aNameSeq = xNameAccess->getElementNames(); CPPUNIT_ASSERT_MESSAGE ("right element / sequence", aNameSeq.getLength() == 696); sal_uInt32 end, start = osl_getGlobalTimer(); @@ -247,7 +245,7 @@ void Test::readCommands() try { { - uno::Reference< container::XNameAccess > xChildNameAccess; + css::uno::Reference< css::container::XNameAccess > xChildNameAccess; // This is the slow bit ! ... // Creating the @#$@#$ing XNameAccess object [ 650 times ] // which we then use to 'getByName' etc. diff --git a/configmgr/qa/unit/threading.cxx b/configmgr/qa/unit/threading.cxx index 217a3adf248f..1531e9f49138 100644 --- a/configmgr/qa/unit/threading.cxx +++ b/configmgr/qa/unit/threading.cxx @@ -169,9 +169,7 @@ void Test::threadTests() } CATCH_FAIL ("checking keys exist") } -typedef ::cppu::WeakImplHelper1< css::beans::XPropertyChangeListener > ListenerBase; - -class RecursiveListener : public ListenerBase +class RecursiveListener : public cppu::WeakImplHelper1< css::beans::XPropertyChangeListener > { public: sal_Int32 m_nRecurse; @@ -183,8 +181,7 @@ public: public: RecursiveListener (Test *pTest, int nCount, const char *pPath, const char *pKey) - : ListenerBase() - , m_nRecurse (nCount) + : m_nRecurse (nCount) , m_pTest (pTest) , m_pPath (pPath) , m_pKey (pKey) @@ -201,8 +198,8 @@ public: disposeComponent (mxPropSet); } - virtual void SAL_CALL acquire() throw() { ListenerBase::acquire(); } - virtual void SAL_CALL release() throw() { ListenerBase::acquire(); } + virtual void SAL_CALL acquire() throw() { cppu::WeakImplHelper1< css::beans::XPropertyChangeListener >::acquire(); } + virtual void SAL_CALL release() throw() { cppu::WeakImplHelper1< css::beans::XPropertyChangeListener >::acquire(); } // XPropertyChangeListener virtual void SAL_CALL propertyChange( const ::css::beans::PropertyChangeEvent& ) throw (::css::uno::RuntimeException) { |