diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-09-08 04:57:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-09-08 04:57:32 +0000 |
| commit | ca00697e3dae9a03573d11281fc8d9a4ee391d3d (patch) | |
| tree | c390c65f02f6f32b6d6d9faa600f4688a8c81857 /framework/inc/macros | |
| parent | 047473d4f1a12e867ab7154113f7f1c5422d5368 (diff) | |
CWS-TOOLING: integrate CWS oj18
2009-08-21 15:08:49 +0200 oj r275263 : wrong check
2009-08-21 08:56:01 +0200 oj r275215 : missing not
2009-08-20 07:27:13 +0200 oj r275164 : use new method from global
2009-08-19 10:22:35 +0200 oj r275138 : call GetLocale instead of pLocale
2009-08-18 10:39:32 +0200 oj r275082 : missing header include
2009-08-18 10:09:44 +0200 oj r275081 : new methods at global
2009-08-18 10:09:00 +0200 oj r275080 : unused var
2009-08-18 08:59:04 +0200 oj r275078 : move files from classes to xml
2009-08-17 14:58:16 +0200 oj r275056 : CWS-TOOLING: rebase CWS oj18 to trunk@275001 (milestone: DEV300:m55)
2009-08-17 13:29:44 +0200 oj r275047 : compile error
2009-08-17 13:27:47 +0200 oj r275045 : compile error
2009-08-17 11:44:54 +0200 oj r275040 : add dep
2009-07-22 14:26:05 +0200 oj r274240 : move unused services into fwl
2009-07-22 14:25:35 +0200 oj r274239 : move unused services into fwl
2009-07-22 13:47:45 +0200 oj r274233 : remove some unused code
2009-07-22 09:06:20 +0200 oj r274219 : export dbtoolsclient dbcharsethelper for sc
2009-07-22 08:48:58 +0200 oj r274218 : create NumberFormatter on demand
2009-07-22 08:39:23 +0200 oj r274217 : change char to sal_Char
2009-07-22 07:33:34 +0200 oj r274214 : export dbtoolsclient dbcharsethelper for sc
2009-07-22 07:30:04 +0200 oj r274213 : late init of numberformatter and breakiterator
2009-07-22 07:28:55 +0200 oj r274212 : export dbtoolsclient dbcharsethelper for sc
2009-07-21 13:43:28 +0200 oj r274196 : check if quick start is enbaled
2009-07-21 13:40:09 +0200 oj r274195 : check config entry for UiEventsLogger
2009-07-21 13:37:40 +0200 oj r274194 : code refactoring, remove of duplicate code and some late inits and removale of not needed files
2009-07-21 13:35:38 +0200 oj r274193 : code refactoring, remove of duplicate code and some late inits and removale of not needed files
2009-07-21 13:33:41 +0200 oj r274192 : doc meta data will now be created on demand
2009-07-21 13:13:40 +0200 oj r274187 : load ldap functions on demand
2009-07-21 13:03:17 +0200 oj r274183 : late init of TransliterationImpl
2009-07-21 12:36:10 +0200 oj r274180 : late init of charClass
Diffstat (limited to 'framework/inc/macros')
| -rw-r--r-- | framework/inc/macros/debug/memorymeasure.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/macros/xserviceinfo.hxx | 27 |
2 files changed, 5 insertions, 24 deletions
diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx index 4ed702429be2..bfc5f5ff5791 100644 --- a/framework/inc/macros/debug/memorymeasure.hxx +++ b/framework/inc/macros/debug/memorymeasure.hxx @@ -111,7 +111,7 @@ { ::rtl::OStringBuffer sBuffer( 10000 ); - if( m_lSnapshots.size() > 0 ) + if( !m_lSnapshots.empty() ) { // Write informations to return buffer ::std::vector< _MemoryInfo >::const_iterator pItem1; diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index c375fe43dfab..45d72ee8bfee 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -55,7 +55,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/factory.hxx> +#include <comphelper/sequence.hxx> #include <rtl/ustring.hxx> +#include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ // namespace @@ -93,29 +95,7 @@ ________________________________________________________________________________ /*===========================================================================================================*/ \ sal_Bool SAL_CALL CLASS::supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) \ { \ - /* Set default return value. */ \ - sal_Bool bReturn = sal_False ; \ - /* Get names of all supported servicenames. */ \ - css::uno::Sequence< ::rtl::OUString > seqServiceNames = getSupportedServiceNames(); \ - const ::rtl::OUString* pArray = seqServiceNames.getConstArray(); \ - sal_Int32 nCounter = 0; \ - sal_Int32 nLength = seqServiceNames.getLength(); \ - /* Search for right name in list. */ \ - while ( \ - ( nCounter < nLength ) && \ - ( bReturn == sal_False ) \ - ) \ - { \ - /* Is name was found, say "YES, SERVICE IS SUPPORTED." and break loop. */ \ - if ( pArray[nCounter] == sServiceName ) \ - { \ - bReturn = sal_True ; \ - } \ - /* Else step to next element in list. */ \ - ++nCounter; \ - } \ - /* Return state of search. */ \ - return bReturn; \ + return ::comphelper::findValue(getSupportedServiceNames(), sServiceName, sal_True).getLength() != 0; \ } \ \ /*===========================================================================================================*/ \ @@ -155,6 +135,7 @@ ________________________________________________________________________________ /*===========================================================================================================*/ \ css::uno::Reference< css::uno::XInterface > SAL_CALL CLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ) \ { \ + RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework","Ocke.Janssen@sun.com",U2B(IMPLEMENTATIONNAME).getStr()); \ /* create new instance of service */ \ CLASS* pClass = new CLASS( xServiceManager ); \ /* hold it alive by increasing his ref count!!! */ \ |