diff options
Diffstat (limited to 'filter/source/config/cache')
| -rw-r--r-- | filter/source/config/cache/basecontainer.cxx | 12 | ||||
| -rw-r--r-- | filter/source/config/cache/configflush.cxx | 2 | ||||
| -rw-r--r-- | filter/source/config/cache/contenthandlerfactory.cxx | 4 | ||||
| -rw-r--r-- | filter/source/config/cache/filtercache.cxx | 52 | ||||
| -rw-r--r-- | filter/source/config/cache/filterfactory.cxx | 40 | ||||
| -rw-r--r-- | filter/source/config/cache/frameloaderfactory.cxx | 4 | ||||
| -rw-r--r-- | filter/source/config/cache/lateinitlistener.cxx | 4 | ||||
| -rw-r--r-- | filter/source/config/cache/lateinitthread.cxx | 5 | ||||
| -rw-r--r-- | filter/source/config/cache/lateinitthread.hxx | 2 | ||||
| -rw-r--r-- | filter/source/config/cache/registration.hxx | 2 | ||||
| -rw-r--r-- | filter/source/config/cache/typedetection.cxx | 10 |
11 files changed, 72 insertions, 65 deletions
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 2653366a5b38..29cc0cc5d321 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -156,7 +156,7 @@ void BaseContainer::impl_initFlushMode() m_pFlushCache = m_rCache->clone(); if (!m_pFlushCache) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Cant create write copy of internal used cache on demand."), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant create write copy of internal used cache on demand." )), dynamic_cast< css::container::XNameAccess* >(this)); // <- SAFE } @@ -231,7 +231,7 @@ void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem , { if (!sItem.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("empty value not allowed as item name."), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "empty value not allowed as item name." )), static_cast< css::container::XNameContainer* >(this), 1); @@ -297,7 +297,7 @@ void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem , { if (!sItem.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("empty value not allowed as item name."), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "empty value not allowed as item name." )), static_cast< css::container::XNameContainer* >(this), 1); @@ -338,7 +338,7 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem) { if (!sItem.getLength()) throw css::container::NoSuchElementException( - ::rtl::OUString::createFromAscii("An empty item cant be part of this cache!"), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "An empty item cant be part of this cache!" )), css::uno::Reference< css::uno::XInterface >(static_cast< css::container::XNameAccess* >(this), css::uno::UNO_QUERY)); css::uno::Any aValue; @@ -543,7 +543,7 @@ void SAL_CALL BaseContainer::flush() if (!m_pFlushCache) throw css::lang::WrappedTargetRuntimeException( - ::rtl::OUString::createFromAscii("Cant guarantee cache consistency. Special flush container does not exists!"), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant guarantee cache consistency. Special flush container does not exists!" )), dynamic_cast< css::container::XNameAccess* >(this), css::uno::Any()); @@ -566,7 +566,7 @@ void SAL_CALL BaseContainer::flush() // later again ... throw css::lang::WrappedTargetRuntimeException( - ::rtl::OUString::createFromAscii("Flush rejected by internal container."), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Flush rejected by internal container." )), dynamic_cast< css::container::XNameAccess* >(this), css::uno::makeAny(ex)); } diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index 426d3495d3c8..b675cee4312b 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -146,7 +146,7 @@ void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css: //----------------------------------------------- ::rtl::OUString ConfigFlush::impl_getImplementationName() { - static ::rtl::OUString IMPLNAME = ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.ConfigFlush"); + static ::rtl::OUString IMPLNAME( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.ConfigFlush" )); return IMPLNAME; } diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 7e9bf1a4356d..c842df864f7a 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -176,7 +176,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ContentHandlerFactory::getAvailab -----------------------------------------------*/ ::rtl::OUString ContentHandlerFactory::impl_getImplementationName() { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.ContentHandlerFactory"); + return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.ContentHandlerFactory" )); } /*----------------------------------------------- @@ -185,7 +185,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ContentHandlerFactory::getAvailab css::uno::Sequence< ::rtl::OUString > ContentHandlerFactory::impl_getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > lServiceNames(1); - lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.ContentHandlerFactory"); + lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ContentHandlerFactory" )); return lServiceNames; } diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 31e7690cd0e1..b9688063a486 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -77,7 +77,7 @@ namespace css = ::com::sun::star; // Error message in case filter config seems to be corrupted. // Note: Dont tell user something about "setup -repair"! // Its no longer supported by using native installers ... -static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG = ::rtl::OUString::createFromAscii("The filter configuration appears to be defective. Please install the office suite again."); +static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG( RTL_CONSTASCII_USTRINGPARAM( "The filter configuration appears to be defective. Please install the office suite again." )); /*----------------------------------------------- 15.03.2004 08:59 @@ -550,14 +550,14 @@ void FilterCache::addStatePropsToItem( EItemType eType, { case E_TYPE : { - xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY); + xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW); xPackage->getByName(CFGSET_TYPES) >>= xSet; } break; case E_FILTER : { - xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY); + xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY_THROW); xPackage->getByName(CFGSET_FILTERS) >>= xSet; } break; @@ -585,14 +585,14 @@ void FilterCache::addStatePropsToItem( EItemType eType, } /* <-- HACK */ - xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY); + xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW); xPackage->getByName(CFGSET_FRAMELOADERS) >>= xSet; } break; case E_CONTENTHANDLER : { - xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY); + xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW); xPackage->getByName(CFGSET_CONTENTHANDLERS) >>= xSet; } break; @@ -658,7 +658,7 @@ void FilterCache::flush() if (m_lChangedTypes.size() > 0) { - css::uno::Reference< css::container::XNameAccess > xConfig(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY); + css::uno::Reference< css::container::XNameAccess > xConfig(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameAccess > xSet ; xConfig->getByName(CFGSET_TYPES) >>= xSet; @@ -670,7 +670,7 @@ void FilterCache::flush() if (m_lChangedFilters.size() > 0) { - css::uno::Reference< css::container::XNameAccess > xConfig(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY); + css::uno::Reference< css::container::XNameAccess > xConfig(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameAccess > xSet ; xConfig->getByName(CFGSET_FILTERS) >>= xSet; @@ -717,7 +717,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN // special case. no exception - but not a valid item => set must be finalized or mandatory! // Reject flush operation by throwing an exception. At least one item couldnt be flushed. if (!xItem.is()) - throw css::uno::Exception(::rtl::OUString::createFromAscii("Cant add item. Set is finalized or mandatory!"), + throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant add item. Set is finalized or mandatory!" )), css::uno::Reference< css::uno::XInterface >() ); CacheItemList::const_iterator pItem = rCache.find(sItem); @@ -734,7 +734,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN // special case. no exception - but not a valid item => it must be finalized or mandatory! // Reject flush operation by throwing an exception. At least one item couldnt be flushed. if (!xItem.is()) - throw css::uno::Exception(::rtl::OUString::createFromAscii("Cant change item. Its finalized or mandatory!"), + throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant change item. Its finalized or mandatory!" )), css::uno::Reference< css::uno::XInterface >() ); CacheItemList::const_iterator pItem = rCache.find(sItem); @@ -831,7 +831,7 @@ CacheItemList& FilterCache::impl_getItemList(EItemType eType) const case E_CONTENTHANDLER : return m_lContentHandlers; case E_DETECTSERVICE : return m_lDetectServices ; - default : throw css::uno::Exception(::rtl::OUString::createFromAscii("unknown sub container requested."), + default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown sub container requested." )), css::uno::Reference< css::uno::XInterface >() ); } @@ -901,7 +901,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig } break; - default : throw css::uno::Exception(::rtl::OUString::createFromAscii("These configuration node isnt supported here for open!"), 0); + default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "These configuration node isnt supported here for open!" )), 0); } { @@ -1072,7 +1072,7 @@ void FilterCache::impl_validateAndOptimize() throw css::document::CorruptedFilterConfigurationException( MESSAGE_CORRUPTED_FILTERCONFIG, css::uno::Reference< css::uno::XInterface >(), - ::rtl::OUString::createFromAscii("The list of types or filters is empty.")); + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The list of types or filters is empty." ))); } // Create a log for all detected problems, which @@ -1372,7 +1372,7 @@ void FilterCache::impl_addItem2FlushList( EItemType eType, pList = &m_lChangedDetectServices; break; - default : throw css::uno::Exception(::rtl::OUString::createFromAscii("unsupported item type"), 0); + default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unsupported item type" )), 0); } OUStringList::const_iterator pItem = ::std::find(pList->begin(), pList->end(), sItem); @@ -1453,7 +1453,7 @@ void FilterCache::impl_load(EFillState eRequiredState) // Attention! If config couldnt be opened successfully // and exception os thrown automaticly and must be forwarded // to our calli ... - css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY); + css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW); { RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::FilterCache::load std"); impl_loadSet(xTypes, E_TYPE, E_READ_STANDARD, &m_lTypes); @@ -1470,7 +1470,7 @@ void FilterCache::impl_load(EFillState eRequiredState) // Attention! If config couldnt be opened successfully // and exception os thrown automaticly and must be forwarded // to our calli ... - css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY); + css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW); { RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::FilterCache::load all types"); impl_loadSet(xTypes, E_TYPE, E_READ_UPDATE, &m_lTypes); @@ -1487,7 +1487,7 @@ void FilterCache::impl_load(EFillState eRequiredState) // Attention! If config couldnt be opened successfully // and exception os thrown automaticly and must be forwarded // to our calli ... - css::uno::Reference< css::container::XNameAccess > xFilters(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY); + css::uno::Reference< css::container::XNameAccess > xFilters(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY_THROW); { RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::FilterCache::load all filters"); impl_loadSet(xFilters, E_FILTER, E_READ_ALL, &m_lFilters); @@ -1504,7 +1504,7 @@ void FilterCache::impl_load(EFillState eRequiredState) // Attention! If config couldnt be opened successfully // and exception os thrown automaticly and must be forwarded // to our calli ... - css::uno::Reference< css::container::XNameAccess > xLoaders(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY); + css::uno::Reference< css::container::XNameAccess > xLoaders(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW); { RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::FilterCache::load all frame loader"); impl_loadSet(xLoaders, E_FRAMELOADER, E_READ_ALL, &m_lFrameLoaders); @@ -1521,7 +1521,7 @@ void FilterCache::impl_load(EFillState eRequiredState) // Attention! If config couldnt be opened successfully // and exception os thrown automaticly and must be forwarded // to our calli ... - css::uno::Reference< css::container::XNameAccess > xHandlers(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY); + css::uno::Reference< css::container::XNameAccess > xHandlers(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW); { RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::FilterCache::load all content handler"); impl_loadSet(xHandlers, E_CONTENTHANDLER, E_READ_ALL, &m_lContentHandlers); @@ -1666,8 +1666,8 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe CacheItem& rItem) throw(css::uno::Exception) { - static ::rtl::OUString FORMATNAME_VAR = ::rtl::OUString::createFromAscii("%productname%" ); - static ::rtl::OUString FORMATVERSION_VAR = ::rtl::OUString::createFromAscii("%formatversion%"); + static ::rtl::OUString FORMATNAME_VAR( RTL_CONSTASCII_USTRINGPARAM( "%productname%" )); + static ::rtl::OUString FORMATVERSION_VAR( RTL_CONSTASCII_USTRINGPARAM( "%formatversion%" )); // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); @@ -2348,8 +2348,8 @@ void FilterCache::impl_interpretDataVal4Filter(const ::rtl::OUString& sValue, void FilterCache::impl_readOldFormat() throw(css::uno::Exception) { - static ::rtl::OUString TYPES_SET = ::rtl::OUString::createFromAscii("Types" ); - static ::rtl::OUString FILTER_SET = ::rtl::OUString::createFromAscii("Filters"); + static ::rtl::OUString TYPES_SET( RTL_CONSTASCII_USTRINGPARAM( "Types" )); + static ::rtl::OUString FILTER_SET( RTL_CONSTASCII_USTRINGPARAM( "Filters" )); // Attention: Opening/Reading of this old configuration format has to be handled gracefully. // Its optional and shouldnt disturb our normal work! @@ -2403,7 +2403,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe xSet->getByName(sItem) >>= xItem; if (!xItem.is()) throw css::uno::Exception( - ::rtl::OUString::createFromAscii("Cant read old item."), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant read old item." )), css::uno::Reference< css::uno::XInterface >()); CacheItem aItem; @@ -2418,7 +2418,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe // Data ::rtl::OUString sData; OUStringList lData; - xItem->getByName(::rtl::OUString::createFromAscii("Data")) >>= sData; + xItem->getByName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ))) >>= sData; lData = impl_tokenizeString(sData, (sal_Unicode)','); if ( (!sData.getLength()) || @@ -2426,7 +2426,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe ) { throw css::uno::Exception( - ::rtl::OUString::createFromAscii("Cant read old item property DATA."), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant read old item property DATA." )), css::uno::Reference< css::uno::XInterface >()); } @@ -2522,7 +2522,7 @@ sal_Bool FilterCache::impl_isModuleInstalled(const ::rtl::OUString& sModule) m_xModuleCfg = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, - ::rtl::OUString::createFromAscii("org.openoffice.Setup/Office/Factories"), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office/Factories" )), ::comphelper::ConfigurationHelper::E_READONLY), css::uno::UNO_QUERY_THROW); } diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 9ce090ba4a9e..155bb5e79fc2 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -84,17 +84,17 @@ namespace css = ::com::sun::star; #define SEPERATOR_QUERYPARAM ((sal_Unicode)':') #define SEPERATOR_QUERYPARAMVALUE ((sal_Unicode)'=') -#define QUERYPARAM_IFLAGS ::rtl::OUString::createFromAscii("iflags") -#define QUERYPARAM_EFLAGS ::rtl::OUString::createFromAscii("eflags") -#define QUERYPARAM_SORT_PROP ::rtl::OUString::createFromAscii("sort_prop") +#define QUERYPARAM_IFLAGS ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "iflags" )) +#define QUERYPARAM_EFLAGS ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "eflags" )) +#define QUERYPARAM_SORT_PROP ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sort_prop" )) -#define QUERYPARAM_DESCENDING ::rtl::OUString::createFromAscii("descending") -#define QUERYPARAM_USE_ORDER ::rtl::OUString::createFromAscii("use_order") -#define QUERYPARAM_DEFAULT_FIRST ::rtl::OUString::createFromAscii("default_first") -#define QUERYPARAM_CASE_SENSITIVE ::rtl::OUString::createFromAscii("case_sensitive") +#define QUERYPARAM_DESCENDING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "descending" )) +#define QUERYPARAM_USE_ORDER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "use_order" )) +#define QUERYPARAM_DEFAULT_FIRST ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "default_first" )) +#define QUERYPARAM_CASE_SENSITIVE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "case_sensitive" )) -#define QUERYPARAMVALUE_SORT_PROP_NAME ::rtl::OUString::createFromAscii("name") -#define QUERYPARAMVALUE_SORT_PROP_UINAME ::rtl::OUString::createFromAscii("uiname") +#define QUERYPARAMVALUE_SORT_PROP_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "name" )) +#define QUERYPARAMVALUE_SORT_PROP_UINAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uiname" )) /*----------------------------------------------- 09.07.2003 07:43 @@ -249,7 +249,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea // convert "_query_xxx:..." to "getByDocService=xxx:..." ::rtl::OUString sNewQuery(sQuery); - sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString::createFromAscii("_query_"),0); + sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_query_" )),0); if (pos != -1) { OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use new query format: 'matchByDocumentService=...'"); @@ -301,7 +301,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea //------------------------------------------- // 1) getDefaultFilterForType=<internal_typename> - pIt = lTokens.find(::rtl::OUString::createFromAscii("getDefaultFilterForType")); + pIt = lTokens.find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getDefaultFilterForType"))); if (pIt != lTokens.end()) { // SAFE -> @@ -354,43 +354,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize if (sDocumentService.equalsAscii("writer")) { OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.text.TextDocument"); + sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" )); } else if (sDocumentService.equalsAscii("web")) { OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.text.WebDocument"); + sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" )); } else if (sDocumentService.equalsAscii("global")) { OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.text.GlobalDocument"); + sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" )); } else if (sDocumentService.equalsAscii("calc")) { OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.sheet.SpreadsheetDocument"); + sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )); } else if (sDocumentService.equalsAscii("draw")) { OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.drawing.DrawingDocument"); + sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" )); } else if (sDocumentService.equalsAscii("impress")) { OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.presentation.PresentationDocument"); + sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" )); } else if (sDocumentService.equalsAscii("math")) { OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.formula.FormulaProperties"); + sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" )); } #endif @@ -699,7 +699,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS -----------------------------------------------*/ ::rtl::OUString FilterFactory::impl_getImplementationName() { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.FilterFactory"); + return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.FilterFactory" )); } /*----------------------------------------------- @@ -708,7 +708,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS css::uno::Sequence< ::rtl::OUString > FilterFactory::impl_getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > lServiceNames(1); - lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.FilterFactory"); + lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )); return lServiceNames; } diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 075b721b29b3..822d826d52bf 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -173,7 +173,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameLoaderFactory::getAvailableS -----------------------------------------------*/ ::rtl::OUString FrameLoaderFactory::impl_getImplementationName() { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.FrameLoaderFactory"); + return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.FrameLoaderFactory" )); } /*----------------------------------------------- @@ -182,7 +182,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameLoaderFactory::getAvailableS css::uno::Sequence< ::rtl::OUString > FrameLoaderFactory::impl_getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > lServiceNames(1); - lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.FrameLoaderFactory"); + lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.FrameLoaderFactory" )); return lServiceNames; } diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx index 0ac452760de8..5c022a0a0b41 100644 --- a/filter/source/config/cache/lateinitlistener.cxx +++ b/filter/source/config/cache/lateinitlistener.cxx @@ -60,8 +60,8 @@ LateInitListener::LateInitListener(const css::uno::Reference< css::lang::XMultiS osl_incrementInterlockedCount( &m_refCount ); m_xBroadcaster = css::uno::Reference< css::document::XEventBroadcaster >( - m_xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster")), - css::uno::UNO_QUERY); + m_xSMGR->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.GlobalEventBroadcaster" ))), + css::uno::UNO_QUERY_THROW); m_xBroadcaster->addEventListener(static_cast< css::document::XEventListener* >(this)); diff --git a/filter/source/config/cache/lateinitthread.cxx b/filter/source/config/cache/lateinitthread.cxx index 14309ca27f55..0812e3f280b3 100644 --- a/filter/source/config/cache/lateinitthread.cxx +++ b/filter/source/config/cache/lateinitthread.cxx @@ -77,6 +77,11 @@ void SAL_CALL LateInitThread::run() rCache->load(FilterCache::E_CONTAINS_ALL, sal_True); } +void SAL_CALL LateInitThread::onTerminated() +{ + delete this; +} + } // namespace config } // namespace filter diff --git a/filter/source/config/cache/lateinitthread.hxx b/filter/source/config/cache/lateinitthread.hxx index c4162d2ef3ea..98c59b00972b 100644 --- a/filter/source/config/cache/lateinitthread.hxx +++ b/filter/source/config/cache/lateinitthread.hxx @@ -82,6 +82,8 @@ class LateInitThread : public ::osl::Thread /** @short thread function. */ virtual void SAL_CALL run(); + + virtual void SAL_CALL onTerminated(); }; } // namespace config diff --git a/filter/source/config/cache/registration.hxx b/filter/source/config/cache/registration.hxx index fda49155492c..2c1ff3f79c0c 100644 --- a/filter/source/config/cache/registration.hxx +++ b/filter/source/config/cache/registration.hxx @@ -67,7 +67,7 @@ namespace comphelper{ MyClass::st_getServNames()) b) _COMPHELPER_COMPONENTINFO( MyClass, - ::rtl::OUString::createFromAscii("css.MyClass"), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "css.MyClass" )), lServiceNames) @param CLASS diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 0b28ee823ada..53ad148dd827 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -140,7 +140,7 @@ TypeDetection::~TypeDetection() ::rtl::OUString sURL = stlDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString()); #if OSL_DEBUG_LEVEL > 0 - if (stlDescriptor.find(::rtl::OUString::createFromAscii("FileName")) != stlDescriptor.end()) + if (stlDescriptor.find(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ))) != stlDescriptor.end()) OSL_ENSURE(sal_False, "Detect using of deprecated and already unsupported MediaDescriptor property \"FileName\"!"); #endif @@ -266,7 +266,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip ) ) { - sRealType = ::rtl::OUString::createFromAscii("calc_Text_txt_csv_StarCalc"); + sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc_Text_txt_csv_StarCalc" )); } else if ( @@ -274,7 +274,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip (sRealType.equalsAscii("calc_Text_txt_csv_StarCalc" )) ) { - sRealType = ::rtl::OUString::createFromAscii("writer_Text"); + sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_Text" )); } #endif // WORKAROUND_CSV_TXT_BUG_i60158 @@ -1230,7 +1230,7 @@ sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( ::comphelper -----------------------------------------------*/ ::rtl::OUString TypeDetection::impl_getImplementationName() { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.TypeDetection"); + return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.TypeDetection" )); } /*----------------------------------------------- @@ -1239,7 +1239,7 @@ sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( ::comphelper css::uno::Sequence< ::rtl::OUString > TypeDetection::impl_getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > lServiceNames(1); - lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection"); + lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )); return lServiceNames; } |