diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /framework | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'framework')
268 files changed, 2721 insertions, 2741 deletions
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx index 116a18602fe7..853a433567bc 100644 --- a/framework/inc/classes/actiontriggercontainer.hxx +++ b/framework/inc/classes/actiontriggercontainer.hxx @@ -49,17 +49,17 @@ class FWE_DLLPUBLIC ActionTriggerContainer : public PropertySetContainer, virtual void SAL_CALL release() throw (); // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index 55e87c1a658f..042c311971ca 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -56,9 +56,9 @@ class ActionTriggerPropertySet : public ThreadHelpBase , virtual FWE_DLLPUBLIC void SAL_CALL release() throw (); // XServiceInfo - virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); @@ -92,7 +92,7 @@ class ActionTriggerPropertySet : public ThreadHelpBase , // helper //--------------------------------------------------------------------------------------------------------- - sal_Bool impl_tryToChangeProperty( const rtl::OUString& aCurrentValue , + sal_Bool impl_tryToChangeProperty( const OUString& aCurrentValue , const com::sun::star::uno::Any& aNewValue , com::sun::star::uno::Any& aOldValue , com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); @@ -111,9 +111,9 @@ class ActionTriggerPropertySet : public ThreadHelpBase , // members //--------------------------------------------------------------------------------------------------------- - rtl::OUString m_aCommandURL; - rtl::OUString m_aHelpURL; - rtl::OUString m_aText; + OUString m_aCommandURL; + OUString m_aHelpURL; + OUString m_aText; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > m_xBitmap; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xActionTriggerContainer; }; diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx index 44f035604aad..8788d43ecb1b 100644 --- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx +++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx @@ -55,9 +55,9 @@ class ActionTriggerSeparatorPropertySet : public ThreadHelpBase virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx index a50b6c8c525d..372fc9a13a0d 100644 --- a/framework/inc/classes/converter.hxx +++ b/framework/inc/classes/converter.hxx @@ -39,9 +39,9 @@ class FWI_DLLPUBLIC Converter static css::uno::Sequence< css::beans::NamedValue > convert_seqPropVal2seqNamedVal ( const css::uno::Sequence< css::beans::PropertyValue >& lSource ); // Seq<String> => Vector<String> - static OUStringList convert_seqOUString2OUStringList( const css::uno::Sequence< ::rtl::OUString >& lSource ); + static OUStringList convert_seqOUString2OUStringList( const css::uno::Sequence< OUString >& lSource ); - static ::rtl::OUString convert_DateTime2ISO8601 ( const DateTime& aSource ); + static OUString convert_DateTime2ISO8601 ( const DateTime& aSource ); }; } // namespace framework diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index c4521d1aaa76..63cc2169c9e1 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -142,27 +142,27 @@ class FilterCache : private ThreadHelpBase @onerror We return false. *//*-*****************************************************************************************************/ - sal_Bool searchType ( const ::rtl::OUString& sURL , - const ::rtl::OUString& sMediaType , - const ::rtl::OUString& sClipboardFormat , + sal_Bool searchType ( const OUString& sURL , + const OUString& sMediaType , + const OUString& sClipboardFormat , CheckedTypeIterator& aStartEntry , - ::rtl::OUString& sResult ) const; + OUString& sResult ) const; - sal_Bool searchFilterForType ( const ::rtl::OUString& sInternalTypeName , + sal_Bool searchFilterForType ( const OUString& sInternalTypeName , CheckedStringListIterator& aStartEntry , - ::rtl::OUString& sResult ) const; + OUString& sResult ) const; - sal_Bool searchDetectorForType ( const ::rtl::OUString& sInternalTypeName , + sal_Bool searchDetectorForType ( const OUString& sInternalTypeName , CheckedStringListIterator& aStartEntry , - ::rtl::OUString& sResult ) const; + OUString& sResult ) const; - sal_Bool searchLoaderForType ( const ::rtl::OUString& sInternalTypeName , + sal_Bool searchLoaderForType ( const OUString& sInternalTypeName , CheckedStringListIterator& aStartEntry , - ::rtl::OUString& sResult ) const; + OUString& sResult ) const; - sal_Bool searchContentHandlerForType ( const ::rtl::OUString& sInternalTypeName , + sal_Bool searchContentHandlerForType ( const OUString& sInternalTypeName , CheckedStringListIterator& aStartEntry , - ::rtl::OUString& sResult ) const; + OUString& sResult ) const; /*-****************************************************************************************************//** @short get all properties of a cache entry by given name @@ -178,32 +178,32 @@ class FilterCache : private ThreadHelpBase @onerror We return an empty Any. *//*-*****************************************************************************************************/ - css::uno::Sequence< ::rtl::OUString > getAllTypeNames () const; - css::uno::Sequence< ::rtl::OUString > getAllFilterNames () const; - css::uno::Sequence< ::rtl::OUString > getAllDetectorNames () const; // without default detector! - css::uno::Sequence< ::rtl::OUString > getAllLoaderNames () const; // without default loader! - css::uno::Sequence< ::rtl::OUString > getAllContentHandlerNames () const; - css::uno::Sequence< ::rtl::OUString > getAllDetectorNamesWithDefault () const; // default detector is last one! - css::uno::Sequence< ::rtl::OUString > getAllLoaderNamesWithDefault () const; // default loader is last one! - ::rtl::OUString getDefaultLoader () const; - - css::uno::Sequence< css::beans::PropertyValue > getTypeProperties ( const ::rtl::OUString& sName ) const; - css::uno::Sequence< css::beans::PropertyValue > getFilterProperties ( const ::rtl::OUString& sName ) const; - css::uno::Sequence< css::beans::PropertyValue > getDetectorProperties ( const ::rtl::OUString& sName ) const; - css::uno::Sequence< css::beans::PropertyValue > getLoaderProperties ( const ::rtl::OUString& sName ) const; - css::uno::Sequence< css::beans::PropertyValue > getContentHandlerProperties ( const ::rtl::OUString& sName ) const; - - FileType getType ( const ::rtl::OUString& sName ) const; - Filter getFilter ( const ::rtl::OUString& sName ) const; - Detector getDetector ( const ::rtl::OUString& sName ) const; - Loader getLoader ( const ::rtl::OUString& sName ) const; - ContentHandler getContentHandler ( const ::rtl::OUString& sName ) const; - - sal_Bool existsType ( const ::rtl::OUString& sName ) const; - sal_Bool existsFilter ( const ::rtl::OUString& sName ) const; - sal_Bool existsDetector ( const ::rtl::OUString& sName ) const; - sal_Bool existsLoader ( const ::rtl::OUString& sName ) const; - sal_Bool existsContentHandler ( const ::rtl::OUString& sName ) const; + css::uno::Sequence< OUString > getAllTypeNames () const; + css::uno::Sequence< OUString > getAllFilterNames () const; + css::uno::Sequence< OUString > getAllDetectorNames () const; // without default detector! + css::uno::Sequence< OUString > getAllLoaderNames () const; // without default loader! + css::uno::Sequence< OUString > getAllContentHandlerNames () const; + css::uno::Sequence< OUString > getAllDetectorNamesWithDefault () const; // default detector is last one! + css::uno::Sequence< OUString > getAllLoaderNamesWithDefault () const; // default loader is last one! + OUString getDefaultLoader () const; + + css::uno::Sequence< css::beans::PropertyValue > getTypeProperties ( const OUString& sName ) const; + css::uno::Sequence< css::beans::PropertyValue > getFilterProperties ( const OUString& sName ) const; + css::uno::Sequence< css::beans::PropertyValue > getDetectorProperties ( const OUString& sName ) const; + css::uno::Sequence< css::beans::PropertyValue > getLoaderProperties ( const OUString& sName ) const; + css::uno::Sequence< css::beans::PropertyValue > getContentHandlerProperties ( const OUString& sName ) const; + + FileType getType ( const OUString& sName ) const; + Filter getFilter ( const OUString& sName ) const; + Detector getDetector ( const OUString& sName ) const; + Loader getLoader ( const OUString& sName ) const; + ContentHandler getContentHandler ( const OUString& sName ) const; + + sal_Bool existsType ( const OUString& sName ) const; + sal_Bool existsFilter ( const OUString& sName ) const; + sal_Bool existsDetector ( const OUString& sName ) const; + sal_Bool existsLoader ( const OUString& sName ) const; + sal_Bool existsContentHandler ( const OUString& sName ) const; /*-****************************************************************************************************//** @short support special query modes @@ -221,7 +221,7 @@ class FilterCache : private ThreadHelpBase @onerror We return an empty result set. *//*-*****************************************************************************************************/ - css::uno::Any queryFilters( const ::rtl::OUString& sQuery ) const; + css::uno::Any queryFilters( const OUString& sQuery ) const; /*-****************************************************************************************************//** @short support registration of elements in current configuration @@ -270,39 +270,39 @@ class FilterCache : private ThreadHelpBase @onerror We return false then. *//*-*****************************************************************************************************/ - sal_Bool addFilter ( const ::rtl::OUString& sName , + sal_Bool addFilter ( const OUString& sName , const css::uno::Sequence< css::beans::PropertyValue >& lProperties , sal_Bool bException ) throw(css::container::ElementExistException , css::registry::InvalidRegistryException); - sal_Bool replaceFilter( const ::rtl::OUString& sName , + sal_Bool replaceFilter( const OUString& sName , const css::uno::Sequence< css::beans::PropertyValue >& lProperties , sal_Bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); - sal_Bool removeFilter ( const ::rtl::OUString& sName , + sal_Bool removeFilter ( const OUString& sName , sal_Bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); - sal_Bool addType ( const ::rtl::OUString& sName , + sal_Bool addType ( const OUString& sName , const css::uno::Sequence< css::beans::PropertyValue >& lProperties , sal_Bool bException ) throw(css::container::ElementExistException , css::registry::InvalidRegistryException); - sal_Bool replaceType ( const ::rtl::OUString& sName , + sal_Bool replaceType ( const OUString& sName , const css::uno::Sequence< css::beans::PropertyValue >& lProperties , sal_Bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); - sal_Bool removeType ( const ::rtl::OUString& sName , + sal_Bool removeType ( const OUString& sName , sal_Bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); - sal_Bool addDetector ( const ::rtl::OUString& sName , + sal_Bool addDetector ( const OUString& sName , const css::uno::Sequence< css::beans::PropertyValue >& lProperties , sal_Bool bException ) throw(css::container::ElementExistException , css::registry::InvalidRegistryException); - sal_Bool replaceDetector( const ::rtl::OUString& sName , + sal_Bool replaceDetector( const OUString& sName , const css::uno::Sequence< css::beans::PropertyValue >& lProperties , sal_Bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); - sal_Bool removeDetector ( const ::rtl::OUString& sName , + sal_Bool removeDetector ( const OUString& sName , sal_Bool bException ) throw(css::container::NoSuchElementException , css::registry::InvalidRegistryException); @@ -347,44 +347,44 @@ class FilterCache : private ThreadHelpBase private: - static sal_Bool implcp_searchType ( const ::rtl::OUString& sURL , - const ::rtl::OUString* pMediaType , - const ::rtl::OUString* pClipboardFormat , + static sal_Bool implcp_searchType ( const OUString& sURL , + const OUString* pMediaType , + const OUString* pClipboardFormat , const CheckedTypeIterator& aStartEntry , - const ::rtl::OUString& sResult ); - static sal_Bool implcp_searchFilterForType ( const ::rtl::OUString& sInternalTypeName , + const OUString& sResult ); + static sal_Bool implcp_searchFilterForType ( const OUString& sInternalTypeName , const CheckedStringListIterator& aStartEntry , - const ::rtl::OUString& sResult ); - static sal_Bool implcp_searchDetectorForType ( const ::rtl::OUString& sInternalTypeName , + const OUString& sResult ); + static sal_Bool implcp_searchDetectorForType ( const OUString& sInternalTypeName , const CheckedStringListIterator& aStartEntry , - const ::rtl::OUString& sResult ); - static sal_Bool implcp_searchLoaderForType ( const ::rtl::OUString& sInternalTypeName , + const OUString& sResult ); + static sal_Bool implcp_searchLoaderForType ( const OUString& sInternalTypeName , const CheckedStringListIterator& aStartEntry , - const ::rtl::OUString& sResult ); - static sal_Bool implcp_searchContentHandlerForType ( const ::rtl::OUString& sInternalTypeName , + const OUString& sResult ); + static sal_Bool implcp_searchContentHandlerForType ( const OUString& sInternalTypeName , const CheckedStringListIterator& aStartEntry , - const ::rtl::OUString& sResult ); - static sal_Bool implcp_getTypeProperties ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getFilterProperties ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getDetectorProperties ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getLoaderProperties ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getContentHandlerProperties ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getType ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getFilter ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getDetector ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getLoader ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getContentHandler ( const ::rtl::OUString& sName ); - static sal_Bool implcp_existsType ( const ::rtl::OUString& sName ); - static sal_Bool implcp_existsFilter ( const ::rtl::OUString& sName ); - static sal_Bool implcp_existsDetector ( const ::rtl::OUString& sName ); - static sal_Bool implcp_existsLoader ( const ::rtl::OUString& sName ); - static sal_Bool implcp_existsContentHandler ( const ::rtl::OUString& sName ); - static sal_Bool implcp_addFilter ( const ::rtl::OUString& sName , + const OUString& sResult ); + static sal_Bool implcp_getTypeProperties ( const OUString& sName ); + static sal_Bool implcp_getFilterProperties ( const OUString& sName ); + static sal_Bool implcp_getDetectorProperties ( const OUString& sName ); + static sal_Bool implcp_getLoaderProperties ( const OUString& sName ); + static sal_Bool implcp_getContentHandlerProperties ( const OUString& sName ); + static sal_Bool implcp_getType ( const OUString& sName ); + static sal_Bool implcp_getFilter ( const OUString& sName ); + static sal_Bool implcp_getDetector ( const OUString& sName ); + static sal_Bool implcp_getLoader ( const OUString& sName ); + static sal_Bool implcp_getContentHandler ( const OUString& sName ); + static sal_Bool implcp_existsType ( const OUString& sName ); + static sal_Bool implcp_existsFilter ( const OUString& sName ); + static sal_Bool implcp_existsDetector ( const OUString& sName ); + static sal_Bool implcp_existsLoader ( const OUString& sName ); + static sal_Bool implcp_existsContentHandler ( const OUString& sName ); + static sal_Bool implcp_addFilter ( const OUString& sName , const css::uno::Sequence< css::beans::PropertyValue >& lProperties ); - static sal_Bool implcp_replaceFilter ( const ::rtl::OUString& sName , + static sal_Bool implcp_replaceFilter ( const OUString& sName , const css::uno::Sequence< css::beans::PropertyValue >& lProperties ); - static sal_Bool implcp_removeFilter ( const ::rtl::OUString& sName ); - static sal_Bool implcp_queryFilters ( const ::rtl::OUString& sQuery ); + static sal_Bool implcp_removeFilter ( const OUString& sName ); + static sal_Bool implcp_queryFilters ( const OUString& sQuery ); #endif // #ifdef ENABLE_ASSERTIONS diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 8fb2090582df..e8591bba2c08 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -94,9 +94,9 @@ struct FileType inline void impl_clear() { bPreferred = sal_False ; - sName = ::rtl::OUString() ; - sMediaType = ::rtl::OUString() ; - sClipboardFormat = ::rtl::OUString() ; + sName = OUString() ; + sMediaType = OUString() ; + sClipboardFormat = OUString() ; nDocumentIconID = 0 ; lUINames.free (); lURLPattern.free(); @@ -122,10 +122,10 @@ struct FileType public: sal_Bool bPreferred ; - ::rtl::OUString sName ; + OUString sName ; OUStringHashMap lUINames ; - ::rtl::OUString sMediaType ; - ::rtl::OUString sClipboardFormat ; + OUString sMediaType ; + OUString sClipboardFormat ; sal_Int32 nDocumentIconID ; OUStringList lURLPattern ; OUStringList lExtensions ; @@ -158,14 +158,14 @@ struct Filter inline void impl_clear() { nOrder = 0 ; - sName = ::rtl::OUString(); - sType = ::rtl::OUString(); - sDocumentService = ::rtl::OUString(); - sFilterService = ::rtl::OUString(); - sUIComponent = ::rtl::OUString(); + sName = OUString(); + sType = OUString(); + sDocumentService = OUString(); + sFilterService = OUString(); + sUIComponent = OUString(); nFlags = 0 ; nFileFormatVersion = 0 ; - sTemplateName = ::rtl::OUString(); + sTemplateName = OUString(); lUINames.free (); lUserData.free (); } @@ -192,16 +192,16 @@ struct Filter public: sal_Int32 nOrder ; - ::rtl::OUString sName ; - ::rtl::OUString sType ; + OUString sName ; + OUString sType ; OUStringHashMap lUINames ; - ::rtl::OUString sDocumentService ; - ::rtl::OUString sFilterService ; - ::rtl::OUString sUIComponent ; + OUString sDocumentService ; + OUString sFilterService ; + OUString sUIComponent ; sal_Int32 nFlags ; OUStringList lUserData ; sal_Int32 nFileFormatVersion ; - ::rtl::OUString sTemplateName ; + OUString sTemplateName ; }; //***************************************************************************************************************** @@ -229,7 +229,7 @@ struct Detector inline void impl_clear() { - sName = ::rtl::OUString(); + sName = OUString(); lTypes.free(); } @@ -245,7 +245,7 @@ struct Detector //------------------------------------------------------------------------------------------------------------- public: - ::rtl::OUString sName ; + OUString sName ; OUStringList lTypes ; }; @@ -274,7 +274,7 @@ struct Loader inline void impl_clear() { - sName = ::rtl::OUString(); + sName = OUString(); lUINames.free (); lTypes.free (); } @@ -292,7 +292,7 @@ struct Loader //------------------------------------------------------------------------------------------------------------- public: - ::rtl::OUString sName ; + OUString sName ; OUStringHashMap lUINames ; OUStringList lTypes ; }; @@ -321,7 +321,7 @@ struct ContentHandler inline void impl_clear() { - sName = ::rtl::OUString(); + sName = OUString(); lTypes.free(); } @@ -337,7 +337,7 @@ struct ContentHandler //------------------------------------------------------------------------------------------------------------- public: - ::rtl::OUString sName ; + OUString sName ; OUStringList lTypes ; }; @@ -347,10 +347,10 @@ struct ContentHandler // and could be used in a generic way //***************************************************************************************************************** template< class HashType > -class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString , +class SetNodeHash : public ::boost::unordered_map< OUString , HashType , - rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > + OUStringHash , + ::std::equal_to< OUString > > { //------------------------------------------------------------------------------------------------------------- // interface @@ -371,7 +371,7 @@ class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString // Append changed, added or removed items to special lists // Necessary for saving changes //--------------------------------------------------------------------------------------------------------- - void appendChange( const ::rtl::OUString& sName , + void appendChange( const OUString& sName , EModifyState eState ); //------------------------------------------------------------------------------------------------------------- @@ -388,10 +388,10 @@ class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString // It's an optimism to find registered services faster! // The preferred hash maps file extensions to preferred types to find these ones faster. //***************************************************************************************************************** -class PerformanceHash : public ::boost::unordered_map< ::rtl::OUString , +class PerformanceHash : public ::boost::unordered_map< OUString , OUStringList , - rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > + OUStringHash , + ::std::equal_to< OUString > > { public: //--------------------------------------------------------------------------------------------------------- @@ -409,7 +409,7 @@ class PerformanceHash : public ::boost::unordered_map< ::rtl::OUString // and could be used for further searches again, which should be started at next element! // We stop search at the end of hash. You can start it again by setting it to the begin by himself. //--------------------------------------------------------------------------------------------------------- - inline sal_Bool findPatternKey( const ::rtl::OUString& sSearchValue , + inline sal_Bool findPatternKey( const OUString& sSearchValue , const_iterator& pStepper ) { sal_Bool bFound = sal_False; @@ -502,11 +502,11 @@ class DataContainer : private ThreadHelpBase sal_Bool validateAndRepairLoader (); sal_Bool validateAndRepairHandler (); - sal_Bool existsType ( const ::rtl::OUString& sName ); - sal_Bool existsFilter ( const ::rtl::OUString& sName ); - sal_Bool existsDetector ( const ::rtl::OUString& sName ); - sal_Bool existsLoader ( const ::rtl::OUString& sName ); - sal_Bool existsContentHandler ( const ::rtl::OUString& sName ); + sal_Bool existsType ( const OUString& sName ); + sal_Bool existsFilter ( const OUString& sName ); + sal_Bool existsDetector ( const OUString& sName ); + sal_Bool existsLoader ( const OUString& sName ); + sal_Bool existsContentHandler ( const OUString& sName ); void addType ( const FileType& aType , sal_Bool bSetModified ); void addFilter ( const Filter& aFilter , sal_Bool bSetModified ); @@ -520,51 +520,51 @@ class DataContainer : private ThreadHelpBase void replaceLoader ( const Loader& aLoader , sal_Bool bSetModified ); void replaceContentHandler( const ContentHandler& aHandler , sal_Bool bSetModified ); - void removeType ( const ::rtl::OUString& sName , sal_Bool bSetModified ); - void removeFilter ( const ::rtl::OUString& sName , sal_Bool bSetModified ); - void removeDetector ( const ::rtl::OUString& sName , sal_Bool bSetModified ); - void removeLoader ( const ::rtl::OUString& sName , sal_Bool bSetModified ); - void removeContentHandler ( const ::rtl::OUString& sName , sal_Bool bSetModified ); + void removeType ( const OUString& sName , sal_Bool bSetModified ); + void removeFilter ( const OUString& sName , sal_Bool bSetModified ); + void removeDetector ( const OUString& sName , sal_Bool bSetModified ); + void removeLoader ( const OUString& sName , sal_Bool bSetModified ); + void removeContentHandler ( const OUString& sName , sal_Bool bSetModified ); static void convertFileTypeToPropertySequence ( const FileType& aSource , css::uno::Sequence< css::beans::PropertyValue >& lDestination , - const ::rtl::OUString& sCurrentLocale ); + const OUString& sCurrentLocale ); static void convertFilterToPropertySequence ( const Filter& aSource , css::uno::Sequence< css::beans::PropertyValue >& lDestination , - const ::rtl::OUString& sCurrentLocale ); + const OUString& sCurrentLocale ); static void convertDetectorToPropertySequence ( const Detector& aSource , css::uno::Sequence< css::beans::PropertyValue >& lDestination ); static void convertLoaderToPropertySequence ( const Loader& aSource , css::uno::Sequence< css::beans::PropertyValue >& lDestination , - const ::rtl::OUString& sCurrentLocale ); + const OUString& sCurrentLocale ); static void convertContentHandlerToPropertySequence ( const ContentHandler& aSource , css::uno::Sequence< css::beans::PropertyValue >& lDestination ); static void convertPropertySequenceToFilter ( const css::uno::Sequence< css::beans::PropertyValue >& lSource , Filter& aDestination , - const ::rtl::OUString& sCurrentLocale ); + const OUString& sCurrentLocale ); static void convertPropertySequenceToFileType ( const css::uno::Sequence< css::beans::PropertyValue >& lSource , FileType& aDestination , - const ::rtl::OUString& sCurrentLocale ); + const OUString& sCurrentLocale ); static void convertPropertySequenceToDetector ( const css::uno::Sequence< css::beans::PropertyValue >& lSource , Detector& aDestination ); static void convertPropertySequenceToLoader ( const css::uno::Sequence< css::beans::PropertyValue >& lSource , Loader& aDestination , - const ::rtl::OUString& sCurrentLocale ); + const OUString& sCurrentLocale ); static void convertPropertySequenceToContentHandler ( const css::uno::Sequence< css::beans::PropertyValue >& lSource , ContentHandler& aDestination , - const ::rtl::OUString& sCurrentLocale ); - static void extractLocalizedStrings ( const ::rtl::OUString& sCurrentLocale , + const OUString& sCurrentLocale ); + static void extractLocalizedStrings ( const OUString& sCurrentLocale , const css::uno::Any& aCFGValue , OUStringHashMap& lLocales ); static void packLocalizedStrings ( sal_Int16 nMode , - const ::rtl::OUString& sCurrentLocale , + const OUString& sCurrentLocale , css::uno::Any& aCFGValue , const OUStringHashMap& lLocales ); - static ::rtl::OUString getLocalelizedString ( const OUStringHashMap& lLocales , - const ::rtl::OUString& sLocale ); + static OUString getLocalelizedString ( const OUStringHashMap& lLocales , + const OUString& sLocale ); static void setLocalelizedString ( OUStringHashMap& lLocales , - const ::rtl::OUString& sLocale , - const ::rtl::OUString& sValue ); + const OUString& sLocale , + const OUString& sValue ); static void correctExtensions ( OUStringList& lExtensions ); public: @@ -580,7 +580,7 @@ class DataContainer : private ThreadHelpBase PerformanceHash m_aFastContentHandlerCache ; /// hold all registered content handler services for a special file type PreferredHash m_aPreferredTypesCache ; /// assignment of extensions to preferred types for it Loader m_aGenericLoader ; /// information about our default frame loader - ::rtl::OUString m_sLocale ; /// current set locale of configuration to handle right UIName from set of all UINames! + OUString m_sLocale ; /// current set locale of configuration to handle right UIName from set of all UINames! sal_Bool m_bTypesModified ; sal_Bool m_bFiltersModified ; sal_Bool m_bDetectorsModified ; @@ -608,7 +608,7 @@ class FilterCFGAccess : public ::utl::ConfigItem // interface //------------------------------------------------------------------------------------------------------------- public: - FilterCFGAccess ( const ::rtl::OUString& sPath , + FilterCFGAccess ( const OUString& sPath , sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION , sal_Int16 nMode = DEFAULT_FILTERCACHE_MODE ); // open configuration virtual ~FilterCFGAccess( ); @@ -618,14 +618,14 @@ class FilterCFGAccess : public ::utl::ConfigItem void write ( DataContainer& rData , DataContainer::ECFGType eType ); // write values from given struct to configuration - static ::rtl::OUString encodeTypeData ( const FileType& aType ); // build own formated string of type properties - static void decodeTypeData ( const ::rtl::OUString& sData , + static OUString encodeTypeData ( const FileType& aType ); // build own formated string of type properties + static void decodeTypeData ( const OUString& sData , FileType& aType ); - static ::rtl::OUString encodeFilterData( const Filter& aFilter ); // build own formated string of filter properties - static void decodeFilterData( const ::rtl::OUString& sData , + static OUString encodeFilterData( const Filter& aFilter ); // build own formated string of filter properties + static void decodeFilterData( const OUString& sData , Filter& aFilter ); - static ::rtl::OUString encodeStringList( const OUStringList& lList ); // build own formated string of OUStringList - static OUStringList decodeStringList( const ::rtl::OUString& sValue ); + static OUString encodeStringList( const OUStringList& lList ); // build own formated string of OUStringList + static OUStringList decodeStringList( const OUString& sValue ); void setProductName ( OUStringHashMap& lUINames ); void resetProductName ( OUStringHashMap& lUINames ); @@ -636,8 +636,8 @@ class FilterCFGAccess : public ::utl::ConfigItem private: void impl_initKeyCounts ( ); // set right key counts, which are used at reading/writing of set node properties void impl_removeNodes ( OUStringList& rChangesList , // helper to remove list of set nodes - const ::rtl::OUString& sTemplateType , - const ::rtl::OUString& sSetName ); + const OUString& sTemplateType , + const OUString& sSetName ); void impl_loadTypes ( DataContainer& rData ); // helper to load configuration parts void impl_loadFilters ( DataContainer& rData ); @@ -656,7 +656,7 @@ class FilterCFGAccess : public ::utl::ConfigItem // debug checks //------------------------------------------------------------------------------------------------------------- private: - static sal_Bool implcp_ctor ( const ::rtl::OUString& sPath , // methods to check incoming parameter on our interface methods! + static sal_Bool implcp_ctor ( const OUString& sPath , // methods to check incoming parameter on our interface methods! sal_Int32 nVersion , sal_Int16 nMode ); static sal_Bool implcp_read ( const DataContainer& rData ); @@ -673,8 +673,8 @@ class FilterCFGAccess : public ::utl::ConfigItem sal_Int32 m_nKeyCountDetectors ; sal_Int32 m_nKeyCountLoaders ; sal_Int32 m_nKeyCountContentHandlers ; - ::rtl::OUString m_sProductName ; - ::rtl::OUString m_sFormatVersion ; + OUString m_sProductName ; + OUString m_sFormatVersion ; }; } // namespace framework diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index 62159aa8062e..2b1a5d7f1569 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -100,8 +100,8 @@ class FrameContainer : private ThreadHelpBase css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > getAllElements() const; /// special helper for Frame::findFrame() - css::uno::Reference< css::frame::XFrame > searchOnAllChildrens ( const ::rtl::OUString& sName ) const; - css::uno::Reference< css::frame::XFrame > searchOnDirectChildrens( const ::rtl::OUString& sName ) const; + css::uno::Reference< css::frame::XFrame > searchOnAllChildrens ( const OUString& sName ) const; + css::uno::Reference< css::frame::XFrame > searchOnDirectChildrens( const OUString& sName ) const; }; // class FrameContainer diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx index 3d957992b750..3a60e3c11245 100644 --- a/framework/inc/classes/fwktabwindow.hxx +++ b/framework/inc/classes/fwktabwindow.hxx @@ -52,19 +52,19 @@ public: class FwkTabPage : public TabPage { private: - rtl::OUString m_sPageURL; - rtl::OUString m_sEventHdl; + OUString m_sPageURL; + OUString m_sEventHdl; css::uno::Reference< css::awt::XWindow > m_xPage; css::uno::Reference< css::awt::XContainerWindowEventHandler > m_xEventHdl; css::uno::Reference< css::awt::XContainerWindowProvider > m_xWinProvider; void CreateDialog(); - sal_Bool CallMethod( const rtl::OUString& rMethod ); + sal_Bool CallMethod( const OUString& rMethod ); public: FwkTabPage( Window* pParent, - const rtl::OUString& rPageURL, + const OUString& rPageURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler >& rEventHdl, const css::uno::Reference< css::awt::XContainerWindowProvider >& rProvider ); @@ -79,13 +79,13 @@ struct TabEntry { sal_Int32 m_nIndex; FwkTabPage* m_pPage; - ::rtl::OUString m_sPageURL; + OUString m_sPageURL; css::uno::Reference< css::awt::XContainerWindowEventHandler > m_xEventHdl; TabEntry() : m_nIndex( -1 ), m_pPage( NULL ) {} - TabEntry( sal_Int32 nIndex, ::rtl::OUString sURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler > & rEventHdl ) : + TabEntry( sal_Int32 nIndex, OUString sURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler > & rEventHdl ) : m_nIndex( nIndex ), m_pPage( NULL ), m_sPageURL( sURL ), m_xEventHdl( rEventHdl ) {} ~TabEntry() { delete m_pPage; } diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index fb3b2759929c..532471a45811 100644 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.hxx @@ -85,8 +85,8 @@ class MenuManager : public ThreadHelpBase , void UpdateSpecialWindowMenu( Menu* pMenu ); void ClearMenuDispatch(const css::lang::EventObject& Source = css::lang::EventObject(),bool _bRemoveOnly = true); void SetHdl(); - void AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren); - sal_uInt16 FillItemCommand(::rtl::OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const; + void AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren); + sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const; struct MenuItemHandler @@ -95,11 +95,11 @@ class MenuManager : public ThreadHelpBase , nItemId( aItemId ), pSubMenuManager( pManager ), xMenuItemDispatch( rDispatch ) {} sal_uInt16 nItemId; - ::rtl::OUString aTargetFrame; - ::rtl::OUString aMenuItemURL; - ::rtl::OUString aFilter; - ::rtl::OUString aPassword; - ::rtl::OUString aTitle; + OUString aTargetFrame; + OUString aMenuItemURL; + OUString aFilter; + OUString aPassword; + OUString aTitle; MenuManager* pSubMenuManager; css::uno::Reference< css::frame::XDispatch > xMenuItemDispatch; }; @@ -116,7 +116,7 @@ class MenuManager : public ThreadHelpBase , sal_Bool m_bActive; sal_Bool m_bIsBookmarkMenu; sal_Bool m_bShowMenuImages; - ::rtl::OUString m_aMenuItemCommand; + OUString m_aMenuItemCommand; Menu* m_pVCLMenu; css::uno::Reference< css::frame::XFrame > m_xFrame; ::std::vector< MenuItemHandler* > m_aMenuItemHandlerVector; diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index 02ddf16d547e..f414cf6714c0 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -146,7 +146,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet * @throw [com::sun::star::beans::UnknownPropertyException] * if no property with the specified name exists. */ - virtual void SAL_CALL impl_removePropertyInfo(const ::rtl::OUString& sProperty) + virtual void SAL_CALL impl_removePropertyInfo(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::uno::Exception ); @@ -163,11 +163,11 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet //--------------------------------------------------------------------- /** */ - virtual void SAL_CALL impl_setPropertyValue(const ::rtl::OUString& sProperty, + virtual void SAL_CALL impl_setPropertyValue(const OUString& sProperty, sal_Int32 nHandle , const css::uno::Any& aValue ) = 0; - virtual css::uno::Any SAL_CALL impl_getPropertyValue(const ::rtl::OUString& sProperty, + virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty, sal_Int32 nHandle ) = 0; //------------------------------------------------------------------------- @@ -178,7 +178,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& sProperty, + virtual void SAL_CALL setPropertyValue(const OUString& sProperty, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException , @@ -186,30 +186,30 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual css::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& sProperty) + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& sProperty, + virtual void SAL_CALL addPropertyChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& sProperty, + virtual void SAL_CALL removePropertyChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& sProperty, + virtual void SAL_CALL addVetoableChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& sProperty, + virtual void SAL_CALL removeVetoableChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , @@ -219,11 +219,11 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() throw(css::uno::RuntimeException); - virtual css::beans::Property SAL_CALL getPropertyByName(const ::rtl::OUString& sName) + virtual css::beans::Property SAL_CALL getPropertyByName(const OUString& sName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasPropertyByName(const ::rtl::OUString& sName) + virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& sName) throw(css::uno::RuntimeException); //------------------------------------------------------------------------- diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 6bc77e5d21f9..b57416806a18 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -54,7 +54,7 @@ struct FWI_DLLPUBLIC ProtocolHandler public: /// the uno implementation name of this handler - ::rtl::OUString m_sUNOName; + OUString m_sUNOName; /// list of URL pattern which defines the protocols which this handler is registered for OUStringList m_lProtocols; }; @@ -66,12 +66,12 @@ struct FWI_DLLPUBLIC ProtocolHandler uno implementation names as value. Overloading of the index operator makes it possible to search for a key by using a full qualified URL on list of all possible pattern keys. */ -class FWI_DLLPUBLIC PatternHash : public BaseHash< ::rtl::OUString > +class FWI_DLLPUBLIC PatternHash : public BaseHash< OUString > { /* interface */ public: - PatternHash::iterator findPatternKey( const ::rtl::OUString& sURL ); + PatternHash::iterator findPatternKey( const OUString& sURL ); }; //_________________________________________________________________________________________________________________ @@ -123,7 +123,7 @@ class FWI_DLLPUBLIC HandlerCache HandlerCache(); virtual ~HandlerCache(); - sal_Bool search( const ::rtl::OUString& sURL, ProtocolHandler* pReturn ) const; + sal_Bool search( const OUString& sURL, ProtocolHandler* pReturn ) const; sal_Bool search( const css::util::URL& aURL, ProtocolHandler* pReturn ) const; void takeOver(HandlerHash* pHandler, PatternHash* pPattern); @@ -152,12 +152,12 @@ class FWI_DLLPUBLIC HandlerCFGAccess : public ::utl::ConfigItem /* interface */ public: - HandlerCFGAccess( const ::rtl::OUString& sPackage ); + HandlerCFGAccess( const OUString& sPackage ); void read ( HandlerHash** ppHandler , PatternHash** ppPattern ); void setCache(HandlerCache* pCache) {m_pCache = pCache;}; - virtual void Notify(const css::uno::Sequence< rtl::OUString >& lPropertyNames); + virtual void Notify(const css::uno::Sequence< OUString >& lPropertyNames); virtual void Commit(); }; diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 726f29c23c7d..44bca4ed7efb 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -43,7 +43,7 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, public com::sun::star::container::XNamed { public: - RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier); + RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier); virtual ~RootActionTriggerContainer(); // XInterface @@ -53,11 +53,11 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, virtual void SAL_CALL release() throw (); // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // XIndexContainer @@ -86,9 +86,9 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException); @@ -98,8 +98,8 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); private: void FillContainer(); @@ -108,7 +108,7 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, sal_Bool m_bContainerChanged; sal_Bool m_bInContainerCreation; const Menu* m_pMenu; - const ::rtl::OUString* m_pMenuIdentifier; + const OUString* m_pMenuIdentifier; }; } diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx index 92da1f14ece9..44b51114e6b6 100644 --- a/framework/inc/classes/taskcreator.hxx +++ b/framework/inc/classes/taskcreator.hxx @@ -57,7 +57,7 @@ class TaskCreator : private ThreadHelpBase TaskCreator( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ); virtual ~TaskCreator( ); - css::uno::Reference< css::frame::XFrame > createTask( const ::rtl::OUString& sName , + css::uno::Reference< css::frame::XFrame > createTask( const OUString& sName , sal_Bool bVisible ); //_______________________ diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx index 7c80170dbb17..f80bb88649a1 100644 --- a/framework/inc/classes/wildcard.hxx +++ b/framework/inc/classes/wildcard.hxx @@ -97,8 +97,8 @@ class Wildcard @onerror - *//*-*****************************************************************************************************/ - static sal_Bool match( const ::rtl::OUString& sText , - const ::rtl::OUString& sPattern ); + static sal_Bool match( const OUString& sText , + const OUString& sPattern ); //--------------------------------------------------------------------------------------------------------- // debug and test methods @@ -121,8 +121,8 @@ class Wildcard #ifdef ENABLE_ASSERTIONS - static sal_Bool impldbg_checkParameter_match( const ::rtl::OUString& sText , - const ::rtl::OUString& sPattern ); + static sal_Bool impldbg_checkParameter_match( const OUString& sText , + const OUString& sPattern ); #endif // #ifdef ENABLE_ASSERTIONS diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 3493590385f3..5b8860f563eb 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -144,7 +144,7 @@ class CloseDispatcher : public css::lang::XTypeProvider */ CloseDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sTarget); + const OUString& sTarget); //--------------------------------------- /** @short does nothing real. */ @@ -300,7 +300,7 @@ class CloseDispatcher : public css::lang::XTypeProvider */ static css::uno::Reference< css::frame::XFrame > static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sTarget); + const OUString& sTarget); }; // class CloseDispatcher diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx index 4515491b164e..bb65b34ce999 100644 --- a/framework/inc/dispatch/dispatchprovider.hxx +++ b/framework/inc/dispatch/dispatchprovider.hxx @@ -107,7 +107,7 @@ class DispatchProvider : // interfaces const css::uno::Reference< css::frame::XFrame >& xFrame ); virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException ); @@ -119,16 +119,16 @@ class DispatchProvider : // interfaces private: css::uno::Reference< css::frame::XDispatch > implts_getOrCreateDispatchHelper ( EDispatchHelper eHelper , const css::uno::Reference< css::frame::XFrame >& xOwner , - const ::rtl::OUString& sTarget = ::rtl::OUString() , + const OUString& sTarget = OUString() , sal_Int32 nSearchFlags = 0 ); sal_Bool implts_isLoadableContent ( const css::util::URL& aURL ); css::uno::Reference< css::frame::XDispatch > implts_queryDesktopDispatch ( const css::uno::Reference< css::frame::XFrame > xDesktop , const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ); css::uno::Reference< css::frame::XDispatch > implts_queryFrameDispatch ( const css::uno::Reference< css::frame::XFrame > xFrame , const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ); css::uno::Reference< css::frame::XDispatch > implts_searchProtocolHandler ( const css::util::URL& aURL ); diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index 80a805188a4d..7e47e949f4db 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -73,7 +73,7 @@ class InterceptionHelper : public css::frame::XDispatchProvider XInterceptorInfo, it will be registered for one pattern "*" by default. That would make it possible to handle it in the same manner then real registered interceptor objects and we must not implement any special code. */ - css::uno::Sequence< ::rtl::OUString > lURLPattern; + css::uno::Sequence< OUString > lURLPattern; }; //_____________________________________________________ @@ -120,13 +120,13 @@ class InterceptionHelper : public css::frame::XDispatchProvider @return An iterator object, which points directly to the located item inside this list. In case no interceptor could be found, it points to the end of this list! */ - iterator findByPattern(const ::rtl::OUString& sURL) + iterator findByPattern(const OUString& sURL) { iterator pIt; for (pIt=begin(); pIt!=end(); ++pIt) { sal_Int32 c = pIt->lURLPattern.getLength(); - const ::rtl::OUString* pPattern = pIt->lURLPattern.getConstArray(); + const OUString* pPattern = pIt->lURLPattern.getConstArray(); for (sal_Int32 i=0; i<c; ++i) { @@ -221,7 +221,7 @@ class InterceptionHelper : public css::frame::XDispatchProvider or NULL otherwise. */ virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName, + const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException); diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index 71031cbd8950..f4662f04137b 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -83,7 +83,7 @@ class MailToDispatcher : // interfaces // XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , - const ::rtl::OUString& sTarget , + const OUString& sTarget , sal_Int32 nFlags ) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ); diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx index e0b30691d645..cc274c7e4f32 100644 --- a/framework/inc/dispatch/menudispatcher.hxx +++ b/framework/inc/dispatch/menudispatcher.hxx @@ -54,9 +54,9 @@ namespace framework{ We implement this as a hashtable for strings. *//*-*************************************************************************************************************/ -typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString , - rtl::OUStringHash, - std::equal_to< ::rtl::OUString > > IMPL_ListenerHashContainer; +typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString , + OUStringHash, + std::equal_to< OUString > > IMPL_ListenerHashContainer; /*-************************************************************************************************************//** diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 0e206338bb34..87e95dbd617b 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -103,7 +103,7 @@ class Oxt_Handler : // interfaces //--------------------------------------------------------------------------------------------------------- // XExtendedFilterDetection //--------------------------------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- // protected methods diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 2c1023c473e2..1a5116b92048 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -56,9 +56,9 @@ namespace framework{ We implement this as a hashtable for strings. *//*-*************************************************************************************************************/ -typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString , - rtl::OUStringHash, - std::equal_to< ::rtl::OUString > > IMPL_ListenerHashContainer; +typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString , + OUStringHash, + std::equal_to< OUString > > IMPL_ListenerHashContainer; /*-************************************************************************************************************//** @@ -107,7 +107,7 @@ class PopupMenuDispatcher : // interfaces // XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL , - const ::rtl::OUString& sTarget , + const OUString& sTarget , sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx index ca8843a368f5..1210a2afe86d 100644 --- a/framework/inc/dispatch/servicehandler.hxx +++ b/framework/inc/dispatch/servicehandler.hxx @@ -87,7 +87,7 @@ class ServiceHandler : // interfaces // XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , - const ::rtl::OUString& sTarget , + const OUString& sTarget , sal_Int32 nFlags ) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ); diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 97d3825dc798..5058f3a3e522 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -73,7 +73,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider //--------------------------------------- /** @short the original queryDispatch() target. */ - ::rtl::OUString m_sDispatchTarget; + OUString m_sDispatchTarget; //--------------------------------------- /** @short list of registered status listener */ @@ -101,7 +101,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider */ StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sTarget); + const OUString& sTarget); //--------------------------------------- /** @short does nothing real. */ diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx index 8fac399056fc..c343b7661a63 100644 --- a/framework/inc/dispatch/systemexec.hxx +++ b/framework/inc/dispatch/systemexec.hxx @@ -85,7 +85,7 @@ class SystemExec : // interfaces // XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , - const ::rtl::OUString& sTarget , + const OUString& sTarget , sal_Int32 nFlags ) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ); diff --git a/framework/inc/framework/actiontriggerhelper.hxx b/framework/inc/framework/actiontriggerhelper.hxx index 2061d6534b1c..e942de94924f 100644 --- a/framework/inc/framework/actiontriggerhelper.hxx +++ b/framework/inc/framework/actiontriggerhelper.hxx @@ -48,7 +48,7 @@ namespace framework // the above mentioned restriction!!! static com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > CreateActionTriggerContainerFromMenu( - const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier ); + const Menu* pMenu, const OUString* pMenuIdentifier ); // Fills the submitted rActionTriggerContainer with the structure of the menu // provided as the second parameter diff --git a/framework/inc/framework/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx index c5fcb63239e9..6390459be0f1 100644 --- a/framework/inc/framework/addonmenu.hxx +++ b/framework/inc/framework/addonmenu.hxx @@ -50,10 +50,10 @@ class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu ~AddonPopupMenu(); // Check if command URL string has the unique prefix to identify addon popup menus - static sal_Bool IsCommandURLPrefix( const rtl::OUString& aCmdURL ); + static sal_Bool IsCommandURLPrefix( const OUString& aCmdURL ); - void SetCommandURL( const rtl::OUString& aCmdURL ) { m_aCommandURL = aCmdURL; } - const rtl::OUString& GetCommandURL() const { return m_aCommandURL; } + void SetCommandURL( const OUString& aCmdURL ) { m_aCommandURL = aCmdURL; } + const OUString& GetCommandURL() const { return m_aCommandURL; } protected: void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition ); @@ -61,7 +61,7 @@ class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu private: AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); - rtl::OUString m_aCommandURL; + OUString m_aCommandURL; friend class AddonMenuManager; }; @@ -80,7 +80,7 @@ class FWE_DLLPUBLIC AddonMenuManager static sal_Bool IsAddonMenuId( sal_uInt16 nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); } // Check if the context string matches the provided xModel context - static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext ); + static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const OUString& aContext ); // Factory method to create different Add-On menu types static PopupMenu* CreatePopupMenuType( MenuType eMenuType, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); @@ -112,11 +112,11 @@ class FWE_DLLPUBLIC AddonMenuManager // Retrieve the menu entry property values from a sequence static void GetMenuEntry( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonMenuEntry, - ::rtl::OUString& rTitle, - ::rtl::OUString& rURL, - ::rtl::OUString& rTarget, - ::rtl::OUString& rImageId, - ::rtl::OUString& rContext, + OUString& rTitle, + OUString& rURL, + OUString& rTarget, + OUString& rImageId, + OUString& rContext, com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rAddonSubMenu ); }; diff --git a/framework/inc/framework/eventsconfiguration.hxx b/framework/inc/framework/eventsconfiguration.hxx index 81ea643f4dbd..29694b7fb539 100644 --- a/framework/inc/framework/eventsconfiguration.hxx +++ b/framework/inc/framework/eventsconfiguration.hxx @@ -32,7 +32,7 @@ namespace framework struct FWE_DLLPUBLIC EventsConfig { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aEventNames; + ::com::sun::star::uno::Sequence< OUString > aEventNames; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aEventsProperties; }; diff --git a/framework/inc/framework/imageproducer.hxx b/framework/inc/framework/imageproducer.hxx index c2a2b11c10ed..0d9398f7b2a3 100644 --- a/framework/inc/framework/imageproducer.hxx +++ b/framework/inc/framework/imageproducer.hxx @@ -31,7 +31,7 @@ namespace framework typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& aURL, + const OUString& aURL, bool bBig ); @@ -39,7 +39,7 @@ pfunc_getImage FWE_DLLPUBLIC SAL_CALL SetImageProducer( pfunc_getImage pGetImage Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& aURL, + const OUString& aURL, bool bBig ); diff --git a/framework/inc/framework/interaction.hxx b/framework/inc/framework/interaction.hxx index 277bb855ef1c..1cd56bbd36d9 100644 --- a/framework/inc/framework/interaction.hxx +++ b/framework/inc/framework/interaction.hxx @@ -67,10 +67,10 @@ class FWE_DLLPUBLIC RequestFilterSelect RequestFilterSelect_Impl* pImp; public: - RequestFilterSelect( const ::rtl::OUString& sURL ); + RequestFilterSelect( const OUString& sURL ); ~RequestFilterSelect(); sal_Bool isAbort () const; - ::rtl::OUString getFilter() const; + OUString getFilter() const; com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); }; diff --git a/framework/inc/framework/menuextensionsupplier.hxx b/framework/inc/framework/menuextensionsupplier.hxx index 2104537ad61f..6d3a6761e38e 100644 --- a/framework/inc/framework/menuextensionsupplier.hxx +++ b/framework/inc/framework/menuextensionsupplier.hxx @@ -25,8 +25,8 @@ struct FWE_DLLPUBLIC MenuExtensionItem { - rtl::OUString aLabel; - rtl::OUString aURL; + OUString aLabel; + OUString aURL; }; typedef MenuExtensionItem ( *pfunc_setMenuExtensionSupplier)(); diff --git a/framework/inc/framework/sfxhelperfunctions.hxx b/framework/inc/framework/sfxhelperfunctions.hxx index 9d638f53e6e1..ce2b604f5e5e 100644 --- a/framework/inc/framework/sfxhelperfunctions.hxx +++ b/framework/inc/framework/sfxhelperfunctions.hxx @@ -32,28 +32,28 @@ typedef svt::ToolboxController* ( *pfunc_setToolBoxControllerCreator)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, - const ::rtl::OUString& aCommandURL ); + const OUString& aCommandURL ); typedef svt::StatusbarController* ( *pfunc_setStatusBarControllerCreator)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, - const ::rtl::OUString& aCommandURL ); + const OUString& aCommandURL ); typedef void ( *pfunc_getRefreshToolbars)( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); typedef void ( *pfunc_createDockingWindow)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& rResourceURL ); + const OUString& rResourceURL ); typedef bool ( *pfunc_isDockingWindowVisible)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& rResourceURL ); + const OUString& rResourceURL ); typedef void ( *pfunc_activateToolPanel)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, - const ::rtl::OUString& i_rPanelURL ); + const OUString& i_rPanelURL ); namespace framework @@ -63,14 +63,14 @@ FWE_DLLPUBLIC svt::ToolboxController* SAL_CALL CreateToolBoxController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, - const ::rtl::OUString& aCommandURL ); + const OUString& aCommandURL ); FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator ); FWE_DLLPUBLIC svt::StatusbarController* SAL_CALL CreateStatusBarController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, - const ::rtl::OUString& aCommandURL ); + const OUString& aCommandURL ); FWE_DLLPUBLIC pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc ); FWE_DLLPUBLIC void SAL_CALL RefreshToolbars( @@ -79,17 +79,17 @@ FWE_DLLPUBLIC void SAL_CALL RefreshToolbars( FWE_DLLPUBLIC pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow ); FWE_DLLPUBLIC void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& rResourceURL ); + const OUString& rResourceURL ); FWE_DLLPUBLIC pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible ); FWE_DLLPUBLIC bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& rResourceURL ); + const OUString& rResourceURL ); FWE_DLLPUBLIC pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator ); FWE_DLLPUBLIC void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, - const ::rtl::OUString& i_rPanelURL ); + const OUString& i_rPanelURL ); } #endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx index 92fff24df7c3..c4cdc31a6329 100644 --- a/framework/inc/framework/titlehelper.hxx +++ b/framework/inc/framework/titlehelper.hxx @@ -102,12 +102,12 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex //--------------------------------------- /** @see XTitle */ - virtual ::rtl::OUString SAL_CALL getTitle() + virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException); //--------------------------------------- /** @see XTitle */ - virtual void SAL_CALL setTitle(const ::rtl::OUString& sTitle) + virtual void SAL_CALL setTitle(const OUString& sTitle) throw (css::uno::RuntimeException); //--------------------------------------- @@ -156,16 +156,16 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex void impl_startListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame); void impl_updateListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame); - void impl_appendComponentTitle ( ::rtl::OUStringBuffer& sTitle , + void impl_appendComponentTitle ( OUStringBuffer& sTitle , const css::uno::Reference< css::uno::XInterface >& xComponent); - void impl_appendProductName (::rtl::OUStringBuffer& sTitle); - void impl_appendProductExtension (::rtl::OUStringBuffer& sTitle); - void impl_appendModuleName (::rtl::OUStringBuffer& sTitle); - void impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle); + void impl_appendProductName (OUStringBuffer& sTitle); + void impl_appendProductExtension (OUStringBuffer& sTitle); + void impl_appendModuleName (OUStringBuffer& sTitle); + void impl_appendDebugVersion (OUStringBuffer& sTitle); void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle); - ::rtl::OUString impl_convertURL2Title(const ::rtl::OUString& sURL); + OUString impl_convertURL2Title(const OUString& sURL); //------------------------------------------- // member @@ -190,7 +190,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex ::sal_Bool m_bExternalTitle; /** the actual title value */ - ::rtl::OUString m_sTitle; + OUString m_sTitle; /** knows the leased number which must be used for untitled components. */ ::sal_Int32 m_nLeasedNumber; diff --git a/framework/inc/framework/undomanagerhelper.hxx b/framework/inc/framework/undomanagerhelper.hxx index f0c3307846cd..ae91db981553 100644 --- a/framework/inc/framework/undomanagerhelper.hxx +++ b/framework/inc/framework/undomanagerhelper.hxx @@ -117,7 +117,7 @@ namespace framework void disposing(); // XUndoManager equivalents - void enterUndoContext( const ::rtl::OUString& i_title, IMutexGuard& i_instanceLock ); + void enterUndoContext( const OUString& i_title, IMutexGuard& i_instanceLock ); void enterHiddenUndoContext( IMutexGuard& i_instanceLock ); void leaveUndoContext( IMutexGuard& i_instanceLock ); void addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action, IMutexGuard& i_instanceLock ); @@ -125,11 +125,11 @@ namespace framework void redo( IMutexGuard& i_instanceLock ); ::sal_Bool isUndoPossible() const; ::sal_Bool isRedoPossible() const; - ::rtl::OUString getCurrentUndoActionTitle() const; - ::rtl::OUString getCurrentRedoActionTitle() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + OUString getCurrentUndoActionTitle() const; + OUString getCurrentRedoActionTitle() const; + ::com::sun::star::uno::Sequence< OUString > getAllUndoActionTitles() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > getAllRedoActionTitles() const; void clear( IMutexGuard& i_instanceLock ); void clearRedo( IMutexGuard& i_instanceLock ); diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 2db48ff6d9b9..0b26720bfd20 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -100,22 +100,22 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > GetGuesser() const; }; -FWI_DLLPUBLIC ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL +FWI_DLLPUBLIC OUString RetrieveLabelFromCommand( const OUString& aCmdURL ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xUICommandLabels ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame - ,::rtl::OUString& _rModuleIdentifier + ,OUString& _rModuleIdentifier ,sal_Bool& _rIni ,const sal_Char* _pName); -FWI_DLLPUBLIC void FillLangItems( std::set< ::rtl::OUString > &rLangItems, +FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems, const SvtLanguageTable &rLanguageTable, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > &rxFrame, const LanguageGuessingHelper & rLangGuessHelper, sal_Int16 nScriptType, - const ::rtl::OUString & rCurLang, - const ::rtl::OUString & rKeyboardLang, - const ::rtl::OUString & rGuessedTextLang ); + const OUString & rCurLang, + const OUString & rKeyboardLang, + const OUString & rGuessedTextLang ); //It's common for an object to want to create and own a Broadcaster and set //itself as a Listener on its own Broadcaster member. diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx index b9a1f3c4080d..037fbc83190e 100644 --- a/framework/inc/helper/networkdomain.hxx +++ b/framework/inc/helper/networkdomain.hxx @@ -29,8 +29,8 @@ namespace framework class FWI_DLLPUBLIC NetworkDomain { public: - static rtl::OUString GetNTDomainName(); - static rtl::OUString GetYPDomainName(); + static OUString GetNTDomainName(); + static OUString GetYPDomainName(); }; } diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index 6e037d3a90ea..a2f680ca5e93 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -126,7 +126,7 @@ class PersistentWindowState : // interfaces @return [string] a module identifier for the current frame component. */ - static ::rtl::OUString implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext, + static OUString implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame); //____________________________ @@ -142,8 +142,8 @@ class PersistentWindowState : // interfaces @return [string] contains the information about position and size. */ - static ::rtl::OUString implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext , - const ::rtl::OUString& sModuleName); + static OUString implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext , + const OUString& sModuleName); //____________________________ /** @short retrieve the window state from the container window. @@ -156,7 +156,7 @@ class PersistentWindowState : // interfaces @return [string] contains the information about position and size. */ - static ::rtl::OUString implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow); + static OUString implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow); //____________________________ /** @short restore the position and size on the container window. @@ -172,8 +172,8 @@ class PersistentWindowState : // interfaces contains the information about position and size. */ static void implst_setWindowStateOnConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sModuleName , - const ::rtl::OUString& sWindowState ); + const OUString& sModuleName , + const OUString& sWindowState ); //____________________________ /** @short restore the position and size on the container window. @@ -187,7 +187,7 @@ class PersistentWindowState : // interfaces contains the information about position and size. */ static void implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow , - const ::rtl::OUString& sWindowState); + const OUString& sWindowState); }; // class PersistentWindowState diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx index 3a9fb451ced0..1f99c8e56ddb 100644 --- a/framework/inc/helper/statusindicator.hxx +++ b/framework/inc/helper/statusindicator.hxx @@ -107,7 +107,7 @@ class StatusIndicator : public css::lang::XTypeProvider //--------------------------------------- // XStatusIndicator - virtual void SAL_CALL start(const ::rtl::OUString& sText , + virtual void SAL_CALL start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException); @@ -117,7 +117,7 @@ class StatusIndicator : public css::lang::XTypeProvider virtual void SAL_CALL reset() throw(css::uno::RuntimeException); - virtual void SAL_CALL setText(const ::rtl::OUString& sText) + virtual void SAL_CALL setText(const OUString& sText) throw(css::uno::RuntimeException); virtual void SAL_CALL setValue(sal_Int32 nValue) diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index c7d30a69f97a..a5cfa5e61d39 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -79,7 +79,7 @@ struct IndicatorInfo css::uno::Reference< css::task::XStatusIndicator > m_xIndicator; /** @short the last set text for this indicator */ - ::rtl::OUString m_sText; + OUString m_sText; /** @short the max range for this indicator. */ sal_Int32 m_nRange; @@ -104,7 +104,7 @@ struct IndicatorInfo the max range for this indicator. */ IndicatorInfo(const css::uno::Reference< css::task::XStatusIndicator >& xIndicator, - const ::rtl::OUString& sText , + const OUString& sText , sal_Int32 nRange ) { m_xIndicator = xIndicator; @@ -240,7 +240,7 @@ class StatusIndicatorFactory : public css::lang::XTypeProvider //--------------------------------------- // similar (XStatusIndicator) virtual void start(const css::uno::Reference< css::task::XStatusIndicator >& xChild, - const ::rtl::OUString& sText , + const OUString& sText , sal_Int32 nRange); virtual void SAL_CALL reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild); @@ -248,7 +248,7 @@ class StatusIndicatorFactory : public css::lang::XTypeProvider virtual void SAL_CALL end(const css::uno::Reference< css::task::XStatusIndicator >& xChild); virtual void SAL_CALL setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, - const ::rtl::OUString& sText ); + const OUString& sText ); virtual void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild, sal_Int32 nValue); diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index cc323f66fa90..47e96470f7a4 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -75,9 +75,9 @@ class TitleBarUpdate : // interfaces struct TModuleInfo { /// internal id of this module - ::rtl::OUString sID; + OUString sID; /// localized name for this module - ::rtl::OUString sUIName; + OUString sUIName; /// configured icon for this module ::sal_Int32 nIcon; }; diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index 2351e65fa8ba..a97aea5acbef 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -87,7 +87,7 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider // XUIElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; @@ -132,7 +132,7 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider m_bConfigListening : 1, m_bDisposed : 1, m_bNoClose : 1; - rtl::OUString m_aResourceURL; + OUString m_aResourceURL; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xConfigSource; com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xConfigData; diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index c610fcefac06..785c2849648e 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -78,7 +78,7 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider // XUIElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; @@ -103,7 +103,7 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener - rtl::OUString m_aResourceURL; + OUString m_aResourceURL; com::sun::star::uno::WeakReference< com::sun::star::frame::XFrame > m_xWeakFrame; sal_Int16 m_nType; sal_Bool m_bInitialized : 1, diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx index 83fc64654dbe..1827174444ab 100644 --- a/framework/inc/helper/vclstatusindicator.hxx +++ b/framework/inc/helper/vclstatusindicator.hxx @@ -63,7 +63,7 @@ class VCLStatusIndicator : public css::task::XStatusIndicator StatusBar* m_pStatusBar; /** knows the current info text of the progress. */ - ::rtl::OUString m_sText; + OUString m_sText; /** knows the current range of the progress. */ sal_Int32 m_nRange; @@ -86,7 +86,7 @@ class VCLStatusIndicator : public css::task::XStatusIndicator virtual ~VCLStatusIndicator(); /// XStatusIndicator - virtual void SAL_CALL start(const ::rtl::OUString& sText , + virtual void SAL_CALL start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException); @@ -96,7 +96,7 @@ class VCLStatusIndicator : public css::task::XStatusIndicator virtual void SAL_CALL end() throw(css::uno::RuntimeException); - virtual void SAL_CALL setText(const ::rtl::OUString& sText) + virtual void SAL_CALL setText(const OUString& sText) throw(css::uno::RuntimeException); virtual void SAL_CALL setValue(sal_Int32 nValue) diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index dd9386a19630..f4bced46bf43 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -72,7 +72,7 @@ class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase css::uno::Reference< css::uno::XInterface > m_xConfig; /** knows the root of the opened config access point */ - ::rtl::OUString m_sRoot; + OUString m_sRoot; /** represent the current open mode */ EOpenMode m_eMode; @@ -83,7 +83,7 @@ class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase public: ConfigAccess( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sRoot ); + const OUString& sRoot ); virtual ~ConfigAccess(); virtual void open ( EOpenMode eMode ); diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index 09f949aae37b..6f728067da53 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -72,13 +72,13 @@ class HelpOnStartup : private ThreadHelpBase /** @short knows the current locale of this office session, which is needed to build complete help URLs. */ - ::rtl::OUString m_sLocale; + OUString m_sLocale; //....................................... /** @short knows the current operating system of this office session, which is needed to build complete help URLs. */ - ::rtl::OUString m_sSystem; + OUString m_sSystem; //------------------------------------------- // native interface @@ -138,7 +138,7 @@ class HelpOnStartup : private ThreadHelpBase a module identifier ... or an empty value if no model could be located ... or if it could not be classified successfully. */ - ::rtl::OUString its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments); + OUString its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments); //--------------------------------------- /** @short tries to locate the open help module and return @@ -150,7 +150,7 @@ class HelpOnStartup : private ThreadHelpBase @return The URL of the current shown help content; or an empty value if the help isnt still open. */ - ::rtl::OUString its_getCurrentHelpURL(); + OUString its_getCurrentHelpURL(); //--------------------------------------- /** @short checks if the given help url match to a default help url @@ -163,7 +163,7 @@ class HelpOnStartup : private ThreadHelpBase sal_True if the given URL is any default one ... sal_False otherwise. */ - ::sal_Bool its_isHelpUrlADefaultOne(const ::rtl::OUString& sHelpURL); + ::sal_Bool its_isHelpUrlADefaultOne(const OUString& sHelpURL); //--------------------------------------- /** @short checks, if the help module should be shown automaticly for the @@ -180,7 +180,7 @@ class HelpOnStartup : private ThreadHelpBase A valid help URL in case the help content should be shown; an empty value if such automatism was disabled for the specified office module. */ - ::rtl::OUString its_checkIfHelpEnabledAndGetURL(const ::rtl::OUString& sModule); + OUString its_checkIfHelpEnabledAndGetURL(const OUString& sModule); //--------------------------------------- /** @short create a help URL for the given parameters. @@ -203,9 +203,9 @@ class HelpOnStartup : private ThreadHelpBase e.g. "vnd.sun.star.help://swriter/?Language=en-US&System=WIN" or "vnd.sun.star.help://swriter/67351?Language=en-US&System=WIN" */ - static ::rtl::OUString ist_createHelpURL(const ::rtl::OUString& sBaseURL, - const ::rtl::OUString& sLocale , - const ::rtl::OUString& sSystem ); + static OUString ist_createHelpURL(const OUString& sBaseURL, + const OUString& sLocale , + const OUString& sSystem ); }; } // namespace framework diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx index dc7bab828433..f515f75913e6 100644 --- a/framework/inc/jobs/jobconst.hxx +++ b/framework/inc/jobs/jobconst.hxx @@ -43,9 +43,9 @@ namespace framework{ class FWI_DLLPUBLIC JobConst { public: - static const ::rtl::OUString ANSWER_DEACTIVATE_JOB(); - static const ::rtl::OUString ANSWER_SAVE_ARGUMENTS(); - static const ::rtl::OUString ANSWER_SEND_DISPATCHRESULT(); + static const OUString ANSWER_DEACTIVATE_JOB(); + static const OUString ANSWER_SAVE_ARGUMENTS(); + static const OUString ANSWER_SEND_DISPATCHRESULT(); }; } // namespace framework diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index ec7f300711d2..a3510650acc9 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -133,11 +133,11 @@ class JobData : private ThreadHelpBase */ struct TJob2DocEventBinding { - ::rtl::OUString m_sJobName; - ::rtl::OUString m_sDocEvent; + OUString m_sJobName; + OUString m_sDocEvent; - TJob2DocEventBinding(const ::rtl::OUString& sJobName , - const ::rtl::OUString& sDocEvent) + TJob2DocEventBinding(const OUString& sJobName , + const OUString& sDocEvent) : m_sJobName (sJobName ) , m_sDocEvent(sDocEvent) {} @@ -180,19 +180,19 @@ class JobData : private ThreadHelpBase Is used as entry of configuration set for job registration, to find all neccessary properties of it.. */ - ::rtl::OUString m_sAlias; + OUString m_sAlias; /** the uno implementation name of this job. It's readed from the configuration. Don't set it from outside! */ - ::rtl::OUString m_sService; + OUString m_sService; /** the module context list of this job. It's readed from the configuration. Don't set it from outside! */ - ::rtl::OUString m_sContext; + OUString m_sContext; /** a job can be registered for an event. @@ -203,7 +203,7 @@ class JobData : private ThreadHelpBase arguments. A job can be called so, with a) it's onw config data and b) some dynamic environment data. */ - ::rtl::OUString m_sEvent; + OUString m_sEvent; /** job specific configuration items ... unknown for us! @@ -233,29 +233,29 @@ class JobData : private ThreadHelpBase EMode getMode () const; EEnvironment getEnvironment () const; - ::rtl::OUString getEnvironmentDescriptor() const; - ::rtl::OUString getService () const; - ::rtl::OUString getEvent () const; + OUString getEnvironmentDescriptor() const; + OUString getService () const; + OUString getEvent () const; css::uno::Sequence< css::beans::NamedValue > getConfig () const; css::uno::Sequence< css::beans::NamedValue > getJobConfig () const; sal_Bool hasConfig () const; - sal_Bool hasCorrectContext ( const ::rtl::OUString& rModuleIdent ) const; + sal_Bool hasCorrectContext ( const OUString& rModuleIdent ) const; void setEnvironment ( EEnvironment eEnvironment ); - void setAlias ( const ::rtl::OUString& sAlias ); - void setService ( const ::rtl::OUString& sService ); - void setEvent ( const ::rtl::OUString& sEvent , - const ::rtl::OUString& sAlias ); + void setAlias ( const OUString& sAlias ); + void setService ( const OUString& sService ); + void setEvent ( const OUString& sEvent , + const OUString& sAlias ); void setJobConfig ( const css::uno::Sequence< css::beans::NamedValue >& lArguments ); void setResult ( const JobResult& aResult ); void disableJob ( ); - static css::uno::Sequence< ::rtl::OUString > getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sEvent ); + static css::uno::Sequence< OUString > getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const OUString& sEvent ); static void appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sEvent , + const OUString& sEvent , ::comphelper::SequenceAsVector< JobData::TJob2DocEventBinding >& lJobs ); //___________________________________ diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx index b3cc0143f062..47f2c62b17b8 100644 --- a/framework/inc/jobs/jobdispatch.hxx +++ b/framework/inc/jobs/jobdispatch.hxx @@ -83,7 +83,7 @@ class JobDispatch : public css::lang::XTypeProvider css::uno::Reference< css::frame::XFrame > m_xFrame; /** name of module (writer, impress etc.) the frame is for */ - ::rtl::OUString m_sModuleIdentifier; + OUString m_sModuleIdentifier; //___________________________________ // native interface methods @@ -93,13 +93,13 @@ class JobDispatch : public css::lang::XTypeProvider JobDispatch( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ); virtual ~JobDispatch( ); - void impl_dispatchEvent ( const ::rtl::OUString& sEvent , + void impl_dispatchEvent ( const OUString& sEvent , const css::uno::Sequence< css::beans::PropertyValue >& lArgs , const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ); - void impl_dispatchService( const ::rtl::OUString& sService , + void impl_dispatchService( const OUString& sService , const css::uno::Sequence< css::beans::PropertyValue >& lArgs , const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ); - void impl_dispatchAlias ( const ::rtl::OUString& sAlias , + void impl_dispatchAlias ( const OUString& sAlias , const css::uno::Sequence< css::beans::PropertyValue >& lArgs , const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ); @@ -119,7 +119,7 @@ class JobDispatch : public css::lang::XTypeProvider // XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException); virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw(css::uno::RuntimeException); diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx index 9e2c91af6921..931fb071af80 100644 --- a/framework/inc/jobs/jobexecutor.hxx +++ b/framework/inc/jobs/jobexecutor.hxx @@ -98,7 +98,7 @@ class JobExecutor : public css::lang::XTypeProvider DECLARE_XSERVICEINFO // task.XJobExecutor - virtual void SAL_CALL trigger( const ::rtl::OUString& sEvent ) throw(css::uno::RuntimeException); + virtual void SAL_CALL trigger( const OUString& sEvent ) throw(css::uno::RuntimeException); // document.XEventListener virtual void SAL_CALL notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException); diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx index 6849f408528e..f6e06837c417 100644 --- a/framework/inc/jobs/joburl.hxx +++ b/framework/inc/jobs/joburl.hxx @@ -87,44 +87,44 @@ class JobURL : private ThreadHelpBase sal_uInt32 m_eRequest; /** holds the event part of a job URL */ - ::rtl::OUString m_sEvent; + OUString m_sEvent; /** holds the alias part of a job URL */ - ::rtl::OUString m_sAlias; + OUString m_sAlias; /** holds the service part of a job URL */ - ::rtl::OUString m_sService; + OUString m_sService; /** holds the event arguments */ - ::rtl::OUString m_sEventArgs; + OUString m_sEventArgs; /** holds the alias arguments */ - ::rtl::OUString m_sAliasArgs; + OUString m_sAliasArgs; /** holds the service arguments */ - ::rtl::OUString m_sServiceArgs; + OUString m_sServiceArgs; //___________________________________ // native interface public: - JobURL ( const ::rtl::OUString& sURL ); + JobURL ( const OUString& sURL ); sal_Bool isValid ( ) const; - sal_Bool getEvent ( ::rtl::OUString& sEvent ) const; - sal_Bool getAlias ( ::rtl::OUString& sAlias ) const; - sal_Bool getService ( ::rtl::OUString& sService ) const; + sal_Bool getEvent ( OUString& sEvent ) const; + sal_Bool getAlias ( OUString& sAlias ) const; + sal_Bool getService ( OUString& sService ) const; //___________________________________ // private helper private: - static sal_Bool implst_split( const ::rtl::OUString& sPart , + static sal_Bool implst_split( const OUString& sPart , const sal_Char* pPartIdentifier , sal_Int32 nPartLength , - ::rtl::OUString& rPartValue , - ::rtl::OUString& rPartArguments ); + OUString& rPartValue , + OUString& rPartArguments ); //___________________________________ // debug methods! @@ -143,11 +143,11 @@ class JobURL : private ThreadHelpBase const sal_Char* pExpectedEventArgs , const sal_Char* pExpectedAliasArgs , const sal_Char* pExpectedServiceArgs ); - ::rtl::OUString impldbg_toString() const; + OUString impldbg_toString() const; - sal_Bool getServiceArgs( ::rtl::OUString& sServiceArgs ) const; - sal_Bool getEventArgs ( ::rtl::OUString& sEventArgs ) const; - sal_Bool getAliasArgs ( ::rtl::OUString& sAliasArgs ) const; + sal_Bool getServiceArgs( OUString& sServiceArgs ) const; + sal_Bool getEventArgs ( OUString& sEventArgs ) const; + sal_Bool getAliasArgs ( OUString& sAliasArgs ) const; #endif // ENABLE_COMPONENT_SELF_CHECK }; diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index 3024aa4c2958..ed8d71ff800a 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -122,7 +122,7 @@ class ShellJob : private ThreadHelpBase @return the substituted command. */ - ::rtl::OUString impl_substituteCommandVariables(const ::rtl::OUString& sCommand); + OUString impl_substituteCommandVariables(const OUString& sCommand); //--------------------------------------- /** executes the command. @@ -140,8 +140,8 @@ class ShellJob : private ThreadHelpBase @return sal_True if command was executed successfully; sal_False otherwise. */ - ::sal_Bool impl_execute(const ::rtl::OUString& sCommand , - const css::uno::Sequence< ::rtl::OUString >& lArguments , + ::sal_Bool impl_execute(const OUString& sCommand , + const css::uno::Sequence< OUString >& lArguments , ::sal_Bool bCheckExitCode); }; diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx index 9e890070d4fe..e650288fa956 100644 --- a/framework/inc/macros/debug/assertion.hxx +++ b/framework/inc/macros/debug/assertion.hxx @@ -73,7 +73,7 @@ #define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) \ if ( ( BCONDITION ) == sal_True ) \ { \ - ::rtl::OStringBuffer _sAssertBuffer( 256 ); \ + OStringBuffer _sAssertBuffer( 256 ); \ _sAssertBuffer.append( "ASSERT:\n\t" ); \ _sAssertBuffer.append( SMETHOD ); \ _sAssertBuffer.append( "\n\t\"" ); \ @@ -104,7 +104,7 @@ #define LOG_ASSERT2( BCONDITION, SMETHODE, STEXT ) \ if ( ( BCONDITION ) == sal_True ) \ { \ - ::rtl::OStringBuffer _sAssertBuffer( 256 ); \ + OStringBuffer _sAssertBuffer( 256 ); \ _sAssertBuffer.append( "ASSERT:\n\t" ); \ _sAssertBuffer.append( SMETHOD ); \ _sAssertBuffer.append( "\n\t\"" ); \ @@ -131,7 +131,7 @@ #define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) \ { \ - ::rtl::OStringBuffer _sAssertBuffer( 256 ); \ + OStringBuffer _sAssertBuffer( 256 ); \ _sAssertBuffer.append( "ASSERT:\n\t" ); \ _sAssertBuffer.append( SMETHOD ); \ _sAssertBuffer.append( "\n\t\"" ); \ @@ -183,7 +183,7 @@ #define LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) \ { \ - ::rtl::OStringBuffer _sAssertBuffer2( 256 ); \ + OStringBuffer _sAssertBuffer2( 256 ); \ _sAssertBuffer2.append( SOWNMESSAGE ); \ _sAssertBuffer2.append( "\n" ); \ _sAssertBuffer2.append( U2B(SEXCEPTIONMESSAGE) ); \ diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx index 4a7a05f05508..ea79afee426b 100644 --- a/framework/inc/macros/debug/event.hxx +++ b/framework/inc/macros/debug/event.hxx @@ -48,7 +48,7 @@ #define LOG_FRAMEACTIONEVENT( SFRAMETYPE, SFRAMENAME, AFRAMEACTION ) \ { \ - ::rtl::OStringBuffer sBuffer(1024); \ + OStringBuffer sBuffer(1024); \ sBuffer.append( "[ " ); \ sBuffer.append( SFRAMETYPE ); \ sBuffer.append( " ] \"" ); \ @@ -90,7 +90,7 @@ #define LOG_DISPOSEEVENT( SFRAMETYPE, SFRAMENAME ) \ { \ - ::rtl::OStringBuffer sBuffer(1024); \ + OStringBuffer sBuffer(1024); \ sBuffer.append( "[ " ); \ sBuffer.append( SFRAMETYPE ); \ sBuffer.append( " ] \"" ); \ diff --git a/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx index 05790dba03ba..064cefca1ace 100644 --- a/framework/inc/macros/debug/filterdbg.hxx +++ b/framework/inc/macros/debug/filterdbg.hxx @@ -48,7 +48,7 @@ #define LOG_FILTERDBG( SOPERATION, SMESSAGE ) \ { \ - ::rtl::OStringBuffer _sBuffer( 256 ); \ + OStringBuffer _sBuffer( 256 ); \ _sBuffer.append( SOPERATION ); \ _sBuffer.append( "\t" ); \ _sBuffer.append( SMESSAGE ); \ @@ -64,7 +64,7 @@ #define LOG_FILTERDBG_1_PARAM( SOPERATION, SPARAM, SMESSAGE ) \ { \ - ::rtl::OStringBuffer _sBuffer( 256 ); \ + OStringBuffer _sBuffer( 256 ); \ _sBuffer.append( SOPERATION ); \ _sBuffer.append( "\t\"" ); \ _sBuffer.append( SPARAM ); \ diff --git a/framework/inc/macros/debug/logmechanism.hxx b/framework/inc/macros/debug/logmechanism.hxx index dd3be0f1a596..b6ad279942cc 100644 --- a/framework/inc/macros/debug/logmechanism.hxx +++ b/framework/inc/macros/debug/logmechanism.hxx @@ -43,8 +43,8 @@ #define WRITE_LOGFILE( SFILENAME, STEXT ) \ { \ - ::rtl::OString _swriteLogfileFileName ( SFILENAME ); \ - ::rtl::OString _swriteLogfileText ( STEXT ); \ + OString _swriteLogfileFileName ( SFILENAME ); \ + OString _swriteLogfileText ( STEXT ); \ FILE* pFile = fopen( _swriteLogfileFileName.getStr(), "a" ); \ fprintf( pFile, "%s", _swriteLogfileText.getStr() ); \ fclose ( pFile ); \ diff --git a/framework/inc/macros/debug/mutex.hxx b/framework/inc/macros/debug/mutex.hxx index b7c1b7d5409e..ddaf33283f89 100644 --- a/framework/inc/macros/debug/mutex.hxx +++ b/framework/inc/macros/debug/mutex.hxx @@ -47,7 +47,7 @@ #define LOG_LOCKTYPE( _EFALLBACK, _ECURRENT ) \ /* new scope to prevent us against multiple definitions of variables ... */ \ { \ - ::rtl::OStringBuffer _sBuffer( 256 ); \ + OStringBuffer _sBuffer( 256 ); \ _sBuffer.append( "Set framework lock type to fallback: \"" ); \ switch( _EFALLBACK ) \ { \ diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx index f4cfb0a5e833..ffebf741378d 100644 --- a/framework/inc/macros/debug/plugin.hxx +++ b/framework/inc/macros/debug/plugin.hxx @@ -51,7 +51,7 @@ #define LOG_URLSEND( SFRAMENAME, SSENDMODE, SINTERNALURL, SEXTERNALURL ) \ /* Use new scope to declare local private variables! */ \ { \ - ::rtl::OStringBuffer sBuffer(1024); \ + OStringBuffer sBuffer(1024); \ sBuffer.append( "PlugInFrame [ \"" ); \ sBuffer.append( SFRAMENAME ); \ sBuffer.append( "\" ] send " ); \ @@ -77,7 +77,7 @@ #define LOG_URLRECEIVE( SFRAMENAME, SRECEIVEMODE, SEXTERNALURL, SINTERNALURL ) \ /* Use new scope to declare local private variables! */ \ { \ - ::rtl::OStringBuffer sBuffer(1024); \ + OStringBuffer sBuffer(1024); \ sBuffer.append( "PlugInFrame [ \"" ); \ sBuffer.append( U2B( SFRAMENAME ) ); \ sBuffer.append( "\" ] receive " ); \ @@ -99,7 +99,7 @@ #define LOG_PARAMETER_NEWURL( SFRAMENAME, SMIMETYPE, SURL, sFILTER, AANY ) \ /* Use new scope to declare local private variables! */ \ { \ - ::rtl::OStringBuffer sBuffer(1024); \ + OStringBuffer sBuffer(1024); \ sBuffer.append( "PlugInFrame [ \"" ); \ sBuffer.append( U2B( SFRAMENAME ) ); \ sBuffer.append( "\" ] called with newURL( \"" ); \ @@ -130,7 +130,7 @@ #define LOG_PARAMETER_NEWSTREAM( SFRAMENAME, SMIMETYPE, SURL, SFILTER, XSTREAM, AANY ) \ /* Use new scope to declare local private variables! */ \ { \ - ::rtl::OStringBuffer sBuffer(1024); \ + OStringBuffer sBuffer(1024); \ sBuffer.append( "PlugInFrame [ \"" ); \ sBuffer.append( U2B( SFRAMENAME ) ); \ sBuffer.append( "\" ] called with newStream( \""); \ diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx index 1d6fc24cd815..84b71c0260e1 100644 --- a/framework/inc/macros/debug/registration.hxx +++ b/framework/inc/macros/debug/registration.hxx @@ -41,7 +41,7 @@ #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) \ { \ - ::rtl::OStringBuffer sOut( 1024 ); \ + OStringBuffer sOut( 1024 ); \ sOut.append( "fw?_component_getFactory():" ); \ sOut.append( SINFOTEXT ); \ WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \ diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 576221a9fda0..bfdc18c8db13 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -44,7 +44,7 @@ ________________________________________________________________________________ #define IFFACTORY( CLASS ) \ /* If searched name found ... */ \ /* You can't add some statements before follow line ... Here can be an ELSE-statement! */ \ - if ( CLASS::impl_getStaticImplementationName().equals( ::rtl::OUString::createFromAscii( pImplementationName ) ) ) \ + if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ { \ LOG_REGISTRATION_GETFACTORY( "\t\tImplementationname found - try to create factory! ...\n" ) \ /* ... then create right factory for this service. */ \ diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 653fd67ed89c..6bf913af1e14 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -60,7 +60,7 @@ ________________________________________________________________________________ /*===========================================================================================================*/ \ /* XServiceInfo */ \ /*===========================================================================================================*/ \ - ::rtl::OUString SAL_CALL CLASS::getImplementationName() throw( css::uno::RuntimeException ) \ + OUString SAL_CALL CLASS::getImplementationName() throw( css::uno::RuntimeException ) \ { \ return impl_getStaticImplementationName(); \ } \ @@ -68,7 +68,7 @@ ________________________________________________________________________________ /*===========================================================================================================*/ \ /* XServiceInfo */ \ /*===========================================================================================================*/ \ - sal_Bool SAL_CALL CLASS::supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) \ + sal_Bool SAL_CALL CLASS::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) \ { \ return ::comphelper::findValue(getSupportedServiceNames(), sServiceName, sal_True).getLength() != 0; \ } \ @@ -76,7 +76,7 @@ ________________________________________________________________________________ /*===========================================================================================================*/ \ /* XServiceInfo */ \ /*===========================================================================================================*/ \ - css::uno::Sequence< ::rtl::OUString > SAL_CALL CLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \ + css::uno::Sequence< OUString > SAL_CALL CLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \ { \ return impl_getStaticSupportedServiceNames(); \ } \ @@ -84,9 +84,9 @@ ________________________________________________________________________________ /*===========================================================================================================*/ \ /* Helper for XServiceInfo */ \ /*===========================================================================================================*/ \ - css::uno::Sequence< ::rtl::OUString > CLASS::impl_getStaticSupportedServiceNames() \ + css::uno::Sequence< OUString > CLASS::impl_getStaticSupportedServiceNames() \ { \ - css::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 ); \ + css::uno::Sequence< OUString > seqServiceNames( 1 ); \ seqServiceNames.getArray() [0] = SERVICENAME ; \ return seqServiceNames; \ } \ @@ -94,7 +94,7 @@ ________________________________________________________________________________ /*===========================================================================================================*/ \ /* Helper for XServiceInfo */ \ /*===========================================================================================================*/ \ - ::rtl::OUString CLASS::impl_getStaticImplementationName() \ + OUString CLASS::impl_getStaticImplementationName() \ { \ return IMPLEMENTATIONNAME ; \ } @@ -185,12 +185,12 @@ ________________________________________________________________________________ #define DECLARE_XSERVICEINFO_NOFACTORY \ /* interface XServiceInfo */ \ - virtual ::rtl::OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); \ - virtual sal_Bool SAL_CALL supportsService ( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ); \ - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); \ + virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); \ + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException ); \ + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); \ /* Helper for XServiceInfo */ \ - static css::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \ - static ::rtl::OUString SAL_CALL impl_getStaticImplementationName ( ); \ + static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \ + static OUString SAL_CALL impl_getStaticImplementationName ( ); \ /* Helper for initialization of service by using own reference! */ \ virtual void SAL_CALL impl_initService ( ); \ diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h index 9b97a6972395..ee393b44789e 100644 --- a/framework/inc/protocols.h +++ b/framework/inc/protocols.h @@ -83,7 +83,7 @@ class ProtocolCheck It returns the right enum value. Protocols are defined above ... */ - static EProtocol specifyProtocol( const ::rtl::OUString& sURL ) + static EProtocol specifyProtocol( const OUString& sURL ) { // because "private:" is part of e.g. "private:object" too ... // we must check it before all other ones!!! @@ -126,7 +126,7 @@ class ProtocolCheck It should be used instead of specifyProtocol() if only this question is interesting to perform the code. We must not check for all possible protocols here... */ - static sal_Bool isProtocol( const ::rtl::OUString& sURL, EProtocol eRequired ) + static sal_Bool isProtocol( const OUString& sURL, EProtocol eRequired ) { sal_Bool bRet = sal_False; switch(eRequired) diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index 2a5023e1bc4f..e88893a97a93 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -79,7 +79,7 @@ class DispatchRecorder virtual void SAL_CALL recordDispatch ( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); virtual void SAL_CALL recordDispatchAsComment( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); virtual void SAL_CALL endRecording () throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getRecordedMacro () throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getRecordedMacro () throw( css::uno::RuntimeException ); virtual com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException); @@ -93,10 +93,10 @@ class DispatchRecorder // private functions private: - void SAL_CALL implts_recordMacro( const ::rtl::OUString& aURL, + void SAL_CALL implts_recordMacro( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, - sal_Bool bAsComment, ::rtl::OUStringBuffer& ); - void SAL_CALL AppendToBuffer( css::uno::Any aValue, ::rtl::OUStringBuffer& aArgumentBuffer ); + sal_Bool bAsComment, OUStringBuffer& ); + void SAL_CALL AppendToBuffer( css::uno::Any aValue, OUStringBuffer& aArgumentBuffer ); }; // class DispatcRecorder diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx index 5632da9a39f9..d7981ec4e032 100644 --- a/framework/inc/services/autorecovery.hxx +++ b/framework/inc/services/autorecovery.hxx @@ -91,7 +91,7 @@ struct DispatchParams //--------------------------------------- /** TODO document me */ - ::rtl::OUString m_sSavePath; + OUString m_sSavePath; //--------------------------------------- /** @short define the current cache entry, which should be used for current @@ -275,20 +275,20 @@ class AutoRecovery : public css::lang::XTypeProvider //------------------------------- /** TODO: document me */ - ::rtl::OUString OrgURL; - ::rtl::OUString FactoryURL; - ::rtl::OUString TemplateURL; - - ::rtl::OUString OldTempURL; - ::rtl::OUString NewTempURL; - - ::rtl::OUString AppModule; // e.g. com.sun.star.text.TextDocument - used to identify app module - ::rtl::OUString FactoryService; // the service to create a document of the module - ::rtl::OUString RealFilter; // real filter, which was used at loading time - ::rtl::OUString DefaultFilter; // supports saving of the default format without loosing data - ::rtl::OUString Extension; // file extension of the default filter - ::rtl::OUString Title; // can be used as "DisplayName" on every recovery UI! - ::com::sun::star::uno::Sequence< ::rtl::OUString > + OUString OrgURL; + OUString FactoryURL; + OUString TemplateURL; + + OUString OldTempURL; + OUString NewTempURL; + + OUString AppModule; // e.g. com.sun.star.text.TextDocument - used to identify app module + OUString FactoryService; // the service to create a document of the module + OUString RealFilter; // real filter, which was used at loading time + OUString DefaultFilter; // supports saving of the default format without loosing data + OUString Extension; // file extension of the default filter + OUString Title; // can be used as "DisplayName" on every recovery UI! + ::com::sun::star::uno::Sequence< OUString > ViewNames; // names of the view which were active at emergency-save time sal_Int32 ID; @@ -774,7 +774,7 @@ class AutoRecovery : public css::lang::XTypeProvider @threadsafe */ - void implts_saveOneDoc(const ::rtl::OUString& sBackupPath , + void implts_saveOneDoc(const OUString& sBackupPath , AutoRecovery::TDocumentInfo& rInfo , const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress); @@ -790,13 +790,13 @@ class AutoRecovery : public css::lang::XTypeProvider //--------------------------------------- // TODO document me - void implts_openOneDoc(const ::rtl::OUString& sURL , + void implts_openOneDoc(const OUString& sURL , ::comphelper::MediaDescriptor& lDescriptor, AutoRecovery::TDocumentInfo& rInfo ); //--------------------------------------- // TODO document me - void implts_generateNewTempURL(const ::rtl::OUString& sBackupPath , + void implts_generateNewTempURL(const OUString& sBackupPath , ::comphelper::MediaDescriptor& rMediaDescriptor, AutoRecovery::TDocumentInfo& rInfo ); @@ -840,7 +840,7 @@ class AutoRecovery : public css::lang::XTypeProvider the event structure for sending. */ static css::frame::FeatureStateEvent implst_createFeatureStateEvent( sal_Int32 eJob , - const ::rtl::OUString& sEventType, + const OUString& sEventType, AutoRecovery::TDocumentInfo* pInfo ); @@ -931,9 +931,9 @@ class AutoRecovery : public css::lang::XTypeProvider //--------------------------------------- // TODO document me - AutoRecovery::EFailureSafeResult implts_copyFile(const ::rtl::OUString& sSource , - const ::rtl::OUString& sTargetPath, - const ::rtl::OUString& sTargetName); + AutoRecovery::EFailureSafeResult implts_copyFile(const OUString& sSource , + const OUString& sTargetPath, + const OUString& sTargetName); //--------------------------------------- /** @short converts m_eJob into a job description, which @@ -948,7 +948,7 @@ class AutoRecovery : public css::lang::XTypeProvider a suitable job description of form: vnd.sun.star.autorecovery:/do... */ - static ::rtl::OUString implst_getJobDescription(sal_Int32 eJob); + static OUString implst_getJobDescription(sal_Int32 eJob); //--------------------------------------- /** @short mape the given URL to an internal int representation. @@ -1020,7 +1020,7 @@ class AutoRecovery : public css::lang::XTypeProvider @param sURL the url of the file, which should be removed. */ - void st_impl_removeFile(const ::rtl::OUString& sURL); + void st_impl_removeFile(const OUString& sURL); //--------------------------------------- /** try to remove ".lock" file from disc if office will be terminated diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx index bf1dd84533e3..17517c326b06 100644 --- a/framework/inc/services/backingcomp.hxx +++ b/framework/inc/services/backingcomp.hxx @@ -103,9 +103,9 @@ class BackingComp : public css::lang::XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName ( ) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService ( const ::rtl::OUString& sServiceName ) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName ( ) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArgs ) throw(css::uno::Exception, css::uno::RuntimeException); @@ -136,8 +136,8 @@ class BackingComp : public css::lang::XTypeProvider public: - static css::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); - static ::rtl::OUString SAL_CALL impl_getStaticImplementationName ( ); + static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); + static OUString SAL_CALL impl_getStaticImplementationName ( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ) throw( css::uno::Exception ); static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ); }; diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx index 31f280a11182..0bb9bda3c6bf 100644 --- a/framework/inc/services/contenthandlerfactory.hxx +++ b/framework/inc/services/contenthandlerfactory.hxx @@ -104,28 +104,28 @@ class ContentHandlerFactory : // interfaces //--------------------------------------------------------------------------------------------------------- // XMultiServiceFactory //--------------------------------------------------------------------------------------------------------- - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance ( const ::rtl::OUString& sTypeName ) throw( css::uno::Exception , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance ( const OUString& sTypeName ) throw( css::uno::Exception , css::uno::RuntimeException ); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& sTypeName , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& sTypeName , const css::uno::Sequence< css::uno::Any >& lArguments ) throw( css::uno::Exception, css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames ( ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames ( ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // XNameContainer //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL insertByName( const ::rtl::OUString& sHandlerName , + virtual void SAL_CALL insertByName( const OUString& sHandlerName , const css::uno::Any& aHandlerProperties ) throw( css::lang::IllegalArgumentException , css::container::ElementExistException , css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual void SAL_CALL removeByName( const ::rtl::OUString& sHandlerName ) throw( css::container::NoSuchElementException , + virtual void SAL_CALL removeByName( const OUString& sHandlerName ) throw( css::container::NoSuchElementException , css::lang::WrappedTargetException , css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // XNameReplace //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL replaceByName( const ::rtl::OUString& sHandlerName , + virtual void SAL_CALL replaceByName( const OUString& sHandlerName , const css::uno::Any& aHandlerProperties ) throw( css::lang::IllegalArgumentException , css::container::NoSuchElementException , css::lang::WrappedTargetException , @@ -134,11 +134,11 @@ class ContentHandlerFactory : // interfaces //--------------------------------------------------------------------------------------------------------- // XNameAccess //--------------------------------------------------------------------------------------------------------- - virtual css::uno::Any SAL_CALL getByName ( const ::rtl::OUString& sName ) throw( css::container::NoSuchElementException , + virtual css::uno::Any SAL_CALL getByName ( const OUString& sName ) throw( css::container::NoSuchElementException , css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName ( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName ( const OUString& sName ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // XElementAccess @@ -183,11 +183,11 @@ class ContentHandlerFactory : // interfaces private: static sal_Bool implcp_ContentHandlerFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); - static sal_Bool implcp_createInstanceWithArguments ( const ::rtl::OUString& sTypeName , + static sal_Bool implcp_createInstanceWithArguments ( const OUString& sTypeName , const css::uno::Sequence< css::uno::Any >& lArguments ); - static sal_Bool implcp_getByName ( const ::rtl::OUString& sName ); - static sal_Bool implcp_hasByName ( const ::rtl::OUString& sName ); - static sal_Bool implcp_removeByName ( const ::rtl::OUString& sHandlerName ); + static sal_Bool implcp_getByName ( const OUString& sName ); + static sal_Bool implcp_hasByName ( const OUString& sName ); + static sal_Bool implcp_removeByName ( const OUString& sHandlerName ); #endif // #ifdef ENABLE_ASSERTIONS diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 24f77b8b4b68..da9f143eec9b 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -220,8 +220,8 @@ class Desktop : // interfaces virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getCurrentFrame ( ) throw( css::uno::RuntimeException ); // XComponentLoader - virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL ( const ::rtl::OUString& sURL , - const ::rtl::OUString& sTargetFrameName , + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL ( const OUString& sURL , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException , css::lang::IllegalArgumentException , @@ -233,7 +233,7 @@ class Desktop : // interfaces // XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches ( const css::uno::Sequence< css::frame::DispatchDescriptor >& lQueries ) throw( css::uno::RuntimeException ); @@ -248,14 +248,14 @@ class Desktop : // interfaces // XFrame // Attention: findFrame() is implemented only! Other methods make no sense for our desktop! - virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame ( const ::rtl::OUString& sTargetFrameName , + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame ( const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); virtual void SAL_CALL initialize ( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException ); virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow ( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL setCreator ( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException ); virtual css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL getCreator ( ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getName ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL setName ( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getName ( ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL setName ( const OUString& sName ) throw( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL isTop ( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL activate ( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL deactivate ( ) throw( css::uno::RuntimeException ); @@ -299,7 +299,7 @@ class Desktop : // interfaces css::uno::RuntimeException ); // css.frame.XUntitledNumbers - virtual ::rtl::OUString SAL_CALL getUntitledPrefix() + virtual OUString SAL_CALL getUntitledPrefix() throw (css::uno::RuntimeException); // we need this wrapped terminate()-call to terminate even the QuickStarter @@ -428,8 +428,8 @@ class Desktop : // interfaces css::uno::Any m_aInteractionRequest ; sal_Bool m_bSuspendQuickstartVeto ; /// don't ask quickstart for a veto SvtCommandOptions m_aCommandOptions ; /// ref counted class to support disabling commands defined by configuration file - ::rtl::OUString m_sName ; - ::rtl::OUString m_sTitle ; + OUString m_sName ; + OUString m_sTitle ; css::uno::Reference< css::frame::XDispatchRecorderSupplier > m_xDispatchRecorderSupplier ; //--------------------------------------------------------------------- diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx index 7887ecea436e..a2a89d194fd5 100644 --- a/framework/inc/services/dispatchhelper.hxx +++ b/framework/inc/services/dispatchhelper.hxx @@ -87,8 +87,8 @@ class DispatchHelper : public ThreadHelpBase // must be the // XDispatchHelper virtual css::uno::Any SAL_CALL executeDispatch( const css::uno::Reference< css::frame::XDispatchProvider >& xDispatchProvider , - const ::rtl::OUString& sURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sURL , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw(css::uno::RuntimeException); diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index 2dadf9115d8a..cc050cff67c1 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -153,8 +153,8 @@ class Frame : // interfaces //--------------------------------------------------------------------------------------------------------- // XComponentLoader //--------------------------------------------------------------------------------------------------------- - virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL ( const ::rtl::OUString& sURL , - const ::rtl::OUString& sTargetFrameName , + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL ( const OUString& sURL , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException , css::lang::IllegalArgumentException , @@ -175,9 +175,9 @@ class Frame : // interfaces virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow ( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL setCreator ( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException ); virtual css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL getCreator ( ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getName ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL setName ( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame ( const ::rtl::OUString& sTargetFrameName , + virtual OUString SAL_CALL getName ( ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL setName ( const OUString& sName ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame ( const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL isTop ( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL activate ( ) throw( css::uno::RuntimeException ); @@ -207,7 +207,7 @@ class Frame : // interfaces // XDispatchProvider //--------------------------------------------------------------------------------------------------------- virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches ( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ); @@ -281,8 +281,8 @@ class Frame : // interfaces //--------------------------------------------------------------------------------------------------------- // XTitle //--------------------------------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException); //--------------------------------------------------------------------------------------------------------- // XTitleChangeBroadcaster @@ -297,11 +297,11 @@ class Frame : // interfaces void impl_initializePropInfo(); - virtual void SAL_CALL impl_setPropertyValue(const ::rtl::OUString& sProperty, + virtual void SAL_CALL impl_setPropertyValue(const OUString& sProperty, sal_Int32 nHandle , const css::uno::Any& aValue ); - virtual css::uno::Any SAL_CALL impl_getPropertyValue(const ::rtl::OUString& sProperty, + virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty, sal_Int32 nHandle ); //------------------------------------------------------------------------------------------------------------- @@ -395,7 +395,7 @@ class Frame : // interfaces css::uno::Reference< css::frame::XController > m_xController ; /// controller of the actual frame css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > m_xDropTargetListener ; /// listen to drag & drop EActiveState m_eActiveState ; /// state, if i'am a member of active path in tree or i have the focus or ... - ::rtl::OUString m_sName ; /// name of this frame + OUString m_sName ; /// name of this frame sal_Bool m_bIsFrameTop ; /// frame has no parent or the parent is a taskor the desktop sal_Bool m_bConnected ; /// due to FrameActionEvent sal_Int16 m_nExternalLockCount ; @@ -420,7 +420,7 @@ class Frame : // interfaces return m_xFactory; } - inline ::rtl::OUString impl_getName() + inline OUString impl_getName() { ReadGuard aReadLock( m_aLock ); return m_sName; diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index adef138c4b0b..74d866eeaee8 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -113,27 +113,27 @@ namespace framework virtual ::com::sun::star::awt::Rectangle SAL_CALL getCurrentDockingArea( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor > SAL_CALL getDockingAreaAcceptor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDockingAreaAcceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor >& xDockingAreaAcceptor ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL createElement( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL destroyElement( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL requestElement( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL getElement( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL createElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL destroyElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL requestElement( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL getElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > > SAL_CALL getElements( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL showElement( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hideElement( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL dockWindow( const ::rtl::OUString& aName, ::com::sun::star::ui::DockingArea DockingArea, const ::com::sun::star::awt::Point& Pos ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL showElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hideElement( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL dockWindow( const OUString& aName, ::com::sun::star::ui::DockingArea DockingArea, const ::com::sun::star::awt::Point& Pos ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL dockAllWindows( ::sal_Int16 nElementType ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL floatWindow( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL lockWindow( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL unlockWindow( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setElementSize( const ::rtl::OUString& aName, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setElementPos( const ::rtl::OUString& aName, const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setElementPosSize( const ::rtl::OUString& aName, const ::com::sun::star::awt::Point& aPos, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isElementVisible( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isElementFloating( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isElementDocked( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isElementLocked( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getElementSize( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getElementPos( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL floatWindow( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL lockWindow( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL unlockWindow( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setElementSize( const OUString& aName, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setElementPos( const OUString& aName, const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setElementPosSize( const OUString& aName, const ::com::sun::star::awt::Point& aPos, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isElementVisible( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isElementFloating( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isElementDocked( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isElementLocked( const OUString& ResourceURL ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::Size SAL_CALL getElementSize( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::Point SAL_CALL getElementPos( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL unlock( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL doLayout( ) throw (::com::sun::star::uno::RuntimeException); @@ -212,22 +212,22 @@ namespace framework //--------------------------------------------------------------------------------------------------------- // query //--------------------------------------------------------------------------------------------------------- - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const rtl::OUString& aName ); + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const OUString& aName ); - void implts_writeNewStateData( const rtl::OUString aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow ); - sal_Bool implts_readWindowStateData( const rtl::OUString& rName, UIElement& rElementData ); - void implts_writeWindowStateData( const rtl::OUString& rName, const UIElement& rElementData ); + void implts_writeNewStateData( const OUString aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow ); + sal_Bool implts_readWindowStateData( const OUString& rName, UIElement& rElementData ); + void implts_writeWindowStateData( const OUString& rName, const UIElement& rElementData ); void implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow ); void implts_sortUIElements(); void implts_destroyElements(); void implts_toggleFloatingUIElementsVisibility( sal_Bool bActive ); void implts_reparentChildWindows(); - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createDockingWindow( const ::rtl::OUString& aElementName ); + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createDockingWindow( const OUString& aElementName ); sal_Bool implts_isEmbeddedLayoutManager() const; sal_Int16 implts_getCurrentSymbolsSize(); sal_Int16 implts_getCurrentSymbolsStyle(); - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createElement( const rtl::OUString& aName ); + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createElement( const OUString& aName ); // layouting methods sal_Bool implts_resizeContainerWindow( const ::com::sun::star::awt::Size& rContainerSize, const ::com::sun::star::awt::Point& rComponentPos ); @@ -242,13 +242,13 @@ namespace framework // internal methods to control status/progress bar ::Size implts_getStatusBarSize(); void implts_destroyStatusBar(); - void implts_createStatusBar( const rtl::OUString& rStatusBarName ); + void implts_createStatusBar( const OUString& rStatusBarName ); void implts_createProgressBar(); void implts_destroyProgressBar(); void implts_setStatusBarPosSize( const ::Point& rPos, const ::Size& rSize ); sal_Bool implts_showStatusBar( sal_Bool bStoreState=sal_False ); sal_Bool implts_hideStatusBar( sal_Bool bStoreState=sal_False ); - void implts_readStatusBarState( const rtl::OUString& rStatusBarName ); + void implts_readStatusBarState( const OUString& rStatusBarName ); sal_Bool implts_showProgressBar(); sal_Bool implts_hideProgressBar(); void implts_backupProgressBarWrapper(); @@ -320,19 +320,19 @@ namespace framework css::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; css::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowStateSupplier; GlobalSettings* m_pGlobalSettings; - rtl::OUString m_aModuleIdentifier; - rtl::OUString m_aStatusBarAlias; - rtl::OUString m_aProgressBarAlias; - rtl::OUString m_aPropDocked; - rtl::OUString m_aPropVisible; - rtl::OUString m_aPropDockingArea; - rtl::OUString m_aPropDockPos; - rtl::OUString m_aPropPos; - rtl::OUString m_aPropSize; - rtl::OUString m_aPropUIName; - rtl::OUString m_aPropStyle; - rtl::OUString m_aPropLocked; - rtl::OUString m_aCustomizeCmd; + OUString m_aModuleIdentifier; + OUString m_aStatusBarAlias; + OUString m_aProgressBarAlias; + OUString m_aPropDocked; + OUString m_aPropVisible; + OUString m_aPropDockingArea; + OUString m_aPropDockPos; + OUString m_aPropPos; + OUString m_aPropSize; + OUString m_aPropUIName; + OUString m_aPropStyle; + OUString m_aPropLocked; + OUString m_aCustomizeCmd; sal_Int16 m_eSymbolsSize; sal_Int16 m_eSymbolsStyle; Timer m_aAsyncLayoutTimer; diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx index 9d6318818925..a60acee76359 100644 --- a/framework/inc/services/licensedlg.hxx +++ b/framework/inc/services/licensedlg.hxx @@ -88,7 +88,7 @@ class LicenseDialog : public ModalDialog DECL_LINK(DeclineBtnHdl, void *); public: - LicenseDialog(const rtl::OUString& aLicense, ResMgr *pResMgr); + LicenseDialog(const OUString& aLicense, ResMgr *pResMgr); virtual ~LicenseDialog(); }; diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx index 1a45c6b6c127..57ef2ea31c7f 100644 --- a/framework/inc/services/logindialog.hxx +++ b/framework/inc/services/logindialog.hxx @@ -82,34 +82,34 @@ namespace framework{ struct tIMPL_DialogData { - ::rtl::OUString sUserName ; - ::rtl::OUString sPassword ; - css::uno::Sequence< ::rtl::OUString > seqServerList; + OUString sUserName ; + OUString sPassword ; + css::uno::Sequence< OUString > seqServerList; sal_Int32 nActiveServer ; - ::rtl::OUString sConnectionType ; + OUString sConnectionType ; css::lang::Locale aLanguage ; sal_Int32 nPortHttp ; sal_Int32 nPortHttps ; css::uno::Any aParentWindow ; - ::rtl::OUString sSecurityProxy ; - ::rtl::OUString sUseProxy ; - ::rtl::OUString sDialog ; + OUString sSecurityProxy ; + OUString sUseProxy ; + OUString sDialog ; sal_Bool bProxyChanged ; // default ctor to initialize empty structure. tIMPL_DialogData() - : sUserName ( ::rtl::OUString() ) - , sPassword ( ::rtl::OUString() ) - , seqServerList ( css::uno::Sequence< ::rtl::OUString >() ) + : sUserName ( OUString() ) + , sPassword ( OUString() ) + , seqServerList ( css::uno::Sequence< OUString >() ) , nActiveServer ( 1 ) - , sConnectionType ( ::rtl::OUString() ) - , aLanguage ( ::rtl::OUString(), ::rtl::OUString(), ::rtl::OUString() ) + , sConnectionType ( OUString() ) + , aLanguage ( OUString(), OUString(), OUString() ) , nPortHttp ( 0 ) , nPortHttps ( 0 ) , aParentWindow ( ) - , sSecurityProxy ( ::rtl::OUString() ) - , sUseProxy ( ::rtl::OUString() ) - , sDialog ( ::rtl::OUString() ) + , sSecurityProxy ( OUString() ) + , sUseProxy ( OUString() ) + , sDialog ( OUString() ) , bProxyChanged ( sal_False ) { } @@ -256,7 +256,7 @@ class cIMPL_Dialog : public ModalDialog @onerror - *//*-*****************************************************************************************************/ - void getProxyHostPort( const ::rtl::OUString& aProxyHostPort, ::rtl::OUString& aHost, ::rtl::OUString& aPort ); + void getProxyHostPort( const OUString& aProxyHostPort, OUString& aHost, OUString& aPort ); /*-****************************************************************************************************//** @short get a resource for given id from right resource file @@ -313,8 +313,8 @@ class cIMPL_Dialog : public ModalDialog Point m_colOKButtonPos ; Point m_colCancelButtonPos ; Point m_colAdditionalButtonPos ; - ::rtl::OUString m_colButtonAddText ; - ::rtl::OUString m_expButtonAddText ; + OUString m_colButtonAddText ; + OUString m_expButtonAddText ; tIMPL_DialogData m_aDataSet ; }; @@ -425,7 +425,7 @@ class LoginDialog : public css::lang::XTypeProvider , @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @short return the current title of this dialog @@ -439,7 +439,7 @@ class LoginDialog : public css::lang::XTypeProvider , @onerror - *//*-*****************************************************************************************************/ - virtual ::rtl::OUString SAL_CALL getTitle() throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getTitle() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @short show the dialog and return user reaction @@ -609,12 +609,12 @@ class LoginDialog : public css::lang::XTypeProvider , @onerror - *//*-*****************************************************************************************************/ - sal_Bool impl_tryToChangeProperty( const ::rtl::OUString& sProperty , + sal_Bool impl_tryToChangeProperty( const OUString& sProperty , const css::uno::Any& aValue , css::uno::Any& aOldValue , css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); - sal_Bool impl_tryToChangeProperty( const css::uno::Sequence< ::rtl::OUString >& seqProperty, + sal_Bool impl_tryToChangeProperty( const css::uno::Sequence< OUString >& seqProperty, const css::uno::Any& aValue , css::uno::Any& aOldValue , css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); @@ -688,9 +688,9 @@ class LoginDialog : public css::lang::XTypeProvider , @onerror - *//*-*****************************************************************************************************/ - void impl_addServerToHistory( css::uno::Sequence< ::rtl::OUString >& seqHistory, + void impl_addServerToHistory( css::uno::Sequence< OUString >& seqHistory, sal_Int32& nActiveServer , - const ::rtl::OUString& sServer ); + const OUString& sServer ); /*-****************************************************************************************************//** @short helper methods to read/write properties from/to ini file @@ -706,27 +706,27 @@ class LoginDialog : public css::lang::XTypeProvider , @onerror Assertions are shown. *//*-*****************************************************************************************************/ - void impl_writeUserName ( const ::rtl::OUString& sUserName ); + void impl_writeUserName ( const OUString& sUserName ); void impl_writeActiveServer ( sal_Int32 nActiveServer ); - void impl_writeServerHistory ( const css::uno::Sequence< ::rtl::OUString >& lHistory ); - void impl_writeConnectionType ( const ::rtl::OUString& sConnectionType ); + void impl_writeServerHistory ( const css::uno::Sequence< OUString >& lHistory ); + void impl_writeConnectionType ( const OUString& sConnectionType ); void impl_writeLanguage ( const css::lang::Locale& aLanguage ); void impl_writePortHttp ( sal_Int32 nPort ); void impl_writePortHttps ( sal_Int32 nPort ); - void impl_writeSecurityProxy ( const ::rtl::OUString& sSecurityProxy ); - void impl_writeUseProxy ( const ::rtl::OUString& sUseProxy ); - void impl_writeDialog ( const ::rtl::OUString& sDialog ); + void impl_writeSecurityProxy ( const OUString& sSecurityProxy ); + void impl_writeUseProxy ( const OUString& sUseProxy ); + void impl_writeDialog ( const OUString& sDialog ); - ::rtl::OUString impl_readUserName ( ); + OUString impl_readUserName ( ); sal_Int32 impl_readActiveServer ( ); - css::uno::Sequence< ::rtl::OUString > impl_readServerHistory ( ); - ::rtl::OUString impl_readConnectionType ( ); + css::uno::Sequence< OUString > impl_readServerHistory ( ); + OUString impl_readConnectionType ( ); css::lang::Locale impl_readLanguage ( ); sal_Int32 impl_readPortHttp ( ); sal_Int32 impl_readPortHttps ( ); - ::rtl::OUString impl_readSecurityProxy ( ); - ::rtl::OUString impl_readUseProxy ( ); - ::rtl::OUString impl_readDialog ( ); + OUString impl_readSecurityProxy ( ); + OUString impl_readUseProxy ( ); + OUString impl_readDialog ( ); //------------------------------------------------------------------------------------------------------------- // debug methods @@ -752,7 +752,7 @@ class LoginDialog : public css::lang::XTypeProvider , private: sal_Bool impldbg_checkParameter_LoginDialog ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); - sal_Bool impldbg_checkParameter_setTitle ( const ::rtl::OUString& sTitle ); + sal_Bool impldbg_checkParameter_setTitle ( const OUString& sTitle ); #endif // #ifdef ENABLE_ASSERTIONS @@ -764,7 +764,7 @@ class LoginDialog : public css::lang::XTypeProvider , private: css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// reference to factory, which has created this instance - ::rtl::OUString m_sININame ; /// full qualified path to profile UNC-notation + OUString m_sININame ; /// full qualified path to profile UNC-notation Config* m_pINIManager ; /// manager for full access to ini file sal_Bool m_bInExecuteMode ; /// protection against setting of properties during showing of dialog cIMPL_Dialog* m_pDialog ; /// VCL dialog diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index 99b8d46efdef..67656f52a9b8 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -111,7 +111,7 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun:: @onerror - *//*-*****************************************************************************************************/ - virtual sal_Bool SAL_CALL mapStrings( css::uno::Sequence< ::rtl::OUString >& seqParameter ) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL mapStrings( css::uno::Sequence< OUString >& seqParameter ) throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- // variables diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx index 849d5500b969..68dc4d8d83c2 100644 --- a/framework/inc/services/modulemanager.hxx +++ b/framework/inc/services/modulemanager.hxx @@ -76,7 +76,7 @@ class ModuleManager: public: - static rtl::OUString SAL_CALL impl_getStaticImplementationName(); + static OUString SAL_CALL impl_getStaticImplementationName(); static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory( @@ -85,7 +85,7 @@ class ModuleManager: private: - static css::uno::Sequence< rtl::OUString > + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); static css::uno::Reference< css::uno::XInterface > SAL_CALL @@ -98,24 +98,24 @@ class ModuleManager: virtual ~ModuleManager( ); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( - rtl::OUString const & ServiceName) + OUString const & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); // XModuleManager - virtual ::rtl::OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule) + virtual OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule) throw(css::lang::IllegalArgumentException, css::frame::UnknownModuleException, css::uno::RuntimeException ); // XNameReplace - virtual void SAL_CALL replaceByName(const ::rtl::OUString& sName , + virtual void SAL_CALL replaceByName(const OUString& sName , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -123,15 +123,15 @@ class ModuleManager: css::uno::RuntimeException ); // XNameAccess - virtual css::uno::Any SAL_CALL getByName(const ::rtl::OUString& sName) + virtual css::uno::Any SAL_CALL getByName(const OUString& sName) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& sName) + virtual sal_Bool SAL_CALL hasByName(const OUString& sName) throw(css::uno::RuntimeException); // XElementAccess @@ -142,7 +142,7 @@ class ModuleManager: throw(css::uno::RuntimeException); // XContainerQuery - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) throw(css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) @@ -198,7 +198,7 @@ class ModuleManager: @threadsafe */ - ::rtl::OUString implts_identify(const css::uno::Reference< css::uno::XInterface >& xComponent); + OUString implts_identify(const css::uno::Reference< css::uno::XInterface >& xComponent); }; } // namespace framework diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx index ea474fb2f7b4..4dffe13a91ae 100644 --- a/framework/inc/services/pathsettings.hxx +++ b/framework/inc/services/pathsettings.hxx @@ -86,7 +86,7 @@ class PathSettings : public css::lang::XTypeProvider , } /// an internal name describing this path - ::rtl::OUString sPathName; + OUString sPathName; /// contains all paths, which are used internaly - but are not visible for the user. OUStringList lInternalPaths; @@ -95,7 +95,7 @@ class PathSettings : public css::lang::XTypeProvider , OUStringList lUserPaths; /// this special path is used to generate feature depending content there - ::rtl::OUString sWritePath; + OUString sWritePath; /// indicates real single paths, which uses WritePath property only sal_Bool bIsSinglePath; @@ -184,10 +184,10 @@ class PathSettings : public css::lang::XTypeProvider , /** read a path info using the old cfg schema. This is needed for "migration on demand" reasons only. Can be removed for next major release .-) */ - OUStringList impl_readOldFormat(const ::rtl::OUString& sPath); + OUStringList impl_readOldFormat(const OUString& sPath); /** read a path info using the new cfg schema. */ - PathSettings::PathInfo impl_readNewFormat(const ::rtl::OUString& sPath); + PathSettings::PathInfo impl_readNewFormat(const OUString& sPath); /** filter "real user defined paths" from the old configuration schema and set it as UserPaths on the new schema. @@ -198,7 +198,7 @@ class PathSettings : public css::lang::XTypeProvider , /** reload one path directly from the new configuration schema (because it was updated by any external code) */ - PathSettings::EChangeOp impl_updatePath(const ::rtl::OUString& sPath , + PathSettings::EChangeOp impl_updatePath(const OUString& sPath , sal_Bool bNotifyListener); /** replace all might existing placeholder variables inside the given path ... @@ -214,8 +214,8 @@ class PathSettings : public css::lang::XTypeProvider , /** converts our new string list schema to the old ";" separated schema ... */ - ::rtl::OUString impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath ) const; - OUStringList impl_convertOldStyle2Path(const ::rtl::OUString& sOldStylePath) const; + OUString impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath ) const; + OUStringList impl_convertOldStyle2Path(const OUString& sOldStylePath) const; /** remove still known paths from the given lList argument. So real user defined paths can be extracted from the list of @@ -240,15 +240,15 @@ class PathSettings : public css::lang::XTypeProvider , const PathSettings::PathInfo* impl_getPathAccessConst(sal_Int32 nHandle) const; /** it checks, if the given path value seams to be a valid URL or system path. */ - sal_Bool impl_isValidPath(const ::rtl::OUString& sPath) const; + sal_Bool impl_isValidPath(const OUString& sPath) const; sal_Bool impl_isValidPath(const OUStringList& lPath) const; void impl_storePath(const PathSettings::PathInfo& aPath); - css::uno::Sequence< sal_Int32 > impl_mapPathName2IDList(const ::rtl::OUString& sPath); + css::uno::Sequence< sal_Int32 > impl_mapPathName2IDList(const OUString& sPath); void impl_notifyPropListener( PathSettings::EChangeOp eOp , - const ::rtl::OUString& sPath , + const OUString& sPath , const PathSettings::PathInfo* pPathOld, const PathSettings::PathInfo* pPathNew); diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index 65ebcc30039d..e9853e1dad79 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -74,14 +74,14 @@ enum OperatingSystem struct SubstituteRule { SubstituteRule() {} - SubstituteRule( const rtl::OUString& aVarName, - const rtl::OUString& aValue, + SubstituteRule( const OUString& aVarName, + const OUString& aValue, const com::sun::star::uno::Any& aVal, EnvironmentType aType ) : aSubstVariable( aVarName ), aSubstValue( aValue ), aEnvValue( aVal ), aEnvType( aType ) {} - rtl::OUString aSubstVariable; - rtl::OUString aSubstValue; + OUString aSubstVariable; + OUString aSubstValue; com::sun::star::uno::Any aEnvValue; EnvironmentType aEnvType; }; @@ -90,13 +90,13 @@ struct SubstitutePathNotify { SubstitutePathNotify() {}; - const com::sun::star::uno::Sequence<rtl::OUString> aPropertyNames; + const com::sun::star::uno::Sequence<OUString> aPropertyNames; }; -class SubstituteVariables : public ::boost::unordered_map< ::rtl::OUString, +class SubstituteVariables : public ::boost::unordered_map< OUString, SubstituteRule, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > + OUStringHash, + ::std::equal_to< OUString > > { public: inline void free() @@ -112,48 +112,48 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem SubstitutePathVariables_Impl( const Link& aNotifyLink ); virtual ~SubstitutePathVariables_Impl(); - static OperatingSystem GetOperatingSystemFromString( const rtl::OUString& ); - static EnvironmentType GetEnvTypeFromString( const rtl::OUString& ); + static OperatingSystem GetOperatingSystemFromString( const OUString& ); + static EnvironmentType GetEnvTypeFromString( const OUString& ); void GetSharePointsRules( SubstituteVariables& aSubstVarMap ); /** is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. */ - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); private: // Wrapper methods for low-level functions OperatingSystem GetOperatingSystem(); - const rtl::OUString& GetYPDomainName(); - const rtl::OUString& GetDNSDomainName(); - const rtl::OUString& GetNTDomainName(); - const rtl::OUString& GetHostName(); + const OUString& GetYPDomainName(); + const OUString& GetDNSDomainName(); + const OUString& GetNTDomainName(); + const OUString& GetHostName(); bool FilterRuleSet( const SubstituteRuleVector& aRuleSet, SubstituteRule& aActiveRule ); - void ReadSharePointsFromConfiguration( com::sun::star::uno::Sequence< rtl::OUString >& aSharePointsSeq ); - void ReadSharePointRuleSetFromConfiguration( const rtl::OUString& aSharePointName, - const rtl::OUString& aSharePointNodeName, + void ReadSharePointsFromConfiguration( com::sun::star::uno::Sequence< OUString >& aSharePointsSeq ); + void ReadSharePointRuleSetFromConfiguration( const OUString& aSharePointName, + const OUString& aSharePointNodeName, SubstituteRuleVector& aRuleSet ); // Stored values for domains and host bool m_bYPDomainRetrieved; - rtl::OUString m_aYPDomain; + OUString m_aYPDomain; bool m_bDNSDomainRetrieved; - rtl::OUString m_aDNSDomain; + OUString m_aDNSDomain; bool m_bNTDomainRetrieved; - rtl::OUString m_aNTDomain; + OUString m_aNTDomain; bool m_bHostRetrieved; - rtl::OUString m_aHost; + OUString m_aHost; bool m_bOSRetrieved; OperatingSystem m_eOSType; Link m_aListenerNotify; - const rtl::OUString m_aSharePointsNodeName; - const rtl::OUString m_aDirPropertyName; - const rtl::OUString m_aEnvPropertyName; - const rtl::OUString m_aLevelSep; + const OUString m_aSharePointsNodeName; + const OUString m_aDirPropertyName; + const OUString m_aEnvPropertyName; + const OUString m_aLevelSep; }; enum PreDefVariable @@ -186,8 +186,8 @@ struct PredefinedPathVariables { // Predefined variables supported by substitute variables LanguageType m_eLanguageType; // Lanuage type of Office - rtl::OUString m_FixedVar[ PREDEFVAR_COUNT ]; // Variable value access by PreDefVariable - rtl::OUString m_FixedVarNames[ PREDEFVAR_COUNT ]; // Variable name access by PreDefVariable + OUString m_FixedVar[ PREDEFVAR_COUNT ]; // Variable value access by PreDefVariable + OUString m_FixedVarNames[ PREDEFVAR_COUNT ]; // Variable name access by PreDefVariable }; struct ReSubstFixedVarOrder @@ -205,7 +205,7 @@ struct ReSubstFixedVarOrder struct ReSubstUserVarOrder { sal_Int32 nVarValueLength; - rtl::OUString aVarName; + OUString aVarName; bool operator< ( const ReSubstUserVarOrder& aUserVarOrder ) const { @@ -230,40 +230,40 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init DECLARE_XSERVICEINFO // XStringSubstitution - virtual rtl::OUString SAL_CALL substituteVariables( const ::rtl::OUString& aText, sal_Bool bSubstRequired ) + virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL reSubstituteVariables( const ::rtl::OUString& aText ) + virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubstituteVariableValue( const ::rtl::OUString& variable ) + virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); protected: DECL_LINK(implts_ConfigurationNotify, void *); void SetPredefinedPathVariables( PredefinedPathVariables& ); - rtl::OUString ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const; + OUString ConvertOSLtoUCBURL( const OUString& aOSLCompliantURL ) const; // Special case (transient) values can change during runtime! // Don't store them in the pre defined struct - rtl::OUString GetWorkPath() const; - rtl::OUString GetWorkVariableValue() const; - rtl::OUString GetPathVariableValue() const; + OUString GetWorkPath() const; + OUString GetWorkVariableValue() const; + OUString GetPathVariableValue() const; - rtl::OUString GetHomeVariableValue() const; + OUString GetHomeVariableValue() const; // XStringSubstitution implementation methods - rtl::OUString impl_substituteVariable( const ::rtl::OUString& aText, bool bSustRequired ) + OUString impl_substituteVariable( const OUString& aText, bool bSustRequired ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - rtl::OUString impl_reSubstituteVariables( const ::rtl::OUString& aText ) + OUString impl_reSubstituteVariables( const OUString& aText ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString impl_getSubstituteVariableValue( const ::rtl::OUString& variable ) + OUString impl_getSubstituteVariableValue( const OUString& variable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); private: - class VarNameToIndexMap : public boost::unordered_map< ::rtl::OUString, + class VarNameToIndexMap : public boost::unordered_map< OUString, PreDefVariable, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > + OUStringHash, + ::std::equal_to< OUString > > { inline void free() { @@ -272,8 +272,8 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init }; // heavy used string - const rtl::OUString m_aVarStart; - const rtl::OUString m_aVarEnd; + const OUString m_aVarStart; + const OUString m_aVarEnd; VarNameToIndexMap m_aPreDefVarMap; // Mapping from pre-def variable names to enum for array access SubstituteVariables m_aSubstVarMap; // Active rule set map indexed by variable name! diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx index 905c142b8130..b7ab2d0e5dcd 100644 --- a/framework/inc/services/tabwindowservice.hxx +++ b/framework/inc/services/tabwindowservice.hxx @@ -144,10 +144,10 @@ class TabWindowService : public css::lang::XTypeProvider private: void impl_initializePropInfo(); - virtual void SAL_CALL impl_setPropertyValue(const ::rtl::OUString& sProperty, + virtual void SAL_CALL impl_setPropertyValue(const OUString& sProperty, sal_Int32 nHandle , const css::uno::Any& aValue ); - virtual css::uno::Any SAL_CALL impl_getPropertyValue(const ::rtl::OUString& sProperty, + virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty, sal_Int32 nHandle ); DECL_DLLPRIVATE_LINK( EventListener, VclSimpleEvent * ); @@ -184,7 +184,7 @@ class TabWindowService : public css::lang::XTypeProvider ::sal_Int32 m_nCurrentPageIndex; /// title of the tabcontrolled window - ::rtl::OUString m_sTitle; + OUString m_sTitle; }; // class TabWindowService diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx index 54d961dedcf5..2d80f43163dd 100644 --- a/framework/inc/services/taskcreatorsrv.hxx +++ b/framework/inc/services/taskcreatorsrv.hxx @@ -134,14 +134,14 @@ class TaskCreatorService : public css::lang::XTypeProvider css::uno::Reference< css::frame::XFrame > implts_createFrame( const css::uno::Reference< css::frame::XFrame >& xParentFrame , const css::uno::Reference< css::awt::XWindow >& xContainerWindow , - const ::rtl::OUString& sName ); + const OUString& sName ); void implts_establishWindowStateListener( const css::uno::Reference< css::frame::XFrame >& xFrame ); void implts_establishTitleBarUpdate( const css::uno::Reference< css::frame::XFrame >& xFrame ); void implts_establishDocModifyListener( const css::uno::Reference< css::frame::XFrame >& xFrame ); - ::rtl::OUString impl_filterNames( const ::rtl::OUString& sName ); + OUString impl_filterNames( const OUString& sName ); }; } // namespace framework diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx index bce15cf6e141..e5c838228c3c 100644 --- a/framework/inc/services/uriabbreviation.hxx +++ b/framework/inc/services/uriabbreviation.hxx @@ -42,7 +42,7 @@ public: DECLARE_XSERVICEINFO // ::com::sun::star::util::XStringAbbreviation: - virtual ::rtl::OUString SAL_CALL abbreviateString(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const ::rtl::OUString & aString) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL abbreviateString(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (::com::sun::star::uno::RuntimeException); private: UriAbbreviation(UriAbbreviation &); // not defined diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx index 884b96aef630..29d1c79b8b97 100644 --- a/framework/inc/services/urltransformer.hxx +++ b/framework/inc/services/urltransformer.hxx @@ -126,7 +126,7 @@ class URLTransformer : public ::cppu::WeakImplHelper2< ::com::sun::star::ut *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL parseSmart( css::util::URL& aURL , - const ::rtl::OUString& sSmartProtocol ) throw( css::uno::RuntimeException ); + const OUString& sSmartProtocol ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @short - @@ -154,7 +154,7 @@ class URLTransformer : public ::cppu::WeakImplHelper2< ::com::sun::star::ut @onerror - *//*-*****************************************************************************************************/ - virtual ::rtl::OUString SAL_CALL getPresentation( const css::util::URL& aURL , + virtual OUString SAL_CALL getPresentation( const css::util::URL& aURL , sal_Bool bWithPassword ) throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index c73f0ebb7031..fe227a8a118a 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -86,23 +86,23 @@ struct KeyEventEqualsFunc It implements some additional funtionality which can be useful but is missing at the normal vector implementation. */ -class OUStringList : public ::comphelper::SequenceAsVector< ::rtl::OUString > +class OUStringList : public ::comphelper::SequenceAsVector< OUString > { public: // insert given element as the first one into the vector - void push_front( const ::rtl::OUString& sElement ) + void push_front( const OUString& sElement ) { insert( begin(), sElement ); } // search for given element - iterator find( const ::rtl::OUString& sElement ) + iterator find( const OUString& sElement ) { return ::std::find(begin(), end(), sElement); } - const_iterator findConst( const ::rtl::OUString& sElement ) const + const_iterator findConst( const OUString& sElement ) const { return ::std::find(begin(), end(), sElement); } @@ -121,7 +121,7 @@ class OUStringList : public ::comphelper::SequenceAsVector< ::rtl::OUString > It implements some additional funtionality which can be useful but is missing at the normal std implementation. */ -typedef ::std::queue< ::rtl::OUString > OUStringQueue; +typedef ::std::queue< OUString > OUStringQueue; //_________________________________________________________________________________________________________________ @@ -131,10 +131,10 @@ typedef ::std::queue< ::rtl::OUString > OUStringQueue; is missing at the normal hash implementation. */ template< class TType > -class BaseHash : public ::boost::unordered_map< ::rtl::OUString , +class BaseHash : public ::boost::unordered_map< OUString , TType , - rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > + OUStringHash , + ::std::equal_to< OUString > > { public: @@ -151,7 +151,7 @@ class BaseHash : public ::boost::unordered_map< ::rtl::OUString Basic OUString hash. Key and values are OUStrings. */ -typedef BaseHash< ::rtl::OUString > OUStringHashMap; +typedef BaseHash< OUString > OUStringHashMap; //_________________________________________________________________________________________________________________ @@ -169,9 +169,9 @@ typedef BaseHash< sal_Int32 > NameToHandleHash; and we need it at different positions ... So it's better to declare it one times only! */ -typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString , - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ListenerHash; +typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString , + OUStringHash, + ::std::equal_to< OUString > > ListenerHash; } // namespace framework diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index dd784b3f8848..e2bf729a153b 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -154,7 +154,7 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , sal_Int32 impl_GetPageIdFromIndex( ::sal_Int32 nIndex ) const; sal_Bool impl_CheckIndex( ::sal_Int32 nIndex ) const; void implts_LayoutWindows() const; - void impl_SetTitle( const ::rtl::OUString& rTitle ); + void impl_SetTitle( const OUString& rTitle ); TabControl* impl_GetTabControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xTabControlWindow ) const; void implts_SendNotification( Notification eNotify, sal_Int32 ID ) const; void implts_SendNotification( Notification eNotify, sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rSeq ) const; @@ -164,8 +164,8 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , sal_Bool m_bInitialized : 1, m_bDisposed : 1; sal_Int32 m_nNextTabID; - ::rtl::OUString m_aTitlePropName; - ::rtl::OUString m_aPosPropName; + OUString m_aTitlePropName; + OUString m_aPosPropName; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindow > m_xTopWindow; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xContainerWindow; diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx index ebcc847f83b6..49044c420ab2 100644 --- a/framework/inc/uiconfiguration/graphicnameaccess.hxx +++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx @@ -34,15 +34,15 @@ namespace framework GraphicNameAccess(); virtual ~GraphicNameAccess(); - void addElement( const rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rElement ); + void addElement( const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rElement ); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -54,7 +54,7 @@ namespace framework private: typedef BaseHash< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > NameGraphicHashMap; NameGraphicHashMap m_aNameToElementMap; - ::com::sun::star::uno::Sequence< rtl::OUString > m_aSeq; + ::com::sun::star::uno::Sequence< OUString > m_aSeq; }; } diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx index 8993456ceecd..82c52d56d17b 100644 --- a/framework/inc/uiconfiguration/imagemanager.hxx +++ b/framework/inc/uiconfiguration/imagemanager.hxx @@ -78,12 +78,12 @@ namespace framework // XImageManager virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); // XUIConfiguration virtual void SAL_CALL addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx index 4ddd79a26d9c..f1f9c86945d8 100644 --- a/framework/inc/uiconfiguration/imagetype.hxx +++ b/framework/inc/uiconfiguration/imagetype.hxx @@ -33,14 +33,14 @@ enum ImageType ImageType_COUNT }; -typedef boost::unordered_map< rtl::OUString, - rtl::OUString, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > CommandToImageNameMap; -typedef boost::unordered_map< rtl::OUString, +typedef boost::unordered_map< OUString, + OUString, + OUStringHash, + ::std::equal_to< OUString > > CommandToImageNameMap; +typedef boost::unordered_map< OUString, bool, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > CommandMap; + OUStringHash, + ::std::equal_to< OUString > > CommandMap; } diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx index 23d9c3f13e25..0a8be679a7bd 100644 --- a/framework/inc/uiconfiguration/moduleimagemanager.hxx +++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx @@ -76,12 +76,12 @@ namespace framework // XImageManager virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); // XUIConfiguration virtual void SAL_CALL addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx index 6d8f564fdeb0..1ca6d2383df2 100644 --- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx +++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx @@ -76,11 +76,11 @@ namespace framework throw (::com::sun::star::uno::RuntimeException); // XModuleUIConfigurationManagerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( const ::rtl::OUString& ModuleIdentifier ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( const OUString& ModuleIdentifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); private: - typedef ::boost::unordered_map< rtl::OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr; + typedef ::boost::unordered_map< OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, OUStringHash, ::std::equal_to< OUString > > ModuleToModuleCfgMgr; //TODO_AS void impl_initStorages(); @@ -88,8 +88,8 @@ namespace framework ModuleToModuleCfgMgr m_aModuleToModuleUICfgMgrMap; bool m_bDisposed; // TODO_AS bool m_bInit; - rtl::OUString m_aDefaultConfigURL; - rtl::OUString m_aUserConfigURL; + OUString m_aDefaultConfigURL; + OUString m_aUserConfigURL; com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xDefaultCfgRootStorage; com::sun::star::uno::Reference< com::sun::star::embed::XStorage > m_xUserCfgRootStorage; com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject > m_xUserRootCommit; diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx index 2712e6ad7910..a41438673e21 100644 --- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx @@ -93,18 +93,18 @@ namespace framework virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL createSettings( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL replaceSettings( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertSettings( const ::rtl::OUString& NewResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getImageManager() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getShortCutManager() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getEventsManager() throw (::com::sun::star::uno::RuntimeException); // XModuleUIConfigurationManager - virtual sal_Bool SAL_CALL isDefaultSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getDefaultSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getDefaultSettings( const OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XUIConfigurationPersistence virtual void SAL_CALL reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -131,18 +131,18 @@ namespace framework struct UIElementInfo { - UIElementInfo( const rtl::OUString& rResourceURL, const rtl::OUString& rUIName ) : + UIElementInfo( const OUString& rResourceURL, const OUString& rUIName ) : aResourceURL( rResourceURL), aUIName( rUIName ) {} - rtl::OUString aResourceURL; - rtl::OUString aUIName; + OUString aResourceURL; + OUString aUIName; }; struct UIElementData { UIElementData() : bModified( false ), bDefault( true ), bDefaultNode( true ) {}; - rtl::OUString aResourceURL; - rtl::OUString aName; + OUString aResourceURL; + OUString aName; bool bModified; // has been changed since last storing bool bDefault; // default settings bool bDefaultNode; // this is a default layer element data @@ -151,7 +151,7 @@ namespace framework struct UIElementType; friend struct UIElementType; - typedef ::boost::unordered_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; + typedef ::boost::unordered_map< OUString, UIElementData, OUStringHash, ::std::equal_to< OUString > > UIElementDataHashMap; struct UIElementType { @@ -171,14 +171,14 @@ namespace framework typedef ::std::vector< UIElementType > UIElementTypesVector; typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer; - typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; + typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap; // private methods void impl_Initialize(); void implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp ); void impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType ); void impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType ); - UIElementData* impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true ); + UIElementData* impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true ); void impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData ); void impl_storeElementTypeData( com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage, UIElementType& rElementType, bool bResetModifyState = true ); void impl_resetElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer ); @@ -193,11 +193,11 @@ namespace framework bool m_bModified; bool m_bConfigRead; bool m_bDisposed; - rtl::OUString m_aXMLPostfix; - rtl::OUString m_aPropUIName; - rtl::OUString m_aPropResourceURL; - rtl::OUString m_aModuleIdentifier; - rtl::OUString m_aModuleShortName; + OUString m_aXMLPostfix; + OUString m_aPropUIName; + OUString m_aPropResourceURL; + OUString m_aModuleIdentifier; + OUString m_aModuleShortName; com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject > m_xUserRootCommit; com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx index bb3e73660f5b..4c5b5d05eccd 100644 --- a/framework/inc/uiconfiguration/uicategorydescription.hxx +++ b/framework/inc/uiconfiguration/uicategorydescription.hxx @@ -48,7 +48,7 @@ class UICategoryDescription : public UICommandDescription DECLARE_XSERVICEINFO private: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const ::rtl::OUString& _sName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const OUString& _sName); }; } // namespace framework diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx index 36bd51eb1d69..6e3ec29a0fc7 100644 --- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx @@ -79,11 +79,11 @@ namespace framework virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL createSettings( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL replaceSettings( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertSettings( const ::rtl::OUString& NewResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getImageManager() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getShortCutManager() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getEventsManager() throw (::com::sun::star::uno::RuntimeException); @@ -110,18 +110,18 @@ namespace framework struct UIElementInfo { - UIElementInfo( const rtl::OUString& rResourceURL, const rtl::OUString& rUIName ) : + UIElementInfo( const OUString& rResourceURL, const OUString& rUIName ) : aResourceURL( rResourceURL), aUIName( rUIName ) {} - rtl::OUString aResourceURL; - rtl::OUString aUIName; + OUString aResourceURL; + OUString aUIName; }; struct UIElementData { UIElementData() : bModified( false ), bDefault( true ) {}; - rtl::OUString aResourceURL; - rtl::OUString aName; + OUString aResourceURL; + OUString aName; bool bModified; // has been changed since last storing bool bDefault; // default settings com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > xSettings; @@ -129,7 +129,7 @@ namespace framework struct UIElementType; friend struct UIElementType; - typedef ::boost::unordered_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; + typedef ::boost::unordered_map< OUString, UIElementData, OUStringHash, ::std::equal_to< OUString > > UIElementDataHashMap; struct UIElementType { @@ -149,14 +149,14 @@ namespace framework typedef ::std::vector< UIElementType > UIElementTypesVector; typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer; - typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap; + typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap; // private methods void impl_Initialize(); void implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp ); void impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType ); void impl_preloadUIElementTypeList( sal_Int16 nElementType ); - UIElementData* impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true ); + UIElementData* impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true ); void impl_requestUIElementData( sal_Int16 nElementType, UIElementData& aUIElementData ); void impl_storeElementTypeData( com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage, UIElementType& rElementType, bool bResetModifyState = true ); void impl_resetElementTypeData( UIElementType& rDocElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer ); @@ -168,10 +168,10 @@ namespace framework bool m_bModified; bool m_bConfigRead; bool m_bDisposed; - rtl::OUString m_aXMLPostfix; - rtl::OUString m_aPropUIName; - rtl::OUString m_aPropResourceURL; - rtl::OUString m_aModuleIdentifier; + OUString m_aXMLPostfix; + OUString m_aPropUIName; + OUString m_aPropResourceURL; + OUString m_aModuleIdentifier; com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xImageManager; diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx index 363497eacde4..afb760ad3599 100644 --- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx +++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx @@ -75,13 +75,13 @@ class WindowStateConfiguration : private ThreadHelpBase DECLARE_XSERVICEINFO // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess @@ -90,15 +90,15 @@ class WindowStateConfiguration : private ThreadHelpBase virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); - typedef ::boost::unordered_map< ::rtl::OUString, - ::rtl::OUString, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateFileMap; + typedef ::boost::unordered_map< OUString, + OUString, + OUStringHash, + ::std::equal_to< OUString > > ModuleToWindowStateFileMap; - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateConfigHashMap; + OUStringHash, + ::std::equal_to< OUString > > ModuleToWindowStateConfigHashMap; private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index 83e33c666887..26c2ac60df01 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -50,7 +50,7 @@ class AddonsToolBarManager : public ToolBarManager public: AddonsToolBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - const rtl::OUString& rResourceName, + const OUString& rResourceName, ToolBar* pToolBar ); virtual ~AddonsToolBarManager(); diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx index 4ad55af1d3d4..3c285506d077 100644 --- a/framework/inc/uielement/buttontoolbarcontroller.hxx +++ b/framework/inc/uielement/buttontoolbarcontroller.hxx @@ -51,7 +51,7 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener, public: ButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, ToolBox* pToolBar, - const rtl::OUString& aCommand ); + const OUString& aCommand ); virtual ~ButtonToolbarController(); // XInterface @@ -86,7 +86,7 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener, private: sal_Bool m_bInitialized : 1, m_bDisposed : 1; - rtl::OUString m_aCommandURL; + OUString m_aCommandURL; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx index e5ea87f7343e..3288916ef4e3 100644 --- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx @@ -57,7 +57,7 @@ class ComboboxToolbarController : public IComboBoxListener, ToolBox* pToolBar, sal_uInt16 nID, sal_Int32 nWidth, - const rtl::OUString& aCommand ); + const OUString& aCommand ); virtual ~ComboboxToolbarController(); // XComponent diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx index badf136e1cc2..f792c6466228 100644 --- a/framework/inc/uielement/complextoolbarcontroller.hxx +++ b/framework/inc/uielement/complextoolbarcontroller.hxx @@ -42,7 +42,7 @@ struct ExecuteInfo struct NotifyInfo { - ::rtl::OUString aEventName; + OUString aEventName; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XControlNotificationListener > xNotifyListener; ::com::sun::star::util::URL aSourceURL; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > aInfoSeq; @@ -58,7 +58,7 @@ class ComplexToolbarController : public svt::ToolboxController const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, - const rtl::OUString& aCommand ); + const OUString& aCommand ); virtual ~ComplexToolbarController(); // XComponent @@ -75,8 +75,8 @@ class ComplexToolbarController : public svt::ToolboxController protected: static sal_Int32 getFontSizePixel( const Window* pWindow ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommand( const rtl::OUString& aCommand ) const; - void addNotifyInfo( const ::rtl::OUString& aEventName, + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommand( const OUString& aCommand ) const; + void addNotifyInfo( const OUString& aEventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& xDispatch, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rInfo ); @@ -85,7 +85,7 @@ class ComplexToolbarController : public svt::ToolboxController const ::com::sun::star::util::URL& getInitializedURL(); void notifyFocusGet(); void notifyFocusLost(); - void notifyTextChanged( const ::rtl::OUString& aText ); + void notifyTextChanged( const OUString& aText ); ToolBox* m_pToolbar; sal_uInt16 m_nID; diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index 30998ffd2333..2742a63a4f5a 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -91,12 +91,12 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::com::sun::star::lang::XType // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XFastPropertySet virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -111,7 +111,7 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::com::sun::star::lang::XType com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer ); std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector; - rtl::OUString m_aUIName; + OUString m_aUIName; }; } diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx index e0228522a64f..68d93517f08d 100644 --- a/framework/inc/uielement/controlmenucontroller.hxx +++ b/framework/inc/uielement/controlmenucontroller.hxx @@ -72,10 +72,10 @@ namespace framework virtual void impl_setPopupMenu(); virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); - class UrlToDispatchMap : public ::boost::unordered_map< ::rtl::OUString, + class UrlToDispatchMap : public ::boost::unordered_map< OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > + OUStringHash, + ::std::equal_to< OUString > > { public: inline void free() diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx index 0f09a931d910..0bc9c3874695 100644 --- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx @@ -56,7 +56,7 @@ class DropdownToolbarController : public IListBoxListener, ToolBox* pToolBar, sal_uInt16 nID, sal_Int32 nWidth, - const rtl::OUString& aCommand ); + const OUString& aCommand ); virtual ~DropdownToolbarController(); // XComponent diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index 35911188984c..ac06db819a66 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -57,7 +57,7 @@ class EditToolbarController : public IEditListener, ToolBox* pToolBar, sal_uInt16 nID, sal_Int32 nWidth, - const rtl::OUString& aCommand ); + const OUString& aCommand ); virtual ~EditToolbarController(); // XComponent diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx index 472839422c3b..255fc519751a 100644 --- a/framework/inc/uielement/fontmenucontroller.hxx +++ b/framework/inc/uielement/fontmenucontroller.hxx @@ -65,9 +65,9 @@ namespace framework private: virtual void impl_setPopupMenu(); virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); - void fillPopupMenu( const com::sun::star::uno::Sequence< ::rtl::OUString >& rFontNameSeq, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); + void fillPopupMenu( const com::sun::star::uno::Sequence< OUString >& rFontNameSeq, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); - rtl::OUString m_aFontFamilyName; + OUString m_aFontFamilyName; com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xFontListDispatch; }; } diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx index 86e73b54fdd6..32a2244838be 100644 --- a/framework/inc/uielement/fontsizemenucontroller.hxx +++ b/framework/inc/uielement/fontsizemenucontroller.hxx @@ -65,7 +65,7 @@ namespace framework virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); void setCurHeight( long nHeight, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); - rtl::OUString retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); + OUString retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); long* m_pHeightArray; com::sun::star::awt::FontDescriptor m_aFontDescriptor; diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx index bfc935f644c0..996543ce2b0b 100644 --- a/framework/inc/uielement/footermenucontroller.hxx +++ b/framework/inc/uielement/footermenucontroller.hxx @@ -31,12 +31,12 @@ namespace framework virtual ~FooterMenuController(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService ( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); /* Helper for XServiceInfo */ - static css::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); - static ::rtl::OUString SAL_CALL impl_getStaticImplementationName ( ); + static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); + static OUString SAL_CALL impl_getStaticImplementationName ( ); /* Helper for registry */ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ); static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index ba4177bfa9c6..f2c2b03efad2 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -38,7 +38,7 @@ class GenericToolbarController : public svt::ToolboxController const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, - const rtl::OUString& aCommand ); + const OUString& aCommand ); virtual ~GenericToolbarController(); // XComponent @@ -57,7 +57,7 @@ class GenericToolbarController : public svt::ToolboxController sal_uInt16 m_nID; sal_Bool m_bEnumCommand : 1, m_bMadeInvisible : 1; - rtl::OUString m_aEnumCommand; + OUString m_aEnumCommand; }; class MenuToolbarController : public GenericToolbarController @@ -65,14 +65,14 @@ class MenuToolbarController : public GenericToolbarController com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_xMenuDesc; PopupMenu* pMenu; com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuManager; - rtl::OUString m_aModuleIdentifier; + OUString m_aModuleIdentifier; public: MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, - const rtl::OUString& aCommand, - const rtl::OUString& aModuleIdentifier, + const OUString& aCommand, + const OUString& aModuleIdentifier, const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc ); ~MenuToolbarController(); diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx index 2d9dd37b489d..e30d1cecdfe1 100644 --- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx @@ -40,7 +40,7 @@ class ImageButtonToolbarController : public ComplexToolbarController const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, - const rtl::OUString& aCommand ); + const OUString& aCommand ); virtual ~ImageButtonToolbarController(); // XComponent @@ -50,7 +50,7 @@ class ImageButtonToolbarController : public ComplexToolbarController virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ); private: - sal_Bool ReadImageFromURL( sal_Bool bBigImage, const rtl::OUString& aImageURL, Image& aImage ); + sal_Bool ReadImageFromURL( sal_Bool bBigImage, const OUString& aImageURL, Image& aImage ); }; } diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx index e6eb10133847..84c43ad09d23 100644 --- a/framework/inc/uielement/langselectionmenucontroller.hxx +++ b/framework/inc/uielement/langselectionmenucontroller.hxx @@ -76,18 +76,18 @@ namespace framework }; sal_Bool m_bShowMenu; - ::rtl::OUString m_aLangStatusCommandURL; + OUString m_aLangStatusCommandURL; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xLanguageDispatch; - ::rtl::OUString m_aMenuCommandURL_Lang; + OUString m_aMenuCommandURL_Lang; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_Lang; - ::rtl::OUString m_aMenuCommandURL_Font; + OUString m_aMenuCommandURL_Font; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_Font; - ::rtl::OUString m_aMenuCommandURL_CharDlgForParagraph; + OUString m_aMenuCommandURL_CharDlgForParagraph; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_CharDlgForParagraph; - ::rtl::OUString m_aCurLang; + OUString m_aCurLang; sal_Int16 m_nScriptType; - ::rtl::OUString m_aKeyboardLang; - ::rtl::OUString m_aGuessedTextLang; + OUString m_aKeyboardLang; + OUString m_aGuessedTextLang; LanguageGuessingHelper m_aLangGuessHelper; void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const Mode rMode ); diff --git a/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx index 9027f99da564..560e627c8e8e 100644 --- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx +++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx @@ -86,9 +86,9 @@ class LangSelectionStatusbarController : public svt::StatusbarController sal_Bool m_bShowMenu; // if the menu is to be displayed or not (depending on the selected object/text) sal_Int16 m_nScriptType; // the flags for the different script types available in the selection, LATIN = 0x0001, ASIAN = 0x0002, COMPLEX = 0x0004 - ::rtl::OUString m_aCurLang; // the language of the current selection, "*" if there are more than one languages - ::rtl::OUString m_aKeyboardLang; // the keyboard language - ::rtl::OUString m_aGuessedTextLang; // the 'guessed' language for the selection, "" if none could be guessed + OUString m_aCurLang; // the language of the current selection, "*" if there are more than one languages + OUString m_aKeyboardLang; // the keyboard language + OUString m_aGuessedTextLang; // the 'guessed' language for the selection, "" if none could be guessed LanguageGuessingHelper m_aLangGuessHelper; void LangMenu() throw (::com::sun::star::uno::RuntimeException); diff --git a/framework/inc/uielement/logotextstatusbarcontroller.hxx b/framework/inc/uielement/logotextstatusbarcontroller.hxx index 7b6aab1aa282..4b52656448dd 100644 --- a/framework/inc/uielement/logotextstatusbarcontroller.hxx +++ b/framework/inc/uielement/logotextstatusbarcontroller.hxx @@ -72,7 +72,7 @@ class LogoTextStatusbarController : public svt::StatusbarController virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); private: - rtl::OUString m_aLogoText; + OUString m_aLogoText; }; } diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index 2483b08d1eee..72e360aab968 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -53,7 +53,7 @@ namespace framework DECL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* ); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider; - ::rtl::OUString m_aModuleIdentifier; + OUString m_aModuleIdentifier; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels; public: diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index e7a6688d0d78..6198f71182ed 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -66,7 +66,7 @@ struct PopupControllerEntry ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider; }; -typedef boost::unordered_map< rtl::OUString, PopupControllerEntry, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > PopupControllerCache; +typedef boost::unordered_map< OUString, PopupControllerEntry, OUStringHash, ::std::equal_to< OUString > > PopupControllerCache; class BmkMenu; class AddonMenu; @@ -102,7 +102,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, - const rtl::OUString& aModuleIdentifier, + const OUString& aModuleIdentifier, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ); @@ -144,19 +144,19 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener // Configuration methods static void FillMenuWithConfiguration( sal_uInt16& nId, Menu* pMenu, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer ); static void FillMenu( sal_uInt16& nId, Menu* pMenu, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider ); void FillMenuManager( Menu* pMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, - const rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, sal_Bool bDelete, sal_Bool bDeleteChildren ); void SetItemContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer ); @@ -192,11 +192,11 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener sal_uInt16 nItemId; sal_Bool bCheckHide; - ::rtl::OUString aTargetFrame; - ::rtl::OUString aMenuItemURL; - ::rtl::OUString aFilter; - ::rtl::OUString aPassword; - ::rtl::OUString aTitle; + OUString aTargetFrame; + OUString aMenuItemURL; + OUString aFilter; + OUString aPassword; + OUString aTitle; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xSubMenuManager; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xMenuItemDispatch; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XPopupMenuController > xPopupMenuController; @@ -210,14 +210,14 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener const MenuItemHandler* ); void CheckAndAddMenuExtension( Menu* pMenu ); static void impl_RetrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, - const ::com::sun::star::uno::Sequence< rtl::OUString >& rCommands, + const ::com::sun::star::uno::Sequence< OUString >& rCommands, std::vector< MenuItemHandler* >& aMenuShortCuts ); - static void MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const ::rtl::OUString& aModuleIdentifier ); + static void MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const OUString& aModuleIdentifier ); MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId ); sal_Bool CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ); - void AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId); - sal_uInt16 FillItemCommand(::rtl::OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const; + void AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sItemCommand,sal_uInt16 _nItemId); + sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const; void Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp = false); void SetHdl(); @@ -231,8 +231,8 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener sal_Bool m_bRetrieveImages : 1, m_bAcceleratorCfg : 1; sal_Bool m_bModuleIdentified; - ::rtl::OUString m_aMenuItemCommand; - ::rtl::OUString m_aModuleIdentifier; + OUString m_aMenuItemCommand; + OUString m_aModuleIdentifier; Menu* m_pVCLMenu; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels; diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx index 57586e71c763..de352898771b 100644 --- a/framework/inc/uielement/menubarmerger.hxx +++ b/framework/inc/uielement/menubarmerger.hxx @@ -33,11 +33,11 @@ typedef ::std::vector< AddonMenuItem > AddonMenuContainer; struct AddonMenuItem { - ::rtl::OUString aTitle; - ::rtl::OUString aURL; - ::rtl::OUString aTarget; - ::rtl::OUString aImageId; - ::rtl::OUString aContext; + OUString aTitle; + OUString aURL; + OUString aTarget; + OUString aImageId; + OUString aContext; AddonMenuContainer aSubMenu; }; @@ -60,12 +60,12 @@ struct ReferencePathInfo class MenuBarMerger { public: - static bool IsCorrectContext( const ::rtl::OUString& aContext, const ::rtl::OUString& aModuleIdentifier ); + static bool IsCorrectContext( const OUString& aContext, const OUString& aModuleIdentifier ); - static void RetrieveReferencePath( const ::rtl::OUString&, - std::vector< ::rtl::OUString >& aReferencePath ); - static ReferencePathInfo FindReferencePath( const std::vector< ::rtl::OUString >& aReferencePath, Menu* pMenu ); - static sal_uInt16 FindMenuItem( const ::rtl::OUString& rCmd, + static void RetrieveReferencePath( const OUString&, + std::vector< OUString >& aReferencePath ); + static ReferencePathInfo FindReferencePath( const std::vector< OUString >& aReferencePath, Menu* pMenu ); + static sal_uInt16 FindMenuItem( const OUString& rCmd, Menu* pMenu ); static void GetMenuEntry( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rAddonMenuEntry, AddonMenuItem& aAddonMenu ); @@ -74,35 +74,35 @@ class MenuBarMerger static bool ProcessMergeOperation( Menu* pMenu, sal_uInt16 nPos, sal_uInt16& rItemId, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeCommandParameter, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rMergeCommand, + const OUString& rMergeCommandParameter, + const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); static bool ProcessFallbackOperation( const ReferencePathInfo& aRefPathInfo, sal_uInt16& rItemId, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeFallback, - const ::std::vector< ::rtl::OUString >& rReferencePath, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rMergeCommand, + const OUString& rMergeFallback, + const ::std::vector< OUString >& rReferencePath, + const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); static bool ProcessFallbackOperation(); static bool MergeMenuItems( Menu* pMenu, sal_uInt16 nPos, sal_uInt16 nModIndex, sal_uInt16& rItemId, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); static bool ReplaceMenuItem( Menu* pMenu, sal_uInt16 nPos, sal_uInt16& rItemId, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); static bool RemoveMenuItems( Menu* pMenu, sal_uInt16 nPos, - const ::rtl::OUString& rMergeCommandParameter ); + const OUString& rMergeCommandParameter ); static bool CreateSubMenu( Menu* pSubMenu, sal_uInt16& nItemId, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonSubMenu ); private: diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index 47bfcce26d02..1bdeca3b726c 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -69,9 +69,9 @@ class MenuBarWrapper : public UIConfigElementWrapperBase, virtual ::sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); private: virtual void impl_fillNewData(); diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index ff9b2beed4f1..b86242ef0534 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -82,15 +82,15 @@ namespace framework virtual void impl_setPopupMenu(); struct AddInfo { - rtl::OUString aTargetFrame; - rtl::OUString aImageId; + OUString aTargetFrame; + OUString aImageId; }; typedef ::boost::unordered_map< int, AddInfo > AddInfoForId; void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, - const ::com::sun::star::uno::Sequence< rtl::OUString >& rCommands, + const ::com::sun::star::uno::Sequence< OUString >& rCommands, std::vector< KeyCode >& aMenuShortCuts ); void setAccelerators( PopupMenu* pPopupMenu ); void determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const KeyCode& rKeyCode ); @@ -103,9 +103,9 @@ namespace framework m_bModuleIdentified : 1, m_bAcceleratorCfg : 1; AddInfoForId m_aAddInfoForItem; - rtl::OUString m_aTargetFrame; - rtl::OUString m_aModuleIdentifier; - rtl::OUString m_aEmptyDocURL; + OUString m_aTargetFrame; + OUString m_aModuleIdentifier; + OUString m_aEmptyDocURL; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager; diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx index 88c48325cbce..39179ee582c9 100644 --- a/framework/inc/uielement/progressbarwrapper.hxx +++ b/framework/inc/uielement/progressbarwrapper.hxx @@ -49,9 +49,9 @@ class ProgressBarWrapper : public UIElementWrapperBase ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getStatusBar() const; // wrapped methods of ::com::sun::star::task::XStatusIndicator - void start( const ::rtl::OUString& Text, ::sal_Int32 Range ) throw (::com::sun::star::uno::RuntimeException); + void start( const OUString& Text, ::sal_Int32 Range ) throw (::com::sun::star::uno::RuntimeException); void end() throw (::com::sun::star::uno::RuntimeException); - void setText( const ::rtl::OUString& Text ) throw (::com::sun::star::uno::RuntimeException); + void setText( const OUString& Text ) throw (::com::sun::star::uno::RuntimeException); void setValue( ::sal_Int32 Value ) throw (::com::sun::star::uno::RuntimeException); void reset() throw (::com::sun::star::uno::RuntimeException); @@ -78,7 +78,7 @@ class ProgressBarWrapper : public UIElementWrapperBase sal_Bool m_bOwnsInstance; // Indicator that we are owner of the XWindow sal_Int32 m_nRange; sal_Int32 m_nValue; - rtl::OUString m_aText; + OUString m_aText; }; // class ProgressBarWrapper } // namespace framework diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx index 2b07c41a1b21..afad9561e787 100644 --- a/framework/inc/uielement/recentfilesmenucontroller.hxx +++ b/framework/inc/uielement/recentfilesmenucontroller.hxx @@ -52,7 +52,7 @@ namespace framework virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); // XDispatch virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException ); @@ -66,9 +66,9 @@ namespace framework virtual void impl_setPopupMenu(); struct RecentFile { - rtl::OUString aURL; - rtl::OUString aTitle; - rtl::OUString aPassword; + OUString aURL; + OUString aTitle; + OUString aPassword; }; void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index 940232a7c089..e4c489b98269 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -127,7 +127,7 @@ class RootItemContainer : public ::com::sun::star::lang::XTypeProvider mutable ShareableMutex m_aShareMutex; std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector; - rtl::OUString m_aUIName; + OUString m_aUIName; }; } diff --git a/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx index 65651917949a..a40d1229d06c 100644 --- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx +++ b/framework/inc/uielement/simpletextstatusbarcontroller.hxx @@ -74,7 +74,7 @@ class SimpleTextStatusbarController : public svt::StatusbarController virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); private: - rtl::OUString m_aText; + OUString m_aText; }; } diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index 6be90b3aefc6..e2a3b8cca16a 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -63,7 +63,7 @@ class SpinfieldToolbarController : public ISpinfieldListener, ToolBox* pToolBar, sal_uInt16 nID, sal_Int32 nWidth, - const rtl::OUString& aCommand ); + const OUString& aCommand ); virtual ~SpinfieldToolbarController(); // XComponent @@ -88,7 +88,7 @@ class SpinfieldToolbarController : public ISpinfieldListener, private: bool impl_getValue( const ::com::sun::star::uno::Any& rAny, sal_Int32& nValue, double& fValue, bool& bFloat ); - rtl::OUString impl_formatOutputString( double fValue ); + OUString impl_formatOutputString( double fValue ); bool m_bFloat, m_bMaxSet, @@ -98,7 +98,7 @@ class SpinfieldToolbarController : public ISpinfieldListener, double m_nValue; double m_nStep; SpinfieldControl* m_pSpinfieldControl; - rtl::OUString m_aOutFormat; + OUString m_aOutFormat; }; } diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index 86e05133fa4d..4c88c968bea0 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -56,7 +56,7 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener public: StatusBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - const rtl::OUString& rResourceName, + const OUString& rResourceName, StatusBar* pStatusBar ); virtual ~StatusBarManager(); @@ -96,7 +96,7 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener DECL_LINK(DoubleClick, void *); void RemoveControllers(); - rtl::OUString RetrieveLabelFromCommand( const rtl::OUString& aCmdURL ); + OUString RetrieveLabelFromCommand( const OUString& aCmdURL ); void CreateControllers(); void UpdateControllers(); void AddFrameActionListener(); @@ -110,8 +110,8 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener m_bUpdateControllers : 1; sal_Bool m_bModuleIdentified; StatusBar* m_pStatusBar; - rtl::OUString m_aModuleIdentifier; - rtl::OUString m_aResourceName; + OUString m_aModuleIdentifier; + OUString m_aResourceName; com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame; com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels; StatusBarControllerVector m_aControllerVector; diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx index c19254a4ad5f..28aa0f4cc187 100644 --- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx +++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx @@ -46,11 +46,11 @@ class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper1< ::com: //--------------------------------------------------------------------------------------------------------- // XStatusIndicator //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL start ( const ::rtl::OUString& sText , + virtual void SAL_CALL start ( const OUString& sText , sal_Int32 nRange ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL end ( ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL reset ( ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setText ( const ::rtl::OUString& sText ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setText ( const OUString& sText ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException ); private: diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx index 0f1bf8703838..afa924555271 100644 --- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx @@ -48,7 +48,7 @@ class ToggleButtonToolbarController : public ComplexToolbarController ToolBox* pToolBar, sal_uInt16 nID, Style eStyle, - const rtl::OUString& aCommand ); + const OUString& aCommand ); virtual ~ToggleButtonToolbarController(); // XComponent @@ -65,8 +65,8 @@ class ToggleButtonToolbarController : public ComplexToolbarController DECL_LINK( MenuSelectHdl, Menu *); Style m_eStyle; - rtl::OUString m_aCurrentSelection; - std::vector< rtl::OUString > m_aDropdownMenuList; + OUString m_aCurrentSelection; + std::vector< OUString > m_aDropdownMenuList; }; } diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 0592e0c78605..d02c42db04ce 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -80,7 +80,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener public: ToolBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - const rtl::OUString& rResourceName, + const OUString& rResourceName, ToolBar* pToolBar ); virtual ~ToolBarManager(); @@ -112,7 +112,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener void CheckAndUpdateImages(); virtual void RefreshImages(); void FillToolbar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolBarData ); - void notifyRegisteredControllers( const rtl::OUString& aUIElementName, const rtl::OUString& aCommand ); + void notifyRegisteredControllers( const OUString& aUIElementName, const OUString& aCommand ); void Destroy(); enum ExecuteCommand @@ -126,7 +126,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener struct ExecuteInfo { - rtl::OUString aToolbarResName; + OUString aToolbarResName; ExecuteCommand nCmd; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow; @@ -159,9 +159,9 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener virtual bool MenuItemAllowed( sal_uInt16 ) const; void RemoveControllers(); - rtl::OUString RetrieveLabelFromCommand( const rtl::OUString& aCmdURL ); - sal_Int32 RetrievePropertiesFromCommand( const rtl::OUString& aCmdURL ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropsForCommand( const ::rtl::OUString& rCmdURL ); + OUString RetrieveLabelFromCommand( const OUString& aCmdURL ); + sal_Int32 RetrievePropertiesFromCommand( const OUString& aCmdURL ); + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropsForCommand( const OUString& rCmdURL ); void CreateControllers(); void UpdateControllers(); //for update controller via Support Visiable @@ -175,13 +175,13 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener sal_uInt16 ConvertStyleToToolboxItemBits( sal_Int32 nStyle ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const; sal_Bool IsPluginMode() const; - Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages ); + Image QueryAddonsImage( const OUString& aCommandURL, bool bBigImages ); long HandleClick(void ( SAL_CALL ::com::sun::star::frame::XToolbarController::*_pClick )( )); void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter); void impl_elementChanged(bool _bRemove,const ::com::sun::star::ui::ConfigurationEvent& Event ); - static bool impl_RetrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, const rtl::OUString& rCommand, rtl::OUString& rShortCut ); - bool RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OUString& rShortCut ); + static bool impl_RetrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, const OUString& rCommand, OUString& rShortCut ); + bool RetrieveShortcut( const OUString& rCommandURL, OUString& rShortCut ); protected: typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap; @@ -200,8 +200,8 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener m_bImageMirrored : 1; long m_lImageRotation; ToolBar* m_pToolBar; - rtl::OUString m_aModuleIdentifier; - rtl::OUString m_aResourceName; + OUString m_aModuleIdentifier; + OUString m_aResourceName; com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame; com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels; diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index a57a142d7ff0..f174e66758bb 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -41,19 +41,19 @@ namespace framework struct AddonsParams { - ::rtl::OUString aImageId; - ::rtl::OUString aTarget; - ::rtl::OUString aControlType; + OUString aImageId; + OUString aTarget; + OUString aControlType; }; struct AddonToolbarItem { - ::rtl::OUString aCommandURL; - ::rtl::OUString aLabel; - ::rtl::OUString aImageIdentifier; - ::rtl::OUString aTarget; - ::rtl::OUString aContext; - ::rtl::OUString aControlType; + OUString aCommandURL; + OUString aLabel; + OUString aImageIdentifier; + OUString aTarget; + OUString aContext; + OUString aControlType; sal_uInt16 nWidth; }; @@ -69,31 +69,31 @@ struct ReferenceToolbarPathInfo class ToolBarMerger { public: - static bool IsCorrectContext( const ::rtl::OUString& aContext, const ::rtl::OUString& aModuleIdentifier ); + static bool IsCorrectContext( const OUString& aContext, const OUString& aModuleIdentifier ); static bool ConvertSeqSeqToVector( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > rSequence, AddonToolbarItemContainer& rContainer ); static void ConvertSequenceToValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rSequence, - ::rtl::OUString& rCommandURL, - ::rtl::OUString& rLabel, - ::rtl::OUString& rImageIdentifier, - ::rtl::OUString& rTarget, - ::rtl::OUString& rContext, - ::rtl::OUString& rControlType, + OUString& rCommandURL, + OUString& rLabel, + OUString& rImageIdentifier, + OUString& rTarget, + OUString& rContext, + OUString& rControlType, sal_uInt16& rWidth ); static ReferenceToolbarPathInfo FindReferencePoint( ToolBox* pToolbar, - const ::rtl::OUString& rReferencePoint ); + const OUString& rReferencePoint ); static bool ProcessMergeOperation( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, - const ::rtl::OUString& rModuleIdentifier, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeCommandParameter, + const OUString& rModuleIdentifier, + const OUString& rMergeCommand, + const OUString& rMergeCommandParameter, const AddonToolbarItemContainer& rItems ); static bool ProcessMergeFallback( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, @@ -101,9 +101,9 @@ class ToolBarMerger sal_uInt16 nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, - const ::rtl::OUString& rModuleIdentifier, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeFallback, + const OUString& rModuleIdentifier, + const OUString& rMergeCommand, + const OUString& rMergeFallback, const AddonToolbarItemContainer& rItems ); static bool MergeItems( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, @@ -112,7 +112,7 @@ class ToolBarMerger sal_uInt16 nModIndex, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const AddonToolbarItemContainer& rAddonToolbarItems ); static bool ReplaceItem( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, @@ -120,21 +120,21 @@ class ToolBarMerger sal_uInt16 nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const AddonToolbarItemContainer& rAddonToolbarItems ); static bool RemoveItems( ToolBox* pToolbar, sal_uInt16 nPos, - const ::rtl::OUString& rMergeCommandParameter ); + const OUString& rMergeCommandParameter ); static ::cppu::OWeakObject* CreateController( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame, ToolBox* pToolbar, - const ::rtl::OUString& rCommandURL, + const OUString& rCommandURL, sal_uInt16 nId, sal_uInt16 nWidth, - const ::rtl::OUString& rControlType ); + const OUString& rControlType ); static void CreateToolbarItem( ToolBox* pToolbox, CommandToInfoMap& rCommandMap, diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 52370f6cb681..e5ba4bf74458 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -85,21 +85,21 @@ namespace framework private: void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager ); - rtl::OUString getUINameFromCommand( const rtl::OUString& rCommandURL ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const rtl::OUString& rCommandURL ); - void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OUString& aLabel ); + OUString getUINameFromCommand( const OUString& rCommandURL ); + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const OUString& rCommandURL ); + void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& aLabel ); sal_Bool isContextSensitiveToolbarNonVisible(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandDescription; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xModuleCfgMgr; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xDocCfgMgr; - rtl::OUString m_aModuleIdentifier; - rtl::OUString m_aPropUIName; - rtl::OUString m_aPropResourceURL; + OUString m_aModuleIdentifier; + OUString m_aPropUIName; + OUString m_aPropResourceURL; sal_Bool m_bModuleIdentified; sal_Bool m_bResetActive; - std::vector< rtl::OUString > m_aCommandVector; + std::vector< OUString > m_aCommandVector; IntlWrapper m_aIntlWrapper; }; } diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx index a777ca642b67..57611c6585ad 100644 --- a/framework/inc/uielement/toolbarwrapper.hxx +++ b/framework/inc/uielement/toolbarwrapper.hxx @@ -59,7 +59,7 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener, virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException); // XUIFunctionListener - virtual void SAL_CALL functionExecute( const ::rtl::OUString& aUIElementName, const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionExecute( const OUString& aUIElementName, const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); // XEventListener using cppu::OPropertySetHelper::disposing; diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index 987a1d85e97b..eb49683d05d6 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -57,13 +57,13 @@ class UICommandDescription : private ThreadHelpBase , DECLARE_XSERVICEINFO private: // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess @@ -73,22 +73,22 @@ private: throw (::com::sun::star::uno::RuntimeException); public: - typedef ::boost::unordered_map< ::rtl::OUString, - ::rtl::OUString, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ModuleToCommandFileMap; + typedef ::boost::unordered_map< OUString, + OUString, + OUStringHash, + ::std::equal_to< OUString > > ModuleToCommandFileMap; - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > UICommandsHashMap; + OUStringHash, + ::std::equal_to< OUString > > UICommandsHashMap; protected: UICommandDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, bool ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const ::rtl::OUString& _sName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > impl_createConfigAccess(const OUString& _sName); void impl_fillElements(const sal_Char* _pName); sal_Bool m_bConfigRead; - rtl::OUString m_aPrivateResourceURL; + OUString m_aPrivateResourceURL; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ModuleToCommandFileMap m_aModuleToCommandFileMap; UICommandsHashMap m_aUICommandsHashMap; diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx index b9aca8453b69..8b8d7be08d39 100644 --- a/framework/inc/uielement/uielement.hxx +++ b/framework/inc/uielement/uielement.hxx @@ -71,8 +71,8 @@ struct UIElement m_nStyle( BUTTON_SYMBOL ) {} - UIElement( const rtl::OUString& rName, - const rtl::OUString& rType, + UIElement( const OUString& rName, + const OUString& rType, const com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& rUIElement, bool bFloating = false ) : m_aType( rType ), @@ -94,9 +94,9 @@ struct UIElement bool operator< ( const UIElement& aUIElement ) const; UIElement& operator=( const UIElement& rUIElement ); - rtl::OUString m_aType; - rtl::OUString m_aName; - rtl::OUString m_aUIName; + OUString m_aType; + OUString m_aName; + OUString m_aUIName; com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > m_xUIElement; bool m_bFloating, m_bVisible, diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx index d05f11c17c5f..7f0c377494ff 100644 --- a/framework/inc/uifactory/addonstoolboxfactory.hxx +++ b/framework/inc/uifactory/addonstoolboxfactory.hxx @@ -55,7 +55,7 @@ class AddonsToolBoxFactory : protected ThreadHelpBase DECLARE_XSERVICEINFO // XUIElementFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); sal_Bool hasButtonsInContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rPropSeq, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index 6e04ca814c6e..82a9943b6926 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -51,16 +51,16 @@ class ConfigurationAccess_ControllerFactory : // interfaces public ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener> { public: - ConfigurationAccess_ControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::rtl::OUString& _sRoot,bool _bAskValue = false ); + ConfigurationAccess_ControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const OUString& _sRoot,bool _bAskValue = false ); virtual ~ConfigurationAccess_ControllerFactory(); void readConfigurationData(); void updateConfigurationData(); - rtl::OUString getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const; - rtl::OUString getValueFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const; - void addServiceToCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier ); - void removeServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ); + OUString getServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const; + OUString getValueFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const; + void addServiceToCommandModule( const OUString& rCommandURL, const OUString& rModule, const OUString& rServiceSpecifier ); + void removeServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ); inline bool hasValue() const { return m_bAskValue; } // container.XContainerListener @@ -74,15 +74,15 @@ public: private: struct ControllerInfo { - rtl::OUString m_aImplementationName; - rtl::OUString m_aValue; - ControllerInfo(const ::rtl::OUString& _aImplementationName,const ::rtl::OUString& _aValue) : m_aImplementationName(_aImplementationName),m_aValue(_aValue){} + OUString m_aImplementationName; + OUString m_aValue; + ControllerInfo(const OUString& _aImplementationName,const OUString& _aValue) : m_aImplementationName(_aImplementationName),m_aValue(_aValue){} ControllerInfo(){} }; - class MenuControllerMap : public boost::unordered_map< rtl::OUString, + class MenuControllerMap : public boost::unordered_map< OUString, ControllerInfo, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > + OUStringHash, + ::std::equal_to< OUString > > { inline void free() { @@ -90,13 +90,13 @@ private: } }; - sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier,rtl::OUString& aValue ) const; + sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const; - rtl::OUString m_aPropCommand; - rtl::OUString m_aPropModule; - rtl::OUString m_aPropController; - rtl::OUString m_aPropValue; - rtl::OUString m_sRoot; + OUString m_aPropCommand; + OUString m_aPropModule; + OUString m_aPropController; + OUString m_aPropValue; + OUString m_sRoot; MenuControllerMap m_aMenuControllerMap; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess; diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx index 0ce2e71e6060..ea58ce908ce3 100644 --- a/framework/inc/uifactory/menubarfactory.hxx +++ b/framework/inc/uifactory/menubarfactory.hxx @@ -52,9 +52,9 @@ namespace framework DECLARE_XSERVICEINFO // XUIElementFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - static void CreateUIElement(const ::rtl::OUString& ResourceURL + static void CreateUIElement(const OUString& ResourceURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ,const char* _pExtraMode ,const char* _pAsciiName diff --git a/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx index c3233b2db2b3..2e0e0cd956a8 100644 --- a/framework/inc/uifactory/statusbarfactory.hxx +++ b/framework/inc/uifactory/statusbarfactory.hxx @@ -40,7 +40,7 @@ class StatusBarFactory : public MenuBarFactory DECLARE_XSERVICEINFO // XUIElementFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); }; diff --git a/framework/inc/uifactory/toolbarcontrollerfactory.hxx b/framework/inc/uifactory/toolbarcontrollerfactory.hxx index c750a44fb9d2..f72c6e6979fa 100644 --- a/framework/inc/uifactory/toolbarcontrollerfactory.hxx +++ b/framework/inc/uifactory/toolbarcontrollerfactory.hxx @@ -50,14 +50,14 @@ class ToolbarControllerFactory : protected ThreadHelpBase DECLARE_XSERVICEINFO // XMultiComponentFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::rtl::OUString& aServiceSpecifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const OUString& aServiceSpecifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // XUIControllerRegistration - virtual sal_Bool SAL_CALL hasController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL registerController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName, const ::rtl::OUString& aControllerImplementationName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deregisterController( const ::rtl::OUString& aCommandURL, const rtl::OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasController( const OUString& aCommandURL, const OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerController( const OUString& aCommandURL, const OUString& aModuleName, const OUString& aControllerImplementationName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException); protected: ToolbarControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool ); diff --git a/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx index ea62fced95d5..43384bebec02 100644 --- a/framework/inc/uifactory/toolboxfactory.hxx +++ b/framework/inc/uifactory/toolboxfactory.hxx @@ -40,7 +40,7 @@ class ToolBoxFactory : public MenuBarFactory DECLARE_XSERVICEINFO // XUIElementFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); }; } diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx index 001988f32158..d9fddc4cbc95 100644 --- a/framework/inc/uifactory/uielementfactorymanager.hxx +++ b/framework/inc/uifactory/uielementfactorymanager.hxx @@ -53,14 +53,14 @@ namespace framework public ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener> { public: - ConfigurationAccess_FactoryManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, const ::rtl::OUString& _sRoot ); + ConfigurationAccess_FactoryManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, const OUString& _sRoot ); virtual ~ConfigurationAccess_FactoryManager(); void readConfigurationData(); - rtl::OUString getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) const; - void addFactorySpecifierToTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule, const rtl::OUString& aServiceSpecifier ); - void removeFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ); + OUString getFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ) const; + void addFactorySpecifierToTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule, const OUString& aServiceSpecifier ); + void removeFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > getFactoriesDescription() const; // container.XContainerListener @@ -72,10 +72,10 @@ namespace framework virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); private: - class FactoryManagerMap : public boost::unordered_map< rtl::OUString, - rtl::OUString, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > + class FactoryManagerMap : public boost::unordered_map< OUString, + OUString, + OUStringHash, + ::std::equal_to< OUString > > { inline void free() { @@ -83,13 +83,13 @@ namespace framework } }; - sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& rElement, rtl::OUString& rType, rtl::OUString& rName, rtl::OUString& rModule, rtl::OUString& rServiceSpecifier ) const; + sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& rElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const; - rtl::OUString m_aPropType; - rtl::OUString m_aPropName; - rtl::OUString m_aPropModule; - rtl::OUString m_aPropFactory; - ::rtl::OUString m_sRoot; + OUString m_aPropType; + OUString m_aPropName; + OUString m_aPropModule; + OUString m_aPropFactory; + OUString m_sRoot; FactoryManagerMap m_aFactoryManagerMap; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess; @@ -110,13 +110,13 @@ class UIElementFactoryManager : private ThreadHelpBase DECLARE_XSERVICEINFO // XUIElementFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XUIElementFactoryRegistration virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getRegisteredFactories( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElementFactory > SAL_CALL getFactory( const ::rtl::OUString& ResourceURL, const ::rtl::OUString& ModuleIdentifier ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL registerFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleIdentifier, const ::rtl::OUString& aFactoryImplementationName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deregisterFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleIdentifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElementFactory > SAL_CALL getFactory( const OUString& ResourceURL, const OUString& ModuleIdentifier ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier, const OUString& aFactoryImplementationName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); private: diff --git a/framework/inc/uifactory/windowcontentfactorymanager.hxx b/framework/inc/uifactory/windowcontentfactorymanager.hxx index c189218a32a3..c4aca5aaf7b3 100644 --- a/framework/inc/uifactory/windowcontentfactorymanager.hxx +++ b/framework/inc/uifactory/windowcontentfactorymanager.hxx @@ -59,7 +59,7 @@ class WindowContentFactoryManager : private ThreadHelpBase virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - static void RetrieveTypeNameFromResourceURL( const ::rtl::OUString& aResourceURL, rtl::OUString& aType, rtl::OUString& aName ); + static void RetrieveTypeNameFromResourceURL( const OUString& aResourceURL, OUString& aType, OUString& aName ); private: sal_Bool m_bConfigRead; diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx index 5a5496a892d9..886a519def6b 100644 --- a/framework/inc/xml/acceleratorconfigurationreader.hxx +++ b/framework/inc/xml/acceleratorconfigurationreader.hxx @@ -148,25 +148,25 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL startElement(const ::rtl::OUString& sElement , + virtual void SAL_CALL startElement(const OUString& sElement , const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList) throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL endElement(const ::rtl::OUString& sElement) + virtual void SAL_CALL endElement(const OUString& sElement) throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL characters(const ::rtl::OUString& sChars) + virtual void SAL_CALL characters(const OUString& sChars) throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString& sWhitespaces) + virtual void SAL_CALL ignorableWhitespace(const OUString& sWhitespaces) throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL processingInstruction(const ::rtl::OUString& sTarget, - const ::rtl::OUString& sData ) + virtual void SAL_CALL processingInstruction(const OUString& sTarget, + const OUString& sData ) throw(css::xml::sax::SAXException, css::uno::RuntimeException ); @@ -181,15 +181,15 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler //--------------------------------------- /** TODO document me */ - static EXMLElement implst_classifyElement(const ::rtl::OUString& sElement); + static EXMLElement implst_classifyElement(const OUString& sElement); //--------------------------------------- /** TODO document me */ - static EXMLAttribute implst_classifyAttribute(const ::rtl::OUString& sAttribute); + static EXMLAttribute implst_classifyAttribute(const OUString& sAttribute); //--------------------------------------- /** TODO document me */ - ::rtl::OUString implts_getErrorLineString(); + OUString implts_getErrorLineString(); }; } // namespace framework diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index fe40f9aa3c2d..ac51454b213c 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -92,7 +92,7 @@ class AcceleratorConfigurationWriter : private ThreadHelpBase //--------------------------------------- /** @short TODO */ void impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey , - const ::rtl::OUString& sCommand, + const OUString& sCommand, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ); }; diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 4f17ff4fa466..fdc9f4cca025 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -79,25 +79,25 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces) + virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget, - const rtl::OUString& aData) + virtual void SAL_CALL processingInstruction(const OUString& aTarget, + const OUString& aData) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -107,12 +107,12 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right ::com::sun::star::uno::RuntimeException ); private: - ::rtl::OUString getErrorLineString(); + OUString getErrorLineString(); - class ImageHashMap : public ::boost::unordered_map< ::rtl::OUString , + class ImageHashMap : public ::boost::unordered_map< OUString , Image_XML_Entry , - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > + OUStringHash, + ::std::equal_to< OUString > > { public: inline void free() @@ -170,11 +170,11 @@ class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right i const ImageListsDescriptor& m_aImageListsItems; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - ::rtl::OUString m_aXMLXlinkNS; - ::rtl::OUString m_aXMLImageNS; - ::rtl::OUString m_aAttributeType; - ::rtl::OUString m_aAttributeXlinkType; - ::rtl::OUString m_aAttributeValueSimple; + OUString m_aXMLXlinkNS; + OUString m_aXMLImageNS; + OUString m_aAttributeType; + OUString m_aAttributeXlinkType; + OUString m_aAttributeValueSimple; }; } // namespace framework diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index b3f3ddd54095..a35634eb36d9 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -52,25 +52,25 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase, // S ::com::sun::star::uno::RuntimeException ) = 0; virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ) = 0; - virtual void SAL_CALL endElement(const rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ) = 0; - virtual void SAL_CALL characters(const rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ) = 0; - virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces) + virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget, - const rtl::OUString& aData) + virtual void SAL_CALL processingInstruction(const OUString& aTarget, + const OUString& aData) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -80,20 +80,20 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase, // S ::com::sun::star::uno::RuntimeException ); protected: - ::rtl::OUString getErrorLineString(); + OUString getErrorLineString(); ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> m_xReader; void initPropertyCommon( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &rProps, - const rtl::OUString &rCommandURL, const rtl::OUString &rHelpId, - const rtl::OUString &rLabel, sal_Int16 nItemStyleBits ); + const OUString &rCommandURL, const OUString &rHelpId, + const OUString &rLabel, sal_Int16 nItemStyleBits ); private: - rtl::OUString m_aType; - rtl::OUString m_aLabel; - rtl::OUString m_aContainer; - rtl::OUString m_aHelpURL; - rtl::OUString m_aCommandURL; - rtl::OUString m_aStyle; + OUString m_aType; + OUString m_aLabel; + OUString m_aContainer; + OUString m_aHelpURL; + OUString m_aCommandURL; + OUString m_aStyle; ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aItemProp; }; @@ -115,16 +115,16 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -154,16 +154,16 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -192,16 +192,16 @@ class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -230,17 +230,17 @@ class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -270,13 +270,13 @@ class FWE_DLLPUBLIC OWriteMenuDocumentHandler virtual void WriteMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rSubMenuContainer ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void WriteMenuItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL, sal_Int16 nStyle = 0 ); + virtual void WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle = 0 ); virtual void WriteMenuSeparator(); com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xMenuBarContainer; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - ::rtl::OUString m_aAttributeType; + OUString m_aAttributeType; }; } // namespace framework diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index f0a688dcd792..1ceb01bfd4ec 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -50,25 +50,25 @@ class FWE_DLLPUBLIC SaxNamespaceFilter : public ThreadHelpBase, // Struct for ri ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces) + virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget, - const rtl::OUString& aData) + virtual void SAL_CALL processingInstruction(const OUString& aTarget, + const OUString& aData) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -80,15 +80,15 @@ class FWE_DLLPUBLIC SaxNamespaceFilter : public ThreadHelpBase, // Struct for ri protected: typedef ::std::stack< XMLNamespaces > NamespaceStack; - ::rtl::OUString getErrorLineString(); + OUString getErrorLineString(); ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler; NamespaceStack m_aNamespaceStack; sal_Int32 m_nDepth; - rtl::OUString m_aXMLAttributeNamespace; - rtl::OUString m_aXMLAttributeType; + OUString m_aXMLAttributeNamespace; + OUString m_aXMLAttributeType; }; diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 4fecf775384b..e1ac3b919915 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -76,25 +76,25 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // S ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces) + virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget, - const rtl::OUString& aData) + virtual void SAL_CALL processingInstruction(const OUString& aTarget, + const OUString& aData) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -104,12 +104,12 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // S ::com::sun::star::uno::RuntimeException ); private: - ::rtl::OUString getErrorLineString(); + OUString getErrorLineString(); - class StatusBarHashMap : public ::boost::unordered_map< ::rtl::OUString , + class StatusBarHashMap : public ::boost::unordered_map< OUString , StatusBar_XML_Entry , - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > + OUStringHash, + ::std::equal_to< OUString > > { public: inline void free() @@ -140,8 +140,8 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler : private ThreadHelpBase // S protected: virtual void WriteStatusBarItem( - const rtl::OUString& rCommandURL, - const rtl::OUString& rHelpURL, + const OUString& rCommandURL, + const OUString& rHelpURL, sal_Int16 nOffset, sal_Int16 nStyle, sal_Int16 nWidth ) throw @@ -151,10 +151,10 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler : private ThreadHelpBase // S ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_aStatusBarItems; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - ::rtl::OUString m_aXMLStatusBarNS; - ::rtl::OUString m_aXMLXlinkNS; - ::rtl::OUString m_aAttributeType; - ::rtl::OUString m_aAttributeURL; + OUString m_aXMLStatusBarNS; + OUString m_aXMLXlinkNS; + OUString m_aAttributeType; + OUString m_aAttributeURL; }; } // namespace framework diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 9cb2564a872e..3e7364f471e6 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -81,25 +81,25 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase, // S ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( - const rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endElement(const rtl::OUString& aName) + virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters(const rtl::OUString& aChars) + virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces) + virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget, - const rtl::OUString& aData) + virtual void SAL_CALL processingInstruction(const OUString& aTarget, + const OUString& aData) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -109,12 +109,12 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase, // S ::com::sun::star::uno::RuntimeException ); private: - ::rtl::OUString getErrorLineString(); + OUString getErrorLineString(); - class ToolBoxHashMap : public ::boost::unordered_map< ::rtl::OUString , + class ToolBoxHashMap : public ::boost::unordered_map< OUString , ToolBox_XML_Entry , - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > + OUStringHash, + ::std::equal_to< OUString > > { public: inline void free() @@ -142,13 +142,13 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase, // S sal_Int32 m_nHashCode_Style_DropDownOnly; sal_Int32 m_nHashCode_Style_Text; sal_Int32 m_nHashCode_Style_Image; - rtl::OUString m_aType; - rtl::OUString m_aLabel; - rtl::OUString m_aStyle; - rtl::OUString m_aHelpURL; - rtl::OUString m_aTooltip; - rtl::OUString m_aIsVisible; - rtl::OUString m_aCommandURL; + OUString m_aType; + OUString m_aLabel; + OUString m_aStyle; + OUString m_aHelpURL; + OUString m_aTooltip; + OUString m_aIsVisible; + OUString m_aCommandURL; }; @@ -165,7 +165,7 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler : private ThreadHelpBase // S ::com::sun::star::uno::RuntimeException ); protected: - virtual void WriteToolBoxItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL, const rtl::OUString& aTooltip, sal_Int16 nStyle, + virtual void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, const OUString& aTooltip, sal_Int16 nStyle, sal_Int16 nWidth, sal_Bool bVisible ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -185,10 +185,10 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler : private ThreadHelpBase // S ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_rItemAccess; - ::rtl::OUString m_aXMLToolbarNS; - ::rtl::OUString m_aXMLXlinkNS; - ::rtl::OUString m_aAttributeType; - ::rtl::OUString m_aAttributeURL; + OUString m_aXMLToolbarNS; + OUString m_aXMLXlinkNS; + OUString m_aAttributeType; + OUString m_aAttributeURL; }; } // namespace framework diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx index ae75bec6ac17..8d19790507d4 100644 --- a/framework/inc/xml/xmlnamespaces.hxx +++ b/framework/inc/xml/xmlnamespaces.hxx @@ -35,22 +35,22 @@ class FWE_DLLPUBLIC XMLNamespaces XMLNamespaces( const XMLNamespaces& ); virtual ~XMLNamespaces(); - void addNamespace( const ::rtl::OUString& aName, const ::rtl::OUString& aValue ) + void addNamespace( const OUString& aName, const OUString& aValue ) throw( ::com::sun::star::xml::sax::SAXException ); - ::rtl::OUString applyNSToAttributeName( const ::rtl::OUString& ) const + OUString applyNSToAttributeName( const OUString& ) const throw( ::com::sun::star::xml::sax::SAXException ); - ::rtl::OUString applyNSToElementName( const ::rtl::OUString& ) const + OUString applyNSToElementName( const OUString& ) const throw( ::com::sun::star::xml::sax::SAXException ); private: - typedef ::std::map< ::rtl::OUString, ::rtl::OUString > NamespaceMap; + typedef ::std::map< OUString, OUString > NamespaceMap; - ::rtl::OUString getNamespaceValue( const ::rtl::OUString& aNamespace ) const + OUString getNamespaceValue( const OUString& aNamespace ) const throw( ::com::sun::star::xml::sax::SAXException ); - ::rtl::OUString m_aDefaultNamespace; - ::rtl::OUString m_aXMLAttributeNamespace; + OUString m_aDefaultNamespace; + OUString m_aXMLAttributeNamespace; NamespaceMap m_aNamespaceMap; }; diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index 179d63963d19..2c1d8d555a6b 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -84,7 +84,7 @@ sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const } //----------------------------------------------- -sal_Bool AcceleratorCache::hasCommand(const ::rtl::OUString& sCommand) const +sal_Bool AcceleratorCache::hasCommand(const OUString& sCommand) const { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -119,7 +119,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const //----------------------------------------------- void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey , - const ::rtl::OUString& sCommand) + const OUString& sCommand) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -136,7 +136,7 @@ void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey , } //----------------------------------------------- -AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUString& sCommand) const +AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& sCommand) const { TKeyList lKeys; @@ -146,7 +146,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUStr TCommand2Keys::const_iterator pCommand = m_lCommand2Keys.find(sCommand); if (pCommand == m_lCommand2Keys.end()) throw css::container::NoSuchElementException( - ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >()); + OUString(), css::uno::Reference< css::uno::XInterface >()); lKeys = pCommand->second; aReadLock.unlock(); @@ -156,9 +156,9 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUStr } //----------------------------------------------- -::rtl::OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const +OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const { - ::rtl::OUString sCommand; + OUString sCommand; // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -166,7 +166,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUStr TKey2Commands::const_iterator pKey = m_lKey2Commands.find(aKey); if (pKey == m_lKey2Commands.end()) throw css::container::NoSuchElementException( - ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >()); + OUString(), css::uno::Reference< css::uno::XInterface >()); sCommand = pKey->second; aReadLock.unlock(); @@ -189,7 +189,7 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey) // get its registered command // Because we must know its place inside the optimized // structure, which bind keys to commands, too! - ::rtl::OUString sCommand = pKey->second; + OUString sCommand = pKey->second; pKey = m_lKey2Commands.end(); // nobody should use an undefined value .-) // remove key from primary list @@ -203,7 +203,7 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey) } //----------------------------------------------- -void AcceleratorCache::removeCommand(const ::rtl::OUString& sCommand) +void AcceleratorCache::removeCommand(const OUString& sCommand) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 2a0330d30a58..c2cd26cd33f8 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -67,10 +67,10 @@ namespace framework namespace fpc = ::framework::pattern::configuration; #endif - ::rtl::OUString lcl_getKeyString(salhelper::SingletonRef<framework::KeyMapping>& _rKeyMapping, const css::awt::KeyEvent& aKeyEvent) + OUString lcl_getKeyString(salhelper::SingletonRef<framework::KeyMapping>& _rKeyMapping, const css::awt::KeyEvent& aKeyEvent) { const sal_Int32 nBeginIndex = 4; // "KEY_" is the prefix of a identifier... - ::rtl::OUStringBuffer sKeyBuffer((_rKeyMapping->mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex)); + OUStringBuffer sKeyBuffer((_rKeyMapping->mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex)); if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT ) sKeyBuffer.appendAscii("_SHIFT"); @@ -133,7 +133,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati } //----------------------------------------------- -::rtl::OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) +OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) { @@ -143,7 +143,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati AcceleratorCache& rCache = impl_getCFG(); if (!rCache.hasKey(aKeyEvent)) throw css::container::NoSuchElementException( - ::rtl::OUString(), + OUString(), static_cast< ::cppu::OWeakObject* >(this)); return rCache.getCommandByKey(aKeyEvent); @@ -152,7 +152,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati //----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent, - const ::rtl::OUString& sCommand ) + const OUString& sCommand ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException ) { @@ -163,13 +163,13 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE (aKeyEvent.Modifiers == 0) ) throw css::lang::IllegalArgumentException( - ::rtl::OUString("Such key event seams not to be supported by any operating system."), + OUString("Such key event seams not to be supported by any operating system."), static_cast< ::cppu::OWeakObject* >(this), 0); if (sCommand.isEmpty()) throw css::lang::IllegalArgumentException( - ::rtl::OUString("Empty command strings are not allowed here."), + OUString("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -194,7 +194,7 @@ throw(css::container::NoSuchElementException, AcceleratorCache& rCache = impl_getCFG(sal_True); // true => force using of a writeable cache if (!rCache.hasKey(aKeyEvent)) throw css::container::NoSuchElementException( - ::rtl::OUString(), + OUString(), static_cast< ::cppu::OWeakObject* >(this)); rCache.removeKey(aKeyEvent); @@ -202,14 +202,14 @@ throw(css::container::NoSuchElementException, } //----------------------------------------------- -css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const ::rtl::OUString& sCommand) +css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::uno::RuntimeException ) { if (sCommand.isEmpty()) throw css::lang::IllegalArgumentException( - ::rtl::OUString("Empty command strings are not allowed here."), + OUString("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -219,7 +219,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati AcceleratorCache& rCache = impl_getCFG(); if (!rCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( - ::rtl::OUString(), + OUString(), static_cast< ::cppu::OWeakObject* >(this)); AcceleratorCache::TKeyList lKeys = rCache.getKeysByCommand(sCommand); @@ -229,7 +229,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati } //----------------------------------------------- -css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList) +css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , css::uno::RuntimeException ) { @@ -243,10 +243,10 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g for (i=0; i<c; ++i) { - const ::rtl::OUString& rCommand = lCommandList[i]; + const OUString& rCommand = lCommandList[i]; if (rCommand.isEmpty()) throw css::lang::IllegalArgumentException( - ::rtl::OUString("Empty command strings are not allowed here."), + OUString("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), (sal_Int16)i); @@ -268,14 +268,14 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g } //----------------------------------------------- -void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand) +void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::uno::RuntimeException ) { if (sCommand.isEmpty()) throw css::lang::IllegalArgumentException( - ::rtl::OUString("Empty command strings are not allowed here."), + OUString("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), 0); @@ -285,7 +285,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co AcceleratorCache& rCache = impl_getCFG(sal_True); // sal_True => force getting of a writeable cache! if (!rCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( - ::rtl::OUString("Command does not exists inside this container."), + OUString("Command does not exists inside this container."), static_cast< ::cppu::OWeakObject* >(this)); rCache.removeCommand(sCommand); @@ -316,7 +316,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() xIn = xStream->getInputStream(); if (!xIn.is()) throw css::io::IOException( - ::rtl::OUString("Could not open accelerator configuration for reading."), + OUString("Could not open accelerator configuration for reading."), static_cast< ::cppu::OWeakObject* >(this)); // impl_ts_load() does not clear the cache @@ -355,7 +355,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store() if (!xOut.is()) throw css::io::IOException( - ::rtl::OUString("Could not open accelerator configuration for saving."), + OUString("Could not open accelerator configuration for saving."), static_cast< ::cppu::OWeakObject* >(this)); impl_ts_save(xOut); @@ -382,7 +382,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R if (!xOut.is()) throw css::io::IOException( - ::rtl::OUString("Could not open accelerator configuration for saving."), + OUString("Could not open accelerator configuration for saving."), static_cast< ::cppu::OWeakObject* >(this)); impl_ts_save(xOut); @@ -474,7 +474,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::u //----------------------------------------------- // IStorageListener -void XMLBasedAcceleratorConfiguration::changesOccurred(const ::rtl::OUString& /*sPath*/) +void XMLBasedAcceleratorConfiguration::changesOccurred(const OUString& /*sPath*/) { reload(); } @@ -618,7 +618,7 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const css::uno::Reference< css::uno::XInterface > xCFG = fpc::ConfigurationHelper::openConfig( comphelper::getComponentContext(xSMGR), "/org.openoffice.Setup", "L10N", fpc::ConfigurationHelper::E_READONLY); css::uno::Reference< css::beans::XPropertySet > xProp (xCFG, css::uno::UNO_QUERY_THROW); - ::rtl::OUString sISOLocale; + OUString sISOLocale; xProp->getPropertyValue("ooLocale") >>= sISOLocale; if (sISOLocale.isEmpty()) @@ -660,7 +660,7 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un , m_pPrimaryWriteCache(0 ) , m_pSecondaryWriteCache(0 ) { - const ::rtl::OUString CFG_ENTRY_ACCELERATORS("org.openoffice.Office.Accelerators"); + const OUString CFG_ENTRY_ACCELERATORS("org.openoffice.Office.Accelerators"); m_xCfg = css::uno::Reference< css::container::XNameAccess > ( ::comphelper::ConfigurationHelper::openConfig( comphelper::getComponentContext(m_xSMGR), CFG_ENTRY_ACCELERATORS, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), css::uno::UNO_QUERY ); @@ -693,7 +693,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati } //----------------------------------------------- -::rtl::OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) +OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) { @@ -705,7 +705,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati if (!rPrimaryCache.hasKey(aKeyEvent) && !rSecondaryCache.hasKey(aKeyEvent)) throw css::container::NoSuchElementException( - ::rtl::OUString(), + OUString(), static_cast< ::cppu::OWeakObject* >(this)); if (rPrimaryCache.hasKey(aKeyEvent)) @@ -718,7 +718,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati //----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent, - const ::rtl::OUString& sCommand ) + const OUString& sCommand ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException ) { @@ -731,13 +731,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE (aKeyEvent.Modifiers == 0) ) throw css::lang::IllegalArgumentException( - ::rtl::OUString("Such key event seams not to be supported by any operating system."), + OUString("Such key event seams not to be supported by any operating system."), static_cast< ::cppu::OWeakObject* >(this), 0); if (sCommand.isEmpty()) throw css::lang::IllegalArgumentException( - ::rtl::OUString("Empty command strings are not allowed here."), + OUString("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -749,7 +749,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE if ( rPrimaryCache.hasKey(aKeyEvent) ) { - ::rtl::OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent); + OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent); if ( sCommand != sOriginalCommand ) { if (rSecondaryCache.hasCommand(sOriginalCommand)) @@ -772,7 +772,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE else if ( rSecondaryCache.hasKey(aKeyEvent) ) { - ::rtl::OUString sOriginalCommand = rSecondaryCache.getCommandByKey(aKeyEvent); + OUString sOriginalCommand = rSecondaryCache.getCommandByKey(aKeyEvent); if (sCommand != sOriginalCommand) { if (rPrimaryCache.hasCommand(sCommand)) @@ -816,15 +816,15 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K if (!rPrimaryCache.hasKey(aKeyEvent) && !rSecondaryCache.hasKey(aKeyEvent)) throw css::container::NoSuchElementException( - ::rtl::OUString(), + OUString(), static_cast< ::cppu::OWeakObject* >(this)); if (rPrimaryCache.hasKey(aKeyEvent)) { - ::rtl::OUString sDelCommand = rPrimaryCache.getCommandByKey(aKeyEvent); + OUString sDelCommand = rPrimaryCache.getCommandByKey(aKeyEvent); if (!sDelCommand.isEmpty()) { - ::rtl::OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent); + OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent); if (rSecondaryCache.hasCommand(sOriginalCommand)) { AcceleratorCache::TKeyList lSecondaryKeys = rSecondaryCache.getKeysByCommand(sOriginalCommand); @@ -838,7 +838,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K } else { - ::rtl::OUString sDelCommand = rSecondaryCache.getCommandByKey(aKeyEvent); + OUString sDelCommand = rSecondaryCache.getCommandByKey(aKeyEvent); if (!sDelCommand.isEmpty()) rSecondaryCache.removeKey(aKeyEvent); } @@ -847,14 +847,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K } //----------------------------------------------- -css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const ::rtl::OUString& sCommand) +css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::uno::RuntimeException ) { if (sCommand.isEmpty()) throw css::lang::IllegalArgumentException( - ::rtl::OUString("Empty command strings are not allowed here."), + OUString("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -866,7 +866,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( - ::rtl::OUString(), + OUString(), static_cast< ::cppu::OWeakObject* >(this)); AcceleratorCache::TKeyList lKeys = rPrimaryCache.getKeysByCommand(sCommand); @@ -901,7 +901,7 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator } //----------------------------------------------- -css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList) +css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , css::uno::RuntimeException ) { @@ -915,10 +915,10 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g for (i=0; i<c; ++i) { - const ::rtl::OUString& rCommand = lCommandList[i]; + const OUString& rCommand = lCommandList[i]; if (rCommand.isEmpty()) throw css::lang::IllegalArgumentException( - ::rtl::OUString("Empty command strings are not allowed here."), + OUString("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), (sal_Int16)i); @@ -944,14 +944,14 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g } //----------------------------------------------- -void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand) +void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::uno::RuntimeException ) { if (sCommand.isEmpty()) throw css::lang::IllegalArgumentException( - ::rtl::OUString("Empty command strings are not allowed here."), + OUString("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), 0); @@ -963,7 +963,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( - ::rtl::OUString("Command does not exists inside this container."), + OUString("Command does not exists inside this container."), static_cast< ::cppu::OWeakObject* >(this)); if (rPrimaryCache.hasCommand(sCommand)) @@ -1055,17 +1055,17 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R return; long nOpenModes = css::embed::ElementModes::READWRITE; - css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString("accelerator"), nOpenModes); + css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(OUString("accelerator"), nOpenModes); if (!xAcceleratorTypeStorage.is()) return; - css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString("current"), nOpenModes); + css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(OUString("current"), nOpenModes); css::uno::Reference< css::io::XOutputStream > xOut; if (xStream.is()) xOut = xStream->getOutputStream(); if (!xOut.is()) throw css::io::IOException( - ::rtl::OUString("Could not open accelerator configuration for saving."), + OUString("Could not open accelerator configuration for saving."), static_cast< ::cppu::OWeakObject* >(this)); // the original m_aCache has been split into primay cache and secondary cache... @@ -1160,7 +1160,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset() throw(css::uno::RuntimeException) { css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY); - ::rtl::OUString sConfig = xNamed->getName(); + OUString sConfig = xNamed->getName(); if ( sConfig == "Global" ) { m_xCfg = css::uno::Reference< css::container::XNameAccess > ( @@ -1214,25 +1214,25 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: // So we try to split the path into 3 parts (module isnt important here, because we already know it ... because // these instance is bound to a specific module configuration ... or it''s the global configuration where no module is given at all. - ::rtl::OUString sOrgPath ; - ::rtl::OUString sPath ; - ::rtl::OUString sKey; + OUString sOrgPath ; + OUString sPath ; + OUString sKey; aChange.Accessor >>= sOrgPath; sPath = sOrgPath; - ::rtl::OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); - ::rtl::OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); + OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); + OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); if ( sGlobalModules == CFG_ENTRY_GLOBAL ) { - ::rtl::OUString sModule; + OUString sModule; sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); if ( !sKey.isEmpty() && !sPath.isEmpty() ) reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey); } else if ( sGlobalModules == CFG_ENTRY_MODULES ) { - ::rtl::OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); + OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); if ( !sKey.isEmpty() && !sPath.isEmpty() ) @@ -1263,28 +1263,28 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const xModules->getByName(m_sModuleCFG) >>= xAccess; } - const ::rtl::OUString sIsoLang = impl_ts_getLocale(); - const ::rtl::OUString sDefaultLocale("en-US"); + const OUString sIsoLang = impl_ts_getLocale(); + const OUString sDefaultLocale("en-US"); css::uno::Reference< css::container::XNameAccess > xKey; css::uno::Reference< css::container::XNameAccess > xCommand; if (xAccess.is()) { - css::uno::Sequence< ::rtl::OUString > lKeys = xAccess->getElementNames(); + css::uno::Sequence< OUString > lKeys = xAccess->getElementNames(); sal_Int32 nKeys = lKeys.getLength(); for ( sal_Int32 i=0; i<nKeys; ++i ) { - ::rtl::OUString sKey = lKeys[i]; + OUString sKey = lKeys[i]; xAccess->getByName(sKey) >>= xKey; xKey->getByName(CFG_PROP_COMMAND) >>= xCommand; - css::uno::Sequence< ::rtl::OUString > lLocales = xCommand->getElementNames(); + css::uno::Sequence< OUString > lLocales = xCommand->getElementNames(); sal_Int32 nLocales = lLocales.getLength(); - ::std::vector< ::rtl::OUString > aLocales; + ::std::vector< OUString > aLocales; for ( sal_Int32 j=0; j<nLocales; ++j ) aLocales.push_back(lLocales[j]); - ::std::vector< ::rtl::OUString >::const_iterator pFound; + ::std::vector< OUString >::const_iterator pFound; for ( pFound = aLocales.begin(); pFound != aLocales.end(); ++pFound ) { if ( *pFound == sIsoLang ) @@ -1303,8 +1303,8 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const continue; } - ::rtl::OUString sLocale = *pFound; - ::rtl::OUString sCommand; + OUString sLocale = *pFound; + OUString sCommand; xCommand->getByName(sLocale) >>= sCommand; if (sCommand.isEmpty()) continue; @@ -1312,11 +1312,11 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const css::awt::KeyEvent aKeyEvent; sal_Int32 nIndex = 0; - ::rtl::OUString sKeyCommand = sKey.getToken(0, '_', nIndex); - ::rtl::OUString sPrefix("KEY_"); + OUString sKeyCommand = sKey.getToken(0, '_', nIndex); + OUString sPrefix("KEY_"); aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sPrefix + sKeyCommand); - css::uno::Sequence< ::rtl::OUString > sToken(4); + css::uno::Sequence< OUString > sToken(4); const sal_Int32 nToken = 4; sal_Bool bValid = sal_True; sal_Int32 k; @@ -1375,14 +1375,14 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c for ( pIt = lPrimaryWriteKeys.begin(); pIt != lPrimaryWriteKeys.end(); ++pIt ) { - ::rtl::OUString sCommand = m_pPrimaryWriteCache->getCommandByKey(*pIt); + OUString sCommand = m_pPrimaryWriteCache->getCommandByKey(*pIt); if (!m_aPrimaryReadCache.hasKey(*pIt)) { insertKeyToConfiguration(*pIt, sCommand, sal_True); } else { - ::rtl::OUString sReadCommand = m_aPrimaryReadCache.getCommandByKey(*pIt); + OUString sReadCommand = m_aPrimaryReadCache.getCommandByKey(*pIt); if (sReadCommand != sCommand) insertKeyToConfiguration(*pIt, sCommand, sal_True); } @@ -1419,14 +1419,14 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c for ( pIt = lSecondaryWriteKeys.begin(); pIt != lSecondaryWriteKeys.end(); ++pIt ) { - ::rtl::OUString sCommand = m_pSecondaryWriteCache->getCommandByKey(*pIt); + OUString sCommand = m_pSecondaryWriteCache->getCommandByKey(*pIt); if (!m_aSecondaryReadCache.hasKey(*pIt)) { insertKeyToConfiguration(*pIt, sCommand, sal_False); } else { - ::rtl::OUString sReadCommand = m_aSecondaryReadCache.getCommandByKey(*pIt); + OUString sReadCommand = m_aSecondaryReadCache.getCommandByKey(*pIt); if (sReadCommand != sCommand) insertKeyToConfiguration(*pIt, sCommand, sal_False); } @@ -1452,7 +1452,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c } //----------------------------------------------- -void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const ::rtl::OUString& sCommand, const sal_Bool bPreferred ) +void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred ) { css::uno::Reference< css::container::XNameAccess > xAccess; css::uno::Reference< css::container::XNameContainer > xContainer; @@ -1479,7 +1479,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt: xModules->getByName(m_sModuleCFG) >>= xContainer; } - const ::rtl::OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent); + const OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent); css::uno::Reference< css::container::XNameAccess > xKey; css::uno::Reference< css::container::XNameContainer > xCommand; if ( !xContainer->hasByName(sKey) ) @@ -1491,7 +1491,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt: xContainer->getByName(sKey) >>= xKey; xKey->getByName(CFG_PROP_COMMAND) >>= xCommand; - ::rtl::OUString sLocale = impl_ts_getLocale(); + OUString sLocale = impl_ts_getLocale(); if ( !xCommand->hasByName(sLocale) ) xCommand->insertByName(sLocale, css::uno::makeAny(sCommand)); else @@ -1520,12 +1520,12 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw xModules->getByName(m_sModuleCFG) >>= xContainer; } - const ::rtl::OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent); + const OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent); xContainer->removeByName(sKey); } //----------------------------------------------- -void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPrimarySecondary, const ::rtl::OUString& sGlobalModules, const ::rtl::OUString& sModule, const ::rtl::OUString& sKey ) +void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey ) { css::uno::Reference< css::container::XNameAccess > xAccess; css::uno::Reference< css::container::XNameContainer > xContainer; @@ -1543,13 +1543,13 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr } css::awt::KeyEvent aKeyEvent; - ::rtl::OUString sKeyIdentifier; + OUString sKeyIdentifier; sal_Int32 nIndex = 0; sKeyIdentifier = sKey.getToken(0, '_', nIndex); - aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString("KEY_")+sKeyIdentifier); + aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(OUString("KEY_")+sKeyIdentifier); - css::uno::Sequence< ::rtl::OUString > sToken(3); + css::uno::Sequence< OUString > sToken(3); const sal_Int32 nToken = 3; for (sal_Int32 i=0; i<nToken; ++i) { @@ -1569,11 +1569,11 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr css::uno::Reference< css::container::XNameAccess > xKey; css::uno::Reference< css::container::XNameAccess > xCommand; - ::rtl::OUString sCommand; + OUString sCommand; if (xContainer->hasByName(sKey)) { - ::rtl::OUString sLocale = impl_ts_getLocale(); + OUString sLocale = impl_ts_getLocale(); xContainer->getByName(sKey) >>= xKey; xKey->getByName(CFG_PROP_COMMAND) >>= xCommand; xCommand->getByName(sLocale) >>= sCommand; @@ -1656,7 +1656,7 @@ OUString XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const css::uno::Reference< css::uno::XInterface > xCFG = fpc::ConfigurationHelper::openConfig( comphelper::getComponentContext(xSMGR), "/org.openoffice.Setup", "L10N", fpc::ConfigurationHelper::E_READONLY); css::uno::Reference< css::beans::XPropertySet > xProp (xCFG, css::uno::UNO_QUERY_THROW); - ::rtl::OUString sISOLocale; + OUString sISOLocale; xProp->getPropertyValue("ooLocale") >>= sISOLocale; if (sISOLocale.isEmpty()) diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 82ffbe68c471..7c8cb5e6a8d2 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -101,7 +101,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::initialize(const css::uno::Seque ::comphelper::SequenceAsHashMap lArgs(lArguments); m_xDocumentRoot = lArgs.getUnpackedValueOrDefault( - ::rtl::OUString("DocumentRoot"), + OUString("DocumentRoot"), css::uno::Reference< css::embed::XStorage >()); aWriteLock.unlock(); @@ -170,7 +170,7 @@ void DocumentAcceleratorConfiguration::impl_ts_fillCache() m_aPresetHandler.connectToResource( PresetHandler::E_DOCUMENT, PresetHandler::RESOURCETYPE_ACCELERATOR(), - ::rtl::OUString(), + OUString(), xDocumentRoot, aLanguageTag); diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index 09ce133eef2c..9e50ff352eae 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -146,7 +146,7 @@ KeyMapping::KeyMapping() sal_Int32 i = 0; while(KeyIdentifierMap[i].Code != 0) { - ::rtl::OUString sIdentifier = ::rtl::OUString::createFromAscii(KeyIdentifierMap[i].Identifier); + OUString sIdentifier = OUString::createFromAscii(KeyIdentifierMap[i].Identifier); sal_Int16 nCode = KeyIdentifierMap[i].Code; m_lIdentifierHash[sIdentifier] = nCode ; @@ -162,7 +162,7 @@ KeyMapping::~KeyMapping() } //----------------------------------------------- -sal_uInt16 KeyMapping::mapIdentifierToCode(const ::rtl::OUString& sIdentifier) +sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier) throw(css::lang::IllegalArgumentException) { Identifier2CodeHash::const_iterator pIt = m_lIdentifierHash.find(sIdentifier); @@ -182,18 +182,18 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const ::rtl::OUString& sIdentifier) } //----------------------------------------------- -::rtl::OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode) +OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode) { Code2IdentifierHash::const_iterator pIt = m_lCodeHash.find(nCode); if (pIt != m_lCodeHash.end()) return pIt->second; // If we have no well known identifier - use the pure code value! - return ::rtl::OUString::valueOf((sal_Int32)nCode); + return OUString::valueOf((sal_Int32)nCode); } //----------------------------------------------- -sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier, +sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, sal_uInt16& rCode ) { sal_Int32 nCode = sIdentifier.toInt32(); diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 2a675cc36568..4e9357b0796d 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -94,12 +94,12 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc WriteGuard aWriteLock(m_aLock); ::comphelper::SequenceAsHashMap lArgs(lArguments); - m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString("ModuleIdentifier"), ::rtl::OUString()); - m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString("Locale") , ::rtl::OUString("x-default")); + m_sModule = lArgs.getUnpackedValueOrDefault(OUString("ModuleIdentifier"), OUString()); + m_sLocale = lArgs.getUnpackedValueOrDefault(OUString("Locale") , OUString("x-default")); if (m_sModule.isEmpty()) throw css::uno::RuntimeException( - ::rtl::OUString("The module dependend accelerator configuration service was initialized with an empty module identifier!"), + OUString("The module dependend accelerator configuration service was initialized with an empty module identifier!"), static_cast< ::cppu::OWeakObject* >(this)); aWriteLock.unlock(); diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 39b9773d9c2a..0ba15b8bde76 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -63,39 +63,39 @@ namespace framework { //----------------------------------------------- -::rtl::OUString PresetHandler::PRESET_DEFAULT() +OUString PresetHandler::PRESET_DEFAULT() { - return ::rtl::OUString("default"); + return OUString("default"); } //----------------------------------------------- -::rtl::OUString PresetHandler::TARGET_CURRENT() +OUString PresetHandler::TARGET_CURRENT() { - return ::rtl::OUString("current"); + return OUString("current"); } //----------------------------------------------- -::rtl::OUString PresetHandler::RESOURCETYPE_MENUBAR() +OUString PresetHandler::RESOURCETYPE_MENUBAR() { - return ::rtl::OUString("menubar"); + return OUString("menubar"); } //----------------------------------------------- -::rtl::OUString PresetHandler::RESOURCETYPE_TOOLBAR() +OUString PresetHandler::RESOURCETYPE_TOOLBAR() { - return ::rtl::OUString("toolbar"); + return OUString("toolbar"); } //----------------------------------------------- -::rtl::OUString PresetHandler::RESOURCETYPE_ACCELERATOR() +OUString PresetHandler::RESOURCETYPE_ACCELERATOR() { - return ::rtl::OUString("accelerator"); + return OUString("accelerator"); } //----------------------------------------------- -::rtl::OUString PresetHandler::RESOURCETYPE_STATUSBAR() +OUString PresetHandler::RESOURCETYPE_STATUSBAR() { - return ::rtl::OUString("statusbar"); + return OUString("statusbar"); } //----------------------------------------------- @@ -177,23 +177,23 @@ void PresetHandler::forgetCachedStorages() namespace { -::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID) +OUString lcl_getLocalizedMessage(::sal_Int32 nID) { - ::rtl::OUString sMessage("Unknown error."); + OUString sMessage("Unknown error."); switch(nID) { case ID_CORRUPT_UICONFIG_SHARE : - sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_SHARE ))); + sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_SHARE ))); break; case ID_CORRUPT_UICONFIG_USER : - sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_USER ))); + sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_USER ))); break; case ID_CORRUPT_UICONFIG_GENERAL : - sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_GENERAL ))); + sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_GENERAL ))); break; } @@ -210,8 +210,8 @@ void lcl_throwCorruptedUIConfigurationException( lcl_getLocalizedMessage(id), css::uno::Reference< css::uno::XInterface >(), (exception.getValueTypeName() + - rtl::OUString(": \"") + e.Message + - rtl::OUString("\""))); + OUString(": \"") + e.Message + + OUString("\""))); } } @@ -232,7 +232,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag xSMGR->createInstance(SERVICENAME_PATHSETTINGS), css::uno::UNO_QUERY_THROW); - ::rtl::OUString sShareLayer; + OUString sShareLayer; xPathSettings->getPropertyValue(BASEPATH_SHARE_LAYER) >>= sShareLayer; // "UIConfig" is a "multi path" ... use first part only here! @@ -243,7 +243,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag // Note: May be an user uses URLs without a final slash! Check it ... nPos = sShareLayer.lastIndexOf('/'); if (nPos != sShareLayer.getLength()-1) - sShareLayer += ::rtl::OUString("/"); + sShareLayer += OUString("/"); sShareLayer += RELPATH_SHARE_LAYER; // folder /* @@ -292,13 +292,13 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag xSMGR->createInstance(SERVICENAME_PATHSETTINGS), css::uno::UNO_QUERY_THROW); - ::rtl::OUString sUserLayer; + OUString sUserLayer; xPathSettings->getPropertyValue(BASEPATH_USER_LAYER) >>= sUserLayer ; // Note: May be an user uses URLs without a final slash! Check it ... sal_Int32 nPos = sUserLayer.lastIndexOf('/'); if (nPos != sUserLayer.getLength()-1) - sUserLayer += ::rtl::OUString("/"); + sUserLayer += OUString("/"); sUserLayer += RELPATH_USER_LAYER; // storage file @@ -369,8 +369,8 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser( //----------------------------------------------- void PresetHandler::connectToResource( PresetHandler::EConfigType eConfigType , - const ::rtl::OUString& sResource , - const ::rtl::OUString& sModule , + const OUString& sResource , + const OUString& sModule , const css::uno::Reference< css::embed::XStorage >& xDocumentRoot, const LanguageTag& rLanguageTag ) { @@ -397,7 +397,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType { if (!xDocumentRoot.is()) throw css::uno::RuntimeException( - ::rtl::OUString("There is valid root storage, where the UI configuration can work on."), + OUString("There is valid root storage, where the UI configuration can work on."), css::uno::Reference< css::uno::XInterface >()); m_lDocumentStorages.setRootStorage(xDocumentRoot); xShare = xDocumentRoot; @@ -420,10 +420,10 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType sal_Int32 eShareMode = (css::embed::ElementModes::READ | css::embed::ElementModes::NOCREATE); sal_Int32 eUserMode = (css::embed::ElementModes::READWRITE ); - ::rtl::OUStringBuffer sRelPathBuf(1024); - ::rtl::OUString sRelPathShare; - ::rtl::OUString sRelPathNoLang; - ::rtl::OUString sRelPathUser; + OUStringBuffer sRelPathBuf(1024); + OUString sRelPathShare; + OUString sRelPathNoLang; + OUString sRelPathUser; switch(eConfigType) { case E_GLOBAL : @@ -489,7 +489,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // First try to find the right localized set inside share layer. // Fallbacks are allowed there. OUString aShareLocale( rLanguageTag.getBcp47()); - ::rtl::OUString sLocalizedSharePath(sRelPathShare); + OUString sLocalizedSharePath(sRelPathShare); sal_Bool bAllowFallbacks = sal_True ; xShare = impl_openLocalizedPathIgnoringErrors(sLocalizedSharePath, eShareMode, sal_True , aShareLocale, bAllowFallbacks); @@ -497,7 +497,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // Normaly the corresponding sub dir should be created matching the specified locale. // Because we allow creation of storages inside user layer by default. OUString aUserLocale( rLanguageTag.getBcp47()); - ::rtl::OUString sLocalizedUserPath(sRelPathUser); + OUString sLocalizedUserPath(sRelPathUser); bAllowFallbacks = sal_False ; xUser = impl_openLocalizedPathIgnoringErrors(sLocalizedUserPath, eUserMode , sal_False, aUserLocale, bAllowFallbacks); @@ -507,8 +507,8 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // read content of level 3 (presets, targets) css::uno::Reference< css::container::XNameAccess > xAccess ; - css::uno::Sequence< ::rtl::OUString > lNames ; - const ::rtl::OUString* pNames ; + css::uno::Sequence< OUString > lNames ; + const OUString* pNames ; sal_Int32 c ; sal_Int32 i ; OUStringList lPresets; @@ -524,7 +524,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType for (i=0; i<c; ++i) { - ::rtl::OUString sTemp = pNames[i]; + OUString sTemp = pNames[i]; sal_Int32 nPos = sTemp.indexOf(FILE_EXTENSION); if (nPos > -1) sTemp = sTemp.copy(0,nPos); @@ -542,7 +542,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType for (i=0; i<c; ++i) { - ::rtl::OUString sTemp = pNames[i]; + OUString sTemp = pNames[i]; sal_Int32 nPos = sTemp.indexOf(FILE_EXTENSION); if (nPos > -1) sTemp = sTemp.copy(0,nPos); @@ -575,8 +575,8 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType } //----------------------------------------------- -void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset, - const ::rtl::OUString& sTarget) +void PresetHandler::copyPresetToTarget(const OUString& sPreset, + const OUString& sTarget) { // dont check our preset list, if element exists // We try to open it and forward all errors to the user! @@ -598,10 +598,10 @@ void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset, return; } - ::rtl::OUString sPresetFile(sPreset); + OUString sPresetFile(sPreset); sPresetFile += FILE_EXTENSION; - ::rtl::OUString sTargetFile(sTarget); + OUString sTargetFile(sTarget); sTargetFile += FILE_EXTENSION; // remove existing elements before you try to copy the preset to that location ... @@ -618,7 +618,7 @@ void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset, } //----------------------------------------------- -css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::OUString& sPreset, +css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString& sPreset, sal_Bool bUseNoLangGlobal) { // SAFE -> ---------------------------------- @@ -631,7 +631,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::O if (!xFolder.is()) return css::uno::Reference< css::io::XStream >(); - ::rtl::OUString sFile(sPreset); + OUString sFile(sPreset); sFile += FILE_EXTENSION; // inform user about errors (use original exceptions!) @@ -640,7 +640,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::O } //----------------------------------------------- -css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::OUString& sTarget , +css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString& sTarget , sal_Bool bCreateIfMissing) { // SAFE -> ---------------------------------- @@ -653,7 +653,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::O if (!xFolder.is()) return css::uno::Reference< css::io::XStream >(); - ::rtl::OUString sFile(sTarget); + OUString sFile(sTarget); sFile += FILE_EXTENSION; sal_Int32 nOpenMode = css::embed::ElementModes::READWRITE; @@ -694,7 +694,7 @@ void PresetHandler::commitUserChanges() if (!xWorking.is()) return; - ::rtl::OUString sPath; + OUString sPath; switch(eCfgType) { @@ -722,7 +722,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - ::rtl::OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer! + OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer! EConfigType eCfgType = m_eConfigType; aReadLock.unlock(); // <- SAFE ---------------------------------- @@ -752,7 +752,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - ::rtl::OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer! + OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer! EConfigType eCfgType = m_eConfigType; aReadLock.unlock(); // <- SAFE ---------------------------------- @@ -778,7 +778,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener) } //----------------------------------------------- -css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const ::rtl::OUString& sPath , +css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const OUString& sPath , sal_Int32 eMode , sal_Bool bShare) { @@ -798,12 +798,12 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring } //----------------------------------------------- -::std::vector< ::rtl::OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue( - const ::std::vector< ::rtl::OUString >& lLocalizedValues, +::std::vector< OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue( + const ::std::vector< OUString >& lLocalizedValues, OUString& rLanguageTag, sal_Bool bAllowFallbacks ) { - ::std::vector< ::rtl::OUString >::const_iterator pFound = lLocalizedValues.end(); + ::std::vector< OUString >::const_iterator pFound = lLocalizedValues.end(); if (bAllowFallbacks) { pFound = LanguageTag::getFallback(lLocalizedValues, rLanguageTag); @@ -830,15 +830,15 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring //----------------------------------------------- css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPathIgnoringErrors( - ::rtl::OUString& sPath , + OUString& sPath , sal_Int32 eMode , sal_Bool bShare , OUString& rLanguageTag , sal_Bool bAllowFallback) { css::uno::Reference< css::embed::XStorage > xPath = impl_openPathIgnoringErrors(sPath, eMode, bShare); - ::std::vector< ::rtl::OUString > lSubFolders = impl_getSubFolderNames(xPath); - ::std::vector< ::rtl::OUString >::const_iterator pLocaleFolder = impl_findMatchingLocalizedValue(lSubFolders, rLanguageTag, bAllowFallback); + ::std::vector< OUString > lSubFolders = impl_getSubFolderNames(xPath); + ::std::vector< OUString >::const_iterator pLocaleFolder = impl_findMatchingLocalizedValue(lSubFolders, rLanguageTag, bAllowFallback); // no fallback ... creation not allowed => no storage if ( @@ -850,7 +850,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat // it doesnt matter, if there is a locale fallback or not // If creation of storages is allowed, we do it anyway. // Otherwhise we have no acc config at all, which can make other trouble. - ::rtl::OUString sLocalizedPath; + OUString sLocalizedPath; sLocalizedPath = sPath; sLocalizedPath += PATH_SEPERATOR; if (pLocaleFolder != lSubFolders.end()) @@ -863,21 +863,21 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat if (xLocalePath.is()) sPath = sLocalizedPath; else - sPath = ::rtl::OUString(); + sPath = OUString(); return xLocalePath; } //----------------------------------------------- -::std::vector< ::rtl::OUString > PresetHandler::impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder) +::std::vector< OUString > PresetHandler::impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder) { css::uno::Reference< css::container::XNameAccess > xAccess(xFolder, css::uno::UNO_QUERY); if (!xAccess.is()) - return ::std::vector< ::rtl::OUString >(); + return ::std::vector< OUString >(); - ::std::vector< ::rtl::OUString > lSubFolders; - const css::uno::Sequence< ::rtl::OUString > lNames = xAccess->getElementNames(); - const ::rtl::OUString* pNames = lNames.getConstArray(); + ::std::vector< OUString > lSubFolders; + const css::uno::Sequence< OUString > lNames = xAccess->getElementNames(); + const OUString* pNames = lNames.getConstArray(); sal_Int32 c = lNames.getLength(); sal_Int32 i = 0; diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index ed05f6f32a8d..40d875c2b51e 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -42,7 +42,7 @@ #define PATH_SEPERATOR_ASCII "/" #define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/') -#define PATH_SEPERATOR ::rtl::OUString(PATH_SEPERATOR_ASCII) +#define PATH_SEPERATOR OUString(PATH_SEPERATOR_ASCII) namespace framework @@ -102,10 +102,10 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getRootStorage() cons } //----------------------------------------------- -css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl::OUString& sPath , +css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUString& sPath , sal_Int32 nOpenMode) { - ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); + OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); // SAFE -> ---------------------------------- @@ -115,15 +115,15 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: // <- SAFE ---------------------------------- css::uno::Reference< css::embed::XStorage > xChild ; - ::rtl::OUString sRelPath; + OUString sRelPath; OUStringList::const_iterator pIt ; for ( pIt = lFolders.begin(); pIt != lFolders.end() ; ++pIt ) { - const ::rtl::OUString& sChild = *pIt; - ::rtl::OUString sCheckPath (sRelPath); + const OUString& sChild = *pIt; + OUString sCheckPath (sRelPath); sCheckPath += sChild; sCheckPath += PATH_SEPERATOR; @@ -187,13 +187,13 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: } //----------------------------------------------- -StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUString& sPath) +StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sPath) { - ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); + OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); StorageHolder::TStorageList lStoragesOfPath; - ::rtl::OUString sRelPath ; + OUString sRelPath ; OUStringList::const_iterator pIt ; // SAFE -> ---------------------------------- @@ -203,8 +203,8 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr pIt != lFolders.end() ; ++pIt ) { - const ::rtl::OUString& sChild = *pIt; - ::rtl::OUString sCheckPath (sRelPath); + const OUString& sChild = *pIt; + OUString sCheckPath (sRelPath); sCheckPath += sChild; sCheckPath += PATH_SEPERATOR; @@ -231,7 +231,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr } //----------------------------------------------- -void StorageHolder::commitPath(const ::rtl::OUString& sPath) +void StorageHolder::commitPath(const OUString& sPath) { StorageHolder::TStorageList lStorages = getAllPathStorages(sPath); @@ -258,9 +258,9 @@ void StorageHolder::commitPath(const ::rtl::OUString& sPath) } //----------------------------------------------- -void StorageHolder::closePath(const ::rtl::OUString& rPath) +void StorageHolder::closePath(const OUString& rPath) { - ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(rPath); + OUString sNormedPath = StorageHolder::impl_st_normPath(rPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); /* convert list of paths in the following way: @@ -269,12 +269,12 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) [2] = "path_3" => "path_1/path_2/path_3" */ OUStringList::iterator pIt1 ; - ::rtl::OUString sParentPath; + OUString sParentPath; for ( pIt1 = lFolders.begin(); pIt1 != lFolders.end() ; ++pIt1 ) { - ::rtl::OUString sCurrentRelPath = sParentPath; + OUString sCurrentRelPath = sParentPath; sCurrentRelPath += *pIt1; sCurrentRelPath += PATH_SEPERATOR; *pIt1 = sCurrentRelPath; @@ -289,7 +289,7 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) pIt2 != lFolders.rend() ; ++pIt2 ) { - ::rtl::OUString sPath = *pIt2; + OUString sPath = *pIt2; TPath2StorageInfo::iterator pPath = m_lStorages.find(sPath); if (pPath == m_lStorages.end()) continue; // ??? @@ -308,9 +308,9 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) } //----------------------------------------------- -void StorageHolder::notifyPath(const ::rtl::OUString& sPath) +void StorageHolder::notifyPath(const OUString& sPath) { - ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); + OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); @@ -336,9 +336,9 @@ void StorageHolder::notifyPath(const ::rtl::OUString& sPath) //----------------------------------------------- void StorageHolder::addStorageListener( IStorageListener* pListener, - const ::rtl::OUString& sPath ) + const OUString& sPath ) { - ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); + OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); @@ -358,9 +358,9 @@ void StorageHolder::addStorageListener( IStorageListener* pListener, //----------------------------------------------- void StorageHolder::removeStorageListener( IStorageListener* pListener, - const ::rtl::OUString& sPath ) + const OUString& sPath ) { - ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); + OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); @@ -379,7 +379,7 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener, } //----------------------------------------------- -::rtl::OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) +OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) { // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); @@ -395,7 +395,7 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener, } if (pIt == m_lStorages.end()) - return ::rtl::OUString(); + return OUString(); return pIt->first; @@ -405,15 +405,15 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener, //----------------------------------------------- css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild) { - ::rtl::OUString sChildPath = getPathOfStorage(xChild); + OUString sChildPath = getPathOfStorage(xChild); return getParentStorage(sChildPath); } //----------------------------------------------- -css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const ::rtl::OUString& sChildPath) +css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const OUString& sChildPath) { // normed path = "a/b/c/" ... we search for "a/b/" - ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sChildPath); + OUString sNormedPath = StorageHolder::impl_st_normPath(sChildPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); sal_Int32 c = lFolders.size(); @@ -433,7 +433,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons return m_xRoot; // c) - ::rtl::OUString sParentPath; + OUString sParentPath; sal_Int32 i = 0; for (i=0; i<c-1; ++i) { @@ -468,7 +468,7 @@ void StorageHolder::operator=(const StorageHolder& rCopy) //----------------------------------------------- css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , - const ::rtl::OUString& sSubStorage , + const OUString& sSubStorage , sal_Int32 eOpenMode , sal_Bool bAllowFallback) { @@ -508,7 +508,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal //----------------------------------------------- css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , - const ::rtl::OUString& sSubStream , + const OUString& sSubStream , sal_Int32 eOpenMode , sal_Bool bAllowFallback) { @@ -547,11 +547,11 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback } //----------------------------------------------- -::rtl::OUString StorageHolder::impl_st_normPath(const ::rtl::OUString& sPath) +OUString StorageHolder::impl_st_normPath(const OUString& sPath) { // path must start without "/" but end with "/"! - ::rtl::OUString sNormedPath = sPath; + OUString sNormedPath = sPath; // "/bla" => "bla" && "/" => "" (!) if (sNormedPath.indexOf(PATH_SEPERATOR) == 0) @@ -559,7 +559,7 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback // "/" => "" || "" => "" ? if (sNormedPath.isEmpty()) - return ::rtl::OUString(); + return OUString(); // "bla" => "bla/" if (sNormedPath.lastIndexOf(PATH_SEPERATOR) != (sNormedPath.getLength()-1)) @@ -569,13 +569,13 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback } //----------------------------------------------- -OUStringList StorageHolder::impl_st_parsePath(const ::rtl::OUString& sPath) +OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath) { OUStringList lToken; sal_Int32 i = 0; while (true) { - ::rtl::OUString sToken = sPath.getToken(0, PATH_SEPERATOR_UNICODE, i); + OUString sToken = sPath.getToken(0, PATH_SEPERATOR_UNICODE, i); if (i < 0) break; lToken.push_back(sToken); diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx index 74c31dc93fbe..66e272b18bef 100644 --- a/framework/source/classes/droptargetlistener.cxx +++ b/framework/source/classes/droptargetlistener.cxx @@ -198,7 +198,7 @@ sal_Bool DropTargetListener::implts_IsDropFormatSupported( SotFormatStringId nFo void DropTargetListener::implts_OpenFile( const String& rFilePath ) { - rtl::OUString aFileURL; + OUString aFileURL; if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFilePath, aFileURL ) ) aFileURL = rFilePath; diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index 78a9c1783d54..9ca00ea7ae44 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -287,7 +287,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::getActive() const @threadsafe yes *****************************************************************************************************************/ -css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens( const ::rtl::OUString& sName ) const +css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens( const OUString& sName ) const { /* SAFE { */ ReadGuard aReadLock( m_aLock ); @@ -325,7 +325,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens( @threadsafe yes *****************************************************************************************************************/ -css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnDirectChildrens( const ::rtl::OUString& sName ) const +css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnDirectChildrens( const OUString& sName ) const { /* SAFE { */ ReadGuard aReadLock( m_aLock ); diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index a9b2aaa6d6ab..5ca707a083b0 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -70,7 +70,7 @@ void FwkTabControl::BroadcastEvent( sal_uLong nEvent ) // class FwkTabPage ------------------------------------------------ FwkTabPage::FwkTabPage( - Window* pParent, const rtl::OUString& rPageURL, + Window* pParent, const OUString& rPageURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler >& rEventHdl, const css::uno::Reference< css::awt::XContainerWindowProvider >& rProvider ) : @@ -104,7 +104,7 @@ void FwkTabPage::CreateDialog() uno::Reference< awt::XWindowPeer > xParent( VCLUnoHelper::GetInterface( this ), uno::UNO_QUERY ); m_xPage = uno::Reference < awt::XWindow >( m_xWinProvider->createContainerWindow( - m_sPageURL, rtl::OUString(), xParent, xHandler ), uno::UNO_QUERY ); + m_sPageURL, OUString(), xParent, xHandler ), uno::UNO_QUERY ); uno::Reference< awt::XControl > xPageControl( m_xPage, uno::UNO_QUERY ); if ( xPageControl.is() ) @@ -118,7 +118,7 @@ void FwkTabPage::CreateDialog() } } - CallMethod( rtl::OUString(INITIALIZE_METHOD) ); + CallMethod( OUString(INITIALIZE_METHOD) ); } catch ( const lang::IllegalArgumentException& ) { @@ -132,14 +132,14 @@ void FwkTabPage::CreateDialog() // ----------------------------------------------------------------------- -sal_Bool FwkTabPage::CallMethod( const rtl::OUString& rMethod ) +sal_Bool FwkTabPage::CallMethod( const OUString& rMethod ) { sal_Bool bRet = sal_False; if ( m_xEventHdl.is() ) { try { - bRet = m_xEventHdl->callHandlerMethod( m_xPage, uno::makeAny( rMethod ), rtl::OUString(EXTERNAL_EVENT) ); + bRet = m_xEventHdl->callHandlerMethod( m_xPage, uno::makeAny( rMethod ), OUString(EXTERNAL_EVENT) ); } catch ( const uno::Exception& ) { @@ -317,7 +317,7 @@ void FwkTabWindow::RemoveEventListener( const Link& rEventListener ) FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< beans::NamedValue >& rProperties ) { - ::rtl::OUString sTitle, sToolTip, sPageURL; + OUString sTitle, sToolTip, sPageURL; uno::Reference< css::awt::XContainerWindowEventHandler > xEventHdl; uno::Reference< graphic::XGraphic > xImage; bool bDisabled = false; @@ -326,7 +326,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea for ( i = 0; i < nLen; ++i ) { beans::NamedValue aValue = rProperties[i]; - ::rtl::OUString sName = aValue.Name; + OUString sName = aValue.Name; if ( sName == "Title" ) aValue.Value >>= sTitle; diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index 1d1c8a5a169d..dbbc8d3899f5 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -58,7 +58,7 @@ TaskCreator::~TaskCreator() /*-****************************************************************************************************//** TODO document me *//*-*****************************************************************************************************/ -css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::OUString& sName , +css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUString& sName , sal_Bool bVisible ) { /* SAFE { */ @@ -68,7 +68,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl:: /* } SAFE */ css::uno::Reference< css::lang::XSingleServiceFactory > xCreator; - ::rtl::OUString sCreator = IMPLEMENTATIONNAME_FWK_TASKCREATOR; + OUString sCreator = IMPLEMENTATIONNAME_FWK_TASKCREATOR; try { @@ -102,23 +102,23 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl:: css::uno::Sequence< css::uno::Any > lArgs(5); css::beans::NamedValue aArg ; - aArg.Name = rtl::OUString(ARGUMENT_PARENTFRAME); + aArg.Name = OUString(ARGUMENT_PARENTFRAME); aArg.Value <<= css::uno::Reference< css::frame::XFrame >( css::frame::Desktop::create( comphelper::getComponentContext(xSMGR) ), css::uno::UNO_QUERY_THROW); lArgs[0] <<= aArg; - aArg.Name = rtl::OUString(ARGUMENT_CREATETOPWINDOW); + aArg.Name = OUString(ARGUMENT_CREATETOPWINDOW); aArg.Value <<= sal_True; lArgs[1] <<= aArg; - aArg.Name = rtl::OUString(ARGUMENT_MAKEVISIBLE); + aArg.Name = OUString(ARGUMENT_MAKEVISIBLE); aArg.Value <<= bVisible; lArgs[2] <<= aArg; - aArg.Name = rtl::OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE); + aArg.Name = OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE); aArg.Value <<= sal_True; lArgs[3] <<= aArg; - aArg.Name = rtl::OUString(ARGUMENT_FRAMENAME); + aArg.Name = OUString(ARGUMENT_FRAMENAME); aArg.Value <<= sName; lArgs[4] <<= aArg; diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index c4f49c570293..1fa0c575eafc 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -74,7 +74,7 @@ DEFINE_XTYPEPROVIDER_4(CloseDispatcher , //----------------------------------------------- CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sTarget) + const OUString& sTarget) : ThreadHelpBase (&Application::GetSolarMutex() ) , ::cppu::OWeakObject( ) , m_xSMGR (xSMGR ) @@ -128,14 +128,14 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher:: a configurable feature ... and further it does not have a valid UIName entry inside the GenericCommands.xcu ... */ css::uno::Sequence< css::frame::DispatchInformation > lViewInfos(1); - lViewInfos[0].Command = rtl::OUString(URL_CLOSEWIN); + lViewInfos[0].Command = OUString(URL_CLOSEWIN); lViewInfos[0].GroupId = css::frame::CommandGroup::VIEW; return lViewInfos; } else if (nCommandGroup == css::frame::CommandGroup::DOCUMENT) { css::uno::Sequence< css::frame::DispatchInformation > lDocInfos(1); - lDocInfos[0].Command = rtl::OUString(URL_CLOSEDOC); + lDocInfos[0].Command = OUString(URL_CLOSEDOC); lDocInfos[0].GroupId = css::frame::CommandGroup::DOCUMENT; return lDocInfos; } @@ -591,7 +591,7 @@ void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css //----------------------------------------------- css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sTarget) + const OUString& sTarget) { if (sTarget.equalsIgnoreAsciiCase("_self")) return xFrame; diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index b0c6db53d2a4..5e2435a6366e 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -143,7 +143,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide if (!xFrame.is()) return css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > >(); - CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! + CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, OUString("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! css::uno::Reference< css::uno::XInterface > xCloser(static_cast< css::frame::XDispatch* >(pCloser), css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser , css::uno::UNO_QUERY); diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 90f39948d327..10b382b64610 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -116,7 +116,7 @@ DispatchProvider::~DispatchProvider() @threadsafe yes */ css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDispatch( const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -184,7 +184,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Disp */ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDesktopDispatch( const css::uno::Reference< css::frame::XFrame > xDesktop , const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -276,7 +276,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrameDispatch( const css::uno::Reference< css::frame::XFrame > xFrame , const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -286,7 +286,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame // But they are specified to use her own fix target. Detect such URLs here and use the correct target. //----------------------------------------------------------------------------------------------------- - ::rtl::OUString sTargetName = sTargetFrameName; + OUString sTargetName = sTargetFrameName; //----------------------------------------------------------------------------------------------------- // I) handle special cases which not right for using findFrame() first @@ -576,7 +576,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt */ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreateDispatchHelper( EDispatchHelper eHelper , const css::uno::Reference< css::frame::XFrame >& xOwner , - const ::rtl::OUString& sTarget , + const OUString& sTarget , sal_Int32 nSearchFlags) { css::uno::Reference< css::frame::XDispatch > xDispatchHelper; diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index e3cacde821e7..eedfcabf26ad 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -53,7 +53,7 @@ InterceptionHelper::~InterceptionHelper() } css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryDispatch(const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName, + const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException) { @@ -127,7 +127,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css: else { aInfo.lURLPattern.realloc(1); - aInfo.lURLPattern[0] = ::rtl::OUString("*"); + aInfo.lURLPattern[0] = OUString("*"); } // SAFE { diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 4d0a12b7c85e..d84d8221629b 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -27,7 +27,7 @@ namespace framework{ LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xOwnerFrame , - const ::rtl::OUString sTargetName , + const OUString sTargetName , sal_Int32 nSearchFlags) : ThreadHelpBase( ) , m_xSMGR (xSMGR ) diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 40f6a9102360..c2c15e776fcf 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -104,7 +104,7 @@ MailToDispatcher::~MailToDispatcher() at the same implementation. */ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDispatch( const css::util::URL& aURL , - const ::rtl::OUString& /*sTarget*/ , + const OUString& /*sTarget*/ , sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -229,7 +229,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& // start mail client // Because there is no notofocation about success - we use case of // no detected exception as SUCCESS - FAILED otherwise. - xSystemShellExecute->execute( aURL.Complete, ::rtl::OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); + xSystemShellExecute->execute( aURL.Complete, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); bSuccess = sal_True; } catch (const css::lang::IllegalArgumentException&) diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 956a403327b9..6518d5fed2e4 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::util ; using namespace ::cppu ; - using ::rtl::OUString; const sal_uInt16 SLOTID_MDIWINDOWLIST = 5610; diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 27ac34dc82cb..e4951efacf19 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -139,7 +139,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL, // SAFE { ResetableGuard aLock( m_aLock ); - rtl::OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog"; + OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog"; css::uno::Sequence< css::uno::Any > lParams(1); lParams[0] <<= aURL.Main; @@ -148,7 +148,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL, xService = m_xFactory->createInstanceWithArguments( sServiceName, lParams ); css::uno::Reference< css::task::XJobExecutor > xExecuteable( xService, css::uno::UNO_QUERY ); if ( xExecuteable.is() ) - xExecuteable->trigger( rtl::OUString() ); + xExecuteable->trigger( OUString() ); if ( xListener.is() ) { @@ -192,15 +192,15 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& @onerror We return nothing. @threadsafe yes *//*-*************************************************************************************************************/ -::rtl::OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) +OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ) { // Our default is "nothing". So we can return it, if detection failed or fily type is realy unknown. - ::rtl::OUString sTypeName; + OUString sTypeName; // Analyze given descriptor to find filename or input stream or ... ::comphelper::MediaDescriptor aDescriptor( lDescriptor ); - ::rtl::OUString sURL = aDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString() ); + OUString sURL = aDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), OUString() ); long nLength = sURL.getLength(); if ( ( nLength > 4 ) && sURL.matchIgnoreAsciiCase( ".oxt", nLength-4 ) ) @@ -210,7 +210,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& // I think we can the following ones: // a) look for given extension of url to map our type decision HARD CODED!!! // b) return preferred type every time... it's easy :-) - sTypeName = ::rtl::OUString("oxt_OpenOffice_Extension"); + sTypeName = OUString("oxt_OpenOffice_Extension"); aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName; aDescriptor >> lDescriptor; } diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index ddd6c681cf39..4abf60aaf0e3 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -106,7 +106,7 @@ ServiceHandler::~ServiceHandler() at the same implementation. */ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispatch( const css::util::URL& aURL , - const ::rtl::OUString& /*sTarget*/ , + const OUString& /*sTarget*/ , sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -226,9 +226,9 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con // extract service name and may optional given parameters from given URL // and use it to create and start the component - ::rtl::OUString sServiceAndArguments = aURL.Complete.copy(PROTOCOL_LENGTH); - ::rtl::OUString sServiceName; - ::rtl::OUString sArguments ; + OUString sServiceAndArguments = aURL.Complete.copy(PROTOCOL_LENGTH); + OUString sServiceName; + OUString sArguments ; sal_Int32 nArgStart = sServiceAndArguments.indexOf('?',0); if (nArgStart!=-1) diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index d5a3d93d697a..56f87f8d498c 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -70,7 +70,7 @@ DEFINE_XTYPEPROVIDER_4(StartModuleDispatcher , //----------------------------------------------- StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame , - const ::rtl::OUString& sTarget) + const OUString& sTarget) : ThreadHelpBase (&Application::GetSolarMutex() ) , ::cppu::OWeakObject( ) , m_xContext (rxContext ) diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index b06b76498ccf..4d36a0a6ac7b 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -90,7 +90,7 @@ SystemExec::~SystemExec() //_________________________________________________________________________________________________________________ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( const css::util::URL& aURL , - const ::rtl::OUString&, + const OUString&, sal_Int32 ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -136,7 +136,7 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& impl_notifyResultListener(xListener, css::frame::DispatchResultState::FAILURE); return; } - ::rtl::OUString sSystemURLWithVariables = aURL.Complete.copy(PROTOCOL_LENGTH, c); + OUString sSystemURLWithVariables = aURL.Complete.copy(PROTOCOL_LENGTH, c); // SAFE -> ReadGuard aReadLock(m_aLock); @@ -150,11 +150,11 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& { css::uno::Reference< css::util::XStringSubstitution > xPathSubst( css::util::PathSubstitution::create(xContext) ); - ::rtl::OUString sSystemURL = xPathSubst->substituteVariables(sSystemURLWithVariables, sal_True); // sal_True force an exception if unknown variables exists ! + OUString sSystemURL = xPathSubst->substituteVariables(sSystemURLWithVariables, sal_True); // sal_True force an exception if unknown variables exists ! css::uno::Reference< css::system::XSystemShellExecute > xShell = css::system::SystemShellExecute::create( xContext ); - xShell->execute(sSystemURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY); + xShell->execute(sSystemURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY); impl_notifyResultListener(xListener, css::frame::DispatchResultState::SUCCESS); } catch(const css::uno::Exception&) diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 620f5449153a..3edef48cd889 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -125,16 +125,16 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) return 0L; const int nCommand = pData->GetDialogId(); - ::rtl::OUString sCommand; + OUString sCommand; switch (nCommand) { case SHOWDIALOG_ID_PREFERENCES : - sCommand = rtl::OUString(".uno:OptionsTreeDialog"); + sCommand = OUString(".uno:OptionsTreeDialog"); break; case SHOWDIALOG_ID_ABOUT : - sCommand = rtl::OUString(".uno:About"); + sCommand = OUString(".uno:About"); break; default : @@ -147,7 +147,7 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) } //----------------------------------------------- -void WindowCommandDispatch::impl_dispatchCommand(const ::rtl::OUString& sCommand) +void WindowCommandDispatch::impl_dispatchCommand(const OUString& sCommand) { // ignore all errors here. It's clicking a menu entry only ... // The user will try it again, in case nothing happens .-) diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index f5b6a05fec25..c291e42bc81c 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -125,7 +125,7 @@ void FrameListAnalyzer::impl_analyze() { css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); css::uno::Reference< css::frame::XModuleManager2 > xModuleMgr = css::frame::ModuleManager::create(xContext); - ::rtl::OUString sModule = xModuleMgr->identify(m_xReferenceFrame); + OUString sModule = xModuleMgr->identify(m_xReferenceFrame); m_bReferenceIsBacking = sModule.equals("com.sun.star.frame.StartModule"); } catch(const css::frame::UnknownModuleException&) @@ -200,7 +200,7 @@ void FrameListAnalyzer::impl_analyze() { css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); css::uno::Reference< css::frame::XModuleManager2 > xModuleMgr = css::frame::ModuleManager::create(xContext); - ::rtl::OUString sModule = xModuleMgr->identify(xFrame); + OUString sModule = xModuleMgr->identify(xFrame); if (sModule.equals("com.sun.star.frame.StartModule")) { m_xBackingComponent = xFrame; diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx index 73f2c3ec3b7d..9ba7fabf5a1e 100644 --- a/framework/source/fwe/classes/sfxhelperfunctions.cxx +++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx @@ -45,7 +45,7 @@ pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_se return pOldSetToolBoxControllerCreator; } -svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ) +svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ) { pfunc_setToolBoxControllerCreator pFactory = NULL; { @@ -67,7 +67,7 @@ pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfun return pOldSetStatusBarControllerCreator; } -svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL ) +svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aCommandURL ) { pfunc_setStatusBarControllerCreator pFactory = NULL; { @@ -111,7 +111,7 @@ pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingW return pOldFunc; } -void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL ) +void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rResourceURL ) { pfunc_createDockingWindow pFactory = NULL; { @@ -132,7 +132,7 @@ pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDocking return pOldFunc; } -bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL ) +bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rResourceURL ) { pfunc_isDockingWindowVisible pCall = NULL; { @@ -154,7 +154,7 @@ pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i return pOldFunc; } -void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL ) +void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ) { pfunc_activateToolPanel pActivator = NULL; { diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 2464439faafb..408464f6c43b 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -53,12 +53,12 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st // uno interface public: - virtual void SAL_CALL setFilter( const ::rtl::OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setFilter( const OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException ); // member private: - ::rtl::OUString m_sFilter; + OUString m_sFilter; }; // class ContinuationFilterSelect @@ -67,14 +67,14 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st // initialize continuation with right start values //--------------------------------------------------------------------------------------------------------- ContinuationFilterSelect::ContinuationFilterSelect() - : m_sFilter( ::rtl::OUString() ) + : m_sFilter( OUString() ) { } //--------------------------------------------------------------------------------------------------------- // handler should use it after selection to set user specified filter for transport //--------------------------------------------------------------------------------------------------------- -void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilter ) throw( css::uno::RuntimeException ) +void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException ) { m_sFilter = sFilter; } @@ -82,7 +82,7 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilte //--------------------------------------------------------------------------------------------------------- // read access to transported filter //--------------------------------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException ) +OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException ) { return m_sFilter; } @@ -90,9 +90,9 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilte class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > { public: - RequestFilterSelect_Impl( const ::rtl::OUString& sURL ); + RequestFilterSelect_Impl( const OUString& sURL ); sal_Bool isAbort () const; - ::rtl::OUString getFilter() const; + OUString getFilter() const; public: virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException ); @@ -109,9 +109,9 @@ private: // initialize instance with all necessary informations // We use it without any further checks on our member then ...! //--------------------------------------------------------------------------------------------------------- -RequestFilterSelect_Impl::RequestFilterSelect_Impl( const ::rtl::OUString& sURL ) +RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL ) { - ::rtl::OUString temp; + OUString temp; css::uno::Reference< css::uno::XInterface > temp2; css::document::NoSuchFilterRequest aFilterRequest( temp , temp2 , @@ -139,7 +139,7 @@ sal_Bool RequestFilterSelect_Impl::isAbort() const // return user selected filter // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! //--------------------------------------------------------------------------------------------------------- -::rtl::OUString RequestFilterSelect_Impl::getFilter() const +OUString RequestFilterSelect_Impl::getFilter() const { return m_pFilter->getFilter(); } @@ -165,7 +165,7 @@ css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > } -RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL ) +RequestFilterSelect::RequestFilterSelect( const OUString& sURL ) { pImp = new RequestFilterSelect_Impl( sURL ); pImp->acquire(); @@ -190,7 +190,7 @@ sal_Bool RequestFilterSelect::isAbort() const // return user selected filter // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! //--------------------------------------------------------------------------------------------------------- -::rtl::OUString RequestFilterSelect::getFilter() const +OUString RequestFilterSelect::getFilter() const { return pImp->getFilter(); } diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index cb57da289c85..08f01d366d55 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; -using ::rtl::OUString; namespace framework { diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx index 57a98f5134a8..d51650755916 100644 --- a/framework/source/fwe/helper/configimporter.cxx +++ b/framework/source/fwe/helper/configimporter.cxx @@ -44,11 +44,11 @@ sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars( { for ( sal_uInt16 i = 1; i <= 4; i++ ) { - rtl::OUStringBuffer aCustomTbxName( 20 ); + OUStringBuffer aCustomTbxName( 20 ); aCustomTbxName.appendAscii( USERDEFTOOLBOX ); aCustomTbxName[14] = aCustomTbxName[14] + i; - rtl::OUString aTbxStreamName( aCustomTbxName.makeStringAndClear() ); + OUString aTbxStreamName( aCustomTbxName.makeStringAndClear() ); uno::Reference< io::XStream > xStream = rToolbarStorage->openStreamElement( aTbxStreamName, embed::ElementModes::READ ); if ( xStream.is() ) { diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx index bdc5319ecdb9..4cff53f8ca1a 100644 --- a/framework/source/fwe/helper/imageproducer.cxx +++ b/framework/source/fwe/helper/imageproducer.cxx @@ -36,7 +36,7 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc ) Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& aURL, + const OUString& aURL, bool bBig ) { diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx index 70d9d28bda66..a93c14f4af2f 100644 --- a/framework/source/fwe/helper/propertysetcontainer.cxx +++ b/framework/source/fwe/helper/propertysetcontainer.cxx @@ -24,7 +24,6 @@ #define WRONG_TYPE_EXCEPTION "Only XPropertSet allowed!" -using ::rtl::OUString; using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::container; diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 0402a9546a90..0f0e894eb69d 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -105,7 +105,7 @@ throw ( WrappedTargetException ) PopupMenu* MenuConfiguration::CreateBookmarkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& aURL ) + const OUString& aURL ) throw ( ::com::sun::star::lang::WrappedTargetException ) { if ( aURL == BOOKMARK_NEWMENU ) diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx index 9083a877084b..87c682a1ddf6 100644 --- a/framework/source/fwi/classes/converter.cxx +++ b/framework/source/fwi/classes/converter.cxx @@ -42,7 +42,7 @@ css::uno::Sequence< css::beans::NamedValue > Converter::convert_seqPropVal2seqNa /** * converts a sequence of unicode strings into a vector of such items */ -OUStringList Converter::convert_seqOUString2OUStringList( const css::uno::Sequence< ::rtl::OUString >& lSource ) +OUStringList Converter::convert_seqOUString2OUStringList( const css::uno::Sequence< OUString >& lSource ) { OUStringList lDestination; sal_Int32 nCount = lSource.getLength(); @@ -55,9 +55,9 @@ OUStringList Converter::convert_seqOUString2OUStringList( const css::uno::Sequen return lDestination; } -::rtl::OUString Converter::convert_DateTime2ISO8601( const DateTime& aSource ) +OUString Converter::convert_DateTime2ISO8601( const DateTime& aSource ) { - ::rtl::OUStringBuffer sBuffer(25); + OUStringBuffer sBuffer(25); sal_Int32 nYear = aSource.GetYear(); sal_Int32 nMonth = aSource.GetMonth(); diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index c8bed4010278..7c23fc2b5daa 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -76,7 +76,7 @@ void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const ::rtl::OUString& sProperty) +void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::uno::Exception ) { @@ -184,7 +184,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PropertySetHelper:: } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::setPropertyValue(const ::rtl::OUString& sProperty, +void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException , @@ -250,7 +250,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const ::rtl::OUString& sProper } //----------------------------------------------------------------------------- -css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const ::rtl::OUString& sProperty) +css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , css::uno::RuntimeException ) @@ -273,7 +273,7 @@ css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const ::rtl::OUString } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::addPropertyChangeListener(const ::rtl::OUString& sProperty, +void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , @@ -295,7 +295,7 @@ void SAL_CALL PropertySetHelper::addPropertyChangeListener(const ::rtl::OUString } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::removePropertyChangeListener(const ::rtl::OUString& sProperty, +void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , @@ -317,7 +317,7 @@ void SAL_CALL PropertySetHelper::removePropertyChangeListener(const ::rtl::OUStr } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::addVetoableChangeListener(const ::rtl::OUString& sProperty, +void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , @@ -339,7 +339,7 @@ void SAL_CALL PropertySetHelper::addVetoableChangeListener(const ::rtl::OUString } //----------------------------------------------------------------------------- -void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const ::rtl::OUString& sProperty, +void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , @@ -385,7 +385,7 @@ css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProper } //----------------------------------------------------------------------------- -css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const ::rtl::OUString& sName) +css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUString& sName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException ) { @@ -403,7 +403,7 @@ css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const ::rtl:: } //----------------------------------------------------------------------------- -sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const ::rtl::OUString& sName) +sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const OUString& sName) throw(css::uno::RuntimeException) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index 22440c3690e8..9b5a4517e2cd 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -49,7 +49,7 @@ namespace framework{ @return An iterator which points to the found item inside the hash or PatternHash::end() if no pattern match this given <var>sURL</var>. */ -PatternHash::iterator PatternHash::findPatternKey( const ::rtl::OUString& sURL ) +PatternHash::iterator PatternHash::findPatternKey( const OUString& sURL ) { PatternHash::iterator pItem = this->begin(); while( pItem!=this->end() ) @@ -139,7 +139,7 @@ HandlerCache::~HandlerCache() @descr It frees all used memory. In further implementations (may if we support write access too) it's a good place to flush changes back to the configuration - but not needed yet. */ -sal_Bool HandlerCache::search( const ::rtl::OUString& sURL, ProtocolHandler* pReturn ) const +sal_Bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) const { sal_Bool bFound = sal_False; /* SAFE */{ @@ -198,10 +198,10 @@ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern) @param sPackage specifies the package name of the configuration data which should be used */ -HandlerCFGAccess::HandlerCFGAccess( const ::rtl::OUString& sPackage ) +HandlerCFGAccess::HandlerCFGAccess( const OUString& sPackage ) : ConfigItem( sPackage ) { - css::uno::Sequence< ::rtl::OUString > lListenPaths(1); + css::uno::Sequence< OUString > lListenPaths(1); lListenPaths[0] = SETNAME_HANDLER; EnableNotification(lListenPaths); } @@ -223,18 +223,18 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler , PatternHash** ppPattern ) { // list of all uno implementation names without encoding - css::uno::Sequence< ::rtl::OUString > lNames = GetNodeNames( SETNAME_HANDLER, ::utl::CONFIG_NAME_LOCAL_PATH ); + css::uno::Sequence< OUString > lNames = GetNodeNames( SETNAME_HANDLER, ::utl::CONFIG_NAME_LOCAL_PATH ); sal_Int32 nSourceCount = lNames.getLength(); sal_Int32 nTargetCount = nSourceCount; // list of all full qualified path names of configuration entries - css::uno::Sequence< ::rtl::OUString > lFullNames ( nTargetCount ); + css::uno::Sequence< OUString > lFullNames ( nTargetCount ); // expand names to full path names sal_Int32 nSource=0; sal_Int32 nTarget=0; for( nSource=0; nSource<nSourceCount; ++nSource ) { - ::rtl::OUStringBuffer sPath( SETNAME_HANDLER ); + OUStringBuffer sPath( SETNAME_HANDLER ); sPath.append(CFG_PATH_SEPERATOR); sPath.append(lNames[nSource]); sPath.append(CFG_PATH_SEPERATOR); @@ -257,7 +257,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler , aHandler.m_sUNOName = ::utl::extractFirstFromConfigurationPath(lNames[nSource]); // unpack all values of this handler - css::uno::Sequence< ::rtl::OUString > lTemp; + css::uno::Sequence< OUString > lTemp; lValues[nTarget] >>= lTemp; aHandler.m_lProtocols = Converter::convert_seqOUString2OUStringList(lTemp); @@ -276,7 +276,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler , } //_________________________________________________________________________________________________________________ -void HandlerCFGAccess::Notify(const css::uno::Sequence< rtl::OUString >& /*lPropertyNames*/) +void HandlerCFGAccess::Notify(const css::uno::Sequence< OUString >& /*lPropertyNames*/) { HandlerHash* pHandler = new HandlerHash; PatternHash* pPattern = new PatternHash; diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx index b8a43a8868fb..a9a0684796f3 100644 --- a/framework/source/fwi/helper/mischelper.cxx +++ b/framework/source/fwi/helper/mischelper.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -using ::rtl::OUString; namespace framework @@ -65,16 +64,16 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues } -::rtl::OUString RetrieveLabelFromCommand( - const ::rtl::OUString& aCmdURL, +OUString RetrieveLabelFromCommand( + const OUString& aCmdURL, const uno::Reference< uno::XComponentContext >& _xContext, uno::Reference< container::XNameAccess >& _xUICommandLabels, const uno::Reference< frame::XFrame >& _xFrame, - ::rtl::OUString& _rModuleIdentifier, + OUString& _rModuleIdentifier, sal_Bool& _rIni, const sal_Char* _pName) { - ::rtl::OUString aLabel; + OUString aLabel; // Retrieve popup menu labels if ( !_xUICommandLabels.is() ) @@ -109,7 +108,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues { if ( !aCmdURL.isEmpty() ) { - rtl::OUString aStr; + OUString aStr; Sequence< PropertyValue > aPropSeq; if( _xUICommandLabels->hasByName( aCmdURL ) ) { diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx index 07a46429474e..3bf207806758 100644 --- a/framework/source/fwi/helper/networkdomain.cxx +++ b/framework/source/fwi/helper/networkdomain.cxx @@ -38,7 +38,7 @@ static DWORD WINAPI GetUserDomainW_NT( LPWSTR lpBuffer, DWORD nSize ) return GetEnvironmentVariable( TEXT("USERDOMAIN"), lpBuffer, nSize ); } -static rtl::OUString GetUserDomain() +static OUString GetUserDomain() { sal_Unicode aBuffer[256]; DWORD nResult; @@ -46,9 +46,9 @@ static rtl::OUString GetUserDomain() nResult = GetUserDomainW_NT( reinterpret_cast<LPWSTR>(aBuffer), sizeof( aBuffer ) ); if ( nResult > 0 ) - return rtl::OUString( aBuffer ); + return OUString( aBuffer ); else - return rtl::OUString(); + return OUString(); } //_________________________________________________________________________________________________________________ @@ -58,12 +58,12 @@ static rtl::OUString GetUserDomain() namespace framework { -rtl::OUString NetworkDomain::GetYPDomainName() +OUString NetworkDomain::GetYPDomainName() { - return ::rtl::OUString(); + return OUString(); } -rtl::OUString NetworkDomain::GetNTDomainName() +OUString NetworkDomain::GetNTDomainName() { return GetUserDomain(); } @@ -188,18 +188,18 @@ static rtl_uString *getDomainName() namespace framework { -rtl::OUString NetworkDomain::GetYPDomainName() +OUString NetworkDomain::GetYPDomainName() { rtl_uString* pResult = getDomainName(); if ( pResult ) - return rtl::OUString( pResult ); + return OUString( pResult ); else - return rtl::OUString(); + return OUString(); } -rtl::OUString NetworkDomain::GetNTDomainName() +OUString NetworkDomain::GetNTDomainName() { - return ::rtl::OUString(); + return OUString(); } } @@ -213,14 +213,14 @@ rtl::OUString NetworkDomain::GetNTDomainName() namespace framework { -rtl::OUString NetworkDomain::GetYPDomainName() +OUString NetworkDomain::GetYPDomainName() { - return rtl::OUString(); + return OUString(); } -rtl::OUString NetworkDomain::GetNTDomainName() +OUString NetworkDomain::GetNTDomainName() { - return rtl::OUString(); + return OUString(); } } diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index 848c2274f440..695342d3b287 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -48,7 +48,7 @@ namespace framework{ force opening of the configuration access in readonly or in read/write mode */ ConfigAccess::ConfigAccess( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& rxContext, - /*IN*/ const ::rtl::OUString& sRoot ) + /*IN*/ const OUString& sRoot ) : ThreadHelpBase( ) , m_xContext ( rxContext) , m_sRoot ( sRoot ) diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx index 12ce3134d059..710c08bc5b74 100644 --- a/framework/source/fwi/threadhelp/lockhelper.cxx +++ b/framework/source/fwi/threadhelp/lockhelper.cxx @@ -499,8 +499,8 @@ ELockType& LockHelper::implts_getLockType() { static ELockType eType = FALLBACK_LOCKTYPE; - ::rtl::OUString aEnvVar( ENVVAR_LOCKTYPE ); - ::rtl::OUString sValue ; + OUString aEnvVar( ENVVAR_LOCKTYPE ); + OUString sValue ; if( osl_getEnvironment( aEnvVar.pData, &sValue.pData ) == osl_Process_E_None ) { eType = (ELockType)(sValue.toInt32()); diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 4ceeb870469e..a0d5acc2bc9d 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -36,7 +36,6 @@ using namespace ::cppu ; using namespace ::osl ; using namespace ::std ; -using rtl::OUString; //***************************************************************************************************************** // constructor diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 3b0d7a4e2e64..d6733eadd3c5 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -126,7 +126,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv return; // unknown module -> no configuration available! - ::rtl::OUString sModuleName = PersistentWindowState::implst_identifyModule(xContext, xFrame); + OUString sModuleName = PersistentWindowState::implst_identifyModule(xContext, xFrame); if (sModuleName.isEmpty()) return; @@ -136,7 +136,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv { if (bRestoreWindowState) { - ::rtl::OUString sWindowState = PersistentWindowState::implst_getWindowStateFromConfig(xContext, sModuleName); + OUString sWindowState = PersistentWindowState::implst_getWindowStateFromConfig(xContext, sModuleName); PersistentWindowState::implst_setWindowStateOnWindow(xWindow,sWindowState); // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -156,7 +156,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv case css::frame::FrameAction_COMPONENT_DETACHING : { - ::rtl::OUString sWindowState = PersistentWindowState::implst_getWindowStateFromWindow(xWindow); + OUString sWindowState = PersistentWindowState::implst_getWindowStateFromWindow(xWindow); PersistentWindowState::implst_setWindowStateOnConfig(xContext, sModuleName, sWindowState); } break; @@ -173,10 +173,10 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) } //***************************************************************************************************************** -::rtl::OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext, +OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame) { - ::rtl::OUString sModuleName; + OUString sModuleName; css::uno::Reference< css::frame::XModuleManager2 > xModuleManager = css::frame::ModuleManager::create( rxContext ); @@ -188,25 +188,25 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { sModuleName = ::rtl::OUString(); } + { sModuleName = OUString(); } return sModuleName; } //***************************************************************************************************************** -::rtl::OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sModuleName) +OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const OUString& sModuleName) { - ::rtl::OUString sWindowState; + OUString sWindowState; - ::rtl::OUStringBuffer sRelPathBuf(256); + OUStringBuffer sRelPathBuf(256); sRelPathBuf.appendAscii("Office/Factories/*[\""); sRelPathBuf.append (sModuleName ); sRelPathBuf.appendAscii("\"]" ); - ::rtl::OUString sPackage("org.openoffice.Setup/"); - ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear(); - ::rtl::OUString sKey("ooSetupFactoryWindowAttributes"); + OUString sPackage("org.openoffice.Setup/"); + OUString sRelPath = sRelPathBuf.makeStringAndClear(); + OUString sKey("ooSetupFactoryWindowAttributes"); try { @@ -219,24 +219,24 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { sWindowState = ::rtl::OUString(); } + { sWindowState = OUString(); } return sWindowState; } //***************************************************************************************************************** void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sModuleName , - const ::rtl::OUString& sWindowState) + const OUString& sModuleName , + const OUString& sWindowState) { - ::rtl::OUStringBuffer sRelPathBuf(256); + OUStringBuffer sRelPathBuf(256); sRelPathBuf.appendAscii("Office/Factories/*[\""); sRelPathBuf.append (sModuleName ); sRelPathBuf.appendAscii("\"]" ); - ::rtl::OUString sPackage("org.openoffice.Setup/"); - ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear(); - ::rtl::OUString sKey("ooSetupFactoryWindowAttributes"); + OUString sPackage("org.openoffice.Setup/"); + OUString sRelPath = sRelPathBuf.makeStringAndClear(); + OUString sKey("ooSetupFactoryWindowAttributes"); try { @@ -254,9 +254,9 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere } //***************************************************************************************************************** -::rtl::OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) +OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { - ::rtl::OUString sWindowState; + OUString sWindowState; if (xWindow.is()) { @@ -272,7 +272,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere { sal_uLong nMask = WINDOWSTATE_MASK_ALL; nMask &= ~(WINDOWSTATE_MASK_MINIMIZED); - sWindowState = rtl::OStringToOUString( + sWindowState = OStringToOUString( ((SystemWindow*)pWindow)->GetWindowState(nMask), RTL_TEXTENCODING_UTF8); } @@ -285,7 +285,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere //********************************************************************************************************* void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow , - const ::rtl::OUString& sWindowState) + const OUString& sWindowState) { if ( (!xWindow.is() ) || @@ -314,9 +314,9 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere if (pWorkWindow->IsMinimized()) return; - ::rtl::OUString sOldWindowState = ::rtl::OStringToOUString( pSystemWindow->GetWindowState(), RTL_TEXTENCODING_ASCII_US ); + OUString sOldWindowState = OStringToOUString( pSystemWindow->GetWindowState(), RTL_TEXTENCODING_ASCII_US ); if ( sOldWindowState != sWindowState ) - pSystemWindow->SetWindowState(rtl::OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8)); + pSystemWindow->SetWindowState(OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8)); // <- SOLAR SAFE ------------------------ } diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index 970be61f5b3d..02df7c03973c 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -55,7 +55,7 @@ StatusIndicator::~StatusIndicator() } //*********************************************** -void SAL_CALL StatusIndicator::start(const ::rtl::OUString& sText , +void SAL_CALL StatusIndicator::start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException) { @@ -104,7 +104,7 @@ void SAL_CALL StatusIndicator::reset() } //*********************************************** -void SAL_CALL StatusIndicator::setText(const ::rtl::OUString& sText) +void SAL_CALL StatusIndicator::setText(const OUString& sText) throw(css::uno::RuntimeException) { // SAFE -> diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 19347ee43177..6a103ad86a4e 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -165,7 +165,7 @@ void SAL_CALL StatusIndicatorFactory::update() //----------------------------------------------- void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatusIndicator >& xChild, - const ::rtl::OUString& sText , + const OUString& sText , sal_Int32 nRange) { // SAFE -> ---------------------------------- @@ -204,7 +204,7 @@ void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatus if (pItem != m_aStack.end()) { pItem->m_nValue = 0; - pItem->m_sText = ::rtl::OUString(); + pItem->m_sText = OUString(); } css::uno::Reference< css::task::XStatusIndicator > xActive = m_xActiveChild; @@ -237,7 +237,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn // activate next child ... or finish the progress if there is no further one. m_xActiveChild.clear(); - ::rtl::OUString sText; + OUString sText; sal_Int32 nValue = 0; IndicatorStack::reverse_iterator pNext = m_aStack.rbegin(); if (pNext != m_aStack.rend()) @@ -280,7 +280,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn //----------------------------------------------- void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, - const ::rtl::OUString& sText ) + const OUString& sText ) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -431,9 +431,9 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() bool bForceFrontAndFocus(false); ::comphelper::ConfigurationHelper::readDirectKey( comphelper::getComponentContext(xSMGR), - ::rtl::OUString("org.openoffice.Office.Common/View"), - ::rtl::OUString("NewDocumentHandling"), - ::rtl::OUString("ForceFocusAndToFront"), + OUString("org.openoffice.Office.Common/View"), + OUString("NewDocumentHandling"), + OUString("ForceFocusAndToFront"), ::comphelper::ConfigurationHelper::E_READONLY) >>= bForceFrontAndFocus; pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 ); @@ -473,7 +473,7 @@ void StatusIndicatorFactory::impl_createProgress() if (xLayoutManager.is()) { xLayoutManager->lock(); - rtl::OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE); + OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE); xLayoutManager->createElement( sPROGRESS_RESOURCE ); xLayoutManager->hideElement( sPROGRESS_RESOURCE ); @@ -520,7 +520,7 @@ void StatusIndicatorFactory::impl_showProgress() // Be sure that we have always a progress. It can be that our frame // was recycled and therefore the progress was destroyed! // CreateElement does nothing if there is already a valid progress. - rtl::OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE); + OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE); xLayoutManager->createElement( sPROGRESS_RESOURCE ); xLayoutManager->showElement( sPROGRESS_RESOURCE ); @@ -560,7 +560,7 @@ void StatusIndicatorFactory::impl_hideProgress() css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>= xLayoutManager; if (xLayoutManager.is()) - xLayoutManager->hideElement( rtl::OUString(PROGRESS_RESOURCE) ); + xLayoutManager->hideElement( OUString(PROGRESS_RESOURCE) ); } } } diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 4c2060545e2b..e8a5334ec1c0 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -158,7 +158,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr if ( ! xWindow.is() ) return; - ::rtl::OUString sApplicationID; + OUString sApplicationID; try { // SYNCHRONIZED -> @@ -170,33 +170,33 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr css::uno::Reference< css::frame::XModuleManager2 > xModuleManager = css::frame::ModuleManager::create( comphelper::getComponentContext(xSMGR) ); - rtl::OUString aModuleId = xModuleManager->identify(xFrame); - rtl::OUString sDesktopName; + OUString aModuleId = xModuleManager->identify(xFrame); + OUString sDesktopName; if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument")) || aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument")) || aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) || aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument")) ) - sDesktopName = ::rtl::OUString("writer"); + sDesktopName = OUString("writer"); else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" ) - sDesktopName = ::rtl::OUString("calc"); + sDesktopName = OUString("calc"); else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" ) - sDesktopName = ::rtl::OUString("impress"); + sDesktopName = OUString("impress"); else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" ) - sDesktopName = ::rtl::OUString("draw"); + sDesktopName = OUString("draw"); else if ( aModuleId == "com.sun.star.formula.FormulaProperties" ) - sDesktopName = ::rtl::OUString("math"); + sDesktopName = OUString("math"); else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument")) || aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")) || aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.RelationDesign")) || aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.QueryDesign")) || aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.TableDesign")) || aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DataSourceBrowser")) ) - sDesktopName = ::rtl::OUString("base"); + sDesktopName = OUString("base"); else - sDesktopName = ::rtl::OUString("startcenter"); + sDesktopName = OUString("startcenter"); sApplicationID = utl::ConfigManager::getProductName().toAsciiLowerCase(); - sApplicationID += ::rtl::OUString(sal_Unicode('-')); + sApplicationID += OUString(sal_Unicode('-')); sApplicationID += sDesktopName; } catch(const css::uno::Exception&) @@ -240,7 +240,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr rInfo.sID = xModuleManager->identify(xFrame); ::comphelper::SequenceAsHashMap lProps = xModuleManager->getByName (rInfo.sID); - rInfo.sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, ::rtl::OUString()); + rInfo.sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, OUString()); rInfo.nIcon = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_ICON , INVALID_ICON_ID ); // Note: If we could retrieve a module id ... everything is OK. @@ -344,7 +344,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra pWorkWindow->SetIcon( (sal_uInt16)nIcon ); css::uno::Reference< css::frame::XModel > xModel = xController->getModel(); - rtl::OUString aURL; + OUString aURL; if( xModel.is() ) aURL = xModel->getURL(); pWorkWindow->SetRepresentedURL( aURL ); @@ -364,7 +364,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr if ( ! xTitle.is() ) return; - const ::rtl::OUString sTitle = xTitle->getTitle (); + const OUString sTitle = xTitle->getTitle (); // VCL SYNCHRONIZED -> SolarMutexGuard aSolarGuard; diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index a819f3f91f13..a70340ad22d8 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -49,7 +49,6 @@ const char UIELEMENT_PROPNAME_RESOURCEURL[] = "ResourceURL"; const char UIELEMENT_PROPNAME_TYPE[] = "Type"; const char UIELEMENT_PROPNAME_XMENUBAR[] = "XMenuBar"; const char UIELEMENT_PROPNAME_NOCLOSE[] = "NoClose"; -using ::rtl::OUString; using namespace com::sun::star::beans; using namespace com::sun::star::uno; using namespace com::sun::star::frame; @@ -453,14 +452,14 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigE const com::sun::star::beans::Property pProperties[] = { - com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE , ::getCppuType((const Reference< ::com::sun::star::ui::XUIConfigurationManager >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((const Reference< com::sun::star::frame::XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), - com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR , ::getCppuType((const Reference< com::sun::star::awt::XMenuBar >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE , ::getCppuType((const Reference< ::com::sun::star::ui::XUIConfigurationManager >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((const Reference< com::sun::star::frame::XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR , ::getCppuType((const Reference< com::sun::star::awt::XMenuBar >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); @@ -483,7 +482,7 @@ void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAc if ( m_xConfigSource.is() && m_bPersistent ) { - ::rtl::OUString aResourceURL( m_aResourceURL ); + OUString aResourceURL( m_aResourceURL ); Reference< XUIConfigurationManager > xUICfgMgr( m_xConfigSource ); aLock.unlock(); @@ -524,7 +523,7 @@ Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (Runti return xFrame; } -::rtl::OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException) +OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException) { ResetableGuard aLock( m_aLock ); return m_aResourceURL; diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 860d5765003a..071448d37e7f 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -40,7 +40,6 @@ const char UIELEMENT_PROPNAME_FRAME[] = "Frame"; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; -using ::rtl::OUString; namespace framework { @@ -131,7 +130,7 @@ throw ( Exception, RuntimeException ) return xFrame; } -::rtl::OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException) { return m_aResourceURL; } @@ -242,9 +241,9 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIElement const com::sun::star::beans::Property pProperties[] = { - com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((Reference< XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((sal_Int16*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), - com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME , ::getCppuType((Reference< XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL , ::getCppuType((sal_Int16*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ), + com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ) }; // Use it to initialize sequence! const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT ); diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 4441ae2a9b3e..b8517a451488 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -47,7 +47,7 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMu { if (!m_xParentWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString("Cant work without a parent window!"), + OUString("Cant work without a parent window!"), static_cast< css::task::XStatusIndicator* >(this)); } @@ -57,7 +57,7 @@ VCLStatusIndicator::~VCLStatusIndicator() } //----------------------------------------------- -void SAL_CALL VCLStatusIndicator::start(const ::rtl::OUString& sText , +void SAL_CALL VCLStatusIndicator::start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException) { @@ -117,7 +117,7 @@ void SAL_CALL VCLStatusIndicator::end() { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - m_sText = ::rtl::OUString(); + m_sText = OUString(); m_nRange = 0; m_nValue = 0; aWriteLock.unlock(); @@ -139,7 +139,7 @@ void SAL_CALL VCLStatusIndicator::end() } //----------------------------------------------- -void SAL_CALL VCLStatusIndicator::setText(const ::rtl::OUString& sText) +void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) throw(css::uno::RuntimeException) { // SAFE -> ---------------------------------- diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 4e7d2c4e2e5a..dbaf0fdafc51 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -63,7 +63,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b keys -> commands */ typedef ::boost::unordered_map< css::awt::KeyEvent , - ::rtl::OUString , + OUString , KeyEventHashCode , KeyEventEqualsFunc > TKey2Commands; @@ -123,7 +123,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b sal_True if the speicfied key exists inside this container. */ virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const; - virtual sal_Bool hasCommand(const ::rtl::OUString& sCommand) const; + virtual sal_Bool hasCommand(const OUString& sCommand) const; //--------------------------------------- /** TODO document me */ @@ -140,7 +140,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b describe the command. */ virtual void setKeyCommandPair(const css::awt::KeyEvent& aKey , - const ::rtl::OUString& sCommand); + const OUString& sCommand); //--------------------------------------- /** @short returns the list of keys, which are registered @@ -152,16 +152,16 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b @return [TKeyList] the list of registered keys. Can be empty! */ - virtual TKeyList getKeysByCommand(const ::rtl::OUString& sCommand) const; + virtual TKeyList getKeysByCommand(const OUString& sCommand) const; //--------------------------------------- /** TODO */ - virtual ::rtl::OUString getCommandByKey(const css::awt::KeyEvent& aKey) const; + virtual OUString getCommandByKey(const css::awt::KeyEvent& aKey) const; //--------------------------------------- /** TODO */ virtual void removeKey(const css::awt::KeyEvent& aKey); - virtual void removeCommand(const ::rtl::OUString& sCommand); + virtual void removeCommand(const OUString& sCommand); }; } // namespace framework diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index a918a4627700..2d71deb8d92e 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -124,12 +124,12 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() throw(css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) + virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ); virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent, - const ::rtl::OUString& sCommand ) + const OUString& sCommand ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException ); @@ -137,16 +137,16 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase throw(css::container::NoSuchElementException, css::uno::RuntimeException ); - virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const ::rtl::OUString& sCommand) + virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::uno::RuntimeException ); - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList) + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , css::uno::RuntimeException ); - virtual void SAL_CALL removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand) + virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::uno::RuntimeException ); @@ -196,7 +196,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase throw(css::uno::RuntimeException); // IStorageListener - virtual void changesOccurred(const ::rtl::OUString& sPath); + virtual void changesOccurred(const OUString& sPath); //______________________________________ // helper for derived classes @@ -260,7 +260,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase Depends from the parameter bWriteable! */ css::uno::Reference< css::uno::XInterface > impl_ts_openSubStorage(const css::uno::Reference< css::embed::XStorage >& xRootStorage, - const ::rtl::OUString& sSubStorage , + const OUString& sSubStorage , sal_Bool bOutStream ); //--------------------------------------- @@ -311,8 +311,8 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase AcceleratorCache* m_pPrimaryWriteCache; AcceleratorCache* m_pSecondaryWriteCache; - ::rtl::OUString m_sGlobalOrModules; - ::rtl::OUString m_sModuleCFG; + OUString m_sGlobalOrModules; + OUString m_sModuleCFG; ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping; @@ -337,12 +337,12 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() throw(css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) + virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ); virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent, - const ::rtl::OUString& sCommand ) + const OUString& sCommand ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException ); @@ -350,16 +350,16 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase throw(css::container::NoSuchElementException, css::uno::RuntimeException ); - virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const ::rtl::OUString& sCommand) + virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::uno::RuntimeException ); - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList) + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , css::uno::RuntimeException ); - virtual void SAL_CALL removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand) + virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::uno::RuntimeException ); @@ -440,10 +440,10 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase void impl_ts_load(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg); void impl_ts_save(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg); - void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const ::rtl::OUString& sCommand, const sal_Bool bPreferred); + void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred); void removeKeyFromConfiguration(const css::awt::KeyEvent& aKeyEvent, const sal_Bool bPreferred); - void reloadChanged(const ::rtl::OUString& sPrimarySecondary, const ::rtl::OUString& sGlobalModules, const ::rtl::OUString& sModule, const ::rtl::OUString& sKey); + void reloadChanged(const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey); AcceleratorCache& impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested = sal_False); }; diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx index d92049c752c8..1068a4c53987 100644 --- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx @@ -75,7 +75,7 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration private: - ::rtl::OUString m_sLocale; + OUString m_sLocale; /** helper to listen for configuration changes without ownership cycle problems */ css::uno::Reference< css::util::XChangesListener > m_xCfgListener; diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx index e37672497bc5..a6355067185f 100644 --- a/framework/source/inc/accelerators/istoragelistener.hxx +++ b/framework/source/inc/accelerators/istoragelistener.hxx @@ -40,7 +40,7 @@ class IStorageListener //-------------------------------------- /** @short TODO */ - virtual void changesOccurred(const ::rtl::OUString& sPath) = 0; + virtual void changesOccurred(const OUString& sPath) = 0; protected: ~IStorageListener() {} diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 88122013705d..4563d60bf39a 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -60,7 +60,7 @@ class KeyMapping //--------------------------------------- /** @short hash structure to map key codes to identifier. */ typedef ::boost::unordered_map< sal_Int16 , - ::rtl::OUString , + OUString , ShortHashCode , ::std::equal_to< sal_Int16 > > Code2IdentifierHash; @@ -102,7 +102,7 @@ class KeyMapping if the given identifier does not describe a well known key code. */ - virtual sal_uInt16 mapIdentifierToCode(const ::rtl::OUString& sIdentifier) + virtual sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier) throw(css::lang::IllegalArgumentException); //---------------------------------- @@ -114,7 +114,7 @@ class KeyMapping @return The corresponding string identifier. */ - virtual ::rtl::OUString mapCodeToIdentifier(sal_uInt16 nCode); + virtual OUString mapCodeToIdentifier(sal_uInt16 nCode); //______________________________________ // helper @@ -136,7 +136,7 @@ class KeyMapping @return [boolean] sal_True if convertion was successfully. */ - sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier, + sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, sal_uInt16& rCode ); }; diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx index d7080939ef30..bd7838fdc3be 100644 --- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx @@ -51,8 +51,8 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration //---------------------------------- /** identify the application module, where this accelerator configuration cache should work on. */ - ::rtl::OUString m_sModule; - ::rtl::OUString m_sLocale; + OUString m_sModule; + OUString m_sLocale; //______________________________________ // interface diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 19853be14932..512ee8be89d7 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -56,13 +56,13 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas public: - static ::rtl::OUString PRESET_DEFAULT(); - static ::rtl::OUString TARGET_CURRENT(); + static OUString PRESET_DEFAULT(); + static OUString TARGET_CURRENT(); - static ::rtl::OUString RESOURCETYPE_MENUBAR(); - static ::rtl::OUString RESOURCETYPE_TOOLBAR(); - static ::rtl::OUString RESOURCETYPE_ACCELERATOR(); - static ::rtl::OUString RESOURCETYPE_STATUSBAR(); + static OUString RESOURCETYPE_MENUBAR(); + static OUString RESOURCETYPE_TOOLBAR(); + static OUString RESOURCETYPE_ACCELERATOR(); + static OUString RESOURCETYPE_STATUSBAR(); //------------------------------------------- // types @@ -134,7 +134,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @descr e.g. menubars, toolbars, accelerators */ - ::rtl::OUString m_sResourceType; + OUString m_sResourceType; //--------------------------------------- /** @short specify the application module for a module @@ -144,7 +144,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas "module". Further it must be a valid module identifier then ... */ - ::rtl::OUString m_sModule; + OUString m_sModule; //--------------------------------------- /** @short provides access to the: @@ -209,9 +209,9 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas //--------------------------------------- /** @short knows the relative path from the root. */ - ::rtl::OUString m_sRelPathShare; - ::rtl::OUString m_sRelPathNoLang; - ::rtl::OUString m_sRelPathUser; + OUString m_sRelPathShare; + OUString m_sRelPathNoLang; + OUString m_sRelPathUser; //------------------------------------------- // native interface @@ -322,8 +322,8 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas if the specified resource couldn't be located. */ void connectToResource( EConfigType eConfigType , - const ::rtl::OUString& sResourceType , - const ::rtl::OUString& sModule , + const OUString& sResourceType , + const OUString& sModule , const css::uno::Reference< css::embed::XStorage >& xDocumentRoot , const LanguageTag& rLanguageTag = LanguageTag(LANGUAGE_USER_PRIV_NOTRANSLATE)); @@ -348,8 +348,8 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @throw com::sun::star::io::IOException if copying failed. */ - void copyPresetToTarget(const ::rtl::OUString& sPreset, - const ::rtl::OUString& sTarget); + void copyPresetToTarget(const OUString& sPreset, + const OUString& sTarget); //--------------------------------------- /** @short open the specified preset as stream object @@ -366,7 +366,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @return The opened preset stream ... or NULL if the preset does not exists. */ - css::uno::Reference< css::io::XStream > openPreset(const ::rtl::OUString& sPreset, + css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset, sal_Bool bUseNoLangGlobal = sal_False); //--------------------------------------- @@ -388,7 +388,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @return The opened target stream ... or NULL if the target does not exists or couldnt be created as new one. */ - css::uno::Reference< css::io::XStream > openTarget(const ::rtl::OUString& sTarget , + css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget , sal_Bool bCreateIfMissing); //--------------------------------------- @@ -427,7 +427,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @return An opened storage in case method was successfully - null otherwise. */ - css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const ::rtl::OUString& sPath , + css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const OUString& sPath , sal_Int32 eMode , sal_Bool bShare); @@ -454,7 +454,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @return An iterator, which points directly into lLocalizedValue list. As a negative result the special iterator lLocalizedValues.end() will be returned. */ - ::std::vector< ::rtl::OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< ::rtl::OUString >& lLocalizedValues, + ::std::vector< OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< OUString >& lLocalizedValues, OUString& rLanguageTag , sal_Bool bAllowFallbacks ); @@ -486,7 +486,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @return An opened storage in case method was successfully - null otherwise. */ - css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(::rtl::OUString& sPath , + css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(OUString& sPath , sal_Int32 eMode , sal_Bool bShare , OUString& rLanguageTag , @@ -501,7 +501,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @return [vector< string >] a list of folder names. */ - ::std::vector< ::rtl::OUString > impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder); + ::std::vector< OUString > impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder); }; } // namespace framework diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index bfde625885c2..1c51cdf786aa 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -60,10 +60,10 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas }; /** @short TODO */ - typedef ::boost::unordered_map< ::rtl::OUString , + typedef ::boost::unordered_map< OUString , TStorageInfo , - ::rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > TPath2StorageInfo; + OUStringHash , + ::std::equal_to< OUString > > TPath2StorageInfo; //------------------------------------------- // member @@ -108,45 +108,45 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO open or get! */ - virtual css::uno::Reference< css::embed::XStorage > openPath(const ::rtl::OUString& sPath , + virtual css::uno::Reference< css::embed::XStorage > openPath(const OUString& sPath , sal_Int32 nOpenMode); //--------------------------------------- /** @short TODO */ - virtual StorageHolder::TStorageList getAllPathStorages(const ::rtl::OUString& sPath); + virtual StorageHolder::TStorageList getAllPathStorages(const OUString& sPath); //--------------------------------------- /** @short TODO */ - virtual void commitPath(const ::rtl::OUString& sPath); + virtual void commitPath(const OUString& sPath); //--------------------------------------- /** @short TODO */ - virtual void closePath(const ::rtl::OUString& sPath); + virtual void closePath(const OUString& sPath); //--------------------------------------- /** @short TODO */ - virtual void notifyPath(const ::rtl::OUString& sPath); + virtual void notifyPath(const OUString& sPath); //--------------------------------------- /** @short TODO */ virtual void addStorageListener( IStorageListener* pListener, - const ::rtl::OUString& sPath ); + const OUString& sPath ); //--------------------------------------- /** @short TODO */ virtual void removeStorageListener( IStorageListener* pListener, - const ::rtl::OUString& sPath ); + const OUString& sPath ); //--------------------------------------- /** @short TODO */ - virtual ::rtl::OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage); + virtual OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage); //--------------------------------------- /** @short TODO @@ -156,7 +156,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas //--------------------------------------- /** @short TODO */ - virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const ::rtl::OUString& sChildPath); + virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const OUString& sChildPath); //--------------------------------------- /** @short TODO @@ -188,12 +188,12 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas again. */ static css::uno::Reference< css::embed::XStorage > openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , - const ::rtl::OUString& sSubStorage , + const OUString& sSubStorage , sal_Int32 eOpenMode , sal_Bool bAllowFallback); static css::uno::Reference< css::io::XStream > openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , - const ::rtl::OUString& sSubStream , + const OUString& sSubStream , sal_Int32 eOpenMode , sal_Bool bAllowFallback); @@ -204,12 +204,12 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas //----------------------------------- /** @short TODO */ - static ::rtl::OUString impl_st_normPath(const ::rtl::OUString& sPath); + static OUString impl_st_normPath(const OUString& sPath); //----------------------------------- /** @short TODO */ - static OUStringList impl_st_parsePath(const ::rtl::OUString& sPath); + static OUStringList impl_st_parsePath(const OUString& sPath); }; } // namespace framework diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index 20c003916efe..c4f866577ccc 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -51,7 +51,7 @@ class LoadDispatcher : private ThreadHelpBase css::uno::WeakReference< css::frame::XFrame > m_xOwnerFrame; /** @short TODO document me */ - ::rtl::OUString m_sTarget; + OUString m_sTarget; /** @short TODO document me */ sal_Int32 m_nSearchFlags; @@ -85,7 +85,7 @@ class LoadDispatcher : private ThreadHelpBase */ LoadDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xOwnerFrame , - const ::rtl::OUString sTargetName , + const OUString sTargetName , sal_Int32 nSearchFlags); //_______________________________________ diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 4d561cb8ee5b..9624e9c99fa0 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -117,7 +117,7 @@ class WindowCommandDispatch : private ThreadHelpBase @param sCommand the command for dispatch */ - void impl_dispatchCommand(const ::rtl::OUString& sCommand); + void impl_dispatchCommand(const OUString& sCommand); }; // class MACDispatch diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index c76877f2d09a..a1065ce6945d 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -135,7 +135,7 @@ private: /** @short contains the name of the target, in which the specified resource of this instance must be loaded. */ - ::rtl::OUString m_sTarget; + OUString m_sTarget; /** @short if m_sTarget is not a special one, this flags regulate searching of a suitable one. @@ -218,8 +218,8 @@ public: static css::uno::Reference< css::lang::XComponent > loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >& xLoader, const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , - const ::rtl::OUString& sURL , - const ::rtl::OUString& sTarget, + const OUString& sURL , + const OUString& sTarget, sal_Int32 nFlags , const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) throw(css::lang::IllegalArgumentException, @@ -275,10 +275,10 @@ public: @throw A RuntimeException in case any internal process indicates, that the whole runtime cant be used any longer. */ - void initializeLoading(const ::rtl::OUString& sURL , + void initializeLoading(const OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor, const css::uno::Reference< css::frame::XFrame >& xBaseFrame , - const ::rtl::OUString& sTarget , + const OUString& sTarget , sal_Int32 nSearchFlags , EFeature eFeature = E_NO_FEATURE , EContentType eContentType = E_UNSUPPORTED_CONTENT); @@ -364,7 +364,7 @@ public: @return A suitable enum value, which classify the specified content. */ - static EContentType classifyContent(const ::rtl::OUString& sURL , + static EContentType classifyContent(const OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor); /** TODO document me ... */ @@ -431,7 +431,7 @@ private: @attention Internaly we update the member m_lMediaDescriptor! */ - ::rtl::OUString impl_askUserForTypeAndFilterIfAllowed() + OUString impl_askUserForTypeAndFilterIfAllowed() throw(LoadEnvException, css::uno::RuntimeException); /** @short tries to use ContentHandler objects for loading. diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index 9bd67738cd04..868944587147 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -100,7 +100,7 @@ class LoadEnvException /** @short contains a suitable message, which describes the reason for this exception. */ - ::rtl::OString m_sMessage; + OString m_sMessage; /** @short An ID, which make this exception unique among others. */ sal_Int32 m_nID; @@ -158,7 +158,7 @@ class LoadEnvException */ ~LoadEnvException() { - m_sMessage = ::rtl::OString(); + m_sMessage = OString(); m_nID = 0; m_bHandled = false; m_exOriginal.clear(); diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 539100abceef..4adea994479a 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -75,7 +75,7 @@ class TargetHelper @return It returns <TRUE/> if <var>sCheckTarget</var> represent the expected <var>eSpecialTarget</var> value; <FALSE/> otherwise. */ - static sal_Bool matchSpecialTarget(const ::rtl::OUString& sCheckTarget , + static sal_Bool matchSpecialTarget(const OUString& sCheckTarget , ESpecialTarget eSpecialTarget); //___________________________________________ @@ -99,7 +99,7 @@ class TargetHelper @param sName the new frame name, which sould be checked. */ - static sal_Bool isValidNameForFrame(const ::rtl::OUString& sName); + static sal_Bool isValidNameForFrame(const OUString& sName); }; } // namespace framework diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx index 01d97c1d5456..1e684825f30f 100644 --- a/framework/source/inc/pattern/configuration.hxx +++ b/framework/source/inc/pattern/configuration.hxx @@ -89,8 +89,8 @@ class ConfigurationHelper see enum EOpenMode for further informations. */ static css::uno::Reference< css::uno::XInterface > openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sPackage , - const ::rtl::OUString& sRelPath , + const OUString& sPackage , + const OUString& sRelPath , sal_Int32 nOpenFlags) { css::uno::Reference< css::uno::XInterface > xCFG; @@ -100,7 +100,7 @@ class ConfigurationHelper css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider = css::configuration::theDefaultProvider::get( rxContext ); - ::rtl::OUStringBuffer sPath(1024); + OUStringBuffer sPath(1024); sPath.append(sPackage ); sPath.append(static_cast<sal_Unicode>('/')); sPath.append(sRelPath ); @@ -115,13 +115,13 @@ class ConfigurationHelper css::uno::Sequence< css::uno::Any > lParams(c); css::beans::PropertyValue aParam; - aParam.Name = ::rtl::OUString("nodepath"); + aParam.Name = OUString("nodepath"); aParam.Value <<= sPath.makeStringAndClear(); lParams[0] <<= aParam; if (bAllLocales) { - aParam.Name = ::rtl::OUString("*"); + aParam.Name = OUString("*"); aParam.Value <<= sal_True; lParams[1] <<= aParam; } diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 0510b86495ea..9a4399215ae8 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -44,12 +44,12 @@ class WindowHelper public: //----------------------------------------------- -static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) +static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) { if (!xWindow.is()) - return ::rtl::OUString(); + return OUString(); - rtl::OString sWindowState; + OString sWindowState; // SOLAR SAFE -> ---------------------------- { SolarMutexGuard aSolarGuard; @@ -65,12 +65,12 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind } // <- SOLAR SAFE ---------------------------- - return rtl::OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8); + return OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8); } //----------------------------------------------- static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow , - const ::rtl::OUString& sWindowState) + const OUString& sWindowState) { if ( (!xWindow.is() ) || diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index 788476b0fddc..f099e0e94ef2 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -46,26 +46,26 @@ namespace framework{ // path to module config -static ::rtl::OUString CFG_PACKAGE_MODULES ("/org.openoffice.Setup/Office/Factories"); -static ::rtl::OUString CFG_PACKAGE_SETUP ("/org.openoffice.Setup"); -static ::rtl::OUString CFG_PACKAGE_COMMON ("/org.openoffice.Office.Common"); -static ::rtl::OUString CFG_PATH_L10N ("L10N"); -static ::rtl::OUString CFG_PATH_HELP ("Help"); -static ::rtl::OUString CFG_KEY_LOCALE ("ooLocale"); -static ::rtl::OUString CFG_KEY_HELPSYSTEM ("System"); +static OUString CFG_PACKAGE_MODULES ("/org.openoffice.Setup/Office/Factories"); +static OUString CFG_PACKAGE_SETUP ("/org.openoffice.Setup"); +static OUString CFG_PACKAGE_COMMON ("/org.openoffice.Office.Common"); +static OUString CFG_PATH_L10N ("L10N"); +static OUString CFG_PATH_HELP ("Help"); +static OUString CFG_KEY_LOCALE ("ooLocale"); +static OUString CFG_KEY_HELPSYSTEM ("System"); // props of job environment -static ::rtl::OUString PROP_ENVIRONMENT ("Environment"); -static ::rtl::OUString PROP_JOBCONFIG ("JobConfig"); -static ::rtl::OUString PROP_ENVTYPE ("EnvType"); -static ::rtl::OUString PROP_MODEL ("Model"); +static OUString PROP_ENVIRONMENT ("Environment"); +static OUString PROP_JOBCONFIG ("JobConfig"); +static OUString PROP_ENVTYPE ("EnvType"); +static OUString PROP_MODEL ("Model"); // props of module config -static ::rtl::OUString PROP_HELP_BASEURL ("ooSetupFactoryHelpBaseURL"); -static ::rtl::OUString PROP_AUTOMATIC_HELP ("ooSetupFactoryHelpOnOpen"); +static OUString PROP_HELP_BASEURL ("ooSetupFactoryHelpBaseURL"); +static OUString PROP_AUTOMATIC_HELP ("ooSetupFactoryHelpOnOpen"); // special value of job environment -static ::rtl::OUString ENVTYPE_DOCUMENTEVENT ("DOCUMENTEVENT"); +static OUString ENVTYPE_DOCUMENTEVENT ("DOCUMENTEVENT"); //----------------------------------------------- @@ -145,7 +145,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea { // Analyze the given arguments; try to locate a model there and // classify it's used application module. - ::rtl::OUString sModule = its_getModuleIdFromEnv(lArguments); + OUString sModule = its_getModuleIdFromEnv(lArguments); // Attention: We are bound to events for openeing any document inside the office. // That includes e.g. the help module itself. But we have to do nothing then! @@ -156,7 +156,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea // a) help isnt open => show default page for the detected module // b) help shows any other default page(!) => show default page for the detected module // c) help shows any other content => do nothing (user travelled to any other content and leaved the set of default pages) - ::rtl::OUString sCurrentHelpURL = its_getCurrentHelpURL(); + OUString sCurrentHelpURL = its_getCurrentHelpURL(); sal_Bool bCurrentHelpURLIsAnyDefaultURL = its_isHelpUrlADefaultOne(sCurrentHelpURL); sal_Bool bShowIt = sal_False; @@ -170,7 +170,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea if (bShowIt) { // retrieve the help URL for the detected application module - ::rtl::OUString sModuleDependendHelpURL = its_checkIfHelpEnabledAndGetURL(sModule); + OUString sModuleDependendHelpURL = its_checkIfHelpEnabledAndGetURL(sModule); if (!sModuleDependendHelpURL.isEmpty()) { // Show this help page. @@ -203,7 +203,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) } //----------------------------------------------- -::rtl::OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments) +OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments) { ::comphelper::SequenceAsHashMap lArgs (lArguments); ::comphelper::SequenceAsHashMap lEnvironment = lArgs.getUnpackedValueOrDefault(PROP_ENVIRONMENT, css::uno::Sequence< css::beans::NamedValue >()); @@ -212,13 +212,13 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) // check for right environment. // If its not a DocumentEvent, which triggered this job, // we cant work correctly! => return immediately and do nothing - ::rtl::OUString sEnvType = lEnvironment.getUnpackedValueOrDefault(PROP_ENVTYPE, ::rtl::OUString()); + OUString sEnvType = lEnvironment.getUnpackedValueOrDefault(PROP_ENVTYPE, OUString()); if (!sEnvType.equals(ENVTYPE_DOCUMENTEVENT)) - return ::rtl::OUString(); + return OUString(); css::uno::Reference< css::frame::XModel > xDoc = lEnvironment.getUnpackedValueOrDefault(PROP_MODEL, css::uno::Reference< css::frame::XModel >()); if (!xDoc.is()) - return ::rtl::OUString(); + return OUString(); // be sure that we work on top level documents only, which are registered // on the desktop instance. Ignore e.g. life previews, which are top frames too ... @@ -231,7 +231,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) if (xFrame.is() && xFrame->isTop()) xDesktopCheck = css::uno::Reference< css::frame::XDesktop >(xFrame->getCreator(), css::uno::UNO_QUERY); if (!xDesktopCheck.is()) - return ::rtl::OUString(); + return OUString(); // OK - now we are sure this document is a top level document. // Classify it. @@ -241,7 +241,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) aLock.unlock(); // <- SAFE - ::rtl::OUString sModuleId; + OUString sModuleId; try { sModuleId = xModuleManager->identify(xDoc); @@ -249,13 +249,13 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { sModuleId = ::rtl::OUString(); } + { sModuleId = OUString(); } return sModuleId; } //----------------------------------------------- -::rtl::OUString HelpOnStartup::its_getCurrentHelpURL() +OUString HelpOnStartup::its_getCurrentHelpURL() { // SAFE -> ResetableGuard aLock(m_aLock); @@ -264,13 +264,13 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) // <- SAFE if (!xDesktop.is()) - return ::rtl::OUString(); + return OUString(); css::uno::Reference< css::frame::XFrame > xHelp = xDesktop->findFrame(SPECIALTARGET_HELPTASK, css::frame::FrameSearchFlag::CHILDREN); if (!xHelp.is()) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString sCurrentHelpURL; + OUString sCurrentHelpURL; try { css::uno::Reference< css::frame::XFramesSupplier > xHelpRoot (xHelp , css::uno::UNO_QUERY_THROW); @@ -291,13 +291,13 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { sCurrentHelpURL = ::rtl::OUString(); } + { sCurrentHelpURL = OUString(); } return sCurrentHelpURL; } //----------------------------------------------- -::sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const ::rtl::OUString& sHelpURL) +::sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL) { if (sHelpURL.isEmpty()) return sal_False; @@ -305,8 +305,8 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) // SAFE -> ResetableGuard aLock(m_aLock); css::uno::Reference< css::container::XNameAccess > xConfig = m_xConfig; - ::rtl::OUString sLocale = m_sLocale; - ::rtl::OUString sSystem = m_sSystem; + OUString sLocale = m_sLocale; + OUString sSystem = m_sSystem; aLock.unlock(); // <- SAFE @@ -314,8 +314,8 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) return sal_False; // check given help url against all default ones - const css::uno::Sequence< ::rtl::OUString > lModules = xConfig->getElementNames(); - const ::rtl::OUString* pModules = lModules.getConstArray(); + const css::uno::Sequence< OUString > lModules = xConfig->getElementNames(); + const OUString* pModules = lModules.getConstArray(); ::sal_Int32 c = lModules.getLength(); ::sal_Int32 i = 0; @@ -328,9 +328,9 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) if (!xModuleConfig.is()) continue; - ::rtl::OUString sHelpBaseURL; + OUString sHelpBaseURL; xModuleConfig->getByName(PROP_HELP_BASEURL) >>= sHelpBaseURL; - ::rtl::OUString sHelpURLForModule = HelpOnStartup::ist_createHelpURL(sHelpBaseURL, sLocale, sSystem); + OUString sHelpURLForModule = HelpOnStartup::ist_createHelpURL(sHelpBaseURL, sLocale, sSystem); if (sHelpURL.equals(sHelpURLForModule)) return sal_True; } @@ -344,17 +344,17 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) } //----------------------------------------------- -::rtl::OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const ::rtl::OUString& sModule) +OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule) { // SAFE -> ResetableGuard aLock(m_aLock); css::uno::Reference< css::container::XNameAccess > xConfig = m_xConfig; - ::rtl::OUString sLocale = m_sLocale; - ::rtl::OUString sSystem = m_sSystem; + OUString sLocale = m_sLocale; + OUString sSystem = m_sSystem; aLock.unlock(); // <- SAFE - ::rtl::OUString sHelpURL; + OUString sHelpURL; try { @@ -368,7 +368,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) if (bHelpEnabled) { - ::rtl::OUString sHelpBaseURL; + OUString sHelpBaseURL; xModuleConfig->getByName(PROP_HELP_BASEURL) >>= sHelpBaseURL; sHelpURL = HelpOnStartup::ist_createHelpURL(sHelpBaseURL, sLocale, sSystem); } @@ -376,17 +376,17 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { sHelpURL = ::rtl::OUString(); } + { sHelpURL = OUString(); } return sHelpURL; } //----------------------------------------------- -::rtl::OUString HelpOnStartup::ist_createHelpURL(const ::rtl::OUString& sBaseURL, - const ::rtl::OUString& sLocale , - const ::rtl::OUString& sSystem ) +OUString HelpOnStartup::ist_createHelpURL(const OUString& sBaseURL, + const OUString& sLocale , + const OUString& sSystem ) { - ::rtl::OUStringBuffer sHelpURL(256); + OUStringBuffer sHelpURL(256); sHelpURL.append (sBaseURL ); sHelpURL.appendAscii("?Language="); sHelpURL.append (sLocale ); diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 385b2bffe8cf..6eb116a77043 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -245,7 +245,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD #if OSL_DEBUG_LEVEL > 0 catch(const css::uno::Exception& ex) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("Got exception during job execution. Original Message was:\n\""); sMsg.append (ex.Message); sMsg.appendAscii("\""); @@ -377,28 +377,28 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c // Create list of environment variables. This list must be part of the // returned structure everytimes ... but some of its members are opetional! css::uno::Sequence< css::beans::NamedValue > lEnvArgs(1); - lEnvArgs[0].Name = ::rtl::OUString::createFromAscii(JobData::PROP_ENVTYPE); + lEnvArgs[0].Name = OUString::createFromAscii(JobData::PROP_ENVTYPE); lEnvArgs[0].Value <<= m_aJobCfg.getEnvironmentDescriptor(); if (m_xFrame.is()) { sal_Int32 c = lEnvArgs.getLength(); lEnvArgs.realloc(c+1); - lEnvArgs[c].Name = ::rtl::OUString::createFromAscii(JobData::PROP_FRAME); + lEnvArgs[c].Name = OUString::createFromAscii(JobData::PROP_FRAME); lEnvArgs[c].Value <<= m_xFrame; } if (m_xModel.is()) { sal_Int32 c = lEnvArgs.getLength(); lEnvArgs.realloc(c+1); - lEnvArgs[c].Name = ::rtl::OUString::createFromAscii(JobData::PROP_MODEL); + lEnvArgs[c].Name = OUString::createFromAscii(JobData::PROP_MODEL); lEnvArgs[c].Value <<= m_xModel; } if (eMode==JobData::E_EVENT) { sal_Int32 c = lEnvArgs.getLength(); lEnvArgs.realloc(c+1); - lEnvArgs[c].Name = ::rtl::OUString::createFromAscii(JobData::PROP_EVENTNAME); + lEnvArgs[c].Name = OUString::createFromAscii(JobData::PROP_EVENTNAME); lEnvArgs[c].Value <<= m_aJobCfg.getEvent(); } @@ -421,28 +421,28 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c { sal_Int32 nLength = lAllArgs.getLength(); lAllArgs.realloc(nLength+1); - lAllArgs[nLength].Name = ::rtl::OUString::createFromAscii(JobData::PROPSET_CONFIG); + lAllArgs[nLength].Name = OUString::createFromAscii(JobData::PROPSET_CONFIG); lAllArgs[nLength].Value <<= lConfigArgs; } if (lJobConfigArgs.getLength()>0) { sal_Int32 nLength = lAllArgs.getLength(); lAllArgs.realloc(nLength+1); - lAllArgs[nLength].Name = ::rtl::OUString::createFromAscii(JobData::PROPSET_OWNCONFIG); + lAllArgs[nLength].Name = OUString::createFromAscii(JobData::PROPSET_OWNCONFIG); lAllArgs[nLength].Value <<= lJobConfigArgs; } if (lEnvArgs.getLength()>0) { sal_Int32 nLength = lAllArgs.getLength(); lAllArgs.realloc(nLength+1); - lAllArgs[nLength].Name = ::rtl::OUString::createFromAscii(JobData::PROPSET_ENVIRONMENT); + lAllArgs[nLength].Name = OUString::createFromAscii(JobData::PROPSET_ENVIRONMENT); lAllArgs[nLength].Value <<= lEnvArgs; } if (lDynamicArgs.getLength()>0) { sal_Int32 nLength = lAllArgs.getLength(); lAllArgs.realloc(nLength+1); - lAllArgs[nLength].Name = ::rtl::OUString::createFromAscii(JobData::PROPSET_DYNAMICDATA); + lAllArgs[nLength].Name = OUString::createFromAscii(JobData::PROPSET_DYNAMICDATA); lAllArgs[nLength].Value <<= lDynamicArgs; } diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 69f5daa4e728..fa1633472efd 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -145,7 +145,7 @@ JobData::~JobData() @param sAlias the alias name of this job, used to locate job properties inside cfg */ -void JobData::setAlias( const ::rtl::OUString& sAlias ) +void JobData::setAlias( const OUString& sAlias ) { /* SAFE { */ WriteGuard aWriteLock(m_aLock); @@ -158,7 +158,7 @@ void JobData::setAlias( const ::rtl::OUString& sAlias ) // try to open the configuration set of this job directly and get a property access to it // We open it readonly here - ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT)); + OUString sKey(OUString::createFromAscii(JOBCFG_ROOT)); sKey += ::utl::wrapConfigurationElementName(m_sAlias); ConfigAccess aConfig(m_xContext, sKey); @@ -175,22 +175,22 @@ void JobData::setAlias( const ::rtl::OUString& sAlias ) css::uno::Any aValue; // read uno implementation name - aValue = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_SERVICE)); + aValue = xJobProperties->getPropertyValue(OUString::createFromAscii(JOBCFG_PROP_SERVICE)); aValue >>= m_sService; // read module context list - aValue = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_CONTEXT)); + aValue = xJobProperties->getPropertyValue(OUString::createFromAscii(JOBCFG_PROP_CONTEXT)); aValue >>= m_sContext; // read whole argument list - aValue = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_ARGUMENTS)); + aValue = xJobProperties->getPropertyValue(OUString::createFromAscii(JOBCFG_PROP_ARGUMENTS)); css::uno::Reference< css::container::XNameAccess > xArgumentList; if ( (aValue >>= xArgumentList) && (xArgumentList.is() ) ) { - css::uno::Sequence< ::rtl::OUString > lArgumentNames = xArgumentList->getElementNames(); + css::uno::Sequence< OUString > lArgumentNames = xArgumentList->getElementNames(); sal_Int32 nCount = lArgumentNames.getLength(); m_lArguments.realloc(nCount); for (sal_Int32 i=0; i<nCount; ++i) @@ -215,7 +215,7 @@ void JobData::setAlias( const ::rtl::OUString& sAlias ) @param sService the uno service name of this "non configured" job */ -void JobData::setService( const ::rtl::OUString& sService ) +void JobData::setService( const OUString& sService ) { /* SAFE { */ WriteGuard aWriteLock(m_aLock); @@ -249,8 +249,8 @@ void JobData::setService( const ::rtl::OUString& sService ) @param sAlias mark the required job inside event registration list */ -void JobData::setEvent( const ::rtl::OUString& sEvent , - const ::rtl::OUString& sAlias ) +void JobData::setEvent( const OUString& sEvent , + const OUString& sAlias ) { // share code to read all job properties! setAlias(sAlias); @@ -292,7 +292,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >& // It doesn't matter if this config object was already opened before. // It doesn nothing here then ... or it change the mode automaticly, if // it was opened using another one before. - ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT)); + OUString sKey(OUString::createFromAscii(JOBCFG_ROOT)); sKey += ::utl::wrapConfigurationElementName(m_sAlias); ConfigAccess aConfig(m_xContext, sKey); @@ -304,7 +304,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >& if (xArgumentList.is()) { sal_Int32 nCount = m_lArguments.getLength(); - css::uno::Sequence< ::rtl::OUString > lNames (nCount); + css::uno::Sequence< OUString > lNames (nCount); css::uno::Sequence< css::uno::Any > lValues(nCount); for (sal_Int32 i=0; i<nCount; ++i) @@ -393,23 +393,23 @@ JobData::EEnvironment JobData::getEnvironment() const //________________________________ -::rtl::OUString JobData::getEnvironmentDescriptor() const +OUString JobData::getEnvironmentDescriptor() const { - ::rtl::OUString sDescriptor; + OUString sDescriptor; /* SAFE { */ ReadGuard aReadLock(m_aLock); switch(m_eEnvironment) { case E_EXECUTION : - sDescriptor = ::rtl::OUString("EXECUTOR"); + sDescriptor = OUString("EXECUTOR"); break; case E_DISPATCH : - sDescriptor = ::rtl::OUString("DISPATCH"); + sDescriptor = OUString("DISPATCH"); break; case E_DOCUMENTEVENT : - sDescriptor = ::rtl::OUString("DOCUMENTEVENT"); + sDescriptor = OUString("DOCUMENTEVENT"); break; default: break; @@ -420,7 +420,7 @@ JobData::EEnvironment JobData::getEnvironment() const //________________________________ -::rtl::OUString JobData::getService() const +OUString JobData::getService() const { /* SAFE { */ ReadGuard aReadLock(m_aLock); @@ -430,7 +430,7 @@ JobData::EEnvironment JobData::getEnvironment() const //________________________________ -::rtl::OUString JobData::getEvent() const +OUString JobData::getEvent() const { /* SAFE { */ ReadGuard aReadLock(m_aLock); @@ -460,15 +460,15 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const lConfig.realloc(3); sal_Int32 i = 0; - lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_ALIAS); + lConfig[i].Name = OUString::createFromAscii(PROP_ALIAS); lConfig[i].Value <<= m_sAlias; ++i; - lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_SERVICE); + lConfig[i].Name = OUString::createFromAscii(PROP_SERVICE); lConfig[i].Value <<= m_sService; ++i; - lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_CONTEXT); + lConfig[i].Name = OUString::createFromAscii(PROP_CONTEXT); lConfig[i].Value <<= m_sContext; ++i; } @@ -521,7 +521,7 @@ void JobData::disableJob() // It doesn't matter if this config object was already opened before. // It doesn nothing here then ... or it change the mode automaticly, if // it was opened using another one before. - ::rtl::OUStringBuffer sKey(256); + OUStringBuffer sKey(256); sKey.appendAscii(JobData::EVENTCFG_ROOT ); sKey.append (::utl::wrapConfigurationElementName(m_sEvent)); sKey.appendAscii(JobData::EVENTCFG_PATH_JOBLIST ); @@ -539,7 +539,7 @@ void JobData::disableJob() // Convert and write the user timestamp to the configuration. css::uno::Any aValue; aValue <<= Converter::convert_DateTime2ISO8601(DateTime( DateTime::SYSTEM)); - xPropSet->setPropertyValue(::rtl::OUString::createFromAscii(EVENTCFG_PROP_USERTIME), aValue); + xPropSet->setPropertyValue(OUString::createFromAscii(EVENTCFG_PROP_USERTIME), aValue); } aConfig.close(); @@ -551,15 +551,15 @@ void JobData::disableJob() //________________________________ /** */ -sal_Bool isEnabled( const ::rtl::OUString& sAdminTime , - const ::rtl::OUString& sUserTime ) +sal_Bool isEnabled( const OUString& sAdminTime , + const OUString& sUserTime ) { /*Attention! To prevent interpreting of TriGraphs inside next const string value, we have to encode all '?' signs. Otherwhise e.g. "??-" will be translated to "~" ... */ - static ::rtl::OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*"); + static OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*"); WildCard aISOPattern(PATTERN_ISO8601); sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime); @@ -577,10 +577,10 @@ sal_Bool isEnabled( const ::rtl::OUString& sAdminTime , /** */ void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sEvent , + const OUString& sEvent , ::comphelper::SequenceAsVector< JobData::TJob2DocEventBinding >& lJobs ) { - css::uno::Sequence< ::rtl::OUString > lAdditionalJobs = JobData::getEnabledJobsForEvent(rxContext, sEvent); + css::uno::Sequence< OUString > lAdditionalJobs = JobData::getEnabledJobsForEvent(rxContext, sEvent); sal_Int32 c = lAdditionalJobs.getLength(); sal_Int32 i = 0; @@ -594,7 +594,7 @@ void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XC //________________________________ /** */ -sal_Bool JobData::hasCorrectContext(const ::rtl::OUString& rModuleIdent) const +sal_Bool JobData::hasCorrectContext(const OUString& rModuleIdent) const { sal_Int32 nContextLen = m_sContext.getLength(); sal_Int32 nModuleIdLen = rModuleIdent.getLength(); @@ -607,7 +607,7 @@ sal_Bool JobData::hasCorrectContext(const ::rtl::OUString& rModuleIdent) const sal_Int32 nIndex = m_sContext.indexOf( rModuleIdent ); if ( nIndex >= 0 && ( nIndex+nModuleIdLen <= nContextLen )) { - ::rtl::OUString sContextModule = m_sContext.copy( nIndex, nModuleIdLen ); + OUString sContextModule = m_sContext.copy( nIndex, nModuleIdLen ); return sContextModule.equals( rModuleIdent ); } } @@ -618,49 +618,49 @@ sal_Bool JobData::hasCorrectContext(const ::rtl::OUString& rModuleIdent) const //________________________________ /** */ -css::uno::Sequence< ::rtl::OUString > JobData::getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sEvent ) +css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const OUString& sEvent ) { // these static values may perform following loop for reading time stamp values ... - static ::rtl::OUString ADMINTIME = ::rtl::OUString::createFromAscii(JobData::EVENTCFG_PROP_ADMINTIME); - static ::rtl::OUString USERTIME = ::rtl::OUString::createFromAscii(JobData::EVENTCFG_PROP_USERTIME ); - static ::rtl::OUString ROOT = ::rtl::OUString::createFromAscii(JobData::EVENTCFG_ROOT ); - static ::rtl::OUString JOBLIST = ::rtl::OUString::createFromAscii(JobData::EVENTCFG_PATH_JOBLIST ); + static OUString ADMINTIME = OUString::createFromAscii(JobData::EVENTCFG_PROP_ADMINTIME); + static OUString USERTIME = OUString::createFromAscii(JobData::EVENTCFG_PROP_USERTIME ); + static OUString ROOT = OUString::createFromAscii(JobData::EVENTCFG_ROOT ); + static OUString JOBLIST = OUString::createFromAscii(JobData::EVENTCFG_PATH_JOBLIST ); // create a config access to "/org.openoffice.Office.Jobs/Events" ConfigAccess aConfig(rxContext,ROOT); aConfig.open(ConfigAccess::E_READONLY); if (aConfig.getMode()==ConfigAccess::E_CLOSED) - return css::uno::Sequence< ::rtl::OUString >(); + return css::uno::Sequence< OUString >(); css::uno::Reference< css::container::XHierarchicalNameAccess > xEventRegistry(aConfig.cfg(), css::uno::UNO_QUERY); if (!xEventRegistry.is()) - return css::uno::Sequence< ::rtl::OUString >(); + return css::uno::Sequence< OUString >(); // check if the given event exist inside list of registered ones - ::rtl::OUString sPath(sEvent); + OUString sPath(sEvent); sPath += JOBLIST; if (!xEventRegistry->hasByHierarchicalName(sPath)) - return css::uno::Sequence< ::rtl::OUString >(); + return css::uno::Sequence< OUString >(); // step to the job list, which is a child of the event node inside cfg // e.g. "/org.openoffice.Office.Jobs/Events/<event name>/JobList" css::uno::Any aJobList = xEventRegistry->getByHierarchicalName(sPath); css::uno::Reference< css::container::XNameAccess > xJobList; if (!(aJobList >>= xJobList) || !xJobList.is()) - return css::uno::Sequence< ::rtl::OUString >(); + return css::uno::Sequence< OUString >(); // get all alias names of jobs, which are part of this job list // But Some of them can be disabled by it's time stamp values. // We create an additional job name list with the same size, then the original list ... // step over all job entries ... check her time stamps ... and put only job names to the // destination list, which represent an enabled job. - css::uno::Sequence< ::rtl::OUString > lAllJobs = xJobList->getElementNames(); - ::rtl::OUString* pAllJobs = lAllJobs.getArray(); + css::uno::Sequence< OUString > lAllJobs = xJobList->getElementNames(); + OUString* pAllJobs = lAllJobs.getArray(); sal_Int32 c = lAllJobs.getLength(); - css::uno::Sequence< ::rtl::OUString > lEnabledJobs(c); - ::rtl::OUString* pEnabledJobs = lEnabledJobs.getArray(); + css::uno::Sequence< OUString > lEnabledJobs(c); + OUString* pEnabledJobs = lEnabledJobs.getArray(); sal_Int32 d = 0; for (sal_Int32 s=0; s<c; ++s) @@ -674,10 +674,10 @@ css::uno::Sequence< ::rtl::OUString > JobData::getEnabledJobsForEvent( const css continue; } - ::rtl::OUString sAdminTime; + OUString sAdminTime; xJob->getPropertyValue(ADMINTIME) >>= sAdminTime; - ::rtl::OUString sUserTime; + OUString sUserTime; xJob->getPropertyValue(USERTIME) >>= sUserTime; if (!isEnabled(sAdminTime, sUserTime)) @@ -711,10 +711,10 @@ void JobData::impl_reset() WriteGuard aWriteLock(m_aLock); m_eMode = E_UNKNOWN_MODE; m_eEnvironment = E_UNKNOWN_ENVIRONMENT; - m_sAlias = ::rtl::OUString(); - m_sService = ::rtl::OUString(); - m_sContext = ::rtl::OUString(); - m_sEvent = ::rtl::OUString(); + m_sAlias = OUString(); + m_sService = OUString(); + m_sContext = OUString(); + m_sEvent = OUString(); m_lArguments = css::uno::Sequence< css::beans::NamedValue >(); aWriteLock.unlock(); /* } SAFE */ diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index 74ad02581f11..90d3dc257834 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -154,7 +154,7 @@ void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any > Can be SELF or CREATE only and are set only if sTargetFrameName isn't a special target */ css::uno::Reference< css::frame::XDispatch > SAL_CALL JobDispatch::queryDispatch( /*IN*/ const css::util::URL& aURL , - /*IN*/ const ::rtl::OUString& /*sTargetFrameName*/ , + /*IN*/ const OUString& /*sTargetFrameName*/ , /*IN*/ sal_Int32 /*nSearchFlags*/ ) throw(css::uno::RuntimeException) { css::uno::Reference< css::frame::XDispatch > xDispatch; @@ -224,7 +224,7 @@ void SAL_CALL JobDispatch::dispatchWithNotification( /*IN*/ const css::util::URL JobURL aAnalyzedURL(aURL.Complete); if (aAnalyzedURL.isValid()) { - ::rtl::OUString sRequest; + OUString sRequest; if (aAnalyzedURL.getEvent(sRequest)) impl_dispatchEvent(sRequest, lArgs, xListener); else @@ -253,7 +253,7 @@ void SAL_CALL JobDispatch::dispatchWithNotification( /*IN*/ const css::util::URL @param xListener an interested listener for possible results of this operation */ -void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString& sEvent , +void JobDispatch::impl_dispatchEvent( /*IN*/ const OUString& sEvent , /*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs , /*IN*/ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) { @@ -262,7 +262,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString& // filter disabled jobs using it's time stamp values. /* SAFE { */ ReadGuard aReadLock(m_aLock); - css::uno::Sequence< ::rtl::OUString > lJobs = JobData::getEnabledJobsForEvent(comphelper::getComponentContext(m_xSMGR), sEvent); + css::uno::Sequence< OUString > lJobs = JobData::getEnabledJobsForEvent(comphelper::getComponentContext(m_xSMGR), sEvent); aReadLock.unlock(); /* } SAFE */ @@ -336,7 +336,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString& @param xListener an interested listener for possible results of this operation */ -void JobDispatch::impl_dispatchService( /*IN*/ const ::rtl::OUString& sService , +void JobDispatch::impl_dispatchService( /*IN*/ const OUString& sService , /*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs , /*IN*/ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) { @@ -387,7 +387,7 @@ void JobDispatch::impl_dispatchService( /*IN*/ const ::rtl::OUString& @param xListener an interested listener for possible results of this operation */ -void JobDispatch::impl_dispatchAlias( /*IN*/ const ::rtl::OUString& sAlias , +void JobDispatch::impl_dispatchAlias( /*IN*/ const OUString& sAlias , /*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs , /*IN*/ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) { diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 2bfb5466b6f3..6b133a5c219d 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -117,7 +117,7 @@ JobExecutor::JobExecutor( /*IN*/ const css::uno::Reference< css::lang::XMultiSer , ::cppu::OWeakObject ( ) , m_xSMGR (xSMGR ) , m_xModuleManager ( ) - , m_aConfig (comphelper::getComponentContext(xSMGR), ::rtl::OUString::createFromAscii(JobData::EVENTCFG_ROOT) ) + , m_aConfig (comphelper::getComponentContext(xSMGR), OUString::createFromAscii(JobData::EVENTCFG_ROOT) ) { // Don't do any reference related code here! Do it inside special // impl_ method() ... see DEFINE_INIT_SERVICE() macro for further informations. @@ -141,7 +141,7 @@ JobExecutor::~JobExecutor() @param sEvent is used to locate registered jobs */ -void SAL_CALL JobExecutor::trigger( const ::rtl::OUString& sEvent ) throw(css::uno::RuntimeException) +void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::RuntimeException) { RTL_LOGFILE_CONTEXT(aLog, "fwk (as96863) JobExecutor::trigger()"); @@ -157,7 +157,7 @@ void SAL_CALL JobExecutor::trigger( const ::rtl::OUString& sEvent ) throw(css::u // get list of all enabled jobs // The called static helper methods read it from the configuration and // filter disabled jobs using it's time stamp values. - css::uno::Sequence< ::rtl::OUString > lJobs = JobData::getEnabledJobsForEvent(comphelper::getComponentContext(m_xSMGR), sEvent); + css::uno::Sequence< OUString > lJobs = JobData::getEnabledJobsForEvent(comphelper::getComponentContext(m_xSMGR), sEvent); aReadLock.unlock(); /* } SAFE */ @@ -197,8 +197,8 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent const char EVENT_ON_LOAD[] = "OnLoad"; // Doc UI event const char EVENT_ON_CREATE[] = "OnCreate"; // Doc API event const char EVENT_ON_LOAD_FINISHED[] = "OnLoadFinished"; // Doc API event - ::rtl::OUString EVENT_ON_DOCUMENT_OPENED("onDocumentOpened"); // Job UI event : OnNew or OnLoad - ::rtl::OUString EVENT_ON_DOCUMENT_ADDED("onDocumentAdded"); // Job API event : OnCreate or OnLoadFinished + OUString EVENT_ON_DOCUMENT_OPENED("onDocumentOpened"); // Job UI event : OnNew or OnLoad + OUString EVENT_ON_DOCUMENT_ADDED("onDocumentAdded"); // Job API event : OnCreate or OnLoadFinished /* SAFE { */ ReadGuard aReadLock(m_aLock); @@ -211,7 +211,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent // see using of m_lEvents.find() below ... // retrieve event context from event source - rtl::OUString aModuleIdentifier; + OUString aModuleIdentifier; try { aModuleIdentifier = m_xModuleManager->identify( aEvent.Source ); @@ -285,10 +285,10 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException) { - ::rtl::OUString sValue; + OUString sValue; if (aEvent.Accessor >>= sValue) { - ::rtl::OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue); + OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue); if (!sEvent.isEmpty()) { OUStringList::iterator pEvent = m_lEvents.find(sEvent); @@ -300,10 +300,10 @@ void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException) { - ::rtl::OUString sValue; + OUString sValue; if (aEvent.Accessor >>= sValue) { - ::rtl::OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue); + OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue); if (!sEvent.isEmpty()) { OUStringList::iterator pEvent = m_lEvents.find(sEvent); diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index 2378e539249e..94810a72db7f 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -38,7 +38,7 @@ namespace framework{ @param sURL the job URL for parsing */ -JobURL::JobURL( /*IN*/ const ::rtl::OUString& sURL ) +JobURL::JobURL( /*IN*/ const OUString& sURL ) : ThreadHelpBase( &Application::GetSolarMutex() ) { #ifdef ENABLE_COMPONENT_SELF_CHECK @@ -56,9 +56,9 @@ JobURL::JobURL( /*IN*/ const ::rtl::OUString& sURL ) do { // seperate all token of "{[event=<name>],[alias=<name>],[service=<name>]}" - ::rtl::OUString sToken = sURL.getToken(0, JOBURL_PART_SEPERATOR, t); - ::rtl::OUString sPartValue ; - ::rtl::OUString sPartArguments; + OUString sToken = sURL.getToken(0, JOBURL_PART_SEPERATOR, t); + OUString sPartValue ; + OUString sPartArguments; // check for "event=" if ( @@ -130,12 +130,12 @@ sal_Bool JobURL::isValid() const @attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>! */ -sal_Bool JobURL::getEvent( /*OUT*/ ::rtl::OUString& sEvent ) const +sal_Bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const { /* SAFE { */ ReadGuard aReadLock(m_aLock); - sEvent = ::rtl::OUString(); + sEvent = OUString(); sal_Bool bSet = ((m_eRequest & E_EVENT) == E_EVENT); if (bSet) sEvent = m_sEvent; @@ -163,12 +163,12 @@ sal_Bool JobURL::getEvent( /*OUT*/ ::rtl::OUString& sEvent ) const @attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>! */ -sal_Bool JobURL::getAlias( /*OUT*/ ::rtl::OUString& sAlias ) const +sal_Bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const { /* SAFE { */ ReadGuard aReadLock(m_aLock); - sAlias = ::rtl::OUString(); + sAlias = OUString(); sal_Bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS); if (bSet) sAlias = m_sAlias; @@ -196,12 +196,12 @@ sal_Bool JobURL::getAlias( /*OUT*/ ::rtl::OUString& sAlias ) const @attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>! */ -sal_Bool JobURL::getService( /*OUT*/ ::rtl::OUString& sService ) const +sal_Bool JobURL::getService( /*OUT*/ OUString& sService ) const { /* SAFE { */ ReadGuard aReadLock(m_aLock); - sService = ::rtl::OUString(); + sService = OUString(); sal_Bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE); if (bSet) sService = m_sService; @@ -238,11 +238,11 @@ sal_Bool JobURL::getService( /*OUT*/ ::rtl::OUString& sService ) const @return <TRUE/> if the identifier could be found and the string was splitted. <FALSE/> otherwise. */ -sal_Bool JobURL::implst_split( /*IN*/ const ::rtl::OUString& sPart , +sal_Bool JobURL::implst_split( /*IN*/ const OUString& sPart , /*IN*/ const sal_Char* pPartIdentifier , /*IN*/ sal_Int32 nPartLength , - /*OUT*/ ::rtl::OUString& rPartValue , - /*OUT*/ ::rtl::OUString& rPartArguments ) + /*OUT*/ OUString& rPartValue , + /*OUT*/ OUString& rPartArguments ) { // first search for the given identifier sal_Bool bPartFound = (sPart.matchIgnoreAsciiCaseAsciiL(pPartIdentifier,nPartLength,0)); @@ -255,9 +255,9 @@ sal_Bool JobURL::implst_split( /*IN*/ const ::rtl::OUString& sPart , // Do so - we set the return value with the whole part string. // Arguments will be set to an empty string as default. // If we detect the right sign - we split the arguments and overwrite the default. - ::rtl::OUString sValueAndArguments = sPart.copy(nPartLength); - ::rtl::OUString sValue = sValueAndArguments ; - ::rtl::OUString sArguments; + OUString sValueAndArguments = sPart.copy(nPartLength); + OUString sValue = sValueAndArguments ; + OUString sArguments; sal_Int32 nArgStart = sValueAndArguments.indexOf('?',0); if (nArgStart!=-1) @@ -365,13 +365,13 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL , /*IN*/ const sal_Char* pExpectedAliasArgs , /*IN*/ const sal_Char* pExpectedServiceArgs ) { - ::rtl::OUString sEvent ; - ::rtl::OUString sAlias ; - ::rtl::OUString sService ; - ::rtl::OUString sEventArgs ; - ::rtl::OUString sAliasArgs ; - ::rtl::OUString sServiceArgs; - ::rtl::OUString sURL (::rtl::OUString::createFromAscii(pURL)); + OUString sEvent ; + OUString sAlias ; + OUString sService ; + OUString sEventArgs ; + OUString sAliasArgs ; + OUString sServiceArgs; + OUString sURL (OUString::createFromAscii(pURL)); sal_Bool bOK = sal_True; JobURL aURL(sURL); @@ -488,7 +488,7 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL , ); } - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("\"" ); sMsg.append (sURL ); @@ -538,12 +538,12 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL , @returns The formated string representation. */ -::rtl::OUString JobURL::impldbg_toString() const +OUString JobURL::impldbg_toString() const { /* SAFE { */ ReadGuard aReadLock(m_aLock); - ::rtl::OUStringBuffer sBuffer(256); + OUStringBuffer sBuffer(256); if (m_eRequest==E_UNKNOWN) sBuffer.appendAscii("E_UNKNOWN"); @@ -569,12 +569,12 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL , //________________________________ -sal_Bool JobURL::getServiceArgs( /*OUT*/ ::rtl::OUString& sServiceArgs ) const +sal_Bool JobURL::getServiceArgs( /*OUT*/ OUString& sServiceArgs ) const { /* SAFE { */ ReadGuard aReadLock(m_aLock); - sServiceArgs = ::rtl::OUString(); + sServiceArgs = OUString(); sal_Bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE); if (bSet) sServiceArgs = m_sServiceArgs; @@ -587,12 +587,12 @@ sal_Bool JobURL::getServiceArgs( /*OUT*/ ::rtl::OUString& sServiceArgs ) const //________________________________ -sal_Bool JobURL::getEventArgs( /*OUT*/ ::rtl::OUString& sEventArgs ) const +sal_Bool JobURL::getEventArgs( /*OUT*/ OUString& sEventArgs ) const { /* SAFE { */ ReadGuard aReadLock(m_aLock); - sEventArgs = ::rtl::OUString(); + sEventArgs = OUString(); sal_Bool bSet = ((m_eRequest & E_EVENT) == E_EVENT); if (bSet) sEventArgs = m_sEventArgs; @@ -605,12 +605,12 @@ sal_Bool JobURL::getEventArgs( /*OUT*/ ::rtl::OUString& sEventArgs ) const //________________________________ -sal_Bool JobURL::getAliasArgs( /*OUT*/ ::rtl::OUString& sAliasArgs ) const +sal_Bool JobURL::getAliasArgs( /*OUT*/ OUString& sAliasArgs ) const { /* SAFE { */ ReadGuard aReadLock(m_aLock); - sAliasArgs = ::rtl::OUString(); + sAliasArgs = OUString(); sal_Bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS); if (bSet) sAliasArgs = m_sAliasArgs; diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index b4a4e1a36fce..5170af2f0cf8 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -47,19 +47,19 @@ namespace framework{ /** address job configuration inside argument set provided on method execute(). */ -static const ::rtl::OUString PROP_JOBCONFIG("JobConfig"); +static const OUString PROP_JOBCONFIG("JobConfig"); /** address job configuration property "Command". */ -static const ::rtl::OUString PROP_COMMAND("Command"); +static const OUString PROP_COMMAND("Command"); /** address job configuration property "Arguments". */ -static const ::rtl::OUString PROP_ARGUMENTS("Arguments"); +static const OUString PROP_ARGUMENTS("Arguments"); /** address job configuration property "DeactivateJobIfDone". */ -static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE("DeactivateJobIfDone"); +static const OUString PROP_DEACTIVATEJOBIFDONE("DeactivateJobIfDone"); /** address job configuration property "CheckExitCode". */ -static const ::rtl::OUString PROP_CHECKEXITCODE("CheckExitCode"); +static const OUString PROP_CHECKEXITCODE("CheckExitCode"); //----------------------------------------------- @@ -99,13 +99,13 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N ::comphelper::SequenceAsHashMap lArgs (lJobArguments); ::comphelper::SequenceAsHashMap lOwnCfg(lArgs.getUnpackedValueOrDefault(PROP_JOBCONFIG, css::uno::Sequence< css::beans::NamedValue >())); - const ::rtl::OUString sCommand = lOwnCfg.getUnpackedValueOrDefault(PROP_COMMAND , ::rtl::OUString()); - const css::uno::Sequence< ::rtl::OUString > lCommandArguments = lOwnCfg.getUnpackedValueOrDefault(PROP_ARGUMENTS , css::uno::Sequence< ::rtl::OUString >()); + const OUString sCommand = lOwnCfg.getUnpackedValueOrDefault(PROP_COMMAND , OUString()); + const css::uno::Sequence< OUString > lCommandArguments = lOwnCfg.getUnpackedValueOrDefault(PROP_ARGUMENTS , css::uno::Sequence< OUString >()); const ::sal_Bool bDeactivateJobIfDone = lOwnCfg.getUnpackedValueOrDefault(PROP_DEACTIVATEJOBIFDONE , sal_True ); const ::sal_Bool bCheckExitCode = lOwnCfg.getUnpackedValueOrDefault(PROP_CHECKEXITCODE , sal_True ); // replace all might existing place holder. - ::rtl::OUString sRealCommand = impl_substituteCommandVariables(sCommand); + OUString sRealCommand = impl_substituteCommandVariables(sCommand); // Command is required as minimum. // If it does not exists ... we cant do our job. @@ -139,7 +139,7 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation() } //----------------------------------------------- -::rtl::OUString ShellJob::impl_substituteCommandVariables(const ::rtl::OUString& sCommand) +OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand) { // SYNCHRONIZED -> ReadGuard aReadLock(m_aLock); @@ -152,19 +152,19 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation() css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::getComponentContext(xSMGR) ); css::uno::Reference< css::util::XStringSubstitution > xSubst( css::util::PathSubstitution::create(xContext) ); const ::sal_Bool bSubstRequired = sal_True; - const ::rtl::OUString sCompleteCommand = xSubst->substituteVariables(sCommand, bSubstRequired); + const OUString sCompleteCommand = xSubst->substituteVariables(sCommand, bSubstRequired); return sCompleteCommand; } catch(const css::uno::Exception&) {} - return ::rtl::OUString(); + return OUString(); } //----------------------------------------------- -::sal_Bool ShellJob::impl_execute(const ::rtl::OUString& sCommand , - const css::uno::Sequence< ::rtl::OUString >& lArguments , +::sal_Bool ShellJob::impl_execute(const OUString& sCommand , + const css::uno::Sequence< OUString >& lArguments , ::sal_Bool bCheckExitCode) { ::rtl_uString** pArgs = NULL; @@ -173,7 +173,7 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation() oslProcess hProcess(0); if (nArgs > 0) - pArgs = reinterpret_cast< ::rtl_uString** >(const_cast< ::rtl::OUString* >(lArguments.getConstArray())); + pArgs = reinterpret_cast< ::rtl_uString** >(const_cast< OUString* >(lArguments.getConstArray())); oslProcessError eError = osl_executeProcess(sCommand.pData, pArgs, nArgs, nOptions, NULL, NULL, NULL, 0, &hProcess); diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 6908369866cb..46ed6b443359 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -89,7 +89,7 @@ OUString retrieveToolbarNameFromHelpURL( Window* pWindow ) ToolBox* pToolBox = dynamic_cast<ToolBox *>( pWindow ); if ( pToolBox ) { - aToolbarName = rtl::OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 ); + aToolbarName = OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 ); sal_Int32 i = aToolbarName.lastIndexOf( ':' ); if ( !aToolbarName.isEmpty() && ( i > 0 ) && (( i + 1 ) < aToolbarName.getLength() )) aToolbarName = aToolbarName.copy( i+1 ); // Remove ".HelpId:" protocol from toolbar name diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index fa70e80eaea4..1ceb6b4eabee 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -152,7 +152,7 @@ LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceM { // Initialize statusbar member const sal_Bool bRefreshVisibility = sal_False; - m_aStatusBarElement.m_aType = rtl::OUString( "statusbar" ); + m_aStatusBarElement.m_aType = OUString( "statusbar" ); m_aStatusBarElement.m_aName = m_aStatusBarAlias; m_pToolbarManager = new ToolbarLayoutManager( comphelper::getComponentContext(xServiceManager), Reference<XUIElementFactory>(m_xUIElementFactoryManager, UNO_QUERY_THROW), this ); @@ -203,7 +203,7 @@ void LayoutManager::impl_clearUpMenuBar() { try { - xPropSet->getPropertyValue( ::rtl::OUString( "XMenuBar" )) >>= xMenuBar; + xPropSet->getPropertyValue( OUString( "XMenuBar" )) >>= xMenuBar; } catch (const beans::UnknownPropertyException&) { @@ -264,7 +264,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached ) Reference< XMultiServiceFactory > xServiceManager( m_xSMGR ); Reference< XNameAccess > xPersistentWindowStateSupplier( m_xPersistentWindowStateSupplier ); ToolbarLayoutManager* pToolbarManager( m_pToolbarManager ); - ::rtl::OUString aModuleIdentifier( m_aModuleIdentifier ); + OUString aModuleIdentifier( m_aModuleIdentifier ); bool bAutomaticToolbars( m_bAutomaticToolbars ); aReadLock.unlock(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -276,7 +276,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached ) { if ( bAttached ) { - ::rtl::OUString aOldModuleIdentifier( aModuleIdentifier ); + OUString aOldModuleIdentifier( aModuleIdentifier ); try { aModuleIdentifier = m_xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ) ); @@ -388,7 +388,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached ) xModuleCfgMgr.clear(); xDocCfgMgr.clear(); xPersistentWindowState.clear(); - aModuleIdentifier = ::rtl::OUString(); + aModuleIdentifier = OUString(); } Reference< XUIConfigurationManager > xModCfgMgr( xModuleCfgMgr, UNO_QUERY ); @@ -469,10 +469,10 @@ void LayoutManager::implts_toggleFloatingUIElementsVisibility( sal_Bool bActive pToolbarManager->setFloatingToolbarsVisibility( bActive ); } -uno::Reference< ui::XUIElement > LayoutManager::implts_findElement( const rtl::OUString& aName ) +uno::Reference< ui::XUIElement > LayoutManager::implts_findElement( const OUString& aName ) { - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; parseResourceURL( aName, aElementType, aElementName ); if ( aElementType.equalsIgnoreAsciiCase("menubar") && @@ -489,7 +489,7 @@ uno::Reference< ui::XUIElement > LayoutManager::implts_findElement( const rtl::O return uno::Reference< ui::XUIElement >(); } -sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName, UIElement& rElementData ) +sal_Bool LayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData ) { sal_Bool bGetSettingsState( sal_False ); @@ -623,7 +623,7 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName, return sal_False; } -void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, const UIElement& rElementData ) +void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UIElement& rElementData ) { WriteGuard aWriteLock( m_aLock ); Reference< XNameAccess > xPersistentWindowState( m_xPersistentWindowState ); @@ -639,7 +639,7 @@ void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, con try { // Check persistent flag of the user interface element - xPropSet->getPropertyValue( ::rtl::OUString( "Persistent" )) >>= bPersistent; + xPropSet->getPropertyValue( OUString( "Persistent" )) >>= bPersistent; } catch (const beans::UnknownPropertyException&) { @@ -714,15 +714,15 @@ void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, con return aContainerWinSize; } -Reference< XUIElement > LayoutManager::implts_createElement( const rtl::OUString& aName ) +Reference< XUIElement > LayoutManager::implts_createElement( const OUString& aName ) { Reference< ui::XUIElement > xUIElement; ReadGuard aReadLock( m_aLock ); Sequence< PropertyValue > aPropSeq( 2 ); - aPropSeq[0].Name = ::rtl::OUString( "Frame" ); + aPropSeq[0].Name = OUString( "Frame" ); aPropSeq[0].Value <<= m_xFrame; - aPropSeq[1].Name = ::rtl::OUString( "Persistent" ); + aPropSeq[1].Name = OUString( "Persistent" ); aPropSeq[1].Value <<= sal_True; try @@ -826,7 +826,7 @@ void LayoutManager::implts_destroyStatusBar() Reference< XComponent > xCompStatusBar; WriteGuard aWriteLock( m_aLock ); - m_aStatusBarElement.m_aName = rtl::OUString(); + m_aStatusBarElement.m_aName = OUString(); xCompStatusBar = Reference< XComponent >( m_aStatusBarElement.m_xUIElement, UNO_QUERY ); m_aStatusBarElement.m_xUIElement.clear(); aWriteLock.unlock(); @@ -837,7 +837,7 @@ void LayoutManager::implts_destroyStatusBar() implts_destroyProgressBar(); } -void LayoutManager::implts_createStatusBar( const rtl::OUString& aStatusBarName ) +void LayoutManager::implts_createStatusBar( const OUString& aStatusBarName ) { WriteGuard aWriteLock( m_aLock ); if ( !m_aStatusBarElement.m_xUIElement.is() ) @@ -851,7 +851,7 @@ void LayoutManager::implts_createStatusBar( const rtl::OUString& aStatusBarName implts_createProgressBar(); } -void LayoutManager::implts_readStatusBarState( const rtl::OUString& rStatusBarName ) +void LayoutManager::implts_readStatusBarState( const OUString& rStatusBarName ) { WriteGuard aWriteLock( m_aLock ); if ( !m_aStatusBarElement.m_bStateRead ) @@ -1165,7 +1165,7 @@ throw (uno::RuntimeException) if ( m_xFrame.is() && m_xContainerWindow.is() ) { - rtl::OUString aModuleIdentifier; + OUString aModuleIdentifier; Reference< XDispatchProvider > xDispatchProvider; MenuBar* pMenuBar = new MenuBar; @@ -1403,7 +1403,7 @@ void LayoutManager::implts_reparentChildWindows() aWriteLock.unlock(); } -uno::Reference< ui::XUIElement > LayoutManager::implts_createDockingWindow( const ::rtl::OUString& aElementName ) +uno::Reference< ui::XUIElement > LayoutManager::implts_createDockingWindow( const OUString& aElementName ) { Reference< XUIElement > xUIElement = implts_createElement( aElementName ); return xUIElement; @@ -1430,7 +1430,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent ) return nResult; } -void SAL_CALL LayoutManager::createElement( const ::rtl::OUString& aName ) +void SAL_CALL LayoutManager::createElement( const OUString& aName ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::createElement" ); @@ -1463,8 +1463,8 @@ throw (RuntimeException) if ( m_xContainerWindow.is() && !bPreviewFrame ) // no UI elements on preview frames { - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; parseResourceURL( aName, aElementType, aElementName ); @@ -1494,7 +1494,7 @@ throw (RuntimeException) { try { - xPropSet->getPropertyValue( ::rtl::OUString( "XMenuBar" )) >>= xMenuBar; + xPropSet->getPropertyValue( OUString( "XMenuBar" )) >>= xMenuBar; } catch (const beans::UnknownPropertyException&) { @@ -1564,7 +1564,7 @@ throw (RuntimeException) } } -void SAL_CALL LayoutManager::destroyElement( const ::rtl::OUString& aName ) +void SAL_CALL LayoutManager::destroyElement( const OUString& aName ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::destroyElement" ); @@ -1575,8 +1575,8 @@ throw (RuntimeException) bool bMustBeLayouted( sal_False ); bool bMustBeDestroyed( sal_False ); bool bNotify( sal_False ); - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; Reference< XComponent > xComponent; parseResourceURL( aName, aElementType, aElementName ); @@ -1641,19 +1641,19 @@ throw (RuntimeException) implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::makeAny( aName ) ); } -::sal_Bool SAL_CALL LayoutManager::requestElement( const ::rtl::OUString& rResourceURL ) +::sal_Bool SAL_CALL LayoutManager::requestElement( const OUString& rResourceURL ) throw (uno::RuntimeException) { bool bResult( false ); bool bNotify( false ); - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; parseResourceURL( rResourceURL, aElementType, aElementName ); WriteGuard aWriteLock( m_aLock ); - ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); + OString aResName = OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s requested.", aResName.getStr() ); if (( aElementType.equalsIgnoreAsciiCase("statusbar") && @@ -1718,7 +1718,7 @@ throw (uno::RuntimeException) return bResult; } -Reference< XUIElement > SAL_CALL LayoutManager::getElement( const ::rtl::OUString& aName ) +Reference< XUIElement > SAL_CALL LayoutManager::getElement( const OUString& aName ) throw (RuntimeException) { Reference< XUIElement > xUIElement = implts_findElement( aName ); @@ -1771,7 +1771,7 @@ throw (uno::RuntimeException) return aSeq; } -sal_Bool SAL_CALL LayoutManager::showElement( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL LayoutManager::showElement( const OUString& aName ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::showElement" ); @@ -1779,12 +1779,12 @@ throw (RuntimeException) bool bResult( false ); bool bNotify( false ); bool bMustLayout( false ); - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; parseResourceURL( aName, aElementType, aElementName ); - ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); + OString aResName = OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() ); if ( aElementType.equalsIgnoreAsciiCase("menubar") && @@ -1856,18 +1856,18 @@ throw (RuntimeException) return bResult; } -sal_Bool SAL_CALL LayoutManager::hideElement( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL LayoutManager::hideElement( const OUString& aName ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::hideElement" ); bool bNotify( false ); bool bMustLayout( false ); - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; parseResourceURL( aName, aElementType, aElementName ); - ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); + OString aResName = OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() ); if ( aElementType.equalsIgnoreAsciiCase("menubar") && @@ -1941,11 +1941,11 @@ throw (RuntimeException) return sal_False; } -sal_Bool SAL_CALL LayoutManager::dockWindow( const ::rtl::OUString& aName, DockingArea DockingArea, const awt::Point& Pos ) +sal_Bool SAL_CALL LayoutManager::dockWindow( const OUString& aName, DockingArea DockingArea, const awt::Point& Pos ) throw (RuntimeException) { - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; parseResourceURL( aName, aElementType, aElementName ); if ( aElementType.equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -1980,7 +1980,7 @@ throw (RuntimeException) return bResult; } -sal_Bool SAL_CALL LayoutManager::floatWindow( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL LayoutManager::floatWindow( const OUString& aName ) throw (RuntimeException) { bool bResult( false ); @@ -2000,7 +2000,7 @@ throw (RuntimeException) return bResult; } -::sal_Bool SAL_CALL LayoutManager::lockWindow( const ::rtl::OUString& aName ) +::sal_Bool SAL_CALL LayoutManager::lockWindow( const OUString& aName ) throw (uno::RuntimeException) { bool bResult( false ); @@ -2020,7 +2020,7 @@ throw (uno::RuntimeException) return bResult; } -::sal_Bool SAL_CALL LayoutManager::unlockWindow( const ::rtl::OUString& aName ) +::sal_Bool SAL_CALL LayoutManager::unlockWindow( const OUString& aName ) throw (uno::RuntimeException) { bool bResult( false ); @@ -2040,7 +2040,7 @@ throw (uno::RuntimeException) return bResult; } -void SAL_CALL LayoutManager::setElementSize( const ::rtl::OUString& aName, const awt::Size& aSize ) +void SAL_CALL LayoutManager::setElementSize( const OUString& aName, const awt::Size& aSize ) throw (RuntimeException) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -2058,7 +2058,7 @@ throw (RuntimeException) } } -void SAL_CALL LayoutManager::setElementPos( const ::rtl::OUString& aName, const awt::Point& aPos ) +void SAL_CALL LayoutManager::setElementPos( const OUString& aName, const awt::Point& aPos ) throw (RuntimeException) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -2076,7 +2076,7 @@ throw (RuntimeException) } } -void SAL_CALL LayoutManager::setElementPosSize( const ::rtl::OUString& aName, const awt::Point& aPos, const awt::Size& aSize ) +void SAL_CALL LayoutManager::setElementPosSize( const OUString& aName, const awt::Point& aPos, const awt::Size& aSize ) throw (RuntimeException) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -2094,11 +2094,11 @@ throw (RuntimeException) } } -sal_Bool SAL_CALL LayoutManager::isElementVisible( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL LayoutManager::isElementVisible( const OUString& aName ) throw (RuntimeException) { - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; parseResourceURL( aName, aElementType, aElementName ); if ( aElementType.equalsIgnoreAsciiCase("menubar") && @@ -2168,7 +2168,7 @@ throw (RuntimeException) return sal_False; } -sal_Bool SAL_CALL LayoutManager::isElementFloating( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL LayoutManager::isElementFloating( const OUString& aName ) throw (RuntimeException) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -2184,7 +2184,7 @@ throw (RuntimeException) return sal_False; } -sal_Bool SAL_CALL LayoutManager::isElementDocked( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL LayoutManager::isElementDocked( const OUString& aName ) throw (RuntimeException) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -2200,7 +2200,7 @@ throw (RuntimeException) return sal_False; } -::sal_Bool SAL_CALL LayoutManager::isElementLocked( const ::rtl::OUString& aName ) +::sal_Bool SAL_CALL LayoutManager::isElementLocked( const OUString& aName ) throw (uno::RuntimeException) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -2216,7 +2216,7 @@ throw (uno::RuntimeException) return sal_False; } -awt::Size SAL_CALL LayoutManager::getElementSize( const ::rtl::OUString& aName ) +awt::Size SAL_CALL LayoutManager::getElementSize( const OUString& aName ) throw (RuntimeException) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -2232,7 +2232,7 @@ throw (RuntimeException) return awt::Size(); } -awt::Point SAL_CALL LayoutManager::getElementPos( const ::rtl::OUString& aName ) +awt::Point SAL_CALL LayoutManager::getElementPos( const OUString& aName ) throw (RuntimeException) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -2259,7 +2259,7 @@ throw (RuntimeException) RTL_LOGFILE_TRACE1( "framework (cd100003) ::LayoutManager::lock lockCount=%d", nLockCount ); #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("LayoutManager::lock ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("LayoutManager::lock ")); aStr.append(reinterpret_cast<sal_Int64>(this)); aStr.append(RTL_CONSTASCII_STRINGPARAM(" - ")); aStr.append(nLockCount); @@ -2281,7 +2281,7 @@ throw (RuntimeException) RTL_LOGFILE_TRACE1( "framework (cd100003) ::LayoutManager::unlock lockCount=%d", nLockCount ); #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("LayoutManager::unlock ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("LayoutManager::unlock ")); aStr.append(reinterpret_cast<sal_Int64>(this)); aStr.append(RTL_CONSTASCII_STRINGPARAM(" - ")); aStr.append(nLockCount); @@ -2631,8 +2631,8 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose) xDispatcher->executeDispatch( xProvider, - ::rtl::OUString(".uno:CloseWin"), - ::rtl::OUString("_self"), + OUString(".uno:CloseWin"), + OUString("_self"), 0, uno::Sequence< beans::PropertyValue >()); @@ -2958,8 +2958,8 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even if ( xFrame.is() ) { - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; bool bRefreshLayout(false); parseResourceURL( Event.ResourceURL, aElementType, aElementName ); @@ -2977,7 +2977,7 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY ); if ( xElementSettings.is() ) { - ::rtl::OUString aConfigSourcePropName( "ConfigurationSource" ); + OUString aConfigSourcePropName( "ConfigurationSource" ); uno::Reference< XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY ); if ( xPropSet.is() ) { @@ -3007,8 +3007,8 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event if ( xFrame.is() ) { - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; bool bRefreshLayout(false); parseResourceURL( Event.ResourceURL, aElementType, aElementName ); @@ -3027,7 +3027,7 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event if ( xElementSettings.is() ) { bool bNoSettings( false ); - ::rtl::OUString aConfigSourcePropName( "ConfigurationSource" ); + OUString aConfigSourcePropName( "ConfigurationSource" ); Reference< XInterface > xElementCfgMgr; Reference< XPropertySet > xPropSet( xElementSettings, UNO_QUERY ); @@ -3091,8 +3091,8 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even if ( xFrame.is() ) { - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; + OUString aElementType; + OUString aElementName; bool bRefreshLayout(false); parseResourceURL( Event.ResourceURL, aElementType, aElementName ); @@ -3110,7 +3110,7 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY ); if ( xElementSettings.is() ) { - ::rtl::OUString aConfigSourcePropName( "ConfigurationSource" ); + OUString aConfigSourcePropName( "ConfigurationSource" ); Reference< XInterface > xElementCfgMgr; Reference< XPropertySet > xPropSet( xElementSettings, UNO_QUERY ); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index c1ea381619b1..9063f5be195c 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -108,13 +108,13 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a void createStaticToolbars(); void destroyToolbars(); - bool requestToolbar( const ::rtl::OUString& rResourceURL ); - bool createToolbar( const ::rtl::OUString& rResourceURL ); - bool destroyToolbar( const ::rtl::OUString& rResourceURL ); + bool requestToolbar( const OUString& rResourceURL ); + bool createToolbar( const OUString& rResourceURL ); + bool destroyToolbar( const OUString& rResourceURL ); // visibility - bool showToolbar( const ::rtl::OUString& rResourceURL ); - bool hideToolbar( const ::rtl::OUString& rResourceURL ); + bool showToolbar( const OUString& rResourceURL ); + bool hideToolbar( const OUString& rResourceURL ); void refreshToolbarsVisibility( bool bAutomaticToolbars ); void setFloatingToolbarsVisibility( bool bVisible ); @@ -122,21 +122,21 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a bool isVisible() { return m_bVisible; } // docking and further functions - bool dockToolbar( const ::rtl::OUString& rResourceURL, ::com::sun::star::ui::DockingArea eDockingArea, const ::com::sun::star::awt::Point& aPos ); + bool dockToolbar( const OUString& rResourceURL, ::com::sun::star::ui::DockingArea eDockingArea, const ::com::sun::star::awt::Point& aPos ); bool dockAllToolbars(); - bool floatToolbar( const ::rtl::OUString& rResoureURL ); - bool lockToolbar( const ::rtl::OUString& rResourceURL ); - bool unlockToolbar( const ::rtl::OUString& rResourceURL ); - void setToolbarPos( const ::rtl::OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos ); - void setToolbarSize( const ::rtl::OUString& rResourceURL, const ::com::sun::star::awt::Size& aSize ); - void setToolbarPosSize( const ::rtl::OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos, const ::com::sun::star::awt::Size& aSize ); - bool isToolbarVisible( const ::rtl::OUString& rResourceURL ); - bool isToolbarFloating( const ::rtl::OUString& rResourceURL ); - bool isToolbarDocked( const ::rtl::OUString& rResourceURL ); - bool isToolbarLocked( const ::rtl::OUString& rResourceURL ); - ::com::sun::star::awt::Point getToolbarPos( const ::rtl::OUString& rResourceURL ); - ::com::sun::star::awt::Size getToolbarSize( const ::rtl::OUString& rResourceURL ); - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > getToolbar( const ::rtl::OUString& aName ); + bool floatToolbar( const OUString& rResoureURL ); + bool lockToolbar( const OUString& rResourceURL ); + bool unlockToolbar( const OUString& rResourceURL ); + void setToolbarPos( const OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos ); + void setToolbarSize( const OUString& rResourceURL, const ::com::sun::star::awt::Size& aSize ); + void setToolbarPosSize( const OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos, const ::com::sun::star::awt::Size& aSize ); + bool isToolbarVisible( const OUString& rResourceURL ); + bool isToolbarFloating( const OUString& rResourceURL ); + bool isToolbarDocked( const OUString& rResourceURL ); + bool isToolbarLocked( const OUString& rResourceURL ); + ::com::sun::star::awt::Point getToolbarPos( const OUString& rResourceURL ); + ::com::sun::star::awt::Size getToolbarSize( const OUString& rResourceURL ); + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > getToolbar( const OUString& aName ); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > > getToolbars(); // child window notifications @@ -193,7 +193,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a { SingleRowColumnWindowData() : nVarSize( 0 ), nStaticSize( 0 ), nSpace( 0 ) {} - std::vector< rtl::OUString > aUIElementNames; + std::vector< OUString > aUIElementNames; std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aRowColumnWindows; std::vector< ::com::sun::star::awt::Rectangle > aRowColumnWindowSizes; std::vector< sal_Int32 > aRowColumnSpace; @@ -211,7 +211,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a ::Rectangle implts_calcDockingArea(); void implts_sortUIElements(); void implts_reparentToolbars(); - rtl::OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const; + OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const; void implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow ); void implts_destroyDockingAreaWindows(); @@ -232,11 +232,11 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a //--------------------------------------------------------------------------------------------------------- // lookup/container methods //--------------------------------------------------------------------------------------------------------- - UIElement implts_findToolbar( const rtl::OUString& aName ); + UIElement implts_findToolbar( const OUString& aName ); UIElement implts_findToolbar( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xToolbar ); - UIElement& impl_findToolbar( const rtl::OUString& aName ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > implts_getXWindow( const ::rtl::OUString& aName ); - Window* implts_getWindow( const ::rtl::OUString& aName ); + UIElement& impl_findToolbar( const OUString& aName ); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > implts_getXWindow( const OUString& aName ); + Window* implts_getWindow( const OUString& aName ); bool implts_insertToolbar( const UIElement& rUIElement ); void implts_setToolbar( const UIElement& rUIElement ); ::Size implts_getTopBottomDockingAreaSizes(); @@ -248,11 +248,11 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a ::Rectangle implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset ); void implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::Rectangle& rTrackingRect, const Point& rMousePos ); DockingOperation implts_determineDockingOperation( ::com::sun::star::ui::DockingArea DockingArea, const ::Rectangle& rRowColRect, const Point& rMousePos ); - ::Rectangle implts_getWindowRectFromRowColumn( ::com::sun::star::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const rtl::OUString& rExcludeElementName ); + ::Rectangle implts_getWindowRectFromRowColumn( ::com::sun::star::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const OUString& rExcludeElementName ); ::Rectangle implts_determineFrontDockingRect( ::com::sun::star::ui::DockingArea eDockingArea, sal_Int32 nRowCol, const ::Rectangle& rDockedElementRect, - const ::rtl::OUString& rMovedElementName, + const OUString& rMovedElementName, const ::Rectangle& rMovedElementRect ); ::Rectangle implts_calcTrackingAndElementRect( ::com::sun::star::ui::DockingArea eDockingArea, sal_Int32 nRowCol, @@ -273,16 +273,16 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a void implts_createCustomToolBars(); void implts_createNonContextSensitiveToolBars(); void implts_createCustomToolBars( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& aCustomTbxSeq ); - void implts_createCustomToolBar( const rtl::OUString& aTbxResName, const rtl::OUString& aTitle ); - void implts_createToolBar( const ::rtl::OUString& aName, bool& bNotify, ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& rUIElement ); - css::uno::Reference< css::ui::XUIElement > implts_createElement( const ::rtl::OUString& aName ); + void implts_createCustomToolBar( const OUString& aTbxResName, const OUString& aTitle ); + void implts_createToolBar( const OUString& aName, bool& bNotify, ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& rUIElement ); + css::uno::Reference< css::ui::XUIElement > implts_createElement( const OUString& aName ); void implts_setToolbarCreation( bool bStart = true ); bool implts_isToolbarCreationActive(); //--------------------------------------------------------------------------------------------------------- // persistence methods //--------------------------------------------------------------------------------------------------------- - sal_Bool implts_readWindowStateData( const rtl::OUString& aName, UIElement& rElementData ); + sal_Bool implts_readWindowStateData( const OUString& aName, UIElement& rElementData ); void implts_writeWindowStateData( const UIElement& rElementData ); //--------------------------------------------------------------------------------------------------------- @@ -319,11 +319,11 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a bool m_bLayoutInProgress; bool m_bToolbarCreation; - ::rtl::OUString m_aFullAddonTbxPrefix; - ::rtl::OUString m_aCustomTbxPrefix; - ::rtl::OUString m_aCustomizeCmd; - ::rtl::OUString m_aToolbarTypeString; - ::rtl::OUString m_aModuleIdentifier; + OUString m_aFullAddonTbxPrefix; + OUString m_aCustomTbxPrefix; + OUString m_aCustomizeCmd; + OUString m_aToolbarTypeString; + OUString m_aModuleIdentifier; }; } // namespace framework diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index b0275f7c0c7e..78f8f27b0848 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -144,8 +144,8 @@ LoadEnv::~LoadEnv() css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >& xLoader, const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , - const ::rtl::OUString& sURL , - const ::rtl::OUString& sTarget, + const OUString& sURL , + const OUString& sTarget, sal_Int32 nFlags , const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) throw(css::lang::IllegalArgumentException, @@ -222,10 +222,10 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const } -void LoadEnv::initializeLoading(const ::rtl::OUString& sURL , +void LoadEnv::initializeLoading(const OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor, const css::uno::Reference< css::frame::XFrame >& xBaseFrame , - const ::rtl::OUString& sTarget , + const OUString& sTarget , sal_Int32 nSearchFlags , EFeature eFeature , // => use default ... EContentType eContentType ) // => use default ... @@ -559,7 +559,7 @@ void LoadEnv::impl_setResult(sal_Bool bResult) TODO: Is it a good idea to change Sequence<> parameter to stl-adapter? -----------------------------------------------*/ -LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString& sURL , +LoadEnv::EContentType LoadEnv::classifyContent(const OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor) { //------------------------------------------- @@ -639,12 +639,12 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString& xContext->getServiceManager()->createInstanceWithContext(SERVICENAME_TYPEDETECTION, xContext), css::uno::UNO_QUERY); - ::rtl::OUString sType = xDetect->queryTypeByURL(sURL); + OUString sType = xDetect->queryTypeByURL(sURL); css::uno::Sequence< css::beans::NamedValue > lQuery(1) ; css::uno::Reference< css::container::XContainerQuery > xContainer ; css::uno::Reference< css::container::XEnumeration > xSet ; - css::uno::Sequence< ::rtl::OUString > lTypesReg(1); + css::uno::Sequence< OUString > lTypesReg(1); //------------------------------------------- @@ -661,7 +661,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString& // Because there exist some types, which are referenced by // other objects ... but not by filters nor frame loaders! - rtl::OUString sPROP_TYPES(PROP_TYPES); + OUString sPROP_TYPES(PROP_TYPES); lTypesReg[0] = sType; lQuery[0].Name = sPROP_TYPES; @@ -766,8 +766,8 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescrip void LoadEnv::impl_detectTypeAndFilter() throw(LoadEnvException, css::uno::RuntimeException) { - static ::rtl::OUString TYPEPROP_PREFERREDFILTER("PreferredFilter"); - static ::rtl::OUString FILTERPROP_FLAGS ("Flags"); + static OUString TYPEPROP_PREFERREDFILTER("PreferredFilter"); + static OUString FILTERPROP_FLAGS ("Flags"); static sal_Int32 FILTERFLAG_TEMPLATEPATH = 16; // SAFE -> @@ -782,7 +782,7 @@ void LoadEnv::impl_detectTypeAndFilter() aReadLock.unlock(); // <- SAFE - rtl::OUString sType, sFilter; + OUString sType, sFilter; if (queryOrcusTypeAndFilter(lDescriptor, sType, sFilter) && !sType.isEmpty() && !sFilter.isEmpty()) { @@ -810,7 +810,7 @@ void LoadEnv::impl_detectTypeAndFilter() m_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sType; // Is there an already detected (may be preselected) filter? // see below ... - sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), ::rtl::OUString()); + sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString()); aWriteLock.unlock(); // <- SAFE @@ -830,7 +830,7 @@ void LoadEnv::impl_detectTypeAndFilter() try { ::comphelper::SequenceAsHashMap lTypeProps(xTypeCont->getByName(sType)); - sFilter = lTypeProps.getUnpackedValueOrDefault(TYPEPROP_PREFERREDFILTER, ::rtl::OUString()); + sFilter = lTypeProps.getUnpackedValueOrDefault(TYPEPROP_PREFERREDFILTER, OUString()); if (!sFilter.isEmpty()) { // SAFE -> @@ -886,7 +886,7 @@ sal_Bool LoadEnv::impl_handleContent() ReadGuard aReadLock(m_aLock); // the type must exist inside the descriptor ... otherwise this class is implemented wrong :-) - ::rtl::OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), ::rtl::OUString()); + OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), OUString()); if (sType.isEmpty()) throw LoadEnvException(LoadEnvException::ID_INVALID_MEDIADESCRIPTOR); @@ -903,20 +903,20 @@ sal_Bool LoadEnv::impl_handleContent() // <- SAFE ----------------------------------- // query - css::uno::Sequence< ::rtl::OUString > lTypeReg(1); + css::uno::Sequence< OUString > lTypeReg(1); lTypeReg[0] = sType; css::uno::Sequence< css::beans::NamedValue > lQuery(1); - lQuery[0].Name = rtl::OUString(PROP_TYPES); + lQuery[0].Name = OUString(PROP_TYPES); lQuery[0].Value <<= lTypeReg; - ::rtl::OUString sPROP_NAME(PROP_NAME); + OUString sPROP_NAME(PROP_NAME); css::uno::Reference< css::container::XEnumeration > xSet = xQuery->createSubSetEnumerationByProperties(lQuery); while(xSet->hasMoreElements()) { ::comphelper::SequenceAsHashMap lProps (xSet->nextElement()); - ::rtl::OUString sHandler = lProps.getUnpackedValueOrDefault(sPROP_NAME, ::rtl::OUString()); + OUString sHandler = lProps.getUnpackedValueOrDefault(sPROP_NAME, OUString()); css::uno::Reference< css::frame::XNotifyingDispatch > xHandler; try @@ -961,9 +961,9 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed() { css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey( comphelper::getComponentContext(xSMGR), - ::rtl::OUString("org.openoffice.Office.Common/"), - ::rtl::OUString("Misc"), - ::rtl::OUString("MaxOpenDocuments"), + OUString("org.openoffice.Office.Common/"), + OUString("Misc"), + OUString("MaxOpenDocuments"), ::comphelper::ConfigurationHelper::E_READONLY); // NIL means: count of allowed documents = infinite ! @@ -1035,7 +1035,7 @@ sal_Bool LoadEnv::impl_loadContent() WriteGuard aWriteLock(m_aLock); // search or create right target frame - ::rtl::OUString sTarget = m_sTarget; + OUString sTarget = m_sTarget; if (TargetHelper::matchSpecialTarget(sTarget, TargetHelper::E_DEFAULT)) { m_xTargetFrame = impl_searchAlreadyLoaded(); @@ -1128,7 +1128,7 @@ sal_Bool LoadEnv::impl_loadContent() // convert media descriptor and URL to right format for later interface call! css::uno::Sequence< css::beans::PropertyValue > lDescriptor; m_lMediaDescriptor >> lDescriptor; - ::rtl::OUString sURL = m_aURL.Complete; + OUString sURL = m_aURL.Complete; // try to locate any interested frame loader css::uno::Reference< css::uno::XInterface > xLoader = impl_searchLoader(); @@ -1191,7 +1191,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader() // Otherwhise ... // We need this type information to locate an registered frame loader // Without such information we can't work! - ::rtl::OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), ::rtl::OUString()); + OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), OUString()); if (sType.isEmpty()) throw LoadEnvException(LoadEnvException::ID_INVALID_MEDIADESCRIPTOR); @@ -1202,14 +1202,14 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader() aReadLock.unlock(); // <- SAFE ----------------------------------- - css::uno::Sequence< ::rtl::OUString > lTypesReg(1); + css::uno::Sequence< OUString > lTypesReg(1); lTypesReg[0] = sType; css::uno::Sequence< css::beans::NamedValue > lQuery(1); - lQuery[0].Name = rtl::OUString(PROP_TYPES); + lQuery[0].Name = OUString(PROP_TYPES); lQuery[0].Value <<= lTypesReg; - ::rtl::OUString sPROP_NAME(PROP_NAME); + OUString sPROP_NAME(PROP_NAME); css::uno::Reference< css::container::XEnumeration > xSet = xQuery->createSubSetEnumerationByProperties(lQuery); while(xSet->hasMoreElements()) @@ -1217,7 +1217,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader() // try everyone ... // Ignore any loader, which makes trouble :-) ::comphelper::SequenceAsHashMap lLoaderProps(xSet->nextElement()); - ::rtl::OUString sLoader = lLoaderProps.getUnpackedValueOrDefault(sPROP_NAME, ::rtl::OUString()); + OUString sLoader = lLoaderProps.getUnpackedValueOrDefault(sPROP_NAME, OUString()); css::uno::Reference< css::uno::XInterface > xLoader ; try { @@ -1252,7 +1252,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x // <- SAFE css::util::URL aCmd; - aCmd.Complete = ::rtl::OUString(".uno:JumpToMark"); + aCmd.Complete = OUString(".uno:JumpToMark"); css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::getComponentContext(m_xSMGR))); xParser->parseStrict(aCmd); @@ -1262,7 +1262,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x return; ::comphelper::SequenceAsHashMap lArgs; - lArgs[::rtl::OUString("Bookmark")] <<= aURL.Mark; + lArgs[OUString("Bookmark")] <<= aURL.Mark; xDispatcher->dispatch(aCmd, lArgs.getAsConstPropertyValueList()); } @@ -1344,7 +1344,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() // don't check the complete URL here. // use its main part - ignore optional jumpmarks! - const ::rtl::OUString sURL = xModel->getURL(); + const OUString sURL = xModel->getURL(); if (!::utl::UCBContentHelper::EqualURLs( m_aURL.Main, sURL )) { xTask.clear (); @@ -1597,7 +1597,7 @@ void LoadEnv::impl_reactForLoadingState() ::comphelper::MediaDescriptor::const_iterator pFrameName = m_lMediaDescriptor.find(::comphelper::MediaDescriptor::PROP_FRAMENAME()); if (pFrameName != m_lMediaDescriptor.end()) { - ::rtl::OUString sFrameName; + OUString sFrameName; pFrameName->second >>= sFrameName; // Check the name again. e.g. "_default" isnt allowed. // On the other side "_beamer" is a valid name :-) @@ -1699,9 +1699,9 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X css::uno::Any const a = ::comphelper::ConfigurationHelper::readDirectKey( comphelper::getComponentContext(xSMGR), - ::rtl::OUString("org.openoffice.Office.Common/View"), - ::rtl::OUString("NewDocumentHandling"), - ::rtl::OUString("ForceFocusAndToFront"), + OUString("org.openoffice.Office.Common/View"), + OUString("NewDocumentHandling"), + OUString("ForceFocusAndToFront"), ::comphelper::ConfigurationHelper::E_READONLY); a >>= bForceFrontAndFocus; } @@ -1716,7 +1716,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) { - static ::rtl::OUString PACKAGE_SETUP_MODULES("/org.openoffice.Setup/Office/Factories"); + static OUString PACKAGE_SETUP_MODULES("/org.openoffice.Setup/Office/Factories"); // no window -> action not possible if (!xWindow.is()) @@ -1756,9 +1756,9 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw ReadGuard aReadLock(m_aLock); // no filter -> no module -> no persistent window state - ::rtl::OUString sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault( + OUString sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_FILTERNAME(), - ::rtl::OUString()); + OUString()); if (sFilter.isEmpty()) return; @@ -1774,7 +1774,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw xSMGR->createInstance(SERVICENAME_FILTERFACTORY), css::uno::UNO_QUERY_THROW); ::comphelper::SequenceAsHashMap lProps (xFilterCfg->getByName(sFilter)); - ::rtl::OUString sModule = lProps.getUnpackedValueOrDefault(FILTER_PROPNAME_DOCUMENTSERVICE, ::rtl::OUString()); + OUString sModule = lProps.getUnpackedValueOrDefault(FILTER_PROPNAME_DOCUMENTSERVICE, OUString()); // get access to the configuration of this office module css::uno::Reference< css::container::XNameAccess > xModuleCfg(::comphelper::ConfigurationHelper::openConfig( @@ -1786,7 +1786,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw // read window state from the configuration // and apply it on the window. // Do nothing, if no configuration entry exists! - ::rtl::OUString sWindowState ; + OUString sWindowState ; ::comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, sModule, OFFICEFACTORY_PROPNAME_WINDOWATTRIBUTES) >>= sWindowState; if (!sWindowState.isEmpty()) { @@ -1803,7 +1803,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw return; SystemWindow* pSystemWindow = (SystemWindow*)pWindowCheck; - pSystemWindow->SetWindowState(rtl::OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8)); + pSystemWindow->SetWindowState(OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8)); // <- SOLAR SAFE } } diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx index 41a064ef9375..b87ed7469bd4 100644 --- a/framework/source/loadenv/targethelper.cxx +++ b/framework/source/loadenv/targethelper.cxx @@ -21,7 +21,7 @@ namespace framework{ -sal_Bool TargetHelper::matchSpecialTarget(const ::rtl::OUString& sCheckTarget , +sal_Bool TargetHelper::matchSpecialTarget(const OUString& sCheckTarget , ESpecialTarget eSpecialTarget) { switch(eSpecialTarget) @@ -57,7 +57,7 @@ sal_Bool TargetHelper::matchSpecialTarget(const ::rtl::OUString& sCheckTarget , } } -sal_Bool TargetHelper::isValidNameForFrame(const ::rtl::OUString& sName) +sal_Bool TargetHelper::isValidNameForFrame(const OUString& sName) { // some special targets are realy special ones :-) // E.g. the are realy used to locate one frame inside the frame tree. diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 73c8d1e5af5d..02451e107f86 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -97,7 +97,7 @@ Sequence< Any > make_seq_out_of_struct( { throw RuntimeException( type.getTypeName() + - ::rtl::OUString( "is no struct or exception!" ), + OUString( "is no struct or exception!" ), Reference< XInterface >() ); } typelib_TypeDescription * pTD = 0; @@ -106,7 +106,7 @@ Sequence< Any > make_seq_out_of_struct( if (! pTD) { throw RuntimeException( - ::rtl::OUString( "cannot get type descr of type " ) + + OUString( "cannot get type descr of type " ) + type.getTypeName(), Reference< XInterface >() ); } @@ -144,7 +144,7 @@ void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css:: void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ) { - ::rtl::OUString aTarget; + OUString aTarget; com::sun::star::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, sal_False ); m_aStatements.push_back( aStatement ); @@ -154,7 +154,7 @@ void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL, void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ) { - ::rtl::OUString aTarget; + OUString aTarget; // last parameter must be set to true -> it's a comment com::sun::star::frame::DispatchStatement aStatement( aURL.Complete, aTarget, lArguments, 0, sal_True ); @@ -171,15 +171,15 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException } //************************************************************************* -::rtl::OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeException ) +OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeException ) { /* SAFE{ */ WriteGuard aWriteLock(m_aLock); if ( m_aStatements.empty() ) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUStringBuffer aScriptBuffer; + OUStringBuffer aScriptBuffer; aScriptBuffer.ensureCapacity(10000); m_nRecordingID = 1; @@ -195,13 +195,13 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException std::vector< com::sun::star::frame::DispatchStatement>::iterator p; for ( p = m_aStatements.begin(); p != m_aStatements.end(); ++p ) implts_recordMacro( p->aCommand, p->aArgs, p->bIsComment, aScriptBuffer ); - ::rtl::OUString sScript = aScriptBuffer.makeStringAndClear(); + OUString sScript = aScriptBuffer.makeStringAndClear(); return sScript; /* } */ } //************************************************************************* -void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, ::rtl::OUStringBuffer& aArgumentBuffer ) +void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBuffer& aArgumentBuffer ) { // if value == bool if (aValue.getValueTypeClass() == css::uno::TypeClass_STRUCT ) @@ -242,7 +242,7 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, ::rtl::OUS else if (aValue.getValueTypeClass() == css::uno::TypeClass_STRING ) { // strings need \" - ::rtl::OUString sVal; + OUString sVal; aValue >>= sVal; // encode non printable characters or '"' by using the CHR$ function @@ -315,12 +315,12 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, ::rtl::OUS } catch (const css::script::CannotConvertException&) {} catch (const css::uno::Exception&) {} - ::rtl::OUString sVal; + OUString sVal; aNew >>= sVal; if (aValue.getValueTypeClass() == css::uno::TypeClass_ENUM ) { - ::rtl::OUString aName = aValue.getValueType().getTypeName(); + OUString aName = aValue.getValueType().getTypeName(); aArgumentBuffer.append( aName ); aArgumentBuffer.appendAscii("."); } @@ -329,15 +329,15 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, ::rtl::OUS } } -void SAL_CALL DispatchRecorder::implts_recordMacro( const ::rtl::OUString& aURL, +void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, - sal_Bool bAsComment, ::rtl::OUStringBuffer& aScriptBuffer ) + sal_Bool bAsComment, OUStringBuffer& aScriptBuffer ) { - ::rtl::OUStringBuffer aArgumentBuffer(1000); - ::rtl::OUString sArrayName; + OUStringBuffer aArgumentBuffer(1000); + OUString sArrayName; // this value is used to name the arrays of aArgumentBuffer - sArrayName = ::rtl::OUString("args"); - sArrayName += ::rtl::OUString::valueOf((sal_Int32)m_nRecordingID); + sArrayName = OUString("args"); + sArrayName += OUString::valueOf((sal_Int32)m_nRecordingID); aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n"); @@ -348,7 +348,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const ::rtl::OUString& aURL, if(!lArguments[i].Value.hasValue()) continue; - ::rtl::OUStringBuffer sValBuffer(100); + OUStringBuffer sValBuffer(100); try { AppendToBuffer(lArguments[i].Value, sValBuffer); @@ -438,7 +438,7 @@ com::sun::star::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx) t { if (idx >= (sal_Int32)m_aStatements.size()) { throw com::sun::star::lang::IndexOutOfBoundsException( - ::rtl::OUString( "Dispatch recorder out of bounds" ), + OUString( "Dispatch recorder out of bounds" ), Reference< XInterface >() ); } @@ -454,13 +454,13 @@ void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const com::sun::st if (element.getValueType() != ::getCppuType((const com::sun::star::frame::DispatchStatement *)NULL)) { throw com::sun::star::lang::IllegalArgumentException( - ::rtl::OUString( "Illegal argument in dispatch recorder" ), + OUString( "Illegal argument in dispatch recorder" ), Reference< XInterface >(), 2 ); } if (idx >= (sal_Int32)m_aStatements.size()) { throw com::sun::star::lang::IndexOutOfBoundsException( - ::rtl::OUString( "Dispatch recorder out of bounds" ), + OUString( "Dispatch recorder out of bounds" ), Reference< XInterface >() ); } diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 00c3e0792757..20ffa4585f22 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -310,7 +310,7 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems) { OSL_FAIL("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."); throw css::uno::RuntimeException( - ::rtl::OUString("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."), + OUString("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."), m_xOwner); } @@ -337,7 +337,7 @@ void CacheLockGuard::unlock() { OSL_FAIL("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)"); throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")), + OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")), m_xOwner); } aWriteLock.unlock(); @@ -356,7 +356,7 @@ DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap& { m_nWorkingEntryID = lArgs.getUnpackedValueOrDefault(PROP_ENTRY_ID, (sal_Int32)-1 ); m_xProgress = lArgs.getUnpackedValueOrDefault(PROP_PROGRESS, css::uno::Reference< css::task::XStatusIndicator >()); - m_sSavePath = lArgs.getUnpackedValueOrDefault(PROP_SAVEPATH, ::rtl::OUString() ); + m_sSavePath = lArgs.getUnpackedValueOrDefault(PROP_SAVEPATH, OUString() ); m_xHoldRefForAsyncOpAlive = xOwner; }; @@ -386,7 +386,7 @@ DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy) //----------------------------------------------- void DispatchParams::forget() { - m_sSavePath = ::rtl::OUString(); + m_sSavePath = OUString(); m_nWorkingEntryID = -1; m_xProgress.clear(); m_xHoldRefForAsyncOpAlive.clear(); @@ -715,7 +715,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr throw(css::uno::RuntimeException) { if (!xListener.is()) - throw css::uno::RuntimeException(::rtl::OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this)); + throw css::uno::RuntimeException(OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this)); // container is threadsafe by using a shared mutex! m_lListener.addInterface(aURL.Complete, xListener); @@ -750,7 +750,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css: throw(css::uno::RuntimeException) { if (!xListener.is()) - throw css::uno::RuntimeException(::rtl::OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this)); + throw css::uno::RuntimeException(OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this)); // container is threadsafe by using a shared mutex! m_lListener.removeInterface(aURL.Complete, xListener); } @@ -845,7 +845,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven for (i=0; i<c; ++i) { - ::rtl::OUString sPath; + OUString sPath; pChanges[i].Accessor >>= sPath; if ( sPath == CFG_ENTRY_AUTOSAVE_ENABLED ) @@ -935,7 +935,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf aWriteLock.unlock(); // <- SAFE ---------------------------------- - rtl::OUString sCFG_PACKAGE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM(CFG_PACKAGE_RECOVERY)); + OUString sCFG_PACKAGE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM(CFG_PACKAGE_RECOVERY)); // throws a RuntimeException if an error occure! css::uno::Reference< css::container::XNameAccess > xCFG( ::comphelper::ConfigurationHelper::openConfig(xContext, sCFG_PACKAGE_RECOVERY, ::comphelper::ConfigurationHelper::E_STANDARD), @@ -946,17 +946,17 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf try { - rtl::OUString sCFG_PATH_AUTOSAVE(CFG_PATH_AUTOSAVE); + OUString sCFG_PATH_AUTOSAVE(CFG_PATH_AUTOSAVE); ::comphelper::ConfigurationHelper::readDirectKey(xContext, sCFG_PACKAGE_RECOVERY, sCFG_PATH_AUTOSAVE, - rtl::OUString(CFG_ENTRY_MINSPACE_DOCSAVE), + OUString(CFG_ENTRY_MINSPACE_DOCSAVE), ::comphelper::ConfigurationHelper::E_STANDARD) >>= nMinSpaceDocSave; ::comphelper::ConfigurationHelper::readDirectKey(xContext, sCFG_PACKAGE_RECOVERY, sCFG_PATH_AUTOSAVE, - rtl::OUString(CFG_ENTRY_MINSPACE_CONFIGSAVE), + OUString(CFG_ENTRY_MINSPACE_CONFIGSAVE), ::comphelper::ConfigurationHelper::E_STANDARD) >>= nMinSpaceConfigSave; } catch(const css::uno::Exception&) @@ -985,11 +985,11 @@ void AutoRecovery::implts_readAutoSaveConfig() // AutoSave [bool] sal_Bool bEnabled = sal_False; - xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_AUTOSAVE_ENABLED)) >>= bEnabled; + xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_AUTOSAVE_ENABLED)) >>= bEnabled; // UserAutoSave [bool] sal_Bool bUserEnabled = sal_False; - xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_USERAUTOSAVE_ENABLED)) >>= bUserEnabled; + xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_USERAUTOSAVE_ENABLED)) >>= bUserEnabled; // SAFE -> ------------------------------ WriteGuard aWriteLock(m_aLock); @@ -1017,7 +1017,7 @@ void AutoRecovery::implts_readAutoSaveConfig() // AutoSaveTimeIntervall [int] in min sal_Int32 nTimeIntervall = 15; - xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_AUTOSAVE_TIMEINTERVALL)) >>= nTimeIntervall; + xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_AUTOSAVE_TIMEINTERVALL)) >>= nTimeIntervall; // SAFE -> ---------------------------------- aWriteLock.lock(); @@ -1050,14 +1050,14 @@ void AutoRecovery::implts_readConfig() css::uno::Any aValue; // RecoveryList [set] - aValue = xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_RECOVERYLIST)); + aValue = xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_RECOVERYLIST)); css::uno::Reference< css::container::XNameAccess > xList; aValue >>= xList; if (xList.is()) { - const rtl::OUString sRECOVERY_ITEM_BASE_IDENTIFIER(RECOVERY_ITEM_BASE_IDENTIFIER); - const css::uno::Sequence< ::rtl::OUString > lItems = xList->getElementNames(); - const ::rtl::OUString* pItems = lItems.getConstArray(); + const OUString sRECOVERY_ITEM_BASE_IDENTIFIER(RECOVERY_ITEM_BASE_IDENTIFIER); + const css::uno::Sequence< OUString > lItems = xList->getElementNames(); + const OUString* pItems = lItems.getConstArray(); sal_Int32 c = lItems.getLength(); sal_Int32 i = 0; @@ -1072,22 +1072,22 @@ void AutoRecovery::implts_readConfig() continue; AutoRecovery::TDocumentInfo aInfo; - aInfo.NewTempURL = ::rtl::OUString(); + aInfo.NewTempURL = OUString(); aInfo.Document = css::uno::Reference< css::frame::XModel >(); - xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_ORIGINALURL)) >>= aInfo.OrgURL ; - xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPURL)) >>= aInfo.OldTempURL ; - xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPLATEURL)) >>= aInfo.TemplateURL ; - xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_FILTER)) >>= aInfo.RealFilter ; - xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_DOCUMENTSTATE)) >>= aInfo.DocumentState; - xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_MODULE)) >>= aInfo.AppModule; - xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TITLE)) >>= aInfo.Title; - xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_VIEWNAMES)) >>= aInfo.ViewNames; + xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL)) >>= aInfo.OrgURL ; + xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL)) >>= aInfo.OldTempURL ; + xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPLATEURL)) >>= aInfo.TemplateURL ; + xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_FILTER)) >>= aInfo.RealFilter ; + xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_DOCUMENTSTATE)) >>= aInfo.DocumentState; + xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_MODULE)) >>= aInfo.AppModule; + xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TITLE)) >>= aInfo.Title; + xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_VIEWNAMES)) >>= aInfo.ViewNames; implts_specifyAppModuleAndFactory(aInfo); implts_specifyDefaultFilterAndExtension(aInfo); if (pItems[i].indexOf(sRECOVERY_ITEM_BASE_IDENTIFIER)==0) { - ::rtl::OUString sID = pItems[i].copy(sRECOVERY_ITEM_BASE_IDENTIFIER.getLength()); + OUString sID = pItems[i].copy(sRECOVERY_ITEM_BASE_IDENTIFIER.getLength()); aInfo.ID = sID.toInt32(); // SAFE -> ---------------------- aWriteLock.lock(); @@ -1124,7 +1124,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume if (rInfo.AppModule.isEmpty()) { throw css::uno::RuntimeException( - ::rtl::OUString("Cant find out the default filter and its extension, if no application module is known!"), + OUString("Cant find out the default filter and its extension, if no application module is known!"), static_cast< css::frame::XDispatch* >(this)); } @@ -1141,7 +1141,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume { // open module config on demand and cache the update access xCFG = css::uno::Reference< css::container::XNameAccess >( - ::comphelper::ConfigurationHelper::openConfig(comphelper::getComponentContext(xSMGR), rtl::OUString(CFG_PACKAGE_MODULES), + ::comphelper::ConfigurationHelper::openConfig(comphelper::getComponentContext(xSMGR), OUString(CFG_PACKAGE_MODULES), ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY_THROW); @@ -1156,27 +1156,27 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume xCFG->getByName(rInfo.AppModule), css::uno::UNO_QUERY_THROW); - xModuleProps->getByName(rtl::OUString(CFG_ENTRY_REALDEFAULTFILTER)) >>= rInfo.DefaultFilter; + xModuleProps->getByName(OUString(CFG_ENTRY_REALDEFAULTFILTER)) >>= rInfo.DefaultFilter; css::uno::Reference< css::container::XNameAccess > xFilterCFG(xSMGR->createInstance(SERVICENAME_FILTERFACTORY), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameAccess > xTypeCFG (xSMGR->createInstance(SERVICENAME_TYPEDETECTION), css::uno::UNO_QUERY_THROW); ::comphelper::SequenceAsHashMap lFilterProps (xFilterCFG->getByName(rInfo.DefaultFilter)); - ::rtl::OUString sTypeRegistration = lFilterProps.getUnpackedValueOrDefault(rtl::OUString(FILTER_PROP_TYPE), ::rtl::OUString()); + OUString sTypeRegistration = lFilterProps.getUnpackedValueOrDefault(OUString(FILTER_PROP_TYPE), OUString()); ::comphelper::SequenceAsHashMap lTypeProps (xTypeCFG->getByName(sTypeRegistration)); - css::uno::Sequence< ::rtl::OUString > lExtensions = lTypeProps.getUnpackedValueOrDefault(rtl::OUString(TYPE_PROP_EXTENSIONS), css::uno::Sequence< ::rtl::OUString >()); + css::uno::Sequence< OUString > lExtensions = lTypeProps.getUnpackedValueOrDefault(OUString(TYPE_PROP_EXTENSIONS), css::uno::Sequence< OUString >()); if (lExtensions.getLength()) { - rInfo.Extension = ::rtl::OUString("."); + rInfo.Extension = OUString("."); rInfo.Extension += lExtensions[0]; } else - rInfo.Extension = ::rtl::OUString(".unknown"); + rInfo.Extension = OUString(".unknown"); } catch(const css::uno::Exception&) { - rInfo.DefaultFilter = ::rtl::OUString(); - rInfo.Extension = ::rtl::OUString(); + rInfo.DefaultFilter = OUString(); + rInfo.Extension = OUString(); } } @@ -1200,8 +1200,8 @@ void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo rInfo.AppModule = xManager->identify(rInfo.Document); ::comphelper::SequenceAsHashMap lModuleDescription(xManager->getByName(rInfo.AppModule)); - lModuleDescription[rtl::OUString(CFG_ENTRY_PROP_EMPTYDOCUMENTURL)] >>= rInfo.FactoryURL; - lModuleDescription[rtl::OUString(CFG_ENTRY_PROP_FACTORYSERVICE)] >>= rInfo.FactoryService; + lModuleDescription[OUString(CFG_ENTRY_PROP_EMPTYDOCUMENTURL)] >>= rInfo.FactoryURL; + lModuleDescription[OUString(CFG_ENTRY_PROP_FACTORYSERVICE)] >>= rInfo.FactoryService; } //----------------------------------------------- @@ -1212,7 +1212,7 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i i_rInfo.ViewNames.realloc(0); // obtain list of controllers of this document - ::std::vector< ::rtl::OUString > aViewNames; + ::std::vector< OUString > aViewNames; const Reference< XModel2 > xModel( i_rInfo.Document, UNO_QUERY ); if ( xModel.is() ) { @@ -1220,7 +1220,7 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i while ( xEnumControllers->hasMoreElements() ) { const Reference< XController2 > xController( xEnumControllers->nextElement(), UNO_QUERY ); - ::rtl::OUString sViewName; + OUString sViewName; if ( xController.is() ) sViewName = xController->getViewControllerName(); OSL_ENSURE( !sViewName.isEmpty(), "AutoRecovery::implts_collectActiveViewNames: (no XController2 ->) no view name -> no recovery of this view!" ); @@ -1232,7 +1232,7 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i else { const Reference< XController2 > xController( xModel->getCurrentController(), UNO_QUERY ); - ::rtl::OUString sViewName; + OUString sViewName; if ( xController.is() ) sViewName = xController->getViewControllerName(); OSL_ENSURE( !sViewName.isEmpty(), "AutoRecovery::implts_collectActiveViewNames: (no XController2 ->) no view name -> no recovery of this view!" ); @@ -1272,15 +1272,15 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn xCFG = css::uno::Reference< css::container::XHierarchicalNameAccess >(implts_openConfig(), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameAccess > xCheck; - xCFG->getByHierarchicalName(rtl::OUString(CFG_ENTRY_RECOVERYLIST)) >>= xCheck; + xCFG->getByHierarchicalName(OUString(CFG_ENTRY_RECOVERYLIST)) >>= xCheck; css::uno::Reference< css::container::XNameContainer > xModify(xCheck, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::lang::XSingleServiceFactory > xCreate(xCheck, css::uno::UNO_QUERY_THROW); - ::rtl::OUStringBuffer sIDBuf; + OUStringBuffer sIDBuf; sIDBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(RECOVERY_ITEM_BASE_IDENTIFIER)); sIDBuf.append((sal_Int32)rInfo.ID); - ::rtl::OUString sID = sIDBuf.makeStringAndClear(); + OUString sID = sIDBuf.makeStringAndClear(); // remove if (bRemoveIt) @@ -1307,14 +1307,14 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn else xCheck->getByName(sID) >>= xSet; - xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_ORIGINALURL), css::uno::makeAny(rInfo.OrgURL )); - xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPURL), css::uno::makeAny(rInfo.OldTempURL )); - xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPLATEURL), css::uno::makeAny(rInfo.TemplateURL )); - xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_FILTER), css::uno::makeAny(rInfo.RealFilter)); - xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), css::uno::makeAny(rInfo.DocumentState)); - xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_MODULE), css::uno::makeAny(rInfo.AppModule)); - xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TITLE), css::uno::makeAny(rInfo.Title)); - xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_VIEWNAMES), css::uno::makeAny(rInfo.ViewNames)); + xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL), css::uno::makeAny(rInfo.OrgURL )); + xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL), css::uno::makeAny(rInfo.OldTempURL )); + xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TEMPLATEURL), css::uno::makeAny(rInfo.TemplateURL )); + xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_FILTER), css::uno::makeAny(rInfo.RealFilter)); + xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), css::uno::makeAny(rInfo.DocumentState)); + xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_MODULE), css::uno::makeAny(rInfo.AppModule)); + xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TITLE), css::uno::makeAny(rInfo.Title)); + xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_VIEWNAMES), css::uno::makeAny(rInfo.ViewNames)); if (bNew) xModify->insertByName(sID, css::uno::makeAny(xSet)); @@ -1742,7 +1742,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame // and save an information about the real used filter by this document. // We save this document with DefaultFilter ... and load it with the RealFilter. implts_specifyDefaultFilterAndExtension(aNew); - aNew.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME() , ::rtl::OUString()); + aNew.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME() , OUString()); // Further we must know, if this document base on a template. // Then we must load it in a different way. @@ -1925,22 +1925,22 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr css::uno::Reference< css::frame::XStorable > xDoc(rInfo.Document, css::uno::UNO_QUERY); rInfo.OrgURL = xDoc->getLocation(); - ::rtl::OUString sRemoveURL1 = rInfo.OldTempURL; - ::rtl::OUString sRemoveURL2 = rInfo.NewTempURL; - rInfo.OldTempURL = ::rtl::OUString(); - rInfo.NewTempURL = ::rtl::OUString(); + OUString sRemoveURL1 = rInfo.OldTempURL; + OUString sRemoveURL2 = rInfo.NewTempURL; + rInfo.OldTempURL = OUString(); + rInfo.NewTempURL = OUString(); ::comphelper::MediaDescriptor lDescriptor(rInfo.Document->getArgs()); - rInfo.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), ::rtl::OUString()); + rInfo.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString()); css::uno::Reference< css::frame::XTitle > xDocTitle(xDocument, css::uno::UNO_QUERY); if (xDocTitle.is ()) rInfo.Title = xDocTitle->getTitle (); else { - rInfo.Title = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TITLE() , ::rtl::OUString()); + rInfo.Title = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TITLE() , OUString()); if (rInfo.Title.isEmpty()) - rInfo.Title = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_DOCUMENTTITLE(), ::rtl::OUString()); + rInfo.Title = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_DOCUMENTTITLE(), OUString()); } rInfo.UsedForSaving = sal_False; @@ -2029,7 +2029,7 @@ void lc_removeLockFile(AutoRecovery::TDocumentInfo& rInfo) try { css::uno::Reference< css::frame::XStorable > xStore(rInfo.Document, css::uno::UNO_QUERY_THROW); - ::rtl::OUString aURL = xStore->getLocation(); + OUString aURL = xStore->getLocation(); if ( !aURL.isEmpty() ) { ::svt::DocumentLockFile aLockFile( aURL ); @@ -2153,7 +2153,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl xExternalProgress = pParams->m_xProgress; css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create( comphelper::getComponentContext(xSMGR)); - ::rtl::OUString sBackupPath(SvtPathOptions().GetBackupPath()); + OUString sBackupPath(SvtPathOptions().GetBackupPath()); css::uno::Reference< css::frame::XController > xActiveController; css::uno::Reference< css::frame::XModel > xActiveModel ; @@ -2315,7 +2315,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl } //----------------------------------------------- -void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString& sBackupPath , +void AutoRecovery::implts_saveOneDoc(const OUString& sBackupPath , AutoRecovery::TDocumentInfo& rInfo , const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress) { @@ -2333,7 +2333,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString& // if the document was loaded with a password, it should be // stored with password ::comphelper::MediaDescriptor lNewArgs; - ::rtl::OUString sPassword = lOldArgs.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PASSWORD(), ::rtl::OUString()); + OUString sPassword = lOldArgs.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PASSWORD(), OUString()); if (!sPassword.isEmpty()) lNewArgs[::comphelper::MediaDescriptor::PROP_PASSWORD()] <<= sPassword; @@ -2349,7 +2349,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString& // #i66598# use special handling of property "DocumentBaseURL" (it must be an empty string!) // for make hyperlinks working - lNewArgs[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= ::rtl::OUString(); + lNewArgs[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= OUString(); // try to save this document as a new temp file everytimes. // Mark AutoSave state as "INCOMPLETE" if it failed. @@ -2421,7 +2421,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString& else { // safe the state about error ... - rInfo.NewTempURL = ::rtl::OUString(); + rInfo.NewTempURL = OUString(); rInfo.DocumentState &= ~AutoRecovery::E_TRY_SAVE; rInfo.DocumentState |= AutoRecovery::E_HANDLED; rInfo.DocumentState |= AutoRecovery::E_INCOMPLETE; @@ -2433,9 +2433,9 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString& // try to remove the old temp file. // Ignore any error here. We have a new temp file, which is up to date. // The only thing is: we fill the disk with temp files, if we cant remove old ones :-) - ::rtl::OUString sRemoveFile = rInfo.OldTempURL; + OUString sRemoveFile = rInfo.OldTempURL; rInfo.OldTempURL = rInfo.NewTempURL; - rInfo.NewTempURL = ::rtl::OUString(); + rInfo.NewTempURL = OUString(); implts_flushConfigItem(rInfo); @@ -2489,8 +2489,8 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa ::comphelper::MediaDescriptor lDescriptor; // its an UI feature - so the "USER" itself must be set as referer - lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= ::rtl::OUString(REFERRER_USER); - lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= ::rtl::OUString(); + lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= OUString(REFERRER_USER); + lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= OUString(); // recovered documents are loaded hidden, and shown all at once, later lDescriptor[::comphelper::MediaDescriptor::PROP_HIDDEN()] <<= true; @@ -2518,8 +2518,8 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa } } - ::rtl::OUString sLoadOriginalURL; - ::rtl::OUString sLoadBackupURL ; + OUString sLoadOriginalURL; + OUString sLoadBackupURL ; if (!bBackupWasTried) sLoadBackupURL = rInfo.OldTempURL; @@ -2542,7 +2542,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa // A "Salvaged" item must exists every time. The core can make something special then for recovery. // Of course it should be the real file name of the original file, in case we load the temp. backup here. - ::rtl::OUString sURL; + OUString sURL; if (!sLoadBackupURL.isEmpty()) { sURL = sLoadBackupURL; @@ -2642,7 +2642,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa } //----------------------------------------------- -void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL , +void AutoRecovery::implts_openOneDoc(const OUString& sURL , ::comphelper::MediaDescriptor& lDescriptor, AutoRecovery::TDocumentInfo& rInfo ) { @@ -2685,7 +2685,7 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL Reference< XDocumentRecovery > xDocRecover( xModel, UNO_QUERY_THROW ); xDocRecover->recoverFromFile( sURL, - lDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_SALVAGEDFILE(), ::rtl::OUString() ), + lDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_SALVAGEDFILE(), OUString() ), lDescriptor.getAsConstPropertyValueList() ); @@ -2694,14 +2694,14 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL } // re-create all the views - ::std::vector< ::rtl::OUString > aViewsToRestore( rInfo.ViewNames.getLength() ); + ::std::vector< OUString > aViewsToRestore( rInfo.ViewNames.getLength() ); if ( rInfo.ViewNames.getLength() ) ::std::copy( rInfo.ViewNames.getConstArray(), rInfo.ViewNames.getConstArray() + rInfo.ViewNames.getLength(), aViewsToRestore.begin() ); // if we don't have views for whatever reason, then create a default-view, at least if ( aViewsToRestore.empty() ) - aViewsToRestore.push_back( ::rtl::OUString() ); + aViewsToRestore.push_back( OUString() ); - for ( ::std::vector< ::rtl::OUString >::const_iterator viewName = aViewsToRestore.begin(); + for ( ::std::vector< OUString >::const_iterator viewName = aViewsToRestore.begin(); viewName != aViewsToRestore.end(); ++viewName ) @@ -2753,7 +2753,7 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL } // re-throw - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("Recovery of \""); sMsg.append (sURL ); sMsg.appendAscii("\" failed." ); @@ -2767,7 +2767,7 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL } //----------------------------------------------- -void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString& sBackupPath , +void AutoRecovery::implts_generateNewTempURL(const OUString& sBackupPath , ::comphelper::MediaDescriptor& /*rMediaDescriptor*/, AutoRecovery::TDocumentInfo& rInfo ) { @@ -2785,7 +2785,7 @@ void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString& // we should not save it realy. Then we put the information about such "empty document" // into the configuration and dont create any recovery file on disk. // We use the title of the document to make it unique. - ::rtl::OUStringBuffer sUniqueName; + OUStringBuffer sUniqueName; if (!rInfo.OrgURL.isEmpty()) { css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::getComponentContext(m_xSMGR))); @@ -2800,7 +2800,7 @@ void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString& // TODO: Must we strip some illegal signes - if we use the title? - rtl::OUString sName(sUniqueName.makeStringAndClear()); + OUString sName(sUniqueName.makeStringAndClear()); String sExtension(rInfo.Extension); String sPath(sBackupPath); ::utl::TempFile aTempFile(sName, &sExtension, &sPath); @@ -2814,7 +2814,7 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ { // Helper shares mutex with us -> threadsafe! ::cppu::OInterfaceContainerHelper* pListenerForURL = 0; - ::rtl::OUString sJob = AutoRecovery::implst_getJobDescription(eJob); + OUString sJob = AutoRecovery::implst_getJobDescription(eJob); // inform listener, which are registered for any URLs(!) pListenerForURL = m_lListener.getContainer(sJob); @@ -2837,10 +2837,10 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ } //----------------------------------------------- -::rtl::OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob) +OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob) { // describe the current running operation - ::rtl::OUStringBuffer sFeature(256); + OUStringBuffer sFeature(256); sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL)); // Attention: Because "eJob" is used as a flag field the order of checking these @@ -2908,7 +2908,7 @@ sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL) //----------------------------------------------- css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( sal_Int32 eJob , - const ::rtl::OUString& sEventType, + const OUString& sEventType, AutoRecovery::TDocumentInfo* pInfo ) { css::frame::FeatureStateEvent aEvent; @@ -2919,15 +2919,15 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( { // pack rInfo for transport via UNO ::comphelper::NamedValueCollection aInfo; - aInfo.put( rtl::OUString(CFG_ENTRY_PROP_ID), pInfo->ID ); - aInfo.put( rtl::OUString(CFG_ENTRY_PROP_ORIGINALURL), pInfo->OrgURL ); - aInfo.put( rtl::OUString(CFG_ENTRY_PROP_FACTORYURL), pInfo->FactoryURL ); - aInfo.put( rtl::OUString(CFG_ENTRY_PROP_TEMPLATEURL), pInfo->TemplateURL ); - aInfo.put( rtl::OUString(CFG_ENTRY_PROP_TEMPURL), pInfo->OldTempURL.isEmpty() ? pInfo->NewTempURL : pInfo->OldTempURL ); - aInfo.put( rtl::OUString(CFG_ENTRY_PROP_MODULE), pInfo->AppModule) ; - aInfo.put( rtl::OUString(CFG_ENTRY_PROP_TITLE), pInfo->Title); - aInfo.put( rtl::OUString(CFG_ENTRY_PROP_VIEWNAMES), pInfo->ViewNames); - aInfo.put( rtl::OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), pInfo->DocumentState); + aInfo.put( OUString(CFG_ENTRY_PROP_ID), pInfo->ID ); + aInfo.put( OUString(CFG_ENTRY_PROP_ORIGINALURL), pInfo->OrgURL ); + aInfo.put( OUString(CFG_ENTRY_PROP_FACTORYURL), pInfo->FactoryURL ); + aInfo.put( OUString(CFG_ENTRY_PROP_TEMPLATEURL), pInfo->TemplateURL ); + aInfo.put( OUString(CFG_ENTRY_PROP_TEMPURL), pInfo->OldTempURL.isEmpty() ? pInfo->NewTempURL : pInfo->OldTempURL ); + aInfo.put( OUString(CFG_ENTRY_PROP_MODULE), pInfo->AppModule) ; + aInfo.put( OUString(CFG_ENTRY_PROP_TITLE), pInfo->Title); + aInfo.put( OUString(CFG_ENTRY_PROP_VIEWNAMES), pInfo->ViewNames); + aInfo.put( OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), pInfo->DocumentState); aEvent.State <<= aInfo.getPropertyValues(); } @@ -2981,9 +2981,9 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) // documents exists and was saved. ::comphelper::ConfigurationHelper::writeDirectKey( comphelper::getComponentContext(m_xSMGR), - rtl::OUString(CFG_PACKAGE_RECOVERY), - rtl::OUString(CFG_PATH_RECOVERYINFO), - rtl::OUString(CFG_ENTRY_CRASHED), + OUString(CFG_PACKAGE_RECOVERY), + OUString(CFG_PATH_RECOVERYINFO), + OUString(CFG_ENTRY_CRASHED), css::uno::makeAny(sal_True), ::comphelper::ConfigurationHelper::E_STANDARD); @@ -3042,9 +3042,9 @@ void AutoRecovery::implts_doRecovery(const DispatchParams& aParams) // Reset the configuration hint "we was crashed"! ::comphelper::ConfigurationHelper::writeDirectKey( comphelper::getComponentContext(m_xSMGR), - rtl::OUString(CFG_PACKAGE_RECOVERY), - rtl::OUString(CFG_PATH_RECOVERYINFO), - rtl::OUString(CFG_ENTRY_CRASHED), + OUString(CFG_PACKAGE_RECOVERY), + OUString(CFG_PATH_RECOVERYINFO), + OUString(CFG_ENTRY_CRASHED), css::uno::makeAny(sal_False), ::comphelper::ConfigurationHelper::E_STANDARD); } @@ -3109,9 +3109,9 @@ void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/) // the on next startup we know what's happen last time ::comphelper::ConfigurationHelper::writeDirectKey( comphelper::getComponentContext(m_xSMGR), - rtl::OUString(CFG_PACKAGE_RECOVERY), - rtl::OUString(CFG_PATH_RECOVERYINFO), - rtl::OUString(CFG_ENTRY_SESSIONDATA), + OUString(CFG_PACKAGE_RECOVERY), + OUString(CFG_PATH_RECOVERYINFO), + OUString(CFG_ENTRY_SESSIONDATA), css::uno::makeAny(sal_True), ::comphelper::ConfigurationHelper::E_STANDARD); @@ -3146,9 +3146,9 @@ void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams) LOG_RECOVERY("... reset config key 'SessionData'") ::comphelper::ConfigurationHelper::writeDirectKey( comphelper::getComponentContext(m_xSMGR), - rtl::OUString(CFG_PACKAGE_RECOVERY), - rtl::OUString(CFG_PATH_RECOVERYINFO), - rtl::OUString(CFG_ENTRY_SESSIONDATA), + OUString(CFG_PACKAGE_RECOVERY), + OUString(CFG_PATH_RECOVERYINFO), + OUString(CFG_ENTRY_SESSIONDATA), css::uno::makeAny(sal_False), ::comphelper::ConfigurationHelper::E_STANDARD); @@ -3169,7 +3169,7 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams) if (rInfo.ID != aParams.m_nWorkingEntryID) continue; - ::rtl::OUString sSourceURL; + OUString sSourceURL; // Prefer temp file. It contains the changes against the original document! if (!rInfo.OldTempURL.isEmpty()) sSourceURL = rInfo.OldTempURL; @@ -3216,9 +3216,9 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams) } //----------------------------------------------- -AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const ::rtl::OUString& sSource , - const ::rtl::OUString& sTargetPath, - const ::rtl::OUString& sTargetName) +AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& sSource , + const OUString& sTargetPath, + const OUString& sTargetName) { // create content for the parent folder and call transfer on that content with the source content // and the destination file name as parameters @@ -3283,9 +3283,9 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , sal_Bool bSessionData = sal_False; ::comphelper::ConfigurationHelper::readDirectKey( comphelper::getComponentContext(m_xSMGR), - rtl::OUString(CFG_PACKAGE_RECOVERY), - rtl::OUString(CFG_PATH_RECOVERYINFO), - rtl::OUString(CFG_ENTRY_SESSIONDATA), + OUString(CFG_PACKAGE_RECOVERY), + OUString(CFG_PATH_RECOVERYINFO), + OUString(CFG_ENTRY_SESSIONDATA), ::comphelper::ConfigurationHelper::E_READONLY) >>= bSessionData; sal_Bool bRecoveryData = ((sal_Bool)(m_lDocCache.size()>0)); @@ -3302,18 +3302,18 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , case AUTORECOVERY_PROPHANDLE_CRASHED : aValue = ::comphelper::ConfigurationHelper::readDirectKey( comphelper::getComponentContext(m_xSMGR), - rtl::OUString(CFG_PACKAGE_RECOVERY), - rtl::OUString(CFG_PATH_RECOVERYINFO), - rtl::OUString(CFG_ENTRY_CRASHED), + OUString(CFG_PACKAGE_RECOVERY), + OUString(CFG_PATH_RECOVERYINFO), + OUString(CFG_ENTRY_CRASHED), ::comphelper::ConfigurationHelper::E_READONLY); break; case AUTORECOVERY_PROPHANDLE_EXISTS_SESSIONDATA : aValue = ::comphelper::ConfigurationHelper::readDirectKey( comphelper::getComponentContext(m_xSMGR), - rtl::OUString(CFG_PACKAGE_RECOVERY), - rtl::OUString(CFG_PATH_RECOVERYINFO), - rtl::OUString(CFG_ENTRY_SESSIONDATA), + OUString(CFG_PACKAGE_RECOVERY), + OUString(CFG_PATH_RECOVERYINFO), + OUString(CFG_ENTRY_SESSIONDATA), ::comphelper::ConfigurationHelper::E_READONLY); break; } @@ -3459,7 +3459,7 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) sal_uInt64 nFreeSpace = SAL_MAX_UINT64; - ::rtl::OUString sBackupPath(SvtPathOptions().GetBackupPath()); + OUString sBackupPath(SvtPathOptions().GetBackupPath()); ::osl::VolumeInfo aInfo (osl_VolumeInfo_Mask_FreeSpace); ::osl::FileBase::RC aRC = ::osl::Directory::getVolumeInfo(sBackupPath, aInfo); @@ -3479,13 +3479,13 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) //----------------------------------------------- void AutoRecovery::impl_showFullDiscError() { - rtl::OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON)); - rtl::OUString sMsg(FWK_RESSTR(STR_FULL_DISC_MSG)); + OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON)); + OUString sMsg(FWK_RESSTR(STR_FULL_DISC_MSG)); - rtl::OUString sBackupURL(SvtPathOptions().GetBackupPath()); + OUString sBackupURL(SvtPathOptions().GetBackupPath()); INetURLObject aConverter(sBackupURL); sal_Unicode aDelimiter; - rtl::OUString sBackupPath = aConverter.getFSysPath(INetURLObject::FSYS_DETECT, &aDelimiter); + OUString sBackupPath = aConverter.getFSysPath(INetURLObject::FSYS_DETECT, &aDelimiter); if (sBackupPath.getLength() < 1) sBackupPath = sBackupURL; @@ -3621,7 +3621,7 @@ void AutoRecovery::impl_flushALLConfigChanges() } //----------------------------------------------- -void AutoRecovery::st_impl_removeFile(const ::rtl::OUString& sURL) +void AutoRecovery::st_impl_removeFile(const OUString& sURL) { if ( sURL.isEmpty()) return; @@ -3629,7 +3629,7 @@ void AutoRecovery::st_impl_removeFile(const ::rtl::OUString& sURL) try { ::ucbhelper::Content aContent = ::ucbhelper::Content(sURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getComponentContext(m_xSMGR)); - aContent.executeCommand(::rtl::OUString("delete"), css::uno::makeAny(sal_True)); + aContent.executeCommand(OUString("delete"), css::uno::makeAny(sal_True)); } catch(const css::uno::Exception&) { @@ -3641,13 +3641,13 @@ void AutoRecovery::st_impl_removeLockFile() { try { - ::rtl::OUString sUserURL; + OUString sUserURL; ::utl::Bootstrap::locateUserInstallation( sUserURL ); - ::rtl::OUStringBuffer sLockURLBuf; + OUStringBuffer sLockURLBuf; sLockURLBuf.append (sUserURL); sLockURLBuf.appendAscii("/.lock"); - ::rtl::OUString sLockURL = sLockURLBuf.makeStringAndClear(); + OUString sLockURL = sLockURLBuf.makeStringAndClear(); AutoRecovery::st_impl_removeFile(sLockURL); } diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 6c7b4eede5a8..88515c03f10f 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -244,7 +244,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId() @return The implementation name of this class. */ -::rtl::OUString SAL_CALL BackingComp::getImplementationName() +OUString SAL_CALL BackingComp::getImplementationName() throw(css::uno::RuntimeException) { return impl_getStaticImplementationName(); @@ -264,7 +264,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId() <br><FALSE/> otherwise. */ -sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const ::rtl::OUString& sServiceName ) +sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const OUString& sServiceName ) throw(css::uno::RuntimeException) { return ( @@ -286,7 +286,7 @@ sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const ::rtl::OUString& sS @return A list of all supported uno service names. */ -css::uno::Sequence< ::rtl::OUString > SAL_CALL BackingComp::getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL BackingComp::getSupportedServiceNames() throw(css::uno::RuntimeException) { return impl_getStaticSupportedServiceNames(); @@ -305,7 +305,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BackingComp::getSupportedServiceN @return The implementation name of this class. */ -::rtl::OUString BackingComp::impl_getStaticImplementationName() +OUString BackingComp::impl_getStaticImplementationName() { return IMPLEMENTATIONNAME_STARTMODULE; } @@ -323,9 +323,9 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BackingComp::getSupportedServiceN @return A list of all supported uno service names. */ -css::uno::Sequence< ::rtl::OUString > BackingComp::impl_getStaticSupportedServiceNames() +css::uno::Sequence< OUString > BackingComp::impl_getStaticSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > lNames(1); + css::uno::Sequence< OUString > lNames(1); lNames[0] = "com.sun.star.frame.StartModule"; return lNames; } @@ -444,12 +444,12 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f // check some required states if (m_xFrame.is()) throw css::uno::RuntimeException( - ::rtl::OUString("already attached"), + OUString("already attached"), static_cast< ::cppu::OWeakObject* >(this)); if (!xFrame.is()) throw css::uno::RuntimeException( - ::rtl::OUString("invalid frame reference"), + OUString("invalid frame reference"), static_cast< ::cppu::OWeakObject* >(this)); if (!m_xWindow.is()) @@ -635,7 +635,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven if (!aEvent.Source.is() || aEvent.Source!=m_xWindow || !m_xWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString("unexpected source or called twice"), + OUString("unexpected source or called twice"), static_cast< ::cppu::OWeakObject* >(this)); m_xWindow = css::uno::Reference< css::awt::XWindow >(); @@ -726,7 +726,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c throw(css::uno::RuntimeException) { throw css::uno::RuntimeException( - ::rtl::OUString("not supported"), + OUString("not supported"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -773,7 +773,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno if (m_xWindow.is()) throw css::uno::Exception( - ::rtl::OUString("already initialized"), + OUString("already initialized"), static_cast< ::cppu::OWeakObject* >(this)); css::uno::Reference< css::awt::XWindow > xParentWindow; @@ -784,7 +784,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno ) { throw css::uno::Exception( - ::rtl::OUString("wrong or corrupt argument list"), + OUString("wrong or corrupt argument list"), static_cast< ::cppu::OWeakObject* >(this)); } @@ -795,7 +795,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno if (!m_xWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString("couldn't create component window"), + OUString("couldn't create component window"), static_cast< ::cppu::OWeakObject* >(this)); // start listening for window disposing diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index 4cfa131ae101..fdf245f826e2 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -71,7 +71,7 @@ namespace framework { struct LoadRecentFile { - rtl::OUString aTargetURL; + OUString aTargetURL; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aArgSeq; }; @@ -126,15 +126,15 @@ namespace framework void loadImage( const ResId& i_rId, PushButton& i_rButton ); - void layoutButton( const char* i_pURL, int nColumn, int i_nExtraWidth, const std::set<rtl::OUString>& i_rURLS, + void layoutButton( const char* i_pURL, int nColumn, int i_nExtraWidth, const std::set<OUString>& i_rURLS, SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule i_eMod, PushButton& i_rBtn, MnemonicGenerator& i_rMnemonicGen, const String& i_rStr = String() ); - void dispatchURL( const rtl::OUString& i_rURL, - const rtl::OUString& i_rTarget = rtl::OUString( "_default" ), + void dispatchURL( const OUString& i_rURL, + const OUString& i_rTarget = OUString( "_default" ), const com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >& i_xProv = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >(), const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& = com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >() ); diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 628730fed95a..b46b5c8fff3f 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -155,8 +155,8 @@ DEFINE_INIT_SERVICE ( Desktop, InterceptionHelper* pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider ); m_xDispatchHelper = css::uno::Reference< css::frame::XDispatchProvider >( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY ); - ::rtl::OUStringBuffer sUntitledPrefix (256); - sUntitledPrefix.append (::rtl::OUString( String( FwkResId( STR_UNTITLED_DOCUMENT )))); + OUStringBuffer sUntitledPrefix (256); + sUntitledPrefix.append (OUString( String( FwkResId( STR_UNTITLED_DOCUMENT )))); sUntitledPrefix.appendAscii (" "); ::comphelper::NumberedCollection* pNumbers = new ::comphelper::NumberedCollection (); @@ -431,7 +431,7 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra css::uno::Reference< css::lang::XServiceInfo > xInfo( xListener, css::uno::UNO_QUERY ); if ( xInfo.is() ) { - ::rtl::OUString sImplementationName = xInfo->getImplementationName(); + OUString sImplementationName = xInfo->getImplementationName(); // SYCNHRONIZED -> WriteGuard aWriteLock( m_aLock ); @@ -474,7 +474,7 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css:: css::uno::Reference< css::lang::XServiceInfo > xInfo( xListener, css::uno::UNO_QUERY ); if ( xInfo.is() ) { - ::rtl::OUString sImplementationName = xInfo->getImplementationName(); + OUString sImplementationName = xInfo->getImplementationName(); // SYCNHRONIZED -> WriteGuard aWriteLock( m_aLock ); @@ -630,8 +630,8 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() th @onerror We return a null reference. @threadsafe yes *//*-*************************************************************************************************************/ -css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFromURL( const ::rtl::OUString& sURL , - const ::rtl::OUString& sTargetFrameName, +css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFromURL( const OUString& sURL , + const OUString& sTargetFrameName, sal_Int32 nSearchFlags , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException , css::lang::IllegalArgumentException , @@ -722,7 +722,7 @@ css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw @threadsafe yes *//*-*************************************************************************************************************/ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ) { const char UNO_PROTOCOL[] = ".uno:"; @@ -899,7 +899,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator( } //***************************************************************************************************************** -::rtl::OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException ) +OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException ) { /* SAFE { */ ReadGuard aReadLock( m_aLock ); @@ -908,7 +908,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator( } //***************************************************************************************************************** -void SAL_CALL Desktop::setName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::RuntimeException ) { /* SAFE { */ WriteGuard aWriteLock( m_aLock ); @@ -1008,7 +1008,7 @@ void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css @onerror A null reference is returned. @threadsafe yes *//*-*************************************************************************************************************/ -css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::rtl::OUString& sTargetFrameName , +css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XFrame > xTarget; @@ -1089,7 +1089,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r // get threadsafe some necessary member which are neccessary for following functionality /* SAFE { */ aReadLock.lock(); - ::rtl::OUString sOwnName = m_sName; + OUString sOwnName = m_sName; aReadLock.unlock(); /* } SAFE */ @@ -1461,7 +1461,7 @@ void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css } //----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL Desktop::getUntitledPrefix() +OUString SAL_CALL Desktop::getUntitledPrefix() throw (css::uno::RuntimeException) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1780,7 +1780,7 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty css::beans::Property( DESKTOP_PROPNAME_DISPATCHRECORDERSUPPLIER , DESKTOP_PROPHANDLE_DISPATCHRECORDERSUPPLIER, ::getCppuType((const css::uno::Reference< css::frame::XDispatchRecorderSupplier >*)NULL), css::beans::PropertyAttribute::TRANSIENT ), css::beans::Property( DESKTOP_PROPNAME_ISPLUGGED , DESKTOP_PROPHANDLE_ISPLUGGED , ::getBooleanCppuType() , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), css::beans::Property( DESKTOP_PROPNAME_SUSPENDQUICKSTARTVETO , DESKTOP_PROPHANDLE_SUSPENDQUICKSTARTVETO , ::getBooleanCppuType() , css::beans::PropertyAttribute::TRANSIENT ), - css::beans::Property( DESKTOP_PROPNAME_TITLE , DESKTOP_PROPHANDLE_TITLE , ::getCppuType((const ::rtl::OUString*)NULL) , css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( DESKTOP_PROPNAME_TITLE , DESKTOP_PROPHANDLE_TITLE , ::getCppuType((const OUString*)NULL) , css::beans::PropertyAttribute::TRANSIENT ), }; // Use it to initialize sequence! const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, DESKTOP_PROPCOUNT ); diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 86565ee1383f..40adc0695f5e 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -84,8 +84,8 @@ DispatchHelper::~DispatchHelper() */ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( const css::uno::Reference< css::frame::XDispatchProvider >& xDispatchProvider , - const ::rtl::OUString& sURL , - const ::rtl::OUString& sTargetFrameName , + const OUString& sURL , + const OUString& sTargetFrameName , sal_Int32 nSearchFlags , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw(css::uno::RuntimeException) @@ -120,7 +120,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments ); sal_Int32 nLength = lArguments.getLength(); aArguments.realloc( nLength + 1 ); - aArguments[ nLength ].Name = ::rtl::OUString("SynchronMode"); + aArguments[ nLength ].Name = OUString("SynchronMode"); aArguments[ nLength ].Value <<= (sal_Bool) sal_True; css::uno::Any aResult; diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index e33e93d5af46..6c6a32aeec67 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -302,8 +302,8 @@ Frame::~Frame() @onerror We return a null reference. @threadsafe yes *//*-*************************************************************************************************************/ -css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromURL( const ::rtl::OUString& sURL , - const ::rtl::OUString& sTargetFrameName, +css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromURL( const OUString& sURL , + const OUString& sTargetFrameName, sal_Int32 nSearchFlags , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException , css::lang::IllegalArgumentException , @@ -524,7 +524,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ if (!xWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString("Frame::initialize() called without a valid container window reference."), + OUString("Frame::initialize() called without a valid container window reference."), static_cast< css::frame::XFrame* >(this)); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -532,7 +532,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& if ( m_xContainerWindow.is() ) throw css::uno::RuntimeException( - ::rtl::OUString("Frame::initialized() is called more then once, which isnt useful nor allowed."), + OUString("Frame::initialized() is called more then once, which isnt useful nor allowed."), static_cast< css::frame::XFrame* >(this)); // Look for rejected calls first! @@ -679,7 +679,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator() @onerror An empty string is returned. *//*-*****************************************************************************************************/ -::rtl::OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException ) +OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException ) { /* SAFE { */ ReadGuard aReadLock( m_aLock ); @@ -701,7 +701,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator() @onerror We do nothing. *//*-*****************************************************************************************************/ -void SAL_CALL Frame::setName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::setName( const OUString& sName ) throw( css::uno::RuntimeException ) { /* SAFE { */ WriteGuard aWriteLock( m_aLock ); @@ -738,7 +738,7 @@ void SAL_CALL Frame::setName( const ::rtl::OUString& sName ) throw( css::uno::Ru @return A reference to found or may be new created frame. @threadsafe yes *//*-*****************************************************************************************************/ -css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl::OUString& sTargetFrameName, +css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XFrame > xTarget; @@ -858,7 +858,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl // get threadsafe some necessary member which are neccessary for following functionality /* SAFE { */ aReadLock.lock(); - ::rtl::OUString sOwnName = m_sName; + OUString sOwnName = m_sName; aReadLock.unlock(); /* } SAFE */ @@ -1676,7 +1676,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util:: } //***************************************************************************************************************** -::rtl::OUString SAL_CALL Frame::getTitle() +OUString SAL_CALL Frame::getTitle() throw (css::uno::RuntimeException) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1691,7 +1691,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util:: } //***************************************************************************************************************** -void SAL_CALL Frame::setTitle( const ::rtl::OUString& sTitle ) +void SAL_CALL Frame::setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1903,7 +1903,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) // If may be later somewhere change the disposed-behaviour of this implementation // and doesn't throw any DisposedExceptions we must guarantee best matching default values ... m_eActiveState = E_INACTIVE; - m_sName = ::rtl::OUString(); + m_sName = OUString(); m_bIsFrameTop = sal_False; m_bConnected = sal_False; m_nExternalLockCount = 0; @@ -2017,7 +2017,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName, + const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ) { const char UNO_PROTOCOL[] = ".uno:"; @@ -2544,12 +2544,12 @@ void Frame::impl_initializePropInfo() css::beans::Property( FRAME_PROPNAME_TITLE, FRAME_PROPHANDLE_TITLE, - ::getCppuType((const ::rtl::OUString*)NULL), + ::getCppuType((const OUString*)NULL), css::beans::PropertyAttribute::TRANSIENT)); } //***************************************************************************************************************** -void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/, +void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle , const css::uno::Any& aValue ) @@ -2567,7 +2567,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/, { case FRAME_PROPHANDLE_TITLE : { - ::rtl::OUString sExternalTitle; + OUString sExternalTitle; aValue >>= sExternalTitle; setTitle (sExternalTitle); } @@ -2611,7 +2611,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/, } //***************************************************************************************************************** -css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const ::rtl::OUString& /*sProperty*/, +css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle ) { /* There is no need to lock any mutex here. Because we share the diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 56f6ac4c4b67..689917006e03 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -136,9 +136,9 @@ static DateTime _oslDateTimeToDateTime(const oslDateTime& aDateTime) Time(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds)); } -static ::rtl::OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False) +static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False) { - ::rtl::OStringBuffer aDateTimeString; + OStringBuffer aDateTimeString; aDateTimeString.append((sal_Int32)aDateTime.GetYear()); aDateTimeString.append("-"); if (aDateTime.GetMonth()<10) aDateTimeString.append("0"); @@ -160,12 +160,12 @@ static ::rtl::OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool return OStringToOUString(aDateTimeString.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); } -static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTime) +static sal_Bool _parseDateTime(const OUString& aString, DateTime& aDateTime) { // take apart a canonical literal xsd:dateTime string //CCYY-MM-DDThh:mm:ss(Z) - ::rtl::OUString aDateTimeString = aString.trim(); + OUString aDateTimeString = aString.trim(); // check length if (aDateTimeString.getLength() < 19 || aDateTimeString.getLength() > 20) @@ -174,10 +174,10 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi sal_Int32 nDateLength = 10; sal_Int32 nTimeLength = 8; - ::rtl::OUString aUTCString("Z"); + OUString aUTCString("Z"); - ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength); - ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength); + OUString aDateString = aDateTimeString.copy(0, nDateLength); + OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength); sal_Int32 nIndex = 0; sal_Int32 nYear = aDateString.getToken(0, '-', nIndex).toInt32(); @@ -198,7 +198,7 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi return sal_True; } -static ::rtl::OUString _getCurrentDateString() +static OUString _getCurrentDateString() { return _makeDateTimeString(DateTime( DateTime::SYSTEM)); } @@ -212,7 +212,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na try { - ::rtl::OUString aBaseInstallPath; + OUString aBaseInstallPath; Bootstrap::PathStatus aBaseLocateResult = Bootstrap::locateBaseInstallation(aBaseInstallPath); if (aBaseLocateResult != Bootstrap::PATH_EXISTS) @@ -224,40 +224,40 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na // determine the filename of the license to show OUString aLangString( Application::GetSettings().GetUILanguageTag().getBcp47()); #if defined(WNT) - ::rtl::OUString aLicensePath = - aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath) - + ::rtl::OUString::createFromAscii(szWNTLicenseName) - + ::rtl::OUString("_") + OUString aLicensePath = + aBaseInstallPath + OUString::createFromAscii(szLicensePath) + + OUString::createFromAscii(szWNTLicenseName) + + OUString("_") + aLangString - + ::rtl::OUString::createFromAscii(szWNTLicenseExt); + + OUString::createFromAscii(szWNTLicenseExt); #else - ::rtl::OUString aLicensePath = - aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath) - + ::rtl::OUString::createFromAscii(szUNXLicenseName) - + ::rtl::OUString("_") + OUString aLicensePath = + aBaseInstallPath + OUString::createFromAscii(szLicensePath) + + OUString::createFromAscii(szUNXLicenseName) + + OUString("_") + aLangString - + ::rtl::OUString::createFromAscii(szUNXLicenseExt); + + OUString::createFromAscii(szUNXLicenseExt); #endif // check if we need to show the license at all // open org.openoffice.Setup/Office/ooLicenseAcceptDate - ::rtl::OUString sAccessSrvc("com.sun.star.configuration.ConfigurationUpdateAccess"); + OUString sAccessSrvc("com.sun.star.configuration.ConfigurationUpdateAccess"); // get configuration provider Reference< XMultiServiceFactory > theConfigProvider = theDefaultProvider::get( m_xContext ); Sequence< Any > theArgs(1); NamedValue v; - v.Name = ::rtl::OUString("NodePath"); - v.Value <<= ::rtl::OUString("org.openoffice.Setup/Office"); + v.Name = OUString("NodePath"); + v.Value <<= OUString("org.openoffice.Setup/Office"); theArgs[0] <<= v; Reference< XPropertySet > pset = Reference< XPropertySet >( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW); // if we find a date there, compare it to baseinstall license date - ::rtl::OUString aAcceptDate; - if (pset->getPropertyValue(::rtl::OUString("ooLicenseAcceptDate")) >>= aAcceptDate) + OUString aAcceptDate; + if (pset->getPropertyValue(OUString("ooLicenseAcceptDate")) >>= aAcceptDate) { // get LicenseFileDate from base install - ::rtl::OUString aLicenseURL = aLicensePath; + OUString aLicenseURL = aLicensePath; DirectoryItem aDirItem; if (DirectoryItem::get(aLicenseURL, aDirItem) != FileBase::E_None) return makeAny(sal_False); @@ -289,7 +289,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na // write org.openoffice.Setup/ooLicenseAcceptDate aAcceptDate = _getCurrentDateString(); - pset->setPropertyValue(::rtl::OUString("ooLicenseAcceptDate"), makeAny(aAcceptDate)); + pset->setPropertyValue(OUString("ooLicenseAcceptDate"), makeAny(aAcceptDate)); Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges(); // enable quickstarter @@ -340,7 +340,7 @@ void SAL_CALL License::removeCloseListener(const css::uno::Reference< css::util: // License Dialog //************************************************************************ -LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResMgr) : +LicenseDialog::LicenseDialog(const OUString & aLicensePath, ResMgr *pResMgr) : ModalDialog(NULL, ResId(DLG_LICENSE, *pResMgr)), aLicenseML(this, ResId(ML_LICENSE, *pResMgr)), aInfo1FT(this, ResId(FT_INFO1, *pResMgr)), @@ -372,7 +372,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM aPBPageDown.SetStyle( aStyle ); String aText = aInfo2FT.GetText(); - aText.SearchAndReplaceAll( rtl::OUString("%PAGEDOWN"), aPBPageDown.GetText() ); + aText.SearchAndReplaceAll( OUString("%PAGEDOWN"), aPBPageDown.GetText() ); aInfo2FT.SetText( aText ); aPBDecline.SetText( aStrNotAccept ); @@ -397,7 +397,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM { nPosition += nBytesRead; } - ::rtl::OUString aLicenseString(pBuffer, nBytes, RTL_TEXTENCODING_UTF8, + OUString aLicenseString(pBuffer, nBytes, RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS | RTL_TEXTTOUNICODE_FLAGS_GLOBAL_SIGNATURE); delete[] pBuffer; aLicenseML.SetText(aLicenseString); diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index 6a8a8c147d75..b057f2ceafd1 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -70,7 +70,7 @@ sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings( OUString& rUrl = rSeq[i]; INetContentType eType = INetContentTypes::GetContentTypeFromURL( rUrl ); - rtl::OUString aType( INetContentTypes::GetContentType( eType ) ); + OUString aType( INetContentTypes::GetContentType( eType ) ); if (!aType.isEmpty()) { rUrl = aType; diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 6afad5741284..6c18d13627c6 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -42,7 +42,7 @@ namespace framework static const char CFGPATH_FACTORIES[] = "/org.openoffice.Setup/Office/Factories"; static const char MODULEPROP_IDENTIFIER[] = "ooSetupFactoryModuleIdentifier"; -rtl::OUString ModuleManager::impl_getStaticImplementationName() { +OUString ModuleManager::impl_getStaticImplementationName() { return IMPLEMENTATIONNAME_MODULEMANAGER; } @@ -55,9 +55,9 @@ ModuleManager::impl_createFactory( impl_getSupportedServiceNames()); } -css::uno::Sequence< rtl::OUString > +css::uno::Sequence< OUString > ModuleManager::impl_getSupportedServiceNames() { - css::uno::Sequence< rtl::OUString > s(1); + css::uno::Sequence< OUString > s(1); s[0] = "com.sun.star.frame.ModuleManager"; return s; } @@ -80,16 +80,16 @@ ModuleManager::~ModuleManager() m_xCFG.clear(); } -rtl::OUString ModuleManager::getImplementationName() +OUString ModuleManager::getImplementationName() throw (css::uno::RuntimeException) { return impl_getStaticImplementationName(); } -sal_Bool ModuleManager::supportsService(rtl::OUString const & ServiceName) +sal_Bool ModuleManager::supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< rtl::OUString > s(getSupportedServiceNames()); + css::uno::Sequence< OUString > s(getSupportedServiceNames()); for (sal_Int32 i = 0; i != s.getLength(); ++i) { if (s[i] == ServiceName) { return true; @@ -98,13 +98,13 @@ sal_Bool ModuleManager::supportsService(rtl::OUString const & ServiceName) return false; } -css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames() +css::uno::Sequence< OUString > ModuleManager::getSupportedServiceNames() throw (css::uno::RuntimeException) { return impl_getSupportedServiceNames(); } -::rtl::OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::XInterface >& xModule) +OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::XInterface >& xModule) throw(css::lang::IllegalArgumentException, css::frame::UnknownModuleException, css::uno::RuntimeException ) @@ -123,7 +123,7 @@ css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames() ) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("Given module is not a frame nor a window, controller or model."), + OUString("Given module is not a frame nor a window, controller or model."), static_cast< ::cppu::OWeakObject* >(this), 1); } @@ -141,7 +141,7 @@ css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames() // No fallbacks to higher components are allowed ! // Note : A frame provides access to module components only ... but it's not a module by himself. - ::rtl::OUString sModule; + OUString sModule; if (xModel.is()) sModule = implts_identify(xModel); else if (xController.is()) @@ -151,13 +151,13 @@ css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames() if (sModule.isEmpty()) throw css::frame::UnknownModuleException( - ::rtl::OUString("Cant find suitable module for the given component."), + OUString("Cant find suitable module for the given component."), static_cast< ::cppu::OWeakObject* >(this)); return sModule; } -void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , +void SAL_CALL ModuleManager::replaceByName(const OUString& sName , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -168,7 +168,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , if (lProps.empty() ) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("No properties given to replace part of module."), + OUString("No properties given to replace part of module."), static_cast< cppu::OWeakObject * >(this), 2); } @@ -186,7 +186,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , // we can close it without a flush ... and our read data wont be affected .-) css::uno::Reference< css::uno::XInterface > xCfg = ::comphelper::ConfigurationHelper::openConfig( comphelper::getComponentContext(xSMGR), - rtl::OUString(CFGPATH_FACTORIES), + OUString(CFGPATH_FACTORIES), ::comphelper::ConfigurationHelper::E_STANDARD); css::uno::Reference< css::container::XNameAccess > xModules (xCfg, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameReplace > xModule ; @@ -195,7 +195,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , if (!xModule.is()) { throw css::uno::RuntimeException( - ::rtl::OUString("Was not able to get write access to the requested module entry inside configuration."), + OUString("Was not able to get write access to the requested module entry inside configuration."), static_cast< cppu::OWeakObject * >(this)); } @@ -204,7 +204,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , pProp != lProps.end() ; ++pProp ) { - const ::rtl::OUString& sPropName = pProp->first; + const OUString& sPropName = pProp->first; const css::uno::Any& aPropValue = pProp->second; // let "NoSuchElementException" out ! We support the same API ... @@ -215,7 +215,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , ::comphelper::ConfigurationHelper::flush(xCfg); } -css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName) +css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ) @@ -227,34 +227,34 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName) if (!xModule.is()) { throw css::uno::RuntimeException( - ::rtl::OUString("Was not able to get write access to the requested module entry inside configuration."), + OUString("Was not able to get write access to the requested module entry inside configuration."), static_cast< cppu::OWeakObject * >(this)); } // convert it to seq< PropertyValue > - const css::uno::Sequence< ::rtl::OUString > lPropNames = xModule->getElementNames(); + const css::uno::Sequence< OUString > lPropNames = xModule->getElementNames(); ::comphelper::SequenceAsHashMap lProps ; sal_Int32 c = lPropNames.getLength(); sal_Int32 i = 0; - lProps[rtl::OUString(MODULEPROP_IDENTIFIER)] <<= sName; + lProps[OUString(MODULEPROP_IDENTIFIER)] <<= sName; for (i=0; i<c; ++i) { - const ::rtl::OUString& sPropName = lPropNames[i]; + const OUString& sPropName = lPropNames[i]; lProps[sPropName] = xModule->getByName(sPropName); } return css::uno::makeAny(lProps.getAsConstPropertyValueList()); } -css::uno::Sequence< ::rtl::OUString > SAL_CALL ModuleManager::getElementNames() +css::uno::Sequence< OUString > SAL_CALL ModuleManager::getElementNames() throw(css::uno::RuntimeException) { css::uno::Reference< css::container::XNameAccess > xCFG = implts_getConfig(); return xCFG->getElementNames(); } -sal_Bool SAL_CALL ModuleManager::hasByName(const ::rtl::OUString& sName) +sal_Bool SAL_CALL ModuleManager::hasByName(const OUString& sName) throw(css::uno::RuntimeException) { css::uno::Reference< css::container::XNameAccess > xCFG = implts_getConfig(); @@ -274,7 +274,7 @@ sal_Bool SAL_CALL ModuleManager::hasElements() return xCFG->hasElements(); } -css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByQuery(const ::rtl::OUString&) +css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByQuery(const OUString&) throw(css::uno::RuntimeException) { return css::uno::Reference< css::container::XEnumeration >(); @@ -284,7 +284,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::crea throw(css::uno::RuntimeException) { ::comphelper::SequenceAsHashMap lSearchProps (lProperties); - css::uno::Sequence< ::rtl::OUString > lModules = getElementNames(); + css::uno::Sequence< OUString > lModules = getElementNames(); sal_Int32 c = lModules.getLength(); sal_Int32 i = 0; ::comphelper::SequenceAsVector< css::uno::Any > lResult ; @@ -293,7 +293,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::crea { try { - const ::rtl::OUString& sModule = lModules[i]; + const OUString& sModule = lModules[i]; ::comphelper::SequenceAsHashMap lModuleProps = getByName(sModule); if (lModuleProps.match(lSearchProps)) @@ -325,7 +325,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf { xCfg = ::comphelper::ConfigurationHelper::openConfig( comphelper::getComponentContext(xSMGR), - rtl::OUString(CFGPATH_FACTORIES), + OUString(CFGPATH_FACTORIES), ::comphelper::ConfigurationHelper::E_READONLY); } catch(const css::uno::RuntimeException&) @@ -344,7 +344,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf // <- SAFE ---------------------------------- } -::rtl::OUString ModuleManager::implts_identify(const css::uno::Reference< css::uno::XInterface >& xComponent) +OUString ModuleManager::implts_identify(const css::uno::Reference< css::uno::XInterface >& xComponent) { // Search for an optional (!) interface XModule first. // Its used to overrule an existing service name. Used e.g. by our database form designer @@ -357,10 +357,10 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf // comparing service names with configured entries ... css::uno::Reference< css::lang::XServiceInfo > xInfo(xComponent, css::uno::UNO_QUERY); if (!xInfo.is()) - return ::rtl::OUString(); + return OUString(); - const css::uno::Sequence< ::rtl::OUString > lKnownModules = getElementNames(); - const ::rtl::OUString* pKnownModules = lKnownModules.getConstArray(); + const css::uno::Sequence< OUString > lKnownModules = getElementNames(); + const OUString* pKnownModules = lKnownModules.getConstArray(); sal_Int32 c = lKnownModules.getLength(); sal_Int32 i = 0; @@ -370,7 +370,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf return pKnownModules[i]; } - return ::rtl::OUString(); + return OUString(); } } // namespace framework diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index df938341f5c8..98ab2c0e705f 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -63,8 +63,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; -using ::rtl::OUString; -using ::rtl::OString; namespace framework{ diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 87ad8b5b87a3..2592bcc94445 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -286,14 +286,14 @@ void TabWindowService::impl_initializePropInfo() impl_addPropertyInfo( css::beans::Property( - rtl::OUString("Window"), + OUString("Window"), TABWINDOWSERVICE_PROPHANDLE_WINDOW, ::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL), css::beans::PropertyAttribute::TRANSIENT)); } //***************************************************************************************************************** -void SAL_CALL TabWindowService::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/, +void SAL_CALL TabWindowService::impl_setPropertyValue(const OUString& /*sProperty*/, sal_Int32 /*nHandle */, const css::uno::Any& /*aValue */) @@ -301,7 +301,7 @@ void SAL_CALL TabWindowService::impl_setPropertyValue(const ::rtl::OUString& /*s } //***************************************************************************************************************** -css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const ::rtl::OUString& /*sProperty*/, +css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const OUString& /*sProperty*/, sal_Int32 nHandle ) { /* There is no need to lock any mutex here. Because we share the @@ -404,7 +404,7 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID) ) { throw css::lang::IndexOutOfBoundsException( - ::rtl::OUString("Tab index out of bounds."), + OUString("Tab index out of bounds."), css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY )); } } @@ -418,7 +418,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID TTabPageInfoHash::iterator pIt = m_lTabPageInfos.find(nID); if (pIt == m_lTabPageInfos.end ()) throw css::lang::IndexOutOfBoundsException( - ::rtl::OUString("Tab index out of bounds."), + OUString("Tab index out of bounds."), css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY )); return pIt; } diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index 6c0e37ca0525..ec25e42ffe73 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -50,9 +50,9 @@ UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContex } // ::com::sun::star::util::XStringAbbreviation: -::rtl::OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const ::rtl::OUString & aString) throw (css::uno::RuntimeException) +OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (css::uno::RuntimeException) { - ::rtl::OUString aResult( aString ); + OUString aResult( aString ); if ( xStringWidth.is() ) { // Use INetURLObject to abbreviate URLs diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 99b2af7fe7e9..13cdf557ee97 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -83,7 +83,7 @@ namespace // Don't add last segment as it is the name! --nCount; - rtl::OUStringBuffer aPath; + OUStringBuffer aPath; for ( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { aPath.append( sal_Unicode( '/' )); @@ -111,8 +111,8 @@ namespace if ( _bUseIntern ) _rURL.Complete = _rURL.Complete.intern(); - _rParser.SetMark ( ::rtl::OUString() ); - _rParser.SetParam( ::rtl::OUString() ); + _rParser.SetMark ( OUString() ); + _rParser.SetParam( OUString() ); _rURL.Main = _rParser.GetMainURL( INetURLObject::NO_DECODE ); } @@ -130,7 +130,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti } // Try to extract the protocol sal_Int32 nURLIndex = aURL.Complete.indexOf( sal_Unicode( ':' )); - ::rtl::OUString aProtocol; + OUString aProtocol; if ( nURLIndex > 1 ) { aProtocol = aURL.Complete.copy( 0, nURLIndex+1 ); @@ -174,7 +174,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti // XURLTransformer //***************************************************************************************************************** sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL , - const ::rtl::OUString& sSmartProtocol ) throw( RuntimeException ) + const OUString& sSmartProtocol ) throw( RuntimeException ) { // Safe impossible cases. if (( &aURL == NULL ) || @@ -202,7 +202,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL { // Try to extract the protocol sal_Int32 nIndex = aURL.Complete.indexOf( sal_Unicode( ':' )); - ::rtl::OUString aProtocol; + OUString aProtocol; if ( nIndex > 1 ) { aProtocol = aURL.Complete.copy( 0, nIndex+1 ); @@ -240,7 +240,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException if ( INetURLObject::CompareProtocolScheme( aURL.Protocol ) != INET_PROT_NOT_VALID ) { - ::rtl::OUStringBuffer aCompletePath( aURL.Path ); + OUStringBuffer aCompletePath( aURL.Path ); // Concat the name if it is provided, just support a final slash if ( !aURL.Name.isEmpty() ) @@ -279,7 +279,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException else if ( !aURL.Protocol.isEmpty() ) { // Minimal support for unknown protocols - ::rtl::OUStringBuffer aBuffer( aURL.Protocol ); + OUStringBuffer aBuffer( aURL.Protocol ); aBuffer.append( aURL.Path ); aURL.Complete = aBuffer.makeStringAndClear(); aURL.Main = aURL.Complete; @@ -292,7 +292,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException //***************************************************************************************************************** // XURLTransformer //***************************************************************************************************************** -::rtl::OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL , +OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL , sal_Bool bWithPassword ) throw( RuntimeException ) { // Safe impossible cases. @@ -301,7 +301,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException (( bWithPassword != sal_True ) && ( bWithPassword != sal_False ) ) ) { - return ::rtl::OUString(); + return OUString(); } // Check given URL @@ -312,18 +312,18 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException if ( !bWithPassword && !aTestURL.Password.isEmpty() ) { // Exchange password text with other placeholder string - aTestURL.Password = ::rtl::OUString("<******>"); + aTestURL.Password = OUString("<******>"); assemble( aTestURL ); } // Convert internal URLs to "praesentation"-URLs! - rtl::OUString sPraesentationURL; + OUString sPraesentationURL; INetURLObject::translateToExternal( aTestURL.Complete, sPraesentationURL, INetURLObject::DECODE_UNAMBIGUOUS ); return sPraesentationURL; } else - return ::rtl::OUString(); + return OUString(); } //_________________________________________________________________________________________________________________ diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 304dc2c1f841..725fda901b59 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -40,7 +40,6 @@ // Defines //_________________________________________________________________________________________________________________ -using ::rtl::OUString; using namespace com::sun::star; namespace framework diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index 258eec7dee2c..4f9d4c017300 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -35,7 +35,6 @@ // Defines //_________________________________________________________________________________________________________________ -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 0912b7bdcc1d..2f0eb7175054 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; //_________________________________________________________________________________________________________________ // Namespace diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx index 63efeda5dfb1..33b7b6ced705 100644 --- a/framework/source/uiconfiguration/graphicnameaccess.cxx +++ b/framework/source/uiconfiguration/graphicnameaccess.cxx @@ -34,13 +34,13 @@ GraphicNameAccess::~GraphicNameAccess() { } -void GraphicNameAccess::addElement( const rtl::OUString& rName, const uno::Reference< graphic::XGraphic >& rElement ) +void GraphicNameAccess::addElement( const OUString& rName, const uno::Reference< graphic::XGraphic >& rElement ) { m_aNameToElementMap.insert( NameGraphicHashMap::value_type( rName, rElement )); } // XNameAccess -uno::Any SAL_CALL GraphicNameAccess::getByName( const ::rtl::OUString& aName ) +uno::Any SAL_CALL GraphicNameAccess::getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) @@ -52,12 +52,12 @@ throw( container::NoSuchElementException, throw container::NoSuchElementException(); } -uno::Sequence< ::rtl::OUString > SAL_CALL GraphicNameAccess::getElementNames() +uno::Sequence< OUString > SAL_CALL GraphicNameAccess::getElementNames() throw(::com::sun::star::uno::RuntimeException) { if ( m_aSeq.getLength() == 0 ) { - uno::Sequence< rtl::OUString > aSeq( m_aNameToElementMap.size() ); + uno::Sequence< OUString > aSeq( m_aNameToElementMap.size() ); NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.begin(); sal_Int32 i( 0); while ( pIter != m_aNameToElementMap.end()) @@ -71,7 +71,7 @@ throw(::com::sun::star::uno::RuntimeException) return m_aSeq; } -sal_Bool SAL_CALL GraphicNameAccess::hasByName( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL GraphicNameAccess::hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException) { NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName ); diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index 5d77a3cbfc46..2a382526c408 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -49,7 +49,6 @@ // namespaces //_________________________________________________________________________________________________________________ -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::Exception; @@ -139,13 +138,13 @@ throw (::com::sun::star::uno::RuntimeException) m_pImpl->reset(); } -Sequence< ::rtl::OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType ) +Sequence< OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException) { return m_pImpl->getAllImageNames( nImageType ); } -::sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) +::sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { return m_pImpl->hasImage(nImageType,aCommandURL); @@ -153,7 +152,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages( ::sal_Int16 nImageType, - const Sequence< ::rtl::OUString >& aCommandURLSequence ) + const Sequence< OUString >& aCommandURLSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { return m_pImpl->getImages(nImageType,aCommandURLSequence); @@ -161,7 +160,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno: void SAL_CALL ImageManager::replaceImages( ::sal_Int16 nImageType, - const Sequence< ::rtl::OUString >& aCommandURLSequence, + const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, @@ -170,7 +169,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence); } -void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) +void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) @@ -178,7 +177,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, m_pImpl->removeImages(nImageType,aCommandURLSequence); } -void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) +void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) throw ( ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index c50fe91db2a4..78d5156ec752 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -49,7 +49,6 @@ #include <rtl/instance.hxx> #include <svtools/miscopt.hxx> -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::Exception; @@ -121,13 +120,13 @@ static GlobalImageList* getGlobalImageList( const uno::Reference< uno::XComponen return pGlobalImageList; } -static rtl::OUString getCanonicalName( const rtl::OUString& rFileName ) +static OUString getCanonicalName( const OUString& rFileName ) { bool bRemoveSlash( true ); sal_Int32 nLength = rFileName.getLength(); const sal_Unicode* pString = rFileName.getStr(); - rtl::OUStringBuffer aBuf( nLength ); + OUStringBuffer aBuf( nLength ); for ( sal_Int32 i = 0; i < nLength; i++ ) { const sal_Unicode c = pString[i]; @@ -152,7 +151,7 @@ static rtl::OUString getCanonicalName( const rtl::OUString& rFileName ) //_________________________________________________________________________________________________________________ -CmdImageList::CmdImageList( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::OUString& aModuleIdentifier ) : +CmdImageList::CmdImageList( const uno::Reference< uno::XComponentContext >& rxContext, const OUString& aModuleIdentifier ) : m_bVectorInit( sal_False ), m_aModuleIdentifier( aModuleIdentifier ), m_xContext( rxContext ), @@ -174,7 +173,7 @@ void CmdImageList::impl_fillCommandToImageNameMap() if ( !m_bVectorInit ) { - const rtl::OUString aCommandImageList( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST ); + const OUString aCommandImageList( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST ); Sequence< OUString > aCmdImageSeq; uno::Reference< XNameAccess > xCmdDesc = frame::UICommandDescription::create( m_xContext ); @@ -210,7 +209,7 @@ void CmdImageList::impl_fillCommandToImageNameMap() } // We have to map commands which uses special characters like '/',':','?','\','<'.'>','|' - String aExt = rtl::OUString(".png"); + String aExt = OUString(".png"); m_aImageCommandNameVector.resize(aCmdImageSeq.getLength() ); m_aImageNameVector.resize( aCmdImageSeq.getLength() ); @@ -281,17 +280,17 @@ ImageList* CmdImageList::impl_getImageList( sal_Int16 nImageType ) return m_pImageList[nImageType]; } -std::vector< ::rtl::OUString >& CmdImageList::impl_getImageNameVector() +std::vector< OUString >& CmdImageList::impl_getImageNameVector() { return m_aImageNameVector; } -std::vector< rtl::OUString >& CmdImageList::impl_getImageCommandNameVector() +std::vector< OUString >& CmdImageList::impl_getImageCommandNameVector() { return m_aImageCommandNameVector; } -Image CmdImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL ) +Image CmdImageList::getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL ) { impl_fillCommandToImageNameMap(); CommandToImageNameMap::const_iterator pIter = m_aCommandToImageNameMap.find( rCommandURL ); @@ -304,7 +303,7 @@ Image CmdImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUS return Image(); } -bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const rtl::OUString& rCommandURL ) +bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const OUString& rCommandURL ) { impl_fillCommandToImageNameMap(); CommandToImageNameMap::const_iterator pIter = m_aCommandToImageNameMap.find( rCommandURL ); @@ -314,12 +313,12 @@ bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const rtl::OUString& rCom return false; } -::std::vector< rtl::OUString >& CmdImageList::getImageNames() +::std::vector< OUString >& CmdImageList::getImageNames() { return impl_getImageNameVector(); } -::std::vector< rtl::OUString >& CmdImageList::getImageCommandNames() +::std::vector< OUString >& CmdImageList::getImageCommandNames() { return impl_getImageCommandNameVector(); } @@ -327,7 +326,7 @@ bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const rtl::OUString& rCom //_________________________________________________________________________________________________________________ GlobalImageList::GlobalImageList( const uno::Reference< uno::XComponentContext >& rxContext ) : - CmdImageList( rxContext, rtl::OUString() ), + CmdImageList( rxContext, OUString() ), m_nRefCount( 0 ) { } @@ -336,25 +335,25 @@ GlobalImageList::~GlobalImageList() { } -Image GlobalImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL ) +Image GlobalImageList::getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL ) { osl::MutexGuard guard( getGlobalImageListMutex() ); return CmdImageList::getImageFromCommandURL( nImageType, rCommandURL ); } -bool GlobalImageList::hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL ) +bool GlobalImageList::hasImage( sal_Int16 nImageType, const OUString& rCommandURL ) { osl::MutexGuard guard( getGlobalImageListMutex() ); return CmdImageList::hasImage( nImageType, rCommandURL ); } -::std::vector< rtl::OUString >& GlobalImageList::getImageNames() +::std::vector< OUString >& GlobalImageList::getImageNames() { osl::MutexGuard guard( getGlobalImageListMutex() ); return impl_getImageNameVector(); } -::std::vector< rtl::OUString >& GlobalImageList::getImageCommandNames() +::std::vector< OUString >& GlobalImageList::getImageCommandNames() { osl::MutexGuard guard( getGlobalImageListMutex() ); return impl_getImageCommandNameVector(); @@ -478,7 +477,7 @@ sal_Bool ImageManagerImpl::implts_loadUserImages( { try { - uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ), + uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ), ElementModes::READ ); uno::Reference< XInputStream > xInputStream = xStream->getInputStream(); @@ -500,7 +499,7 @@ sal_Bool ImageManagerImpl::implts_loadUserImages( } uno::Reference< XStream > xBitmapStream = xUserBitmapsStorage->openStreamElement( - rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ), + OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ), ElementModes::READ ); if ( xBitmapStream.is() ) @@ -575,17 +574,17 @@ sal_Bool ImageManagerImpl::implts_storeUserImages( pList->pImageItemList->push_back( pItem ); } - pList->aURL = rtl::OUString("Bitmaps/"); - pList->aURL += rtl::OUString::createFromAscii(BITMAP_FILE_NAMES[nImageType]); + pList->aURL = OUString("Bitmaps/"); + pList->aURL += OUString::createFromAscii(BITMAP_FILE_NAMES[nImageType]); uno::Reference< XTransactedObject > xTransaction; uno::Reference< XOutputStream > xOutputStream; - uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ), + uno::Reference< XStream > xStream = xUserImageStorage->openStreamElement( OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ), ElementModes::WRITE|ElementModes::TRUNCATE ); if ( xStream.is() ) { uno::Reference< XStream > xBitmapStream = - xUserBitmapsStorage->openStreamElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ), + xUserBitmapsStorage->openStreamElement( OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ), ElementModes::WRITE|ElementModes::TRUNCATE ); if ( xBitmapStream.is() ) { @@ -620,7 +619,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages( // the NoSuchElementException as it can be possible that there is no stream at all! try { - xUserImageStorage->removeElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] )); + xUserImageStorage->removeElement( OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] )); } catch ( const ::com::sun::star::container::NoSuchElementException& ) { @@ -628,7 +627,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages( try { - xUserBitmapsStorage->removeElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] )); + xUserBitmapsStorage->removeElement( OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] )); } catch ( const ::com::sun::star::container::NoSuchElementException& ) { @@ -776,7 +775,7 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments ) if ( xPropSet.is() ) { long nOpenMode = 0; - if ( xPropSet->getPropertyValue( rtl::OUString( "OpenMode" )) >>= nOpenMode ) + if ( xPropSet->getPropertyValue( OUString( "OpenMode" )) >>= nOpenMode ) m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } } @@ -805,7 +804,7 @@ throw (::com::sun::star::uno::RuntimeException) ImageList* pImageList = implts_getUserImageList( ImageType(i)); pImageList->GetImageNames( aUserImageNames ); - Sequence< rtl::OUString > aRemoveList( aUserImageNames.size() ); + Sequence< OUString > aRemoveList( aUserImageNames.size() ); const sal_uInt32 nCount = aUserImageNames.size(); for ( sal_uInt32 j = 0; j < nCount; j++ ) aRemoveList[j] = aUserImageNames[j]; @@ -818,7 +817,7 @@ throw (::com::sun::star::uno::RuntimeException) m_bModified = sal_True; } -Sequence< ::rtl::OUString > ImageManagerImpl::getAllImageNames( ::sal_Int16 nImageType ) +Sequence< OUString > ImageManagerImpl::getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aLock( m_aLock ); @@ -863,7 +862,7 @@ throw (::com::sun::star::uno::RuntimeException) return aImageNameSeq; } -::sal_Bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) +::sal_Bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { ResetableGuard aLock( m_aLock ); @@ -896,7 +895,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: Sequence< uno::Reference< XGraphic > > ImageManagerImpl::getImages( ::sal_Int16 nImageType, - const Sequence< ::rtl::OUString >& aCommandURLSequence ) + const Sequence< OUString >& aCommandURLSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { ResetableGuard aLock( m_aLock ); @@ -910,7 +909,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno: Sequence< uno::Reference< XGraphic > > aGraphSeq( aCommandURLSequence.getLength() ); - const rtl::OUString* aStrArray = aCommandURLSequence.getConstArray(); + const OUString* aStrArray = aCommandURLSequence.getConstArray(); sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType ); rtl::Reference< GlobalImageList > rGlobalImageList; @@ -944,7 +943,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno: void ImageManagerImpl::replaceImages( ::sal_Int16 nImageType, - const Sequence< ::rtl::OUString >& aCommandURLSequence, + const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, @@ -1028,7 +1027,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, } } -void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) +void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) @@ -1132,7 +1131,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, } } -void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) +void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) throw ( ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, @@ -1153,7 +1152,7 @@ throw ( ::com::sun::star::uno::Exception, throw DisposedException(); CommandMap aOldUserCmdImageSet; - std::vector< rtl::OUString > aNewUserCmdImageSet; + std::vector< OUString > aNewUserCmdImageSet; if ( m_bModified ) { @@ -1161,7 +1160,7 @@ throw ( ::com::sun::star::uno::Exception, { if ( !m_bDisposed && m_bUserImageListModified[i] ) { - std::vector< rtl::OUString > aOldUserCmdImageVector; + std::vector< OUString > aOldUserCmdImageVector; ImageList* pImageList = implts_getUserImageList( (ImageType)i ); pImageList->GetImageNames( aOldUserCmdImageVector ); diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index a1416b00f84e..81bd48609543 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -60,28 +60,28 @@ namespace framework { public: CmdImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& aModuleIdentifier ); + const OUString& aModuleIdentifier ); virtual ~CmdImageList(); - virtual Image getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL ); - virtual bool hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL ); - virtual ::std::vector< rtl::OUString >& getImageNames(); - virtual ::std::vector< rtl::OUString >& getImageCommandNames(); + virtual Image getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL ); + virtual bool hasImage( sal_Int16 nImageType, const OUString& rCommandURL ); + virtual ::std::vector< OUString >& getImageNames(); + virtual ::std::vector< OUString >& getImageCommandNames(); protected: void impl_fillCommandToImageNameMap(); ImageList* impl_getImageList( sal_Int16 nImageType ); - std::vector< ::rtl::OUString >& impl_getImageNameVector(); - std::vector< ::rtl::OUString >& impl_getImageCommandNameVector(); + std::vector< OUString >& impl_getImageNameVector(); + std::vector< OUString >& impl_getImageCommandNameVector(); private: sal_Bool m_bVectorInit; - rtl::OUString m_aModuleIdentifier; + OUString m_aModuleIdentifier; ImageList* m_pImageList[ImageType_COUNT]; CommandToImageNameMap m_aCommandToImageNameMap; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::std::vector< rtl::OUString > m_aImageNameVector; - ::std::vector< rtl::OUString > m_aImageCommandNameVector; + ::std::vector< OUString > m_aImageNameVector; + ::std::vector< OUString > m_aImageCommandNameVector; sal_Int16 m_nSymbolsStyle; }; @@ -91,10 +91,10 @@ namespace framework GlobalImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); virtual ~GlobalImageList(); - virtual Image getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL ); - virtual bool hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL ); - virtual ::std::vector< rtl::OUString >& getImageNames(); - virtual ::std::vector< rtl::OUString >& getImageCommandNames(); + virtual Image getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL ); + virtual bool hasImage( sal_Int16 nImageType, const OUString& rCommandURL ); + virtual ::std::vector< OUString >& getImageNames(); + virtual ::std::vector< OUString >& getImageCommandNames(); // Reference virtual oslInterlockedCount SAL_CALL acquire(); @@ -120,12 +120,12 @@ namespace framework // XImageManager void reset() throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - void replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); - void removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); - void insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + void replaceImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicsSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + void removeImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aResourceURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); + void insertImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& aGraphicSequence ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException); // XUIConfiguration void addConfigurationListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); @@ -140,10 +140,10 @@ namespace framework void clear(); - typedef boost::unordered_map< rtl::OUString, + typedef boost::unordered_map< OUString, sal_Bool, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ImageNameMap; + OUStringHash, + ::std::equal_to< OUString > > ImageNameMap; enum Layer { @@ -183,9 +183,9 @@ namespace framework ::cppu::OWeakObject* m_pOwner; rtl::Reference< GlobalImageList > m_pGlobalImageList; CmdImageList* m_pDefaultImageList; - rtl::OUString m_aXMLPostfix; - rtl::OUString m_aModuleIdentifier; - rtl::OUString m_aResourceString; + OUString m_aXMLPostfix; + OUString m_aModuleIdentifier; + OUString m_aResourceString; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener ImageList* m_pUserImageList[ImageType_COUNT]; bool m_bUserImageListModified[ImageType_COUNT]; diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index 6d5fc8226bb9..1125c547100d 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -53,7 +53,6 @@ // namespaces //_________________________________________________________________________________________________________________ -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::Exception; @@ -112,13 +111,13 @@ throw (::com::sun::star::uno::RuntimeException) m_pImpl->reset(); } -Sequence< ::rtl::OUString > SAL_CALL ModuleImageManager::getAllImageNames( ::sal_Int16 nImageType ) +Sequence< OUString > SAL_CALL ModuleImageManager::getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException) { return m_pImpl->getAllImageNames( nImageType ); } -::sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) +::sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { return m_pImpl->hasImage(nImageType,aCommandURL); @@ -126,7 +125,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages( ::sal_Int16 nImageType, - const Sequence< ::rtl::OUString >& aCommandURLSequence ) + const Sequence< OUString >& aCommandURLSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { RTL_LOGFILE_CONTEXT( aLog, "framework: ModuleImageManager::getImages" ); @@ -135,7 +134,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno: void SAL_CALL ModuleImageManager::replaceImages( ::sal_Int16 nImageType, - const Sequence< ::rtl::OUString >& aCommandURLSequence, + const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, @@ -144,7 +143,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence); } -void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) +void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) @@ -152,7 +151,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, m_pImpl->removeImages(nImageType,aCommandURLSequence); } -void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) +void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) throw ( ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 8fe2b042d7d4..f95021c4e38b 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -45,7 +45,6 @@ // namespaces //_________________________________________________________________________________________________________________ -using rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::io; using namespace com::sun::star::embed; @@ -110,7 +109,7 @@ static const char RESOURCEURL_PREFIX[] = "private:resource/"; static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17; static const char RESOURCEURL_CUSTOM_ELEMENT[] = "custom_"; -static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL ) +static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) { if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) && @@ -132,7 +131,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL return UIElementType::UNKNOWN; } -static OUString RetrieveNameFromResourceURL( const rtl::OUString& aResourceURL ) +static OUString RetrieveNameFromResourceURL( const OUString& aResourceURL ) { if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) && ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) @@ -166,7 +165,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme if ( pDataSettings ) { // Retrieve user interface name from XPropertySet interface - rtl::OUString aUIName; + OUString aUIName; Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY ); if ( xPropSet.is() ) { @@ -204,7 +203,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme if ( pDataSettings ) { // Retrieve user interface name from XPropertySet interface - rtl::OUString aUIName; + OUString aUIName; Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY ); if ( xPropSet.is() ) { @@ -237,7 +236,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage; if ( xElementTypeStorage.is() ) { - rtl::OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE ); + OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE ); aBuf.appendAscii( RESOURCEURL_PREFIX ); aBuf.appendAscii( UIELEMENTTYPENAMES[ nElementType ] ); aBuf.appendAscii( "/" ); @@ -384,7 +383,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer() ), UNO_QUERY ); } -ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad ) +ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad ) { // preload list of element types on demand impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType ); @@ -811,12 +810,12 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a if ( !m_bInitialized ) { ::comphelper::SequenceAsHashMap lArgs(aArguments); - m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString("ModuleIdentifier"), ::rtl::OUString()); - m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString("ModuleShortName"), ::rtl::OUString()); + m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(OUString("ModuleIdentifier"), OUString()); + m_aModuleShortName = lArgs.getUnpackedValueOrDefault(OUString("ModuleShortName"), OUString()); for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) { - rtl::OUString aResourceType; + OUString aResourceType; if ( i == ::com::sun::star::ui::UIElementType::MENUBAR ) aResourceType = PresetHandler::RESOURCETYPE_MENUBAR(); else if ( i == ::com::sun::star::ui::UIElementType::TOOLBAR ) @@ -848,7 +847,7 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a if ( xPropSet.is() ) { long nOpenMode = 0; - Any a = xPropSet->getPropertyValue( rtl::OUString( "OpenMode" )); + Any a = xPropSet->getPropertyValue( OUString( "OpenMode" )); if ( a >>= nOpenMode ) m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } @@ -1018,7 +1017,7 @@ Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettin return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); } -sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) +sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1041,7 +1040,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: return sal_False; } -Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable ) +Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1070,7 +1069,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la throw NoSuchElementException(); } -void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) +void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1180,7 +1179,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } } -void SAL_CALL ModuleUIConfigurationManager::removeSettings( const ::rtl::OUString& ResourceURL ) +void SAL_CALL ModuleUIConfigurationManager::removeSettings( const OUString& ResourceURL ) throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1259,7 +1258,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException } } -void SAL_CALL ModuleUIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) +void SAL_CALL ModuleUIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); @@ -1337,13 +1336,13 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() Sequence< Any > aPropSeq( 3 ); PropertyValue aPropValue; - aPropValue.Name = rtl::OUString( "UserConfigStorage" ); + aPropValue.Name = OUString( "UserConfigStorage" ); aPropValue.Value = makeAny( m_xUserConfigStorage ); aPropSeq[0] = makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( "ModuleIdentifier" ); + aPropValue.Name = OUString( "ModuleIdentifier" ); aPropValue.Value = makeAny( m_aModuleIdentifier ); aPropSeq[1] = makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( "UserRootCommit" ); + aPropValue.Name = OUString( "UserRootCommit" ); aPropValue.Value = makeAny( m_xUserRootCommit ); aPropSeq[2] = makeAny( aPropValue ); @@ -1361,7 +1360,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManage throw DisposedException(); Reference< XMultiServiceFactory > xSMGR = m_xServiceManager; - ::rtl::OUString aModule = m_aModuleIdentifier; + OUString aModule = m_aModuleIdentifier; if ( !m_xModuleAcceleratorManager.is() ) { @@ -1369,7 +1368,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManage Reference< XInitialization > xInit (xManager, UNO_QUERY_THROW); PropertyValue aProp; - aProp.Name = ::rtl::OUString("ModuleIdentifier"); + aProp.Name = OUString("ModuleIdentifier"); aProp.Value <<= aModule; Sequence< Any > lArgs(1); @@ -1388,7 +1387,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager( } // XModuleUIConfigurationManager -sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const ::rtl::OUString& ResourceURL ) +sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1411,7 +1410,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: return sal_False; } -Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const ::rtl::OUString& ResourceURL ) +Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 5e70410fd721..78f97f4c9a14 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -78,17 +78,17 @@ class ConfigurationAccess_UICategory : // Order is necessary for right initializ public ::cppu::WeakImplHelper2<XNameAccess,XContainerListener> { public: - ConfigurationAccess_UICategory( const ::rtl::OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext ); + ConfigurationAccess_UICategory( const OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext ); virtual ~ConfigurationAccess_UICategory(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess @@ -107,21 +107,21 @@ class ConfigurationAccess_UICategory : // Order is necessary for right initializ virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException); protected: - Any getUINameFromID( const rtl::OUString& rId ); - Any getUINameFromCache( const rtl::OUString& rId ); - Sequence< rtl::OUString > getAllIds(); + Any getUINameFromID( const OUString& rId ); + Any getUINameFromCache( const OUString& rId ); + Sequence< OUString > getAllIds(); sal_Bool fillCache(); private: - typedef ::boost::unordered_map< ::rtl::OUString, - ::rtl::OUString, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > IdToInfoCache; + typedef ::boost::unordered_map< OUString, + OUString, + OUStringHash, + ::std::equal_to< OUString > > IdToInfoCache; sal_Bool initializeConfigAccess(); - rtl::OUString m_aConfigCategoryAccess; - rtl::OUString m_aPropUIName; + OUString m_aConfigCategoryAccess; + OUString m_aPropUIName; Reference< XNameAccess > m_xGenericUICategories; Reference< XMultiServiceFactory > m_xConfigProvider; Reference< XNameAccess > m_xConfigAccess; @@ -135,7 +135,7 @@ class ConfigurationAccess_UICategory : // Order is necessary for right initializ // XInterface, XTypeProvider //***************************************************************************************************************** -ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XComponentContext >& rxContext ) : +ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XComponentContext >& rxContext ) : ThreadHelpBase(), m_aConfigCategoryAccess( CONFIGURATION_ROOT_ACCESS ), m_aPropUIName( CONFIGURATION_PROPERTY_NAME ), @@ -146,7 +146,7 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUStr RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::ConfigurationAccess_UICategory" ); // Create configuration hierachical access name m_aConfigCategoryAccess += aModuleName; - m_aConfigCategoryAccess += rtl::OUString( CONFIGURATION_CATEGORY_ELEMENT_ACCESS ); + m_aConfigCategoryAccess += OUString( CONFIGURATION_CATEGORY_ELEMENT_ACCESS ); m_xConfigProvider = theDefaultProvider::get( rxContext ); } @@ -161,7 +161,7 @@ ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory() } // XNameAccess -Any SAL_CALL ConfigurationAccess_UICategory::getByName( const ::rtl::OUString& rId ) +Any SAL_CALL ConfigurationAccess_UICategory::getByName( const OUString& rId ) throw ( NoSuchElementException, WrappedTargetException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getByName" ); @@ -182,14 +182,14 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException) return a; } -Sequence< ::rtl::OUString > SAL_CALL ConfigurationAccess_UICategory::getElementNames() +Sequence< OUString > SAL_CALL ConfigurationAccess_UICategory::getElementNames() throw ( RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getElementNames" ); return getAllIds(); } -sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasByName( const ::rtl::OUString& rId ) +sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasByName( const OUString& rId ) throw (::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::hasByName" ); @@ -201,7 +201,7 @@ Type SAL_CALL ConfigurationAccess_UICategory::getElementType() throw ( RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getElementType" ); - return( ::getCppuType( (const rtl::OUString*)NULL ) ); + return( ::getCppuType( (const OUString*)NULL ) ); } sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasElements() @@ -221,8 +221,8 @@ sal_Bool ConfigurationAccess_UICategory::fillCache() return sal_True; sal_Int32 i( 0 ); - rtl::OUString aUIName; - Sequence< ::rtl::OUString > aNameSeq = m_xConfigAccess->getElementNames(); + OUString aUIName; + Sequence< OUString > aNameSeq = m_xConfigAccess->getElementNames(); for ( i = 0; i < aNameSeq.getLength(); i++ ) { @@ -249,7 +249,7 @@ sal_Bool ConfigurationAccess_UICategory::fillCache() return sal_True; } -Any ConfigurationAccess_UICategory::getUINameFromID( const rtl::OUString& rId ) +Any ConfigurationAccess_UICategory::getUINameFromID( const OUString& rId ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getUINameFromID" ); Any a; @@ -285,7 +285,7 @@ Any ConfigurationAccess_UICategory::getUINameFromID( const rtl::OUString& rId ) return a; } -Any ConfigurationAccess_UICategory::getUINameFromCache( const rtl::OUString& rId ) +Any ConfigurationAccess_UICategory::getUINameFromCache( const OUString& rId ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getUINameFromCache" ); Any a; @@ -297,7 +297,7 @@ Any ConfigurationAccess_UICategory::getUINameFromCache( const rtl::OUString& rId return a; } -Sequence< rtl::OUString > ConfigurationAccess_UICategory::getAllIds() +Sequence< OUString > ConfigurationAccess_UICategory::getAllIds() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getAllIds" ); // SAFE @@ -317,18 +317,18 @@ Sequence< rtl::OUString > ConfigurationAccess_UICategory::getAllIds() try { - Sequence< ::rtl::OUString > aNameSeq = m_xConfigAccess->getElementNames(); + Sequence< OUString > aNameSeq = m_xConfigAccess->getElementNames(); if ( m_xGenericUICategories.is() ) { // Create concat list of supported user interface commands of the module - Sequence< ::rtl::OUString > aGenericNameSeq = m_xGenericUICategories->getElementNames(); + Sequence< OUString > aGenericNameSeq = m_xGenericUICategories->getElementNames(); sal_uInt32 nCount1 = aNameSeq.getLength(); sal_uInt32 nCount2 = aGenericNameSeq.getLength(); aNameSeq.realloc( nCount1 + nCount2 ); - ::rtl::OUString* pNameSeq = aNameSeq.getArray(); - const ::rtl::OUString* pGenericSeq = aGenericNameSeq.getConstArray(); + OUString* pNameSeq = aNameSeq.getArray(); + const OUString* pGenericSeq = aGenericNameSeq.getConstArray(); for ( sal_uInt32 i = 0; i < nCount2; i++ ) pNameSeq[nCount1+i] = pGenericSeq[i]; } @@ -343,7 +343,7 @@ Sequence< rtl::OUString > ConfigurationAccess_UICategory::getAllIds() } } - return Sequence< rtl::OUString >(); + return Sequence< OUString >(); } sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() @@ -354,7 +354,7 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() try { - aPropValue.Name = rtl::OUString( "nodepath" ); + aPropValue.Name = OUString( "nodepath" ); aPropValue.Value <<= m_aConfigCategoryAccess; aArgs[0] <<= aPropValue; @@ -427,12 +427,12 @@ UICategoryDescription::UICategoryDescription( const Reference< XComponentContext UICommandDescription(rxContext,true) { Reference< XNameAccess > xEmpty; - rtl::OUString aGenericCategories( "GenericCategories" ); + OUString aGenericCategories( "GenericCategories" ); m_xGenericUICommands = new ConfigurationAccess_UICategory( aGenericCategories, xEmpty, rxContext ); // insert generic categories mappings m_aModuleToCommandFileMap.insert( ModuleToCommandFileMap::value_type( - rtl::OUString(GENERIC_MODULE_NAME ), aGenericCategories )); + OUString(GENERIC_MODULE_NAME ), aGenericCategories )); UICommandsHashMap::iterator pCatIter = m_aUICommandsHashMap.find( aGenericCategories ); if ( pCatIter != m_aUICommandsHashMap.end() ) @@ -444,7 +444,7 @@ UICategoryDescription::UICategoryDescription( const Reference< XComponentContext UICategoryDescription::~UICategoryDescription() { } -Reference< XNameAccess > UICategoryDescription::impl_createConfigAccess(const ::rtl::OUString& _sName) +Reference< XNameAccess > UICategoryDescription::impl_createConfigAccess(const OUString& _sName) { return new ConfigurationAccess_UICategory( _sName, m_xGenericUICommands, m_xContext ); } diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 199a89aeefcc..a2469e087cea 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -110,17 +110,17 @@ static const char* UIELEMENTTYPENAMES[] = static const char RESOURCEURL_PREFIX[] = "private:resource/"; static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17; -static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL ) +static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) { if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) && ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) { - rtl::OUString aTmpStr = aResourceURL.copy( RESOURCEURL_PREFIX_SIZE ); + OUString aTmpStr = aResourceURL.copy( RESOURCEURL_PREFIX_SIZE ); sal_Int32 nIndex = aTmpStr.indexOf( '/' ); if (( nIndex > 0 ) && ( aTmpStr.getLength() > nIndex )) { - rtl::OUString aTypeStr( aTmpStr.copy( 0, nIndex )); + OUString aTypeStr( aTmpStr.copy( 0, nIndex )); for ( int i = 0; i < UIElementType::COUNT; i++ ) { if ( aTypeStr.equalsAscii( UIELEMENTTYPENAMES[i] )) @@ -132,7 +132,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL return UIElementType::UNKNOWN; } -static rtl::OUString RetrieveNameFromResourceURL( const rtl::OUString& aResourceURL ) +static OUString RetrieveNameFromResourceURL( const OUString& aResourceURL ) { if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) && ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) @@ -142,7 +142,7 @@ static rtl::OUString RetrieveNameFromResourceURL( const rtl::OUString& aResource return aResourceURL.copy( nIndex+1 ); } - return rtl::OUString(); + return OUString(); } void UIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType ) @@ -159,7 +159,7 @@ void UIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIElementInfo if ( pDataSettings && !pDataSettings->bDefault ) { // Retrieve user interface name from XPropertySet interface - rtl::OUString aUIName; + OUString aUIName; Reference< XPropertySet > xPropSet( pDataSettings->xSettings, UNO_QUERY ); if ( xPropSet.is() ) { @@ -183,15 +183,15 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy Reference< XStorage > xElementTypeStorage = rElementTypeData.xStorage; if ( xElementTypeStorage.is() ) { - rtl::OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE ); + OUStringBuffer aBuf( RESOURCEURL_PREFIX_SIZE ); aBuf.appendAscii( RESOURCEURL_PREFIX ); aBuf.appendAscii( UIELEMENTTYPENAMES[ nElementType ] ); aBuf.appendAscii( "/" ); - rtl::OUString aResURLPrefix( aBuf.makeStringAndClear() ); + OUString aResURLPrefix( aBuf.makeStringAndClear() ); UIElementDataHashMap& rHashMap = rElementTypeData.aElementsHashMap; Reference< XNameAccess > xNameAccess( xElementTypeStorage, UNO_QUERY ); - Sequence< rtl::OUString > aUIElementNames = xNameAccess->getElementNames(); + Sequence< OUString > aUIElementNames = xNameAccess->getElementNames(); for ( sal_Int32 n = 0; n < aUIElementNames.getLength(); n++ ) { UIElementData aUIElementData; @@ -200,8 +200,8 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy sal_Int32 nIndex = aUIElementNames[n].lastIndexOf( '.' ); if (( nIndex > 0 ) && ( nIndex < aUIElementNames[n].getLength() )) { - rtl::OUString aExtension( aUIElementNames[n].copy( nIndex+1 )); - rtl::OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex )); + OUString aExtension( aUIElementNames[n].copy( nIndex+1 )); + OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex )); if (!aUIElementName.isEmpty() && ( aExtension.equalsIgnoreAsciiCase("xml"))) @@ -325,7 +325,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer()), UNO_QUERY ); } -UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElementData( const rtl::OUString& aResourceURL, sal_Int16 nElementType, bool bLoad ) +UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad ) { // preload list of element types on demand impl_preloadUIElementTypeList( nElementType ); @@ -549,7 +549,7 @@ void UIConfigurationManager::impl_Initialize() Reference< XStorage > xElementTypeStorage; try { - xElementTypeStorage = m_xDocConfigStorage->openStorageElement( rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), nModes ); + xElementTypeStorage = m_xDocConfigStorage->openStorageElement( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), nModes ); } catch ( const com::sun::star::container::NoSuchElementException& ) { @@ -697,7 +697,7 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt { bool bCommitSubStorage( false ); Reference< XNameAccess > xSubStorageNameAccess( xSubStorage, UNO_QUERY ); - Sequence< rtl::OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames(); + Sequence< OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames(); for ( sal_Int32 j = 0; j < aUIElementStreamNames.getLength(); j++ ) { xSubStorage->removeElement( aUIElementStreamNames[j] ); @@ -808,7 +808,7 @@ Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() t return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer()), UNO_QUERY ); } -sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) +sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -826,7 +826,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: return sal_False; } -Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const ::rtl::OUString& ResourceURL, sal_Bool bWriteable ) +Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -855,7 +855,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la throw NoSuchElementException(); } -void SAL_CALL UIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) +void SAL_CALL UIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -914,7 +914,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } } -void SAL_CALL UIConfigurationManager::removeSettings( const ::rtl::OUString& ResourceURL ) +void SAL_CALL UIConfigurationManager::removeSettings( const OUString& ResourceURL ) throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -972,7 +972,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException } } -void SAL_CALL UIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) +void SAL_CALL UIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); @@ -1061,10 +1061,10 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw Sequence< Any > aPropSeq( 2 ); PropertyValue aPropValue; - aPropValue.Name = rtl::OUString( "UserConfigStorage" ); + aPropValue.Name = OUString( "UserConfigStorage" ); aPropValue.Value = makeAny( m_xDocConfigStorage ); aPropSeq[0] = makeAny( aPropValue ); - aPropValue.Name = rtl::OUString( "ModuleIdentifier" ); + aPropValue.Name = OUString( "ModuleIdentifier" ); aPropValue.Value = makeAny( m_aModuleIdentifier ); aPropSeq[1] = makeAny( aPropValue ); @@ -1092,7 +1092,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getShortCutManager() th Reference< XInitialization > xInit (xAccConfig, UNO_QUERY_THROW); PropertyValue aProp; - aProp.Name = ::rtl::OUString("DocumentRoot"); + aProp.Name = OUString("DocumentRoot"); aProp.Value <<= xDocumentRoot; Sequence< Any > lArgs(1); @@ -1159,7 +1159,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S try { long nOpenMode = 0; - Any a = xPropSet->getPropertyValue( rtl::OUString( "OpenMode" )); + Any a = xPropSet->getPropertyValue( OUString( "OpenMode" )); if ( a >>= nOpenMode ) m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } @@ -1273,7 +1273,7 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage try { Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( - rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE )); + OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE )); UIElementType& rElementType = m_aUIElements[i]; if ( rElementType.bModified && xElementTypeStorage.is() ) diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index fc61fa68a00a..6f426bc69d12 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -133,7 +133,7 @@ class ConfigurationAccess_WindowState : // interfaces public ::cppu::OWeakObject { public: - ConfigurationAccess_WindowState( const ::rtl::OUString& aWindowStateConfigFile, const Reference< XComponentContext >& rxContext ); + ConfigurationAccess_WindowState( const OUString& aWindowStateConfigFile, const Reference< XComponentContext >& rxContext ); virtual ~ConfigurationAccess_WindowState(); // XInterface, XTypeProvider @@ -141,24 +141,24 @@ class ConfigurationAccess_WindowState : // interfaces FWK_DECLARE_XTYPEPROVIDER // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL removeByName( const ::rtl::OUString& sName ) + virtual void SAL_CALL removeByName( const OUString& sName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); - virtual void SAL_CALL insertByName( const ::rtl::OUString& sName, const css::uno::Any& aPropertySet ) + virtual void SAL_CALL insertByName( const OUString& sName, const css::uno::Any& aPropertySet ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException ); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& sName, const css::uno::Any& aPropertySet ) + virtual void SAL_CALL replaceByName( const OUString& sName, const css::uno::Any& aPropertySet ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); // XElementAccess @@ -222,34 +222,34 @@ class ConfigurationAccess_WindowState : // interfaces com::sun::star::awt::Size aDockSize; com::sun::star::awt::Point aPos; com::sun::star::awt::Size aSize; - rtl::OUString aUIName; + OUString aUIName; sal_uInt32 nInternalState; sal_uInt16 nStyle; sal_uInt32 nMask; // see WindowStateMask }; void impl_putPropertiesFromStruct( const WindowStateInfo& rWinStateInfo, Reference< XPropertySet >& xPropSet ); - Any impl_insertCacheAndReturnSequence( const rtl::OUString& rResourceURL, Reference< XNameAccess >& rNameAccess ); - WindowStateInfo& impl_insertCacheAndReturnWinState( const rtl::OUString& rResourceURL, Reference< XNameAccess >& rNameAccess ); + Any impl_insertCacheAndReturnSequence( const OUString& rResourceURL, Reference< XNameAccess >& rNameAccess ); + WindowStateInfo& impl_insertCacheAndReturnWinState( const OUString& rResourceURL, Reference< XNameAccess >& rNameAccess ); Any impl_getSequenceFromStruct( const WindowStateInfo& rWinStateInfo ); void impl_fillStructFromSequence( WindowStateInfo& rWinStateInfo, const Sequence< PropertyValue >& rSeq ); - Any impl_getWindowStateFromResourceURL( const rtl::OUString& rResourceURL ); + Any impl_getWindowStateFromResourceURL( const OUString& rResourceURL ); sal_Bool impl_initializeConfigAccess(); private: - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, WindowStateInfo, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ResourceURLToInfoCache; + OUStringHash, + ::std::equal_to< OUString > > ResourceURLToInfoCache; - rtl::OUString m_aConfigWindowAccess; + OUString m_aConfigWindowAccess; Reference< XMultiServiceFactory > m_xConfigProvider; Reference< XNameAccess > m_xConfigAccess; Reference< XContainerListener > m_xConfigListener; ResourceURLToInfoCache m_aResourceURLToInfoCache; sal_Bool m_bConfigAccessInitialized : 1, m_bModified : 1; - std::vector< ::rtl::OUString > m_aPropArray; + std::vector< OUString > m_aPropArray; }; //***************************************************************************************************************** @@ -276,7 +276,7 @@ DEFINE_XTYPEPROVIDER_7 ( ConfigurationAccess_WindowState , css::lang::XTypeProvider ) -ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const rtl::OUString& aModuleName, const Reference< XComponentContext >& rxContext ) : +ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const OUString& aModuleName, const Reference< XComponentContext >& rxContext ) : ThreadHelpBase(), m_aConfigWindowAccess( CONFIGURATION_ROOT_ACCESS ), m_bConfigAccessInitialized( sal_False ), @@ -284,14 +284,14 @@ ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const rtl::OUS { // Create configuration hierachical access name m_aConfigWindowAccess += aModuleName; - m_aConfigWindowAccess += rtl::OUString( CONFIGURATION_WINDOWSTATE_ACCESS ); + m_aConfigWindowAccess += OUString( CONFIGURATION_WINDOWSTATE_ACCESS ); m_xConfigProvider = theDefaultProvider::get( rxContext ); // Initialize access array with property names. sal_Int32 n = 0; while ( CONFIGURATION_PROPERTIES[n] ) { - m_aPropArray.push_back( ::rtl::OUString::createFromAscii( CONFIGURATION_PROPERTIES[n] )); + m_aPropArray.push_back( OUString::createFromAscii( CONFIGURATION_PROPERTIES[n] )); ++n; } } @@ -306,7 +306,7 @@ ConfigurationAccess_WindowState::~ConfigurationAccess_WindowState() } // XNameAccess -Any SAL_CALL ConfigurationAccess_WindowState::getByName( const ::rtl::OUString& rResourceURL ) +Any SAL_CALL ConfigurationAccess_WindowState::getByName( const OUString& rResourceURL ) throw ( NoSuchElementException, WrappedTargetException, RuntimeException) { // SAFE @@ -325,7 +325,7 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException) } } -Sequence< ::rtl::OUString > SAL_CALL ConfigurationAccess_WindowState::getElementNames() +Sequence< OUString > SAL_CALL ConfigurationAccess_WindowState::getElementNames() throw ( RuntimeException ) { // SAFE @@ -340,10 +340,10 @@ throw ( RuntimeException ) if ( m_xConfigAccess.is() ) return m_xConfigAccess->getElementNames(); else - return Sequence< ::rtl::OUString > (); + return Sequence< OUString > (); } -sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasByName( const ::rtl::OUString& rResourceURL ) +sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasByName( const OUString& rResourceURL ) throw (::com::sun::star::uno::RuntimeException) { // SAFE @@ -388,7 +388,7 @@ throw ( RuntimeException ) } // XNameContainer -void SAL_CALL ConfigurationAccess_WindowState::removeByName( const ::rtl::OUString& rResourceURL ) +void SAL_CALL ConfigurationAccess_WindowState::removeByName( const OUString& rResourceURL ) throw( NoSuchElementException, WrappedTargetException, RuntimeException ) { // SAFE @@ -423,7 +423,7 @@ throw( NoSuchElementException, WrappedTargetException, RuntimeException ) } } -void SAL_CALL ConfigurationAccess_WindowState::insertByName( const ::rtl::OUString& rResourceURL, const css::uno::Any& aPropertySet ) +void SAL_CALL ConfigurationAccess_WindowState::insertByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet ) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException ) { // SAFE @@ -488,7 +488,7 @@ throw( IllegalArgumentException, ElementExistException, WrappedTargetException, } // XNameReplace -void SAL_CALL ConfigurationAccess_WindowState::replaceByName( const ::rtl::OUString& rResourceURL, const css::uno::Any& aPropertySet ) +void SAL_CALL ConfigurationAccess_WindowState::replaceByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet ) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException ) { // SAFE @@ -533,7 +533,7 @@ throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, if ( xNameContainer.is() ) { WindowStateInfo aWinStateInfo( pIter->second ); - ::rtl::OUString aResourceURL( pIter->first ); + OUString aResourceURL( pIter->first ); m_bModified = sal_False; aLock.unlock(); @@ -645,7 +645,7 @@ Any ConfigurationAccess_WindowState::impl_getSequenceFromStruct( const WindowSta return makeAny( aPropSeq ); } -Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rtl::OUString& rResourceURL, Reference< XNameAccess >& xNameAccess ) +Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OUString& rResourceURL, Reference< XNameAccess >& xNameAccess ) { sal_Int32 nMask( 0 ); sal_Int32 nCount( m_aPropArray.size() ); @@ -720,11 +720,11 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt case PROPERTY_POS: case PROPERTY_DOCKPOS: { - ::rtl::OUString aString; + OUString aString; if ( a >>= aString ) { sal_Int32 nToken( 0 ); - ::rtl::OUString aXStr = aString.getToken( 0, ',', nToken ); + OUString aXStr = aString.getToken( 0, ',', nToken ); if ( nToken > 0 ) { com::sun::star::awt::Point aPos; @@ -752,11 +752,11 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt case PROPERTY_SIZE: case PROPERTY_DOCKSIZE: { - ::rtl::OUString aString; + OUString aString; if ( a >>= aString ) { sal_Int32 nToken( 0 ); - ::rtl::OUString aStr = aString.getToken( 0, ',', nToken ); + OUString aStr = aString.getToken( 0, ',', nToken ); if ( nToken > 0 ) { com::sun::star::awt::Size aSize; @@ -782,7 +782,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt case PROPERTY_UINAME: { - ::rtl::OUString aValue; + OUString aValue; if ( a >>= aValue ) { nMask |= WINDOWSTATE_MASK_UINAME; @@ -842,7 +842,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt return makeAny( aPropSeq ); } -ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowState::impl_insertCacheAndReturnWinState( const rtl::OUString& rResourceURL, Reference< XNameAccess >& rNameAccess ) +ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowState::impl_insertCacheAndReturnWinState( const OUString& rResourceURL, Reference< XNameAccess >& rNameAccess ) { sal_Int32 nMask( 0 ); sal_Int32 nCount( m_aPropArray.size() ); @@ -914,11 +914,11 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat case PROPERTY_POS: case PROPERTY_DOCKPOS: { - ::rtl::OUString aString; + OUString aString; if ( a >>= aString ) { sal_Int32 nToken( 0 ); - ::rtl::OUString aXStr = aString.getToken( 0, ',', nToken ); + OUString aXStr = aString.getToken( 0, ',', nToken ); if ( nToken > 0 ) { com::sun::star::awt::Point aPos; @@ -943,11 +943,11 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat case PROPERTY_SIZE: case PROPERTY_DOCKSIZE: { - ::rtl::OUString aString; + OUString aString; if ( a >>= aString ) { sal_Int32 nToken( 0 ); - ::rtl::OUString aStr = aString.getToken( 0, ',', nToken ); + OUString aStr = aString.getToken( 0, ',', nToken ); if ( nToken > 0 ) { com::sun::star::awt::Size aSize; @@ -970,7 +970,7 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat case PROPERTY_UINAME: { - ::rtl::OUString aValue; + OUString aValue; if ( a >>= aValue ) { nMask |= WINDOWSTATE_MASK_UINAME; @@ -1017,7 +1017,7 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat return pIter->second; } -Any ConfigurationAccess_WindowState::impl_getWindowStateFromResourceURL( const rtl::OUString& rResourceURL ) +Any ConfigurationAccess_WindowState::impl_getWindowStateFromResourceURL( const OUString& rResourceURL ) { if ( !m_bConfigAccessInitialized ) { @@ -1160,7 +1160,7 @@ void ConfigurationAccess_WindowState::impl_fillStructFromSequence( WindowStateIn case PROPERTY_UINAME: { - ::rtl::OUString aValue; + OUString aValue; if ( rSeq[i].Value >>= aValue ) { rWinStateInfo.aUIName = aValue; @@ -1206,7 +1206,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window sal_Int32 i( 0 ); sal_Int32 nCount( m_aPropArray.size() ); Sequence< PropertyValue > aPropSeq; - ::rtl::OUString aDelim( "," ); + OUString aDelim( "," ); for ( i = 0; i < nCount; i++ ) { @@ -1238,32 +1238,32 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window case PROPERTY_POS: case PROPERTY_DOCKPOS: { - ::rtl::OUString aPosStr; + OUString aPosStr; if ( i == PROPERTY_POS ) - aPosStr = ::rtl::OUString::valueOf( rWinStateInfo.aPos.X ); + aPosStr = OUString::valueOf( rWinStateInfo.aPos.X ); else - aPosStr = ::rtl::OUString::valueOf( rWinStateInfo.aDockPos.X ); + aPosStr = OUString::valueOf( rWinStateInfo.aDockPos.X ); aPosStr += aDelim; if ( i == PROPERTY_POS ) - aPosStr += ::rtl::OUString::valueOf( rWinStateInfo.aPos.Y ); + aPosStr += OUString::valueOf( rWinStateInfo.aPos.Y ); else - aPosStr += ::rtl::OUString::valueOf( rWinStateInfo.aDockPos.Y ); + aPosStr += OUString::valueOf( rWinStateInfo.aDockPos.Y ); xPropSet->setPropertyValue( m_aPropArray[i], makeAny( aPosStr ) ); break; } case PROPERTY_SIZE: case PROPERTY_DOCKSIZE: { - ::rtl::OUString aSizeStr; + OUString aSizeStr; if ( i == PROPERTY_SIZE ) - aSizeStr = ( ::rtl::OUString::valueOf( rWinStateInfo.aSize.Width )); + aSizeStr = ( OUString::valueOf( rWinStateInfo.aSize.Width )); else - aSizeStr = ( ::rtl::OUString::valueOf( rWinStateInfo.aDockSize.Width )); + aSizeStr = ( OUString::valueOf( rWinStateInfo.aDockSize.Width )); aSizeStr += aDelim; if ( i == PROPERTY_SIZE ) - aSizeStr += ::rtl::OUString::valueOf( rWinStateInfo.aSize.Height ); + aSizeStr += OUString::valueOf( rWinStateInfo.aSize.Height ); else - aSizeStr += ::rtl::OUString::valueOf( rWinStateInfo.aDockSize.Height ); + aSizeStr += OUString::valueOf( rWinStateInfo.aDockSize.Height ); xPropSet->setPropertyValue( m_aPropArray[i], makeAny( aSizeStr ) ); break; } @@ -1291,10 +1291,10 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() try { - aPropValue.Name = rtl::OUString( "nodepath" ); + aPropValue.Name = OUString( "nodepath" ); aPropValue.Value <<= m_aConfigWindowAccess; aArgs[0] <<= aPropValue; - aPropValue.Name = rtl::OUString( "lazywrite" ); + aPropValue.Name = OUString( "lazywrite" ); aPropValue.Value <<= sal_True; aArgs[1] <<= aPropValue; @@ -1357,7 +1357,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XComponentC { m_xModuleManager = ModuleManager::create( m_xContext ); Reference< XNameAccess > xEmptyNameAccess; - Sequence< rtl::OUString > aElementNames; + Sequence< OUString > aElementNames; try { aElementNames = m_xModuleManager->getElementNames(); @@ -1366,14 +1366,14 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XComponentC { } Sequence< PropertyValue > aSeq; - ::rtl::OUString aModuleIdentifier; + OUString aModuleIdentifier; for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ ) { aModuleIdentifier = aElementNames[i]; if ( m_xModuleManager->getByName( aModuleIdentifier ) >>= aSeq ) { - ::rtl::OUString aWindowStateFileStr; + OUString aWindowStateFileStr; for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ ) { if ( aSeq[y].Name == "ooSetupFactoryWindowStateConfigRef" ) @@ -1404,7 +1404,7 @@ WindowStateConfiguration::~WindowStateConfiguration() m_aModuleToWindowStateHashMap.clear(); } -Any SAL_CALL WindowStateConfiguration::getByName( const ::rtl::OUString& aModuleIdentifier ) +Any SAL_CALL WindowStateConfiguration::getByName( const OUString& aModuleIdentifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { ResetableGuard aLock( m_aLock ); @@ -1413,7 +1413,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la if ( pIter != m_aModuleToFileHashMap.end() ) { Any a; - ::rtl::OUString aWindowStateConfigFile( pIter->second ); + OUString aWindowStateConfigFile( pIter->second ); ModuleToWindowStateConfigHashMap::iterator pModuleIter = m_aModuleToWindowStateHashMap.find( aWindowStateConfigFile ); if ( pModuleIter != m_aModuleToWindowStateHashMap.end() ) @@ -1436,12 +1436,12 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la throw NoSuchElementException(); } -Sequence< ::rtl::OUString > SAL_CALL WindowStateConfiguration::getElementNames() +Sequence< OUString > SAL_CALL WindowStateConfiguration::getElementNames() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aLock( m_aLock ); - Sequence< rtl::OUString > aSeq( m_aModuleToFileHashMap.size() ); + Sequence< OUString > aSeq( m_aModuleToFileHashMap.size() ); sal_Int32 n = 0; ModuleToWindowStateFileMap::const_iterator pIter = m_aModuleToFileHashMap.begin(); @@ -1454,7 +1454,7 @@ throw (::com::sun::star::uno::RuntimeException) return aSeq; } -sal_Bool SAL_CALL WindowStateConfiguration::hasByName( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL WindowStateConfiguration::hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 270fd3e64f29..6c1c8c145b33 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -57,7 +57,7 @@ namespace framework ButtonToolbarController::ButtonToolbarController( const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, ToolBox* pToolBar, - const rtl::OUString& aCommand ) : + const OUString& aCommand ) : cppu::OWeakObject(), m_bInitialized( sal_False ), m_bDisposed( sal_False ), @@ -209,7 +209,7 @@ throw (::com::sun::star::uno::RuntimeException) uno::Reference< frame::XDispatch > xDispatch; uno::Reference< frame::XFrame > xFrame; uno::Reference< util::XURLTransformer > xURLTransformer; - rtl::OUString aCommandURL; + OUString aCommandURL; ::com::sun::star::util::URL aTargetURL; { @@ -239,7 +239,7 @@ throw (::com::sun::star::uno::RuntimeException) { aTargetURL.Complete = aCommandURL; xURLTransformer->parseStrict( aTargetURL ); - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } if ( xDispatch.is() ) @@ -249,7 +249,7 @@ throw (::com::sun::star::uno::RuntimeException) Sequence<PropertyValue> aArgs( 1 ); // Provide key modifier information to dispatch function - aArgs[0].Name = rtl::OUString( "KeyModifier" ); + aArgs[0].Name = OUString( "KeyModifier" ); aArgs[0].Value <<= KeyModifier; xDispatch->dispatch( aTargetURL, aArgs ); diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 5f2fbb9919ac..499e1b47e146 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -57,7 +57,7 @@ ComplexToolbarController::ComplexToolbarController( const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, - const ::rtl::OUString& aCommand ) : + const OUString& aCommand ) : svt::ToolboxController( rServiceManager, rFrame, aCommand ) , m_pToolbar( pToolbar ) , m_nID( nID ) @@ -93,7 +93,7 @@ Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyMo Sequence<PropertyValue> aArgs( 1 ); // Add key modifier to argument list - aArgs[0].Name = rtl::OUString( "KeyModifier" ); + aArgs[0].Name = OUString( "KeyModifier" ); aArgs[0].Value <<= KeyModifier; return aArgs; } @@ -103,7 +103,7 @@ throw ( RuntimeException ) { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; - ::rtl::OUString aCommandURL; + OUString aCommandURL; ::com::sun::star::util::URL aTargetURL; Sequence<PropertyValue> aArgs; @@ -156,7 +156,7 @@ throw ( RuntimeException ) TriState eTri = STATE_NOCHECK; sal_Bool bValue = sal_Bool(); - rtl::OUString aStrValue; + OUString aStrValue; ItemStatus aItemState; Visibility aItemVisibility; ControlCommand aControlCommand; @@ -173,7 +173,7 @@ throw ( RuntimeException ) } else if ( Event.State >>= aStrValue ) { - ::rtl::OUString aText( MnemonicGenerator::EraseAllMnemonicChars( aStrValue ) ); + OUString aText( MnemonicGenerator::EraseAllMnemonicChars( aStrValue ) ); m_pToolbar->SetItemText( m_nID, aText ); m_pToolbar->SetQuickHelpText( m_nID, aText ); @@ -256,7 +256,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, Notify_Impl, NotifyInfo*, // ------------------------------------------------------------------ void ComplexToolbarController::addNotifyInfo( - const rtl::OUString& aEventName, + const OUString& aEventName, const uno::Reference< frame::XDispatch >& xDispatch, const uno::Sequence< beans::NamedValue >& rInfo ) { @@ -275,7 +275,7 @@ void ComplexToolbarController::addNotifyInfo( sal_Int32 nCount = rInfo.getLength(); uno::Sequence< beans::NamedValue > aInfoSeq( rInfo ); aInfoSeq.realloc( nCount+1 ); - aInfoSeq[nCount].Name = ::rtl::OUString( "Source" ); + aInfoSeq[nCount].Name = OUString( "Source" ); aInfoSeq[nCount].Value = uno::makeAny( getFrameInterface() ); pNotifyInfo->aInfoSeq = aInfoSeq; @@ -297,7 +297,7 @@ sal_Int32 ComplexToolbarController::getFontSizePixel( const Window* pWindow ) // -------------------------------------------------------- -uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromCommand( const rtl::OUString& aCommand ) const +uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromCommand( const OUString& aCommand ) const { uno::Reference< frame::XDispatch > xDispatch; @@ -327,7 +327,7 @@ void ComplexToolbarController::notifyFocusGet() { // send focus get notification uno::Sequence< beans::NamedValue > aInfo; - addNotifyInfo( rtl::OUString( "FocusSet" ), + addNotifyInfo( OUString( "FocusSet" ), getDispatchFromCommand( m_aCommandURL ), aInfo ); } @@ -336,18 +336,18 @@ void ComplexToolbarController::notifyFocusLost() { // send focus lost notification uno::Sequence< beans::NamedValue > aInfo; - addNotifyInfo( rtl::OUString( "FocusLost" ), + addNotifyInfo( OUString( "FocusLost" ), getDispatchFromCommand( m_aCommandURL ), aInfo ); } -void ComplexToolbarController::notifyTextChanged( const ::rtl::OUString& aText ) +void ComplexToolbarController::notifyTextChanged( const OUString& aText ) { // send text changed notification uno::Sequence< beans::NamedValue > aInfo( 1 ); - aInfo[0].Name = rtl::OUString( "Text" ); + aInfo[0].Name = OUString( "Text" ); aInfo[0].Value <<= aText; - addNotifyInfo( rtl::OUString( "TextChanged" ), + addNotifyInfo( OUString( "TextChanged" ), getDispatchFromCommand( m_aCommandURL ), aInfo ); } diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 42de11ea3ffa..4c1276e8bbb6 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -380,10 +380,10 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star:: for (sal_uInt32 i=0; i<sizeof(aCommands)/sizeof(aCommands[0]); ++i) { - aTargetURL.Complete = rtl::OUString::createFromAscii( aCommands[i] ); + aTargetURL.Complete = OUString::createFromAscii( aCommands[i] ); m_xURLTransformer->parseStrict( aTargetURL ); - Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); if ( xDispatch.is() ) { xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); @@ -399,7 +399,7 @@ void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArgumen { osl::ResettableMutexGuard aLock( m_aMutex ); svt::PopupMenuControllerBase::initialize(aArguments); - m_aBaseURL = ::rtl::OUString(); + m_aBaseURL = OUString(); } } diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 5d7a3e35d25d..714332cb5a12 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -47,7 +47,7 @@ using namespace com::sun::star::util; using namespace std; -static bool lcl_I18nCompareString(const rtl::OUString& rStr1, const rtl::OUString& rStr2) +static bool lcl_I18nCompareString(const OUString& rStr1, const OUString& rStr2) { const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper(); return rI18nHelper.CompareString( rStr1, rStr2 ) < 0 ? true : false; @@ -74,9 +74,9 @@ FontMenuController::~FontMenuController() } // private function -void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFontNameSeq, Reference< css::awt::XPopupMenu >& rPopupMenu ) +void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq, Reference< css::awt::XPopupMenu >& rPopupMenu ) { - const rtl::OUString* pFontNameArray = rFontNameSeq.getConstArray(); + const OUString* pFontNameArray = rFontNameSeq.getConstArray(); VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; @@ -88,7 +88,7 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont if ( pVCLPopupMenu ) { - vector<rtl::OUString> aVector; + vector<OUString> aVector; aVector.reserve(rFontNameSeq.getLength()); for ( sal_uInt16 i = 0; i < rFontNameSeq.getLength(); i++ ) { @@ -96,18 +96,18 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont } sort(aVector.begin(), aVector.end(), lcl_I18nCompareString ); - const rtl::OUString aFontNameCommandPrefix( ".uno:CharFontName?CharFontName.FamilyName:string=" ); + const OUString aFontNameCommandPrefix( ".uno:CharFontName?CharFontName.FamilyName:string=" ); const sal_Int16 nCount = (sal_Int16)aVector.size(); for ( sal_Int16 i = 0; i < nCount; i++ ) { - const rtl::OUString& rName = aVector[i]; + const OUString& rName = aVector[i]; m_xPopupMenu->insertItem( i+1, rName, css::awt::MenuItemStyle::RADIOCHECK | css::awt::MenuItemStyle::AUTOCHECK, i ); if ( rName == m_aFontFamilyName ) m_xPopupMenu->checkItem( i+1, sal_True ); // use VCL popup menu pointer to set vital information that are not part of the awt implementation - rtl::OUStringBuffer aCommandBuffer( aFontNameCommandPrefix ); + OUStringBuffer aCommandBuffer( aFontNameCommandPrefix ); aCommandBuffer.append( INetURLObject::encode( rName, INetURLObject::PART_HTTP_QUERY, '%', INetURLObject::ENCODE_ALL )); - rtl::OUString aFontNameCommand = aCommandBuffer.makeStringAndClear(); + OUString aFontNameCommand = aCommandBuffer.makeStringAndClear(); pVCLPopupMenu->SetItemCommand( i+1, aFontNameCommand ); // Store font name into item command. } @@ -134,7 +134,7 @@ void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( Runtim void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { com::sun::star::awt::FontDescriptor aFontDescriptor; - Sequence< rtl::OUString > aFontNameSeq; + Sequence< OUString > aFontNameSeq; if ( Event.State >>= aFontDescriptor ) { @@ -167,7 +167,7 @@ void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw ( // find new font name and set check mark! sal_uInt16 nChecked = 0; sal_uInt16 nItemCount = m_xPopupMenu->getItemCount(); - rtl::OUString aEmpty; + OUString aEmpty; for( sal_uInt16 i = 0; i < nItemCount; i++ ) { sal_uInt16 nItemId = m_xPopupMenu->getItemId( i ); @@ -175,7 +175,7 @@ void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw ( if ( m_xPopupMenu->isItemChecked( nItemId ) ) nChecked = nItemId; - rtl::OUString aText = m_xPopupMenu->getItemText( nItemId ); + OUString aText = m_xPopupMenu->getItemText( nItemId ); // TODO: must be replaced by implementation of VCL, when available sal_Int32 nIndex = aText.indexOf( (sal_Unicode)'~' ); @@ -202,9 +202,9 @@ void FontMenuController::impl_setPopupMenu() com::sun::star::util::URL aTargetURL; // Register for font list updates to get the current font list from the controller - aTargetURL.Complete = rtl::OUString( ".uno:FontNameList" ); + aTargetURL.Complete = OUString( ".uno:FontNameList" ); m_xURLTransformer->parseStrict( aTargetURL ); - m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) @@ -214,7 +214,7 @@ void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::un osl::ClearableMutexGuard aLock( m_aMutex ); Reference< XDispatch > xDispatch( m_xFontListDispatch ); com::sun::star::util::URL aTargetURL; - aTargetURL.Complete = rtl::OUString( ".uno:FontNameList" ); + aTargetURL.Complete = OUString( ".uno:FontNameList" ); m_xURLTransformer->parseStrict( aTargetURL ); aLock.clear(); diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 9defbc9965a1..22ddd7619601 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -71,9 +71,9 @@ FontSizeMenuController::~FontSizeMenuController() } // private function -rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ) +OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ) { - rtl::OUString aPrinterName; + OUString aPrinterName; if ( rFrame.is() ) { @@ -137,7 +137,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r { FontList* pFontList = 0; Printer* pInfoPrinter = 0; - rtl::OUString aPrinterName; + OUString aPrinterName; SolarMutexGuard aSolarMutexGuard; @@ -166,13 +166,13 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r nSizeCount++; sal_uInt16 nPos = 0; - const rtl::OUString aFontHeightCommand( ".uno:FontHeight?FontHeight.Height:float=" ); + const OUString aFontHeightCommand( ".uno:FontHeight?FontHeight.Height:float=" ); // first insert font size names (for simplified/traditional chinese) float fPoint; FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguageTag().getLanguageType() ); m_pHeightArray = new long[nSizeCount+aFontSizeNames.Count()]; - rtl::OUString aCommand; + OUString aCommand; if ( !aFontSizeNames.IsEmpty() ) { @@ -190,7 +190,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r fPoint = float( m_pHeightArray[nPos-1] ) / 10; // Create dispatchable .uno command and set it - aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint ); + aCommand = aFontHeightCommand + OUString::valueOf( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); } } @@ -209,7 +209,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r fPoint = float( m_pHeightArray[nPos-1] ) / 10; // Create dispatchable .uno command and set it - aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint ); + aCommand = aFontHeightCommand + OUString::valueOf( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); } pTempAry++; @@ -228,7 +228,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r fPoint = float( m_pHeightArray[nPos-1] ) / 10; // Create dispatchable .uno command and set it - aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint ); + aCommand = aFontHeightCommand + OUString::valueOf( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); pTempAry++; @@ -298,9 +298,9 @@ void FontSizeMenuController::impl_setPopupMenu() Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); com::sun::star::util::URL aTargetURL; // Register for font name updates which gives us info about the current font! - aTargetURL.Complete = rtl::OUString( ".uno:CharFontName" ); + aTargetURL.Complete = OUString( ".uno:CharFontName" ); m_xURLTransformer->parseStrict( aTargetURL ); - m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) @@ -311,7 +311,7 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star Reference< XDispatch > xDispatch( m_xCurrentFontDispatch ); com::sun::star::util::URL aTargetURL; - aTargetURL.Complete = rtl::OUString( ".uno:CharFontName" ); + aTargetURL.Complete = OUString( ".uno:CharFontName" ); m_xURLTransformer->parseStrict( aTargetURL ); aLock.clear(); diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index ef97fe10a586..a021b33471fe 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::container; namespace framework { -static sal_Bool isEnumCommand( const rtl::OUString& rCommand ) +static sal_Bool isEnumCommand( const OUString& rCommand ) { INetURLObject aURL( rCommand ); @@ -65,11 +65,11 @@ static sal_Bool isEnumCommand( const rtl::OUString& rCommand ) return sal_False; } -static rtl::OUString getEnumCommand( const rtl::OUString& rCommand ) +static OUString getEnumCommand( const OUString& rCommand ) { INetURLObject aURL( rCommand ); - rtl::OUString aEnumCommand; + OUString aEnumCommand; String aURLPath = aURL.GetURLPath(); xub_StrLen nIndex = aURLPath.Search( '.' ); if (( nIndex > 0 ) && ( nIndex < aURLPath.Len() )) @@ -78,9 +78,9 @@ static rtl::OUString getEnumCommand( const rtl::OUString& rCommand ) return aEnumCommand; } -static rtl::OUString getMasterCommand( const rtl::OUString& rCommand ) +static OUString getMasterCommand( const OUString& rCommand ) { - rtl::OUString aMasterCommand( rCommand ); + OUString aMasterCommand( rCommand ); INetURLObject aURL( rCommand ); if ( aURL.GetProtocol() == INET_PROT_UNO ) { @@ -105,7 +105,7 @@ GenericToolbarController::GenericToolbarController( const Reference< XMultiServi const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, - const ::rtl::OUString& aCommand ) : + const OUString& aCommand ) : svt::ToolboxController( rServiceManager, rFrame, aCommand ) , m_pToolbar( pToolbar ) , m_nID( nID ) @@ -137,7 +137,7 @@ throw ( RuntimeException ) { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; - ::rtl::OUString aCommandURL; + OUString aCommandURL; { SolarMutexGuard aSolarMutexGuard; @@ -165,7 +165,7 @@ throw ( RuntimeException ) Sequence<PropertyValue> aArgs( 1 ); // Add key modifier to argument list - aArgs[0].Name = rtl::OUString( "KeyModifier" ); + aArgs[0].Name = OUString( "KeyModifier" ); aArgs[0].Value <<= KeyModifier; aTargetURL.Complete = aCommandURL; @@ -197,7 +197,7 @@ throw ( RuntimeException ) TriState eTri = STATE_NOCHECK; sal_Bool bValue = sal_Bool(); - rtl::OUString aStrValue; + OUString aStrValue; ItemStatus aItemState; Visibility aItemVisibility; @@ -231,26 +231,26 @@ throw ( RuntimeException ) if ( aStrValue.matchAsciiL( "($1)", 4 )) { String aResStr = String( FwkResId( STR_UPDATEDOC )); - rtl::OUString aTmp( aResStr ); - aTmp += rtl::OUString( " " ); + OUString aTmp( aResStr ); + aTmp += OUString( " " ); aTmp += aStrValue.copy( 4 ); aStrValue = aTmp; } else if ( aStrValue.matchAsciiL( "($2)", 4 )) { String aResStr = String( FwkResId( STR_CLOSEDOC_ANDRETURN )); - rtl::OUString aTmp( aResStr ); + OUString aTmp( aResStr ); aTmp += aStrValue.copy( 4 ); aStrValue = aTmp; } else if ( aStrValue.matchAsciiL( "($3)", 4 )) { String aResStr = String( FwkResId( STR_SAVECOPYDOC )); - rtl::OUString aTmp( aResStr ); + OUString aTmp( aResStr ); aTmp += aStrValue.copy( 4 ); aStrValue = aTmp; } - ::rtl::OUString aText( MnemonicGenerator::EraseAllMnemonicChars( aStrValue ) ); + OUString aText( MnemonicGenerator::EraseAllMnemonicChars( aStrValue ) ); m_pToolbar->SetItemText( m_nID, aText ); m_pToolbar->SetQuickHelpText( m_nID, aText ); } @@ -297,7 +297,7 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI return 0; } -MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const rtl::OUString& aCommand, const rtl::OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier ) +MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand, const OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier ) { } diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index eb6ad5b1ee22..28a67b95a603 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -63,7 +63,6 @@ using namespace com::sun::star::frame; using namespace com::sun::star::beans; using namespace com::sun::star::util; -using ::rtl::OUString; namespace framework { diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index cf9b635b998e..5b1059c0d513 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -67,7 +67,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::document; -using ::rtl::OUString; namespace framework diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx index f33861399a98..f2032c79cf06 100644 --- a/framework/source/uielement/logoimagestatusbarcontroller.cxx +++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx @@ -47,7 +47,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( LogoImageStatusbarController DEFINE_INIT_SERVICE ( LogoImageStatusbarController, {} ) LogoImageStatusbarController::LogoImageStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) : - svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ) + svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), OUString(), 0 ) { Image aImage( FwlResId( RID_IMAGE_STATUSBAR_LOGO )); m_aLogoImage = aImage; diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx index b85d3ed8330e..32259c20e9ef 100644 --- a/framework/source/uielement/logotextstatusbarcontroller.cxx +++ b/framework/source/uielement/logotextstatusbarcontroller.cxx @@ -48,7 +48,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( LogoTextStatusbarController DEFINE_INIT_SERVICE ( LogoTextStatusbarController, {} ) LogoTextStatusbarController::LogoTextStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) : - svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ) + svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), OUString(), 0 ) { m_aLogoText = String( FwlResId( STR_STATUSBAR_LOGOTEXT )); } diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 58641d100d4d..0450d8646f64 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -86,7 +86,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo return; // insert basic - rtl::OUString aCommand(".uno:MacroDialog"); + OUString aCommand(".uno:MacroDialog"); String aDisplayName = RetrieveLabelFromCommand( aCommand ); pPopupMenu->InsertItem( 2, aDisplayName ); pPopupMenu->SetItemCommand( 2, aCommand ); @@ -130,7 +130,7 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc // need to requery, since we handle more than one type of Command // if we don't do this only .uno:ScriptOrganizer commands are executed Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); if( xDispatch.is() ) { ExecuteInfo* pExecuteInfo = new ExecuteInfo; @@ -165,10 +165,10 @@ String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL ) void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId ) { - const rtl::OUString aCmdBase(".uno:ScriptOrganizer?ScriptOrganizer.Language:string="); - const rtl::OUString ellipsis( "..." ); - const rtl::OUString providerKey("com.sun.star.script.provider.ScriptProviderFor"); - const rtl::OUString languageProviderName("com.sun.star.script.provider.LanguageScriptProvider"); + const OUString aCmdBase(".uno:ScriptOrganizer?ScriptOrganizer.Language:string="); + const OUString ellipsis( "..." ); + const OUString providerKey("com.sun.star.script.provider.ScriptProviderFor"); + const OUString languageProviderName("com.sun.star.script.provider.LanguageScriptProvider"); sal_uInt16 itemId = startItemId; Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW ); Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName ); @@ -180,7 +180,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta { break; } - Sequence< ::rtl::OUString > serviceNames = xServiceInfo->getSupportedServiceNames(); + Sequence< OUString > serviceNames = xServiceInfo->getSupportedServiceNames(); if ( serviceNames.getLength() > 0 ) { @@ -188,10 +188,10 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta { if ( serviceNames[ index ].indexOf( providerKey ) == 0 ) { - ::rtl::OUString serviceName = serviceNames[ index ]; + OUString serviceName = serviceNames[ index ]; String aCommand = aCmdBase; String aDisplayName = String( serviceName.copy( providerKey.getLength() ) ); - if( aDisplayName.Equals( rtl::OUString("Java") ) || aDisplayName.Equals( rtl::OUString("Basic") ) ) + if( aDisplayName.Equals( OUString("Java") ) || aDisplayName.Equals( OUString("Basic") ) ) { // no entries for Java & Basic added elsewhere break; diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 241f9275daa4..e90d85990836 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -127,7 +127,7 @@ class StringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XSt virtual ~StringLength() {} // XStringWidth - sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString ) + sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) throw (RuntimeException) { return aString.getLength(); @@ -170,7 +170,7 @@ MenuBarManager::MenuBarManager( const Reference< XFrame >& rFrame, const Reference< XURLTransformer >& _xURLTransformer, const Reference< XDispatchProvider >& rDispatchProvider, - const rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) : ThreadHelpBase( &Application::GetSolarMutex() ), OWeakObject() , m_bDisposed( sal_False ) @@ -466,7 +466,7 @@ void SAL_CALL MenuBarManager::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::statusChanged" ); - ::rtl::OUString aFeatureURL = Event.FeatureURL.Complete; + OUString aFeatureURL = Event.FeatureURL.Complete; SolarMutexGuard aSolarGuard; { @@ -485,7 +485,7 @@ throw ( RuntimeException ) sal_Bool bCheckmark( sal_False ); sal_Bool bMenuItemEnabled( m_pVCLMenu->IsItemEnabled( pMenuItemHandler->nItemId )); sal_Bool bEnabledItem( Event.IsEnabled ); - rtl::OUString aItemText; + OUString aItemText; status::Visibility aVisibilityStatus; #ifdef UNIX @@ -518,22 +518,22 @@ throw ( RuntimeException ) if ( aItemText.matchAsciiL( "($1)", 4 )) { String aResStr = String( FwkResId( STR_UPDATEDOC )); - rtl::OUString aTmp( aResStr ); - aTmp += rtl::OUString( " " ); + OUString aTmp( aResStr ); + aTmp += OUString( " " ); aTmp += aItemText.copy( 4 ); aItemText = aTmp; } else if ( aItemText.matchAsciiL( "($2)", 4 )) { String aResStr = String( FwkResId( STR_CLOSEDOC_ANDRETURN )); - rtl::OUString aTmp( aResStr ); + OUString aTmp( aResStr ); aTmp += aItemText.copy( 4 ); aItemText = aTmp; } else if ( aItemText.matchAsciiL( "($3)", 4 )) { String aResStr = String( FwkResId( STR_SAVECOPYDOC )); - rtl::OUString aTmp( aResStr ); + OUString aTmp( aResStr ); aTmp += aItemText.copy( 4 ); aItemText = aTmp; } @@ -758,7 +758,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu ) sal_uInt16 nNewItemId( 0 ); sal_uInt16 nInsertPos( MENU_APPEND ); sal_uInt16 nBeforePos( MENU_APPEND ); - String aCommandBefore( rtl::OUString(".uno:About")); + String aCommandBefore( OUString(".uno:About")); for ( sal_uInt16 n = 0; n < pMenu->GetItemCount(); n++ ) { sal_uInt16 nItemId = pMenu->GetItemId( n ); @@ -802,7 +802,7 @@ private: virtual ~QuietInteractionContext() {} virtual com::sun::star::uno::Any SAL_CALL getValueByName( - rtl::OUString const & Name) + OUString const & Name) throw (com::sun::star::uno::RuntimeException) { return Name != JAVA_INTERACTION_HANDLER_NAME && context_.is() @@ -845,7 +845,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) m_bActive = sal_True; - ::rtl::OUString aMenuCommand( m_aMenuItemCommand ); + OUString aMenuCommand( m_aMenuItemCommand ); if ( m_aMenuItemCommand == aSpecialWindowMenu || m_aMenuItemCommand == aSlotSpecialWindowMenu || aMenuCommand == aSpecialWindowCommand ) MenuManager::UpdateSpecialWindowMenu( pMenu, comphelper::getComponentContext(getServiceFactory()), m_aLock ); @@ -926,11 +926,11 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) { Reference< XDispatch > xMenuItemDispatch; - ::rtl::OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId ); + OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId ); if ( aItemCommand.isEmpty() ) { - aItemCommand = ::rtl::OUString( "slot:" ); - aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)pMenuItemHandler->nItemId ); + aItemCommand = OUString( "slot:" ); + aItemCommand += OUString::valueOf( (sal_Int32)pMenuItemHandler->nItemId ); pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand ); } @@ -947,11 +947,11 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) if ( m_bIsBookmarkMenu ) xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, pMenuItemHandler->aTargetFrame, 0 ); else - xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); sal_Bool bPopupMenu( sal_False ); if ( !pMenuItemHandler->xPopupMenuController.is() && - m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() )) + m_xPopupMenuControllerRegistration->hasController( aItemCommand, OUString() )) { bPopupMenu = CreatePopupMenuController( pMenuItemHandler ); } @@ -1104,8 +1104,8 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) { // bookmark menu item selected aArgs.realloc( 1 ); - aArgs[0].Name = ::rtl::OUString( "Referer" ); - aArgs[0].Value <<= ::rtl::OUString( SFX_REFERER_USER ); + aArgs[0].Name = OUString( "Referer" ); + aArgs[0].Value <<= OUString( SFX_REFERER_USER ); } xDispatch = pMenuItemHandler->xMenuItemDispatch; @@ -1183,16 +1183,16 @@ String MenuBarManager::RetrieveLabelFromCommand( const String& aCmdURL ) sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::CreatePopupMenuController" ); - rtl::OUString aItemCommand( pMenuItemHandler->aMenuItemURL ); + OUString aItemCommand( pMenuItemHandler->aMenuItemURL ); // Try instantiate a popup menu controller. It is stored in the menu item handler. Sequence< Any > aSeq( 2 ); PropertyValue aPropValue; - aPropValue.Name = rtl::OUString( "ModuleName" ); + aPropValue.Name = OUString( "ModuleName" ); aPropValue.Value <<= m_aModuleIdentifier; aSeq[0] <<= aPropValue; - aPropValue.Name = rtl::OUString( "Frame" ); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value <<= m_xFrame; aSeq[1] <<= aPropValue; @@ -1217,7 +1217,7 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa return sal_False; } -void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rFrame, const Reference< XDispatchProvider >& rDispatchProvider, const rtl::OUString& rModuleIdentifier, sal_Bool bDelete, sal_Bool bDeleteChildren ) +void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rFrame, const Reference< XDispatchProvider >& rDispatchProvider, const OUString& rModuleIdentifier, sal_Bool bDelete, sal_Bool bDeleteChildren ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillMenuManager" ); m_xFrame = rFrame; @@ -1245,7 +1245,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF for ( nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) { sal_uInt16 nItemId = pMenu->GetItemId( nPos ); - ::rtl::OUString aCommand = pMenu->GetItemCommand( nItemId ); + OUString aCommand = pMenu->GetItemCommand( nItemId ); if ( nItemId == SID_MDIWINDOWLIST || aCommand == aSpecialWindowCommand) { // Retrieve addon popup menus and add them to our menu bar @@ -1265,7 +1265,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF String aEmpty; sal_Bool bAccessibilityEnabled( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() ); sal_uInt16 nItemCount = pMenu->GetItemCount(); - ::rtl::OUString aItemCommand; + OUString aItemCommand; m_aMenuItemHandlerVector.reserve(nItemCount); for ( sal_uInt16 i = 0; i < nItemCount; i++ ) { @@ -1298,7 +1298,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if ( pPopup ) { // Retrieve module identifier from Help Command entry - rtl::OUString aModuleIdentifier( rModuleIdentifier ); + OUString aModuleIdentifier( rModuleIdentifier ); if ( pMenu->GetHelpCommand( nItemId ).Len() > 0 ) { aModuleIdentifier = pMenu->GetHelpCommand( nItemId ); @@ -1307,7 +1307,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if ( m_xPopupMenuControllerRegistration.is() && pPopup->GetItemCount() == 0 && - m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() ) + m_xPopupMenuControllerRegistration->hasController( aItemCommand, OUString() ) ) { // Check if we have to create a popup menu for a uno based popup menu controller. @@ -1368,9 +1368,9 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF pPopup->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu ); // Set item command for popup menu to enable it for GetImageFromURL - const ::rtl::OUString aSlotString( "slot:" ); - ::rtl::OUString aNewItemCommand( aSlotString ); - aNewItemCommand += ::rtl::OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST ); + const OUString aSlotString( "slot:" ); + OUString aNewItemCommand( aSlotString ); + aNewItemCommand += OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST ); pPopup->SetItemCommand( ITEMID_ADDONLIST, aNewItemCommand ); } else @@ -1384,7 +1384,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF { MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), m_xFrame, m_xURLTransformer,pSubMenu, sal_True, sal_False ); AddMenu(pSubMenuManager,aItemCommand,nItemId); - pSubMenuManager->m_aMenuItemCommand = ::rtl::OUString(); + pSubMenuManager->m_aMenuItemCommand = OUString(); // Set image for the addon popup menu item if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST )) @@ -1411,7 +1411,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF { // Add-Ons uses images from different places Image aImage; - rtl::OUString aImageId; + OUString aImageId; MenuConfiguration::Attributes* pMenuAttributes = (MenuConfiguration::Attributes*)pMenu->GetUserValue( nItemId ); @@ -1441,7 +1441,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF pItemHandler->aMenuItemURL = aItemCommand; if ( m_xPopupMenuControllerRegistration.is() && - m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() )) + m_xPopupMenuControllerRegistration->hasController( aItemCommand, OUString() )) { // Check if we have to create a popup menu for a uno based popup menu controller. // We have to set an empty popup menu into our menu structure so the controller also @@ -1488,7 +1488,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF void MenuBarManager::impl_RetrieveShortcutsFromConfiguration( const Reference< XAcceleratorConfiguration >& rAccelCfg, - const Sequence< rtl::OUString >& rCommands, + const Sequence< OUString >& rCommands, std::vector< MenuItemHandler* >& aMenuShortCuts ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::impl_RetrieveShortcutsFromConfiguration" ); @@ -1590,7 +1590,7 @@ void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuSh } KeyCode aEmptyKeyCode; - Sequence< rtl::OUString > aSeq( aMenuShortCuts.size() ); + Sequence< OUString > aSeq( aMenuShortCuts.size() ); const sal_uInt32 nCount = aMenuShortCuts.size(); for ( sal_uInt32 i = 0; i < nCount; ++i ) { @@ -1659,7 +1659,7 @@ void MenuBarManager::RetrieveImageManagers() void MenuBarManager::FillMenuWithConfiguration( sal_uInt16& nId, Menu* pMenu, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const Reference< XIndexAccess >& rItemContainer, const Reference< XURLTransformer >& rTransformer ) { @@ -1695,7 +1695,7 @@ void MenuBarManager::FillMenuWithConfiguration( void MenuBarManager::FillMenu( sal_uInt16& nId, Menu* pMenu, - const rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const Reference< XIndexAccess >& rItemContainer, const Reference< XDispatchProvider >& rDispatchProvider ) { @@ -1704,10 +1704,10 @@ void MenuBarManager::FillMenu( for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ ) { Sequence< PropertyValue > aProp; - rtl::OUString aCommandURL; - rtl::OUString aLabel; - rtl::OUString aHelpURL; - rtl::OUString aModuleIdentifier( rModuleIdentifier ); + OUString aCommandURL; + OUString aLabel; + OUString aHelpURL; + OUString aModuleIdentifier( rModuleIdentifier ); sal_Bool bShow(sal_True); sal_Bool bEnabled(sal_True); sal_uInt16 nType = 0; @@ -1720,7 +1720,7 @@ void MenuBarManager::FillMenu( { for ( int i = 0; i < aProp.getLength(); i++ ) { - rtl::OUString aPropName = aProp[i].Name; + OUString aPropName = aProp[i].Name; if ( aPropName.equalsAsciiL( ITEM_DESCRIPTOR_COMMANDURL, LEN_DESCRIPTOR_COMMANDURL )) aProp[i].Value >>= aCommandURL; else if ( aPropName.equalsAsciiL( ITEM_DESCRIPTOR_HELPURL, LEN_DESCRIPTOR_HELPURL )) @@ -1806,7 +1806,7 @@ void MenuBarManager::FillMenu( void MenuBarManager::MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer& aMergeInstructionContainer, - const ::rtl::OUString& rModuleIdentifier ) + const OUString& rModuleIdentifier ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::MergeAddonMenus" ); // set start value for the item ID for the new addon menu items @@ -1819,7 +1819,7 @@ void MenuBarManager::MergeAddonMenus( if ( MenuBarMerger::IsCorrectContext( rMergeInstruction.aMergeContext, rModuleIdentifier )) { - ::std::vector< ::rtl::OUString > aMergePath; + ::std::vector< OUString > aMergePath; // retrieve the merge path from the merge point string MenuBarMerger::RetrieveReferencePath( rMergeInstruction.aMergePoint, aMergePath ); @@ -1939,8 +1939,8 @@ void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController // Just use the main part of the URL for popup menu controllers sal_Int32 nQueryPart( 0 ); sal_Int32 nSchemePart( 0 ); - rtl::OUString aMainURL( "vnd.sun.star.popup:" ); - rtl::OUString aMenuURL( pItemHandler->aMenuItemURL ); + OUString aMainURL( "vnd.sun.star.popup:" ); + OUString aMenuURL( pItemHandler->aMenuItemURL ); nSchemePart = aMenuURL.indexOf( ':' ); if (( nSchemePart > 0 ) && @@ -1970,7 +1970,7 @@ const Reference< XMultiServiceFactory >& MenuBarManager::getServiceFactory() return mxServiceFactory; } -void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId) +void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sItemCommand,sal_uInt16 _nItemId) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::AddMenu" ); Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY ); @@ -1987,7 +1987,7 @@ void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUStri m_aMenuItemHandlerVector.push_back( pMenuItemHandler ); } -sal_uInt16 MenuBarManager::FillItemCommand(::rtl::OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const +sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillItemCommand" ); sal_uInt16 nItemId = _pMenu->GetItemId( _nIndex ); @@ -1995,9 +1995,9 @@ sal_uInt16 MenuBarManager::FillItemCommand(::rtl::OUString& _rItemCommand, Menu* _rItemCommand = _pMenu->GetItemCommand( nItemId ); if ( _rItemCommand.isEmpty() ) { - const static ::rtl::OUString aSlotString( "slot:" ); + const static OUString aSlotString( "slot:" ); _rItemCommand = aSlotString; - _rItemCommand += ::rtl::OUString::valueOf( (sal_Int32)nItemId ); + _rItemCommand += OUString::valueOf( (sal_Int32)nItemId ); _pMenu->SetItemCommand( nItemId, _rItemCommand ); } return nItemId; @@ -2013,13 +2013,13 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen m_bInitialized = sal_False; m_bIsBookmarkMenu = sal_True; - rtl::OUString aModuleIdentifier; + OUString aModuleIdentifier; m_xPopupMenuControllerRegistration = PopupMenuControllerFactory::create( comphelper::getComponentContext(getServiceFactory()) ); Reference< XStatusListener > xStatusListener; Reference< XDispatch > xDispatch; sal_uInt16 nItemCount = pAddonMenu->GetItemCount(); - ::rtl::OUString aItemCommand; + OUString aItemCommand; m_aMenuItemHandlerVector.reserve(nItemCount); for ( sal_uInt16 i = 0; i < nItemCount; i++ ) { @@ -2062,7 +2062,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen // We have to set an empty popup menu into our menu structure so the controller also // works with inplace OLE. if ( m_xPopupMenuControllerRegistration.is() && - m_xPopupMenuControllerRegistration->hasController( aItemCommand, rtl::OUString() )) + m_xPopupMenuControllerRegistration->hasController( aItemCommand, OUString() )) { VCLXPopupMenu* pVCLXPopupMenu = new VCLXPopupMenu; PopupMenu* pCtlPopupMenu = (PopupMenu *)pVCLXPopupMenu->GetMenu(); diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 80fefdfbad11..8d5569fb3fa6 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -63,14 +63,14 @@ namespace framework description of com::sun::star::frame::XModuleManager. */ -bool MenuBarMerger::IsCorrectContext( const ::rtl::OUString& rContext, const ::rtl::OUString& rModuleIdentifier ) +bool MenuBarMerger::IsCorrectContext( const OUString& rContext, const OUString& rModuleIdentifier ) { return ( rContext.isEmpty() || ( rContext.indexOf( rModuleIdentifier ) >= 0 )); } void MenuBarMerger::RetrieveReferencePath( - const ::rtl::OUString& rReferencePathString, - ::std::vector< ::rtl::OUString >& rReferencePath ) + const OUString& rReferencePathString, + ::std::vector< OUString >& rReferencePath ) { const sal_Char aDelimiter = '\\'; @@ -78,7 +78,7 @@ void MenuBarMerger::RetrieveReferencePath( sal_Int32 nIndex( 0 ); do { - ::rtl::OUString aToken = rReferencePathString.getToken( 0, aDelimiter, nIndex ); + OUString aToken = rReferencePathString.getToken( 0, aDelimiter, nIndex ); if ( !aToken.isEmpty() ) rReferencePath.push_back( aToken ); } @@ -86,7 +86,7 @@ void MenuBarMerger::RetrieveReferencePath( } ReferencePathInfo MenuBarMerger::FindReferencePath( - const ::std::vector< ::rtl::OUString >& rReferencePath, + const ::std::vector< OUString >& rReferencePath, Menu* pMenu ) { sal_uInt32 i( 0 ); @@ -107,7 +107,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( do { ++nLevel; - ::rtl::OUString aCmd( rReferencePath[i] ); + OUString aCmd( rReferencePath[i] ); if ( i == nCount-1 ) { @@ -148,14 +148,14 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( return aResult; } -sal_uInt16 MenuBarMerger::FindMenuItem( const ::rtl::OUString& rCmd, Menu* pCurrMenu ) +sal_uInt16 MenuBarMerger::FindMenuItem( const OUString& rCmd, Menu* pCurrMenu ) { for ( sal_uInt16 i = 0; i < pCurrMenu->GetItemCount(); i++ ) { const sal_uInt16 nItemId = pCurrMenu->GetItemId( i ); if ( nItemId > 0 ) { - if ( rCmd == ::rtl::OUString( pCurrMenu->GetItemCommand( nItemId ))) + if ( rCmd == OUString( pCurrMenu->GetItemCommand( nItemId ))) return i; } } @@ -166,7 +166,7 @@ sal_uInt16 MenuBarMerger::FindMenuItem( const ::rtl::OUString& rCmd, Menu* pCurr bool MenuBarMerger::CreateSubMenu( Menu* pSubMenu, sal_uInt16& nItemId, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonSubMenu ) { const sal_uInt32 nSize = rAddonSubMenu.size(); @@ -206,7 +206,7 @@ bool MenuBarMerger::MergeMenuItems( sal_uInt16 nPos, sal_uInt16 nModIndex, sal_uInt16& nItemId, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ) { sal_uInt16 nIndex( 0 ); @@ -247,7 +247,7 @@ bool MenuBarMerger::ReplaceMenuItem( Menu* pMenu, sal_uInt16 nPos, sal_uInt16& rItemId, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ) { // There is no replace available. Therfore we first have to @@ -260,7 +260,7 @@ bool MenuBarMerger::ReplaceMenuItem( bool MenuBarMerger::RemoveMenuItems( Menu* pMenu, sal_uInt16 nPos, - const ::rtl::OUString& rMergeCommandParameter ) + const OUString& rMergeCommandParameter ) { const sal_uInt16 nParam( sal_uInt16( rMergeCommandParameter.toInt32() )); sal_uInt16 nCount( 1 ); @@ -281,9 +281,9 @@ bool MenuBarMerger::ProcessMergeOperation( Menu* pMenu, sal_uInt16 nPos, sal_uInt16& nItemId, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeCommandParameter, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rMergeCommand, + const OUString& rMergeCommandParameter, + const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ) { sal_uInt16 nModIndex( 0 ); @@ -313,10 +313,10 @@ bool MenuBarMerger::ProcessMergeOperation( bool MenuBarMerger::ProcessFallbackOperation( const ReferencePathInfo& aRefPathInfo, sal_uInt16& rItemId, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeFallback, - const ::std::vector< ::rtl::OUString >& rReferencePath, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rMergeCommand, + const OUString& rMergeFallback, + const ::std::vector< OUString >& rReferencePath, + const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ) { if (( rMergeFallback.equalsAsciiL( MERGEFALLBACK_IGNORE, MERGEFALLBACK_IGNORE_LEN )) || @@ -355,7 +355,7 @@ bool MenuBarMerger::ProcessFallbackOperation( } else { - const ::rtl::OUString aCmd( rReferencePath[nLevel] ); + const OUString aCmd( rReferencePath[nLevel] ); sal_uInt16 nInsPos( MENU_APPEND ); PopupMenu* pPopupMenu( new PopupMenu ); @@ -397,7 +397,7 @@ void MenuBarMerger::GetMenuEntry( for ( sal_Int32 i = 0; i < rAddonMenuEntry.getLength(); i++ ) { - ::rtl::OUString aMenuEntryPropName = rAddonMenuEntry[i].Name; + OUString aMenuEntryPropName = rAddonMenuEntry[i].Name; if ( aMenuEntryPropName.equalsAsciiL( ADDONSMENUITEM_STRING_URL, ADDONSMENUITEM_URL_LEN )) rAddonMenuEntry[i].Value >>= rAddonMenuItem.aURL; else if ( aMenuEntryPropName.equalsAsciiL( ADDONSMENUITEM_STRING_TITLE, ADDONSMENUITEM_TITLE_LEN )) diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 636d72846844..d41acc182b0d 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -124,7 +124,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th if ( !m_bInitialized ) { - rtl::OUString aModuleIdentifier; + OUString aModuleIdentifier; UIConfigElementWrapperBase::initialize( aArguments ); Reference< XFrame > xFrame( m_xWeakFrame ); @@ -276,7 +276,7 @@ throw (::com::sun::star::uno::RuntimeException) // XNameAccess Any SAL_CALL MenuBarWrapper::getByName( - const ::rtl::OUString& aName ) + const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) @@ -299,7 +299,7 @@ throw ( container::NoSuchElementException, throw container::NoSuchElementException(); } -Sequence< ::rtl::OUString > SAL_CALL MenuBarWrapper::getElementNames() +Sequence< OUString > SAL_CALL MenuBarWrapper::getElementNames() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aLock( m_aLock ); @@ -309,7 +309,7 @@ throw (::com::sun::star::uno::RuntimeException) fillPopupControllerCache(); - Sequence< rtl::OUString > aSeq( m_aPopupControllerCache.size() ); + Sequence< OUString > aSeq( m_aPopupControllerCache.size() ); sal_Int32 i( 0 ); PopupControllerCache::const_iterator pIter = m_aPopupControllerCache.begin(); @@ -323,7 +323,7 @@ throw (::com::sun::star::uno::RuntimeException) } ::sal_Bool SAL_CALL MenuBarWrapper::hasByName( - const ::rtl::OUString& aName ) + const OUString& aName ) throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index bddc886594b0..15c749548ef0 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -84,7 +84,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage if ( bSetImages ) { sal_Bool bImageSet( sal_False ); - ::rtl::OUString aImageId; + OUString aImageId; AddInfoForId::const_iterator pInfo = m_aAddInfoForItem.find( nItemId ); if ( pInfo != m_aAddInfoForItem.end() ) @@ -121,7 +121,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const sal_uInt16 nCount( pPopupMenu->GetItemCount() ); sal_uInt16 nId( 0 ); sal_Bool bFound( sal_False ); - rtl::OUString aCommand; + OUString aCommand; if ( !m_aEmptyDocURL.isEmpty() ) { @@ -146,7 +146,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const if ( !bFound ) { // Search for the default module name - rtl::OUString aDefaultModuleName( SvtModuleOptions().GetDefaultModuleName() ); + OUString aDefaultModuleName( SvtModuleOptions().GetDefaultModuleName() ); if ( !aDefaultModuleName.isEmpty() ) { for ( sal_uInt32 i = 0; i < sal_uInt32( nCount ); i++ ) @@ -223,7 +223,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu ) KeyCode aEmptyKeyCode; sal_uInt32 nItemCount( pPopupMenu->GetItemCount() ); std::vector< KeyCode > aMenuShortCuts; - std::vector< rtl::OUString > aCmds; + std::vector< OUString > aCmds; std::vector< sal_uInt32 > aIds; for ( sal_uInt32 i = 0; i < nItemCount; i++ ) { @@ -241,7 +241,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu ) if ( m_bNewMenu ) nSeqCount+=1; - Sequence< rtl::OUString > aSeq( nSeqCount ); + Sequence< OUString > aSeq( nSeqCount ); // Add a special command for our "New" menu. if ( m_bNewMenu ) @@ -277,7 +277,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu ) void NewMenuController::retrieveShortcutsFromConfiguration( const Reference< XAcceleratorConfiguration >& rAccelCfg, - const Sequence< rtl::OUString >& rCommands, + const Sequence< OUString >& rCommands, std::vector< KeyCode >& aMenuShortCuts ) { if ( rAccelCfg.is() ) @@ -418,10 +418,10 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr xURLTransformer->parseStrict( aTargetURL ); - aArgsList[0].Name = ::rtl::OUString( "Referer" ); - aArgsList[0].Value = makeAny( ::rtl::OUString(SFX_REFERER_USER )); + aArgsList[0].Name = OUString( "Referer" ); + aArgsList[0].Value = makeAny( OUString(SFX_REFERER_USER )); - rtl::OUString aTargetFrame( m_aTargetFrame ); + OUString aTargetFrame( m_aTargetFrame ); AddInfoForId::const_iterator pItem = m_aAddInfoForItem.find( rEvent.MenuId ); if ( pItem != m_aAddInfoForItem.end() ) aTargetFrame = pItem->second.aTargetFrame; diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index ad6a0c1b5832..452667a23417 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -80,7 +80,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed: if ( pVCLPopupMenu ) { - const rtl::OUString aVerbCommand( ".uno:ObjectMenue?VerbID:short=" ); + const OUString aVerbCommand( ".uno:ObjectMenue?VerbID:short=" ); for ( sal_uInt16 i = 0; i < rVerbCommandSeq.getLength(); i++ ) { const com::sun::star::embed::VerbDescriptor& rVerb = pVerbCommandArray[i]; @@ -89,8 +89,8 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed: m_xPopupMenu->insertItem( i+1, rVerb.VerbName, 0, i ); // use VCL popup menu pointer to set vital information that are not part of the awt implementation - rtl::OUString aCommand( aVerbCommand ); - aCommand += rtl::OUString::valueOf( rVerb.VerbID ); + OUString aCommand( aVerbCommand ); + aCommand += OUString::valueOf( rVerb.VerbID ); pVCLPopupMenu->SetItemCommand( i+1, aCommand ); // Store verb command } } diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx index 468f1512bf88..e22e79f44625 100644 --- a/framework/source/uielement/popupmenucontroller.cxx +++ b/framework/source/uielement/popupmenucontroller.cxx @@ -34,7 +34,6 @@ #include "uielement/popupmenucontroller.hxx" #include "services.h" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index 6eaa200e0928..7d6a931adb1d 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -83,7 +83,7 @@ uno::Reference< awt::XWindow > ProgressBarWrapper::getStatusBar() const } // wrapped methods of ::com::sun::star::task::XStatusIndicator -void ProgressBarWrapper::start( const ::rtl::OUString& Text, ::sal_Int32 Range ) +void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; @@ -152,7 +152,7 @@ throw (uno::RuntimeException) } } -void ProgressBarWrapper::setText( const ::rtl::OUString& Text ) +void ProgressBarWrapper::setText( const OUString& Text ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; @@ -194,7 +194,7 @@ void ProgressBarWrapper::setValue( ::sal_Int32 nValue ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; - rtl::OUString aText; + OUString aText; sal_Bool bSetValue( sal_False ); { @@ -239,7 +239,7 @@ throw (uno::RuntimeException) void ProgressBarWrapper::reset() throw (uno::RuntimeException) { - setText( rtl::OUString() ); + setText( OUString() ); setValue( 0 ); } diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 59d6fe5c16d0..5e09180bde65 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -148,24 +148,24 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > aMenuShortCut.append( ": " ); } - rtl::OUStringBuffer aStrBuffer; + OUStringBuffer aStrBuffer; aStrBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( CMD_PREFIX ) ); aStrBuffer.append( sal_Int32( i ) ); - rtl::OUString aURLString( aStrBuffer.makeStringAndClear() ); + OUString aURLString( aStrBuffer.makeStringAndClear() ); // Abbreviate URL - rtl::OUString aTipHelpText; - rtl::OUString aMenuTitle; + OUString aTipHelpText; + OUString aMenuTitle; INetURLObject aURL( m_aRecentFilesItems[i].aURL ); if ( aURL.GetProtocol() == INET_PROT_FILE ) { // Do handle file URL differently => convert it to a system // path and abbreviate it with a special function: - rtl::OUString aSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); + OUString aSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); aTipHelpText = aSystemPath; - ::rtl::OUString aCompactedSystemPath; + OUString aCompactedSystemPath; if ( osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, MAX_STR_WIDTH, NULL ) == osl_File_E_None ) aMenuTitle = aCompactedSystemPath; else @@ -190,7 +190,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > pVCLPopupMenu->InsertItem( sal_uInt16( nCount + 1 ), String( FwkResId( STR_CLEAR_RECENT_FILES ) ) ); pVCLPopupMenu->SetItemCommand( sal_uInt16( nCount + 1 ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_CLEAR_LIST ) ) ); + OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_CLEAR_LIST ) ) ); pVCLPopupMenu->SetHelpText( sal_uInt16( nCount + 1 ), String( FwkResId( STR_CLEAR_RECENT_FILES_HELP ) ) ); } @@ -290,9 +290,9 @@ void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEve if ( xMenuExt.is() ) { - const rtl::OUString aCommand( xMenuExt->getCommand( rEvent.MenuId ) ); + const OUString aCommand( xMenuExt->getCommand( rEvent.MenuId ) ); OSL_TRACE( "RecentFilesMenuController::select() - Command : %s", - rtl::OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8 ).getStr() ); if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( CMD_CLEAR_LIST ) ) ) SvtHistoryOptions().Clear( ePICKLIST ); diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index efccbf2a6fd5..4b295bf6458b 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -530,15 +530,15 @@ OUString SpinfieldToolbarController::impl_formatOutputString( double fValue ) // is 32 bit on Unix platform! char aBuffer[128]; - ::rtl::OString aFormat = OUStringToOString( m_aOutFormat, osl_getThreadTextEncoding() ); + OString aFormat = OUStringToOString( m_aOutFormat, osl_getThreadTextEncoding() ); if ( m_bFloat ) snprintf( aBuffer, 128, aFormat.getStr(), fValue ); else snprintf( aBuffer, 128, aFormat.getStr(), static_cast<long>( fValue )); sal_Int32 nSize = strlen( aBuffer ); - rtl::OString aTmp( aBuffer, nSize ); - return rtl::OStringToOUString( aTmp, osl_getThreadTextEncoding() ); + OString aTmp( aBuffer, nSize ); + return OStringToOUString( aTmp, osl_getThreadTextEncoding() ); #endif } } diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx index e5250ed4486f..267f8c0a89af 100644 --- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx +++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx @@ -45,7 +45,7 @@ StatusIndicatorInterfaceWrapper::~StatusIndicatorInterfaceWrapper() void SAL_CALL StatusIndicatorInterfaceWrapper::start( - const ::rtl::OUString& sText, + const OUString& sText, sal_Int32 nRange ) throw( ::com::sun::star::uno::RuntimeException ) { @@ -83,7 +83,7 @@ throw( ::com::sun::star::uno::RuntimeException ) } void SAL_CALL StatusIndicatorInterfaceWrapper::setText( - const ::rtl::OUString& sText ) + const OUString& sText ) throw( ::com::sun::star::uno::RuntimeException ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 661942c9ee5c..58cc63824790 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -77,7 +77,6 @@ // namespaces //_________________________________________________________________________________________________________________ -using rtl::OUString; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::beans; @@ -172,7 +171,7 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager { try { - xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" )) >>= xLayoutManager; + xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xLayoutManager; } catch (const RuntimeException&) { @@ -210,7 +209,7 @@ DEFINE_XTYPEPROVIDER_6 ( ToolBarManager ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, - const rtl::OUString& rResourceName, + const OUString& rResourceName, ToolBar* pToolBar ) : ThreadHelpBase( &Application::GetSolarMutex() ), OWeakObject(), @@ -259,7 +258,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic // enables a menu for clipped items and customization SvtCommandOptions aCmdOptions; sal_uInt16 nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS; - if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString("CreateDialog"))) + if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, OUString("CreateDialog"))) nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE; m_pToolBar->SetCommandHdl( LINK( this, ToolBarManager, Command ) ); @@ -271,9 +270,9 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic // set name for testtool, the useful part is after the last '/' sal_Int32 idx = rResourceName.lastIndexOf('/'); idx++; // will become 0 if '/' not found: use full string - ::rtl::OString aHelpIdAsString( HELPID_PREFIX_TESTTOOL ); - ::rtl::OUString aToolbarName = rResourceName.copy( idx ); - aHelpIdAsString += rtl::OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 );; + OString aHelpIdAsString( HELPID_PREFIX_TESTTOOL ); + OUString aToolbarName = rResourceName.copy( idx ); + aHelpIdAsString += OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 );; m_pToolBar->SetHelpId( aHelpIdAsString ); m_aAsyncUpdateControllersTimer.SetTimeout( 50 ); @@ -375,7 +374,7 @@ void ToolBarManager::RefreshImages() if ( nId > 0 ) { - ::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId ); + OUString aCommandURL = m_pToolBar->GetItemCommand( nId ); Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages ); // Try also to query for add-on images before giving up and use an // empty image. @@ -397,24 +396,24 @@ void ToolBarManager::UpdateImageOrientation() if ( m_xUICommandLabels.is() ) { sal_Int32 i; - Sequence< rtl::OUString > aSeqMirrorCmd; - Sequence< rtl::OUString > aSeqRotateCmd; + Sequence< OUString > aSeqMirrorCmd; + Sequence< OUString > aSeqRotateCmd; m_xUICommandLabels->getByName( - rtl::OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) >>= aSeqMirrorCmd; + OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) >>= aSeqMirrorCmd; m_xUICommandLabels->getByName( - rtl::OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) >>= aSeqRotateCmd; + OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) >>= aSeqRotateCmd; CommandToInfoMap::iterator pIter; for ( i = 0; i < aSeqMirrorCmd.getLength(); i++ ) { - rtl::OUString aMirrorCmd = aSeqMirrorCmd[i]; + OUString aMirrorCmd = aSeqMirrorCmd[i]; pIter = m_aCommandMap.find( aMirrorCmd ); if ( pIter != m_aCommandMap.end() ) pIter->second.bMirrored = sal_True; } for ( i = 0; i < aSeqRotateCmd.getLength(); i++ ) { - rtl::OUString aRotateCmd = aSeqRotateCmd[i]; + OUString aRotateCmd = aSeqRotateCmd[i]; pIter = m_aCommandMap.find( aRotateCmd ); if ( pIter != m_aCommandMap.end() ) pIter->second.bRotated = sal_True; @@ -426,7 +425,7 @@ void ToolBarManager::UpdateImageOrientation() sal_uInt16 nId = m_pToolBar->GetItemId( nPos ); if ( nId > 0 ) { - rtl::OUString aCmd = m_pToolBar->GetItemCommand( nId ); + OUString aCmd = m_pToolBar->GetItemCommand( nId ); CommandToInfoMap::const_iterator pIter = m_aCommandMap.find( aCmd ); if ( pIter != m_aCommandMap.end() ) @@ -455,7 +454,7 @@ void ToolBarManager::UpdateControllers() Reference< XLayoutManager > xLayoutManager; Reference< XPropertySet > xFramePropSet( m_xFrame, UNO_QUERY ); if ( xFramePropSet.is() ) - a = xFramePropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" )); + a = xFramePropSet->getPropertyValue( OUString( "LayoutManager" )); a >>= xLayoutManager; Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY ); if ( xLayoutManager.is() && xDockable.is() ) @@ -723,7 +722,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u if ( xIfacDocImgMgr == Event.Source ) nImageInfo = 0; - Sequence< rtl::OUString > aSeq = xNameAccess->getElementNames(); + Sequence< OUString > aSeq = xNameAccess->getElementNames(); for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) { CommandToInfoMap::iterator pIter = m_aCommandMap.find( aSeq[i] ); @@ -737,7 +736,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u // Special case: An image from the document image manager has been removed. // It is possible that we have a image at our module image manager. Before // we can remove our image we have to ask our module image manager. - Sequence< rtl::OUString > aCmdURLSeq( 1 ); + Sequence< OUString > aCmdURLSeq( 1 ); Sequence< Reference< XGraphic > > aGraphicSeq; aCmdURLSeq[0] = pIter->first; aGraphicSeq = m_xModuleImageManager->getImages( nImageType, aCmdURLSeq ); @@ -809,7 +808,7 @@ void ToolBarManager::RemoveControllers() m_aControllerMap.clear(); } -uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const ::rtl::OUString& rCmdURL ) +uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const OUString& rCmdURL ) { Sequence< PropertyValue > aPropSeq; @@ -844,9 +843,9 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const return aPropSeq; } -::rtl::OUString ToolBarManager::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) +OUString ToolBarManager::RetrieveLabelFromCommand( const OUString& aCmdURL ) { - ::rtl::OUString aLabel; + OUString aLabel; Sequence< PropertyValue > aPropSeq; // Retrieve popup menu labels @@ -862,7 +861,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const return aLabel; } -sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const ::rtl::OUString& aCmdURL ) +sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const OUString& aCmdURL ) { sal_Int32 nProperties(0); Sequence< PropertyValue > aPropSeq; @@ -899,8 +898,8 @@ void ToolBarManager::CreateControllers() if ( nId == 0 ) continue; - rtl::OUString aLoadURL( ".uno:OpenUrl" ); - rtl::OUString aCommandURL( m_pToolBar->GetItemCommand( nId )); + OUString aLoadURL( ".uno:OpenUrl" ); + OUString aCommandURL( m_pToolBar->GetItemCommand( nId )); sal_Bool bInit( sal_True ); sal_Bool bCreate( sal_True ); Reference< XStatusListener > xController; @@ -929,22 +928,22 @@ void ToolBarManager::CreateControllers() PropertyValue aPropValue; std::vector< Any > aPropertyVector; - aPropValue.Name = rtl::OUString( "ModuleName" ); + aPropValue.Name = OUString( "ModuleName" ); aPropValue.Value <<= m_aModuleIdentifier; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = rtl::OUString( "Frame" ); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value <<= m_xFrame; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = rtl::OUString( "ServiceManager" ); + aPropValue.Name = OUString( "ServiceManager" ); aPropValue.Value <<= m_xServiceManager; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = rtl::OUString( "ParentWindow" ); + aPropValue.Name = OUString( "ParentWindow" ); aPropValue.Value <<= xToolbarWindow; aPropertyVector.push_back( makeAny( aPropValue )); if ( nWidth > 0 ) { - aPropValue.Name = rtl::OUString( "Width" ); + aPropValue.Name = OUString( "Width" ); aPropValue.Value <<= nWidth; aPropertyVector.push_back( makeAny( aPropValue )); } @@ -968,7 +967,7 @@ void ToolBarManager::CreateControllers() if ( m_pToolBar->GetItemData( nId ) != 0 ) { // retrieve additional parameters - ::rtl::OUString aControlType = static_cast< AddonsParams* >( m_pToolBar->GetItemData( nId ))->aControlType; + OUString aControlType = static_cast< AddonsParams* >( m_pToolBar->GetItemData( nId ))->aControlType; Reference< XStatusListener > xStatusListener( ToolBarMerger::CreateController( m_xServiceManager, @@ -1013,7 +1012,7 @@ void ToolBarManager::CreateControllers() Reference< XSubToolbarController > xSubToolBar( xController, UNO_QUERY ); if ( xSubToolBar.is() && xSubToolBar->opensSubToolbar() ) { - rtl::OUString aSubToolBarName = xSubToolBar->getSubToolbarName(); + OUString aSubToolBarName = xSubToolBar->getSubToolbarName(); if ( !aSubToolBarName.isEmpty() ) { SubToolBarToSubToolBarControllerMap::iterator pIter = @@ -1039,25 +1038,25 @@ void ToolBarManager::CreateControllers() PropertyValue aPropValue; std::vector< Any > aPropertyVector; - aPropValue.Name = ::rtl::OUString( "Frame" ); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value <<= m_xFrame; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = ::rtl::OUString( "CommandURL" ); + aPropValue.Name = OUString( "CommandURL" ); aPropValue.Value <<= aCommandURL; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = ::rtl::OUString( "ServiceManager" ); + aPropValue.Name = OUString( "ServiceManager" ); aPropValue.Value <<= m_xServiceManager; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = rtl::OUString( "ParentWindow" ); + aPropValue.Name = OUString( "ParentWindow" ); aPropValue.Value <<= xToolbarWindow; aPropertyVector.push_back( makeAny( aPropValue )); - aPropValue.Name = rtl::OUString( "ModuleName" ); + aPropValue.Name = OUString( "ModuleName" ); aPropValue.Value <<= m_aModuleIdentifier; aPropertyVector.push_back( makeAny( aPropValue )); if ( nWidth > 0 ) { - aPropValue.Name = rtl::OUString( "Width" ); + aPropValue.Name = OUString( "Width" ); aPropValue.Value <<= nWidth; aPropertyVector.push_back( makeAny( aPropValue )); } @@ -1067,10 +1066,10 @@ void ToolBarManager::CreateControllers() if (pController) { - if(aCommandURL == rtl::OUString( ".uno:SwitchXFormsDesignMode" ) || - aCommandURL == rtl::OUString( ".uno:ViewDataSourceBrowser" ) || - aCommandURL == rtl::OUString( ".uno:ParaLeftToRight" ) || - aCommandURL == rtl::OUString( ".uno:ParaRightToLeft" ) + if(aCommandURL == OUString( ".uno:SwitchXFormsDesignMode" ) || + aCommandURL == OUString( ".uno:ViewDataSourceBrowser" ) || + aCommandURL == OUString( ".uno:ParaLeftToRight" ) || + aCommandURL == OUString( ".uno:ParaRightToLeft" ) ) pController->setFastPropertyValue_NoBroadcast(1,makeAny(sal_True)); } @@ -1102,7 +1101,7 @@ void ToolBarManager::CreateControllers() try { sal_Bool bSupportVisible = sal_True; - Any a( xPropSet->getPropertyValue( ::rtl::OUString( "SupportsVisible" )) ); + Any a( xPropSet->getPropertyValue( OUString( "SupportsVisible" )) ); a >>= bSupportVisible; if (bSupportVisible) { @@ -1146,7 +1145,7 @@ void ToolBarManager::AddImageOrientationListener() m_xImageOrientationListener = Reference< XComponent >( static_cast< ::cppu::OWeakObject *>( pImageOrientation ), UNO_QUERY ); pImageOrientation->addStatusListener( - rtl::OUString( ".uno:ImageOrientation" )); + OUString( ".uno:ImageOrientation" )); pImageOrientation->bindListener(); } } @@ -1176,7 +1175,7 @@ sal_uInt16 ToolBarManager::ConvertStyleToToolboxItemBits( sal_Int32 nStyle ) void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContainer ) { - ::rtl::OString aTbxName = rtl::OUStringToOString( m_aResourceName, RTL_TEXTENCODING_ASCII_US ); + OString aTbxName = OUStringToOString( m_aResourceName, RTL_TEXTENCODING_ASCII_US ); RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::FillToolbar" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) ::ToolBarManager::FillToolbar %s", aTbxName.getStr() ); @@ -1237,10 +1236,10 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ ) { Sequence< PropertyValue > aProp; - rtl::OUString aCommandURL; - rtl::OUString aLabel; - rtl::OUString aHelpURL; - rtl::OUString aTooltip; + OUString aCommandURL; + OUString aLabel; + OUString aHelpURL; + OUString aTooltip; sal_uInt16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); sal_uInt16 nWidth( 0 ); sal_Bool bIsVisible( sal_True ); @@ -1306,7 +1305,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine if (( nType == ::com::sun::star::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() ) { - ::rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL )); + OUString aString( RetrieveLabelFromCommand( aCommandURL )); sal_uInt16 nItemBits = ConvertStyleToToolboxItemBits( nStyle ); if ( aMenuDesc.is() ) @@ -1319,13 +1318,13 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine } else { - ::rtl::OUString sQuickHelp( aString ); - ::rtl::OUString sShortCut; + OUString sQuickHelp( aString ); + OUString sShortCut; if( RetrieveShortcut( aCommandURL, sShortCut ) ) { - sQuickHelp += rtl::OUString( " (" ); + sQuickHelp += OUString( " (" ); sQuickHelp += sShortCut; - sQuickHelp += rtl::OUString( ")" ); + sQuickHelp += OUString( ")" ); } m_pToolBar->SetQuickHelpText( nId, sQuickHelp ); @@ -1390,7 +1389,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine MergeToolbarInstructionContainer aMergeInstructionContainer; // Retrieve the toolbar name from the resource name - ::rtl::OUString aToolbarName( m_aResourceName ); + OUString aToolbarName( m_aResourceName ); sal_Int32 nIndex = aToolbarName.lastIndexOf( '/' ); if (( nIndex > 0 ) && ( nIndex < aToolbarName.getLength() )) aToolbarName = aToolbarName.copy( nIndex+1 ); @@ -1463,8 +1462,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine { try { - rtl::OUString aUIName; - xPropSet->getPropertyValue( rtl::OUString( "UIName" )) >>= aUIName; + OUString aUIName; + xPropSet->getPropertyValue( OUString( "UIName" )) >>= aUIName; if ( !aUIName.isEmpty() ) m_pToolBar->SetText( aUIName ); } @@ -1479,7 +1478,7 @@ void ToolBarManager::RequestImages() RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::RequestImages" ); // Request images from image manager - Sequence< rtl::OUString > aCmdURLSeq( m_aCommandMap.size() ); + Sequence< OUString > aCmdURLSeq( m_aCommandMap.size() ); Sequence< Reference< XGraphic > > aDocGraphicSeq; Sequence< Reference< XGraphic > > aModGraphicSeq; @@ -1526,7 +1525,7 @@ void ToolBarManager::RequestImages() } } -void ToolBarManager::notifyRegisteredControllers( const rtl::OUString& aUIElementName, const rtl::OUString& aCommand ) +void ToolBarManager::notifyRegisteredControllers( const OUString& aUIElementName, const OUString& aCommand ) { ResetableGuard aGuard( m_aLock ); if ( !m_aSubToolBarControllerMap.empty() ) @@ -1707,10 +1706,10 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) if ( m_xFrame.is() ) { Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY ); - aURL.Complete = ::rtl::OUString( ".uno:ConfigureDialog" ); + aURL.Complete = OUString( ".uno:ConfigureDialog" ); m_xURLTransformer->parseStrict( aURL ); if ( xProv.is() ) - xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); if ( !xDisp.is() || IsPluginMode() ) return 0; @@ -1758,7 +1757,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) if ( m_pToolBar->GetItemType(nPos) == TOOLBOXITEM_BUTTON ) { sal_uInt16 nId = m_pToolBar->GetItemId(nPos); - ::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId ); + OUString aCommandURL = m_pToolBar->GetItemCommand( nId ); pItemMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MIB_CHECKABLE ); pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) ); pItemMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL ); @@ -1867,10 +1866,10 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) if ( m_xFrame.is() ) { Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY ); - aURL.Complete = ::rtl::OUString( ".uno:ConfigureDialog" ); + aURL.Complete = OUString( ".uno:ConfigureDialog" ); m_xURLTransformer->parseStrict( aURL ); if ( xProv.is() ) - xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); } if ( xDisp.is() ) @@ -1878,7 +1877,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) Sequence< PropertyValue > aPropSeq( 1 ); aPropSeq[ 0 ].Name = - rtl::OUString( "ResourceURL"); + OUString( "ResourceURL"); aPropSeq[ 0 ].Value <<= m_aResourceName; xDisp->dispatch( aURL, aPropSeq ); @@ -1943,7 +1942,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) if(( nId > 0 ) && ( nId < TOOLBOX_MENUITEM_START )) { // toggle toolbar button visibility - rtl::OUString aCommand = pMenu->GetItemCommand( nId ); + OUString aCommand = pMenu->GetItemCommand( nId ); Reference< XLayoutManager > xLayoutManager = getLayoutManagerFromFrame( m_xFrame ); if ( xLayoutManager.is() ) @@ -1957,7 +1956,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) { Sequence< PropertyValue > aProp; sal_Int32 nVisibleIndex( -1 ); - rtl::OUString aCommandURL; + OUString aCommandURL; sal_Bool bVisible( sal_False ); if ( xItemContainer->getByIndex( i ) >>= aProp ) @@ -1988,7 +1987,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) if ( xPropSet.is() ) { Reference< XUIConfigurationPersistence > xUICfgMgr; - if (( xPropSet->getPropertyValue( rtl::OUString( "ConfigurationSource" )) >>= xUICfgMgr ) && ( xUICfgMgr.is() )) + if (( xPropSet->getPropertyValue( OUString( "ConfigurationSource" )) >>= xUICfgMgr ) && ( xUICfgMgr.is() )) xUICfgMgr->store(); } } @@ -2162,7 +2161,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe return 0; } -Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages ) +Image ToolBarManager::QueryAddonsImage( const OUString& aCommandURL, bool bBigImages ) { Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages ); return aImage; @@ -2170,8 +2169,8 @@ Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bool ToolBarManager::impl_RetrieveShortcutsFromConfiguration( const Reference< XAcceleratorConfiguration >& rAccelCfg, - const rtl::OUString& rCommand, - rtl::OUString& rShortCut ) + const OUString& rCommand, + OUString& rShortCut ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ToolBarManager::impl_RetrieveShortcutsFromConfiguration" ); if ( rAccelCfg.is() ) @@ -2200,7 +2199,7 @@ bool ToolBarManager::impl_RetrieveShortcutsFromConfiguration( return false; } -bool ToolBarManager::RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OUString& rShortCut ) +bool ToolBarManager::RetrieveShortcut( const OUString& rCommandURL, OUString& rShortCut ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ToolBarManager::RetrieveShortcuts" ); if ( m_bModuleIdentified ) diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index dcb40869651b..9d714711d421 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -104,8 +104,8 @@ using namespace ::com::sun::star; */ bool ToolBarMerger::IsCorrectContext( - const ::rtl::OUString& rContext, - const ::rtl::OUString& rModuleIdentifier ) + const OUString& rContext, + const OUString& rModuleIdentifier ) { return ( rContext.isEmpty() || ( rContext.indexOf( rModuleIdentifier ) >= 0 )); } @@ -204,12 +204,12 @@ bool ToolBarMerger::ConvertSeqSeqToVector( */ void ToolBarMerger::ConvertSequenceToValues( const uno::Sequence< beans::PropertyValue > rSequence, - ::rtl::OUString& rCommandURL, - ::rtl::OUString& rLabel, - ::rtl::OUString& rImageIdentifier, - ::rtl::OUString& rTarget, - ::rtl::OUString& rContext, - ::rtl::OUString& rControlType, + OUString& rCommandURL, + OUString& rLabel, + OUString& rImageIdentifier, + OUString& rTarget, + OUString& rContext, + OUString& rControlType, sal_uInt16& rWidth ) { for ( sal_Int32 i = 0; i < rSequence.getLength(); i++ ) @@ -257,7 +257,7 @@ void ToolBarMerger::ConvertSequenceToValues( */ ReferenceToolbarPathInfo ToolBarMerger::FindReferencePoint( ToolBox* pToolbar, - const ::rtl::OUString& rReferencePoint ) + const OUString& rReferencePoint ) { ReferenceToolbarPathInfo aResult; aResult.bResult = false; @@ -271,7 +271,7 @@ ReferenceToolbarPathInfo ToolBarMerger::FindReferencePoint( const sal_uInt16 nItemId = pToolbar->GetItemId( i ); if ( nItemId > 0 ) { - const ::rtl::OUString rCmd = pToolbar->GetItemCommand( nItemId ); + const OUString rCmd = pToolbar->GetItemCommand( nItemId ); if ( rCmd == rReferencePoint ) { aResult.bResult = true; @@ -341,9 +341,9 @@ bool ToolBarMerger::ProcessMergeOperation( sal_uInt16 nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, - const ::rtl::OUString& rModuleIdentifier, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeCommandParameter, + const OUString& rModuleIdentifier, + const OUString& rMergeCommand, + const OUString& rMergeCommandParameter, const AddonToolbarItemContainer& rItems ) { if ( rMergeCommand.equalsAsciiL( MERGECOMMAND_ADDAFTER, MERGECOMMAND_ADDAFTER_LEN )) @@ -410,9 +410,9 @@ bool ToolBarMerger::ProcessMergeFallback( sal_uInt16 /*nPos*/, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, - const ::rtl::OUString& rModuleIdentifier, - const ::rtl::OUString& rMergeCommand, - const ::rtl::OUString& rMergeFallback, + const OUString& rModuleIdentifier, + const OUString& rMergeCommand, + const OUString& rMergeFallback, const AddonToolbarItemContainer& rItems ) { if (( rMergeFallback.equalsAsciiL( MERGEFALLBACK_IGNORE, MERGEFALLBACK_IGNORE_LEN )) || @@ -481,7 +481,7 @@ bool ToolBarMerger::MergeItems( sal_uInt16 nModIndex, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const AddonToolbarItemContainer& rAddonToolbarItems ) { const sal_Int32 nSize( rAddonToolbarItems.size() ); @@ -574,7 +574,7 @@ bool ToolBarMerger::ReplaceItem( sal_uInt16 nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rModuleIdentifier, const AddonToolbarItemContainer& rAddonToolbarItems ) { pToolbar->RemoveItem( nPos ); @@ -609,7 +609,7 @@ bool ToolBarMerger::ReplaceItem( bool ToolBarMerger::RemoveItems( ToolBox* pToolbar, sal_uInt16 nPos, - const ::rtl::OUString& rMergeCommandParameter ) + const OUString& rMergeCommandParameter ) { sal_Int32 nCount = rMergeCommandParameter.toInt32(); if ( nCount > 0 ) @@ -652,10 +652,10 @@ bool ToolBarMerger::RemoveItems( uno::Reference< lang::XMultiServiceFactory > xSMGR, uno::Reference< frame::XFrame > xFrame, ToolBox* pToolbar, - const ::rtl::OUString& rCommandURL, + const OUString& rCommandURL, sal_uInt16 nId, sal_uInt16 nWidth, - const ::rtl::OUString& rControlType ) + const OUString& rControlType ) { ::cppu::OWeakObject* pResult( 0 ); diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 8d25b03c6f89..d82d183f8428 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -275,8 +275,8 @@ Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::c //XUIFunctionExecute void SAL_CALL ToolBarWrapper::functionExecute( - const ::rtl::OUString& aUIElementName, - const ::rtl::OUString& aCommand ) + const OUString& aUIElementName, + const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 7c16b83ea369..f48fb94167ca 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -95,17 +95,17 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa public ::cppu::WeakImplHelper2<XNameAccess,XContainerListener> { public: - ConfigurationAccess_UICommand( const ::rtl::OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext ); + ConfigurationAccess_UICommand( const OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext ); virtual ~ConfigurationAccess_UICommand(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess @@ -124,7 +124,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException); protected: - virtual ::com::sun::star::uno::Any SAL_CALL getByNameImpl( const ::rtl::OUString& aName ); + virtual ::com::sun::star::uno::Any SAL_CALL getByNameImpl( const OUString& aName ); struct CmdToInfoMap { @@ -132,55 +132,55 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa bCommandNameCreated( false ), nProperties( 0 ) {} - rtl::OUString aLabel; - rtl::OUString aContextLabel; - rtl::OUString aCommandName; + OUString aLabel; + OUString aContextLabel; + OUString aCommandName; bool bPopup : 1, bCommandNameCreated : 1; sal_Int32 nProperties; }; - Any getSequenceFromCache( const rtl::OUString& aCommandURL ); - Any getInfoFromCommand( const rtl::OUString& rCommandURL ); - void fillInfoFromResult( CmdToInfoMap& rCmdInfo, const rtl::OUString& aLabel ); - Any getUILabelFromCommand( const rtl::OUString& rCommandURL ); - Sequence< rtl::OUString > getAllCommands(); + Any getSequenceFromCache( const OUString& aCommandURL ); + Any getInfoFromCommand( const OUString& rCommandURL ); + void fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel ); + Any getUILabelFromCommand( const OUString& rCommandURL ); + Sequence< OUString > getAllCommands(); sal_Bool fillCache(); sal_Bool addGenericInfoToCache(); void impl_fill(const Reference< XNameAccess >& _xConfigAccess,sal_Bool _bPopup, - std::vector< ::rtl::OUString >& aImageCommandVector, - std::vector< ::rtl::OUString >& aImageRotateVector, - std::vector< ::rtl::OUString >& aImageMirrorVector); + std::vector< OUString >& aImageCommandVector, + std::vector< OUString >& aImageRotateVector, + std::vector< OUString >& aImageMirrorVector); private: - typedef ::boost::unordered_map< ::rtl::OUString, + typedef ::boost::unordered_map< OUString, CmdToInfoMap, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > CommandToInfoCache; + OUStringHash, + ::std::equal_to< OUString > > CommandToInfoCache; sal_Bool initializeConfigAccess(); - rtl::OUString m_aConfigCmdAccess; - rtl::OUString m_aConfigPopupAccess; - rtl::OUString m_aPropUILabel; - rtl::OUString m_aPropUIContextLabel; - rtl::OUString m_aPropLabel; - rtl::OUString m_aPropName; - rtl::OUString m_aPropPopup; - rtl::OUString m_aPropProperties; - rtl::OUString m_aXMLFileFormatVersion; - rtl::OUString m_aVersion; - rtl::OUString m_aExtension; - rtl::OUString m_aPrivateResourceURL; + OUString m_aConfigCmdAccess; + OUString m_aConfigPopupAccess; + OUString m_aPropUILabel; + OUString m_aPropUIContextLabel; + OUString m_aPropLabel; + OUString m_aPropName; + OUString m_aPropPopup; + OUString m_aPropProperties; + OUString m_aXMLFileFormatVersion; + OUString m_aVersion; + OUString m_aExtension; + OUString m_aPrivateResourceURL; Reference< XNameAccess > m_xGenericUICommands; Reference< XMultiServiceFactory > m_xConfigProvider; Reference< XNameAccess > m_xConfigAccess; Reference< XContainerListener > m_xConfigListener; Reference< XNameAccess > m_xConfigAccessPopups; Reference< XContainerListener > m_xConfigAccessListener; - Sequence< rtl::OUString > m_aCommandImageList; - Sequence< rtl::OUString > m_aCommandRotateImageList; - Sequence< rtl::OUString > m_aCommandMirrorImageList; + Sequence< OUString > m_aCommandImageList; + Sequence< OUString > m_aCommandRotateImageList; + Sequence< OUString > m_aCommandMirrorImageList; CommandToInfoCache m_aCmdInfoCache; sal_Bool m_bConfigAccessInitialized; sal_Bool m_bCacheFilled; @@ -190,7 +190,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa //***************************************************************************************************************** // XInterface, XTypeProvider //***************************************************************************************************************** -ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XComponentContext>& rxContext ) : +ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XComponentContext>& rxContext ) : ThreadHelpBase(), m_aConfigCmdAccess( CONFIGURATION_ROOT_ACCESS ), m_aConfigPopupAccess( CONFIGURATION_ROOT_ACCESS ), @@ -208,12 +208,12 @@ ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const rtl::OUStrin { // Create configuration hierachical access name m_aConfigCmdAccess += aModuleName; - m_aConfigCmdAccess += rtl::OUString( CONFIGURATION_CMD_ELEMENT_ACCESS ); + m_aConfigCmdAccess += OUString( CONFIGURATION_CMD_ELEMENT_ACCESS ); m_xConfigProvider = theDefaultProvider::get( rxContext ); m_aConfigPopupAccess += aModuleName; - m_aConfigPopupAccess += rtl::OUString( CONFIGURATION_POP_ELEMENT_ACCESS ); + m_aConfigPopupAccess += OUString( CONFIGURATION_POP_ELEMENT_ACCESS ); } ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand() @@ -230,7 +230,7 @@ ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand() // XNameAccess -Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const ::rtl::OUString& rCommandURL ) +Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL ) { static sal_Int32 nRequests = 0; @@ -265,7 +265,7 @@ Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const ::rtl::OUString } } -Any SAL_CALL ConfigurationAccess_UICommand::getByName( const ::rtl::OUString& rCommandURL ) +Any SAL_CALL ConfigurationAccess_UICommand::getByName( const OUString& rCommandURL ) throw ( NoSuchElementException, WrappedTargetException, RuntimeException) { Any aRet( getByNameImpl( rCommandURL ) ); @@ -275,13 +275,13 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException) return aRet; } -Sequence< ::rtl::OUString > SAL_CALL ConfigurationAccess_UICommand::getElementNames() +Sequence< OUString > SAL_CALL ConfigurationAccess_UICommand::getElementNames() throw ( RuntimeException ) { return getAllCommands(); } -sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const ::rtl::OUString& rCommandURL ) +sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const OUString& rCommandURL ) throw (::com::sun::star::uno::RuntimeException) { return getByNameImpl( rCommandURL ).hasValue(); @@ -301,18 +301,18 @@ throw ( RuntimeException ) return sal_True; } -void ConfigurationAccess_UICommand::fillInfoFromResult( CmdToInfoMap& rCmdInfo, const rtl::OUString& aLabel ) +void ConfigurationAccess_UICommand::fillInfoFromResult( CmdToInfoMap& rCmdInfo, const OUString& aLabel ) { String rStr( aLabel ); rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", utl::ConfigManager::getProductName() ); - rCmdInfo.aLabel = ::rtl::OUString( rStr ); + rCmdInfo.aLabel = OUString( rStr ); rStr = comphelper::string::stripEnd(rStr, '.'); // Remove "..." from string - rCmdInfo.aCommandName = ::rtl::OUString( MnemonicGenerator::EraseAllMnemonicChars( rStr )); + rCmdInfo.aCommandName = OUString( MnemonicGenerator::EraseAllMnemonicChars( rStr )); rCmdInfo.bCommandNameCreated = sal_True; } -Any ConfigurationAccess_UICommand::getSequenceFromCache( const ::rtl::OUString& aCommandURL ) +Any ConfigurationAccess_UICommand::getSequenceFromCache( const OUString& aCommandURL ) { CommandToInfoCache::iterator pIter = m_aCmdInfoCache.find( aCommandURL ); if ( pIter != m_aCmdInfoCache.end() ) @@ -336,13 +336,13 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const ::rtl::OUString& return Any(); } void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _xConfigAccess,sal_Bool _bPopup, - std::vector< ::rtl::OUString >& aImageCommandVector, - std::vector< ::rtl::OUString >& aImageRotateVector, - std::vector< ::rtl::OUString >& aImageMirrorVector) + std::vector< OUString >& aImageCommandVector, + std::vector< OUString >& aImageRotateVector, + std::vector< OUString >& aImageMirrorVector) { if ( _xConfigAccess.is() ) { - Sequence< ::rtl::OUString> aNameSeq = _xConfigAccess->getElementNames(); + Sequence< OUString> aNameSeq = _xConfigAccess->getElementNames(); const sal_Int32 nCount = aNameSeq.getLength(); for ( sal_Int32 i = 0; i < nCount; i++ ) { @@ -384,9 +384,9 @@ sal_Bool ConfigurationAccess_UICommand::fillCache() if ( m_bCacheFilled ) return sal_True; - std::vector< ::rtl::OUString > aImageCommandVector; - std::vector< ::rtl::OUString > aImageRotateVector; - std::vector< ::rtl::OUString > aImageMirrorVector; + std::vector< OUString > aImageCommandVector; + std::vector< OUString > aImageRotateVector; + std::vector< OUString > aImageMirrorVector; impl_fill(m_xConfigAccess,sal_False,aImageCommandVector,aImageRotateVector,aImageMirrorVector); impl_fill(m_xConfigAccessPopups,sal_True,aImageCommandVector,aImageRotateVector,aImageMirrorVector); @@ -404,12 +404,12 @@ sal_Bool ConfigurationAccess_UICommand::addGenericInfoToCache() { if ( m_xGenericUICommands.is() && !m_bGenericDataRetrieved ) { - Sequence< rtl::OUString > aCommandNameSeq; + Sequence< OUString > aCommandNameSeq; try { if ( m_xGenericUICommands->getByName( - rtl::OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) >>= aCommandNameSeq ) - m_aCommandRotateImageList = comphelper::concatSequences< rtl::OUString >( m_aCommandRotateImageList, aCommandNameSeq ); + OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) >>= aCommandNameSeq ) + m_aCommandRotateImageList = comphelper::concatSequences< OUString >( m_aCommandRotateImageList, aCommandNameSeq ); } catch (const RuntimeException&) { @@ -422,8 +422,8 @@ sal_Bool ConfigurationAccess_UICommand::addGenericInfoToCache() try { if ( m_xGenericUICommands->getByName( - rtl::OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) >>= aCommandNameSeq ) - m_aCommandMirrorImageList = comphelper::concatSequences< rtl::OUString >( m_aCommandMirrorImageList, aCommandNameSeq ); + OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) >>= aCommandNameSeq ) + m_aCommandMirrorImageList = comphelper::concatSequences< OUString >( m_aCommandMirrorImageList, aCommandNameSeq ); } catch (const RuntimeException&) { @@ -439,7 +439,7 @@ sal_Bool ConfigurationAccess_UICommand::addGenericInfoToCache() return sal_True; } -Any ConfigurationAccess_UICommand::getInfoFromCommand( const rtl::OUString& rCommandURL ) +Any ConfigurationAccess_UICommand::getInfoFromCommand( const OUString& rCommandURL ) { Any a; @@ -475,7 +475,7 @@ Any ConfigurationAccess_UICommand::getInfoFromCommand( const rtl::OUString& rCom return a; } -Sequence< rtl::OUString > ConfigurationAccess_UICommand::getAllCommands() +Sequence< OUString > ConfigurationAccess_UICommand::getAllCommands() { // SAFE ResetableGuard aLock( m_aLock ); @@ -493,18 +493,18 @@ Sequence< rtl::OUString > ConfigurationAccess_UICommand::getAllCommands() try { - Sequence< ::rtl::OUString > aNameSeq = m_xConfigAccess->getElementNames(); + Sequence< OUString > aNameSeq = m_xConfigAccess->getElementNames(); if ( m_xGenericUICommands.is() ) { // Create concat list of supported user interface commands of the module - Sequence< ::rtl::OUString > aGenericNameSeq = m_xGenericUICommands->getElementNames(); + Sequence< OUString > aGenericNameSeq = m_xGenericUICommands->getElementNames(); sal_uInt32 nCount1 = aNameSeq.getLength(); sal_uInt32 nCount2 = aGenericNameSeq.getLength(); aNameSeq.realloc( nCount1 + nCount2 ); - ::rtl::OUString* pNameSeq = aNameSeq.getArray(); - const ::rtl::OUString* pGenericSeq = aGenericNameSeq.getConstArray(); + OUString* pNameSeq = aNameSeq.getArray(); + const OUString* pGenericSeq = aGenericNameSeq.getConstArray(); for ( sal_uInt32 i = 0; i < nCount2; i++ ) pNameSeq[nCount1+i] = pGenericSeq[i]; } @@ -519,7 +519,7 @@ Sequence< rtl::OUString > ConfigurationAccess_UICommand::getAllCommands() } } - return Sequence< rtl::OUString >(); + return Sequence< OUString >(); } sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess() @@ -529,7 +529,7 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess() try { - aPropValue.Name = rtl::OUString( "nodepath" ); + aPropValue.Name = OUString( "nodepath" ); aPropValue.Value <<= m_aConfigCmdAccess; aArgs[0] <<= aPropValue; @@ -630,7 +630,7 @@ UICommandDescription::UICommandDescription( const Reference< XComponentContext > { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::UICommandDescription" ); Reference< XNameAccess > xEmpty; - rtl::OUString aGenericUICommand( "GenericCommands" ); + OUString aGenericUICommand( "GenericCommands" ); m_xGenericUICommands = new ConfigurationAccess_UICommand( aGenericUICommand, xEmpty, m_xContext ); impl_fillElements("ooSetupFactoryCommandConfigRef"); @@ -655,16 +655,16 @@ UICommandDescription::~UICommandDescription() void UICommandDescription::impl_fillElements(const sal_Char* _pName) { m_xModuleManager.set( ModuleManager::create( m_xContext ) ); - Sequence< rtl::OUString > aElementNames = m_xModuleManager->getElementNames(); + Sequence< OUString > aElementNames = m_xModuleManager->getElementNames(); Sequence< PropertyValue > aSeq; - ::rtl::OUString aModuleIdentifier; + OUString aModuleIdentifier; for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ ) { aModuleIdentifier = aElementNames[i]; if ( m_xModuleManager->getByName( aModuleIdentifier ) >>= aSeq ) { - ::rtl::OUString aCommandStr; + OUString aCommandStr; for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ ) { if ( aSeq[y].Name.equalsAscii(_pName) ) @@ -684,12 +684,12 @@ void UICommandDescription::impl_fillElements(const sal_Char* _pName) } } // for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ ) } -Reference< XNameAccess > UICommandDescription::impl_createConfigAccess(const ::rtl::OUString& _sName) +Reference< XNameAccess > UICommandDescription::impl_createConfigAccess(const OUString& _sName) { return new ConfigurationAccess_UICommand( _sName, m_xGenericUICommands, m_xContext ); } -Any SAL_CALL UICommandDescription::getByName( const ::rtl::OUString& aName ) +Any SAL_CALL UICommandDescription::getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::getByName" ); @@ -700,7 +700,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la ModuleToCommandFileMap::const_iterator pM2CIter = m_aModuleToCommandFileMap.find( aName ); if ( pM2CIter != m_aModuleToCommandFileMap.end() ) { - ::rtl::OUString aCommandFile( pM2CIter->second ); + OUString aCommandFile( pM2CIter->second ); UICommandsHashMap::iterator pIter = m_aUICommandsHashMap.find( aCommandFile ); if ( pIter != m_aUICommandsHashMap.end() ) { @@ -731,13 +731,13 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la return a; } -Sequence< ::rtl::OUString > SAL_CALL UICommandDescription::getElementNames() +Sequence< OUString > SAL_CALL UICommandDescription::getElementNames() throw (::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::getElementNames" ); ResetableGuard aLock( m_aLock ); - Sequence< rtl::OUString > aSeq( m_aModuleToCommandFileMap.size() ); + Sequence< OUString > aSeq( m_aModuleToCommandFileMap.size() ); sal_Int32 n = 0; ModuleToCommandFileMap::const_iterator pIter = m_aModuleToCommandFileMap.begin(); @@ -750,7 +750,7 @@ throw (::com::sun::star::uno::RuntimeException) return aSeq; } -sal_Bool SAL_CALL UICommandDescription::hasByName( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL UICommandDescription::hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::hasByName" ); diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index dd5448915b75..83ba7402c9ca 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -67,7 +67,7 @@ StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::co // XUIElementFactory Reference< XUIElement > SAL_CALL StatusBarFactory::createUIElement( - const ::rtl::OUString& ResourceURL, + const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx index 2a2f790ed2fc..993987ee3608 100644 --- a/framework/source/uifactory/toolboxfactory.cxx +++ b/framework/source/uifactory/toolboxfactory.cxx @@ -65,7 +65,7 @@ ToolBoxFactory::ToolBoxFactory( const ::com::sun::star::uno::Reference< ::com::s // XUIElementFactory Reference< XUIElement > SAL_CALL ToolBoxFactory::createUIElement( - const ::rtl::OUString& ResourceURL, + const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 1a6a38a19e9a..f61d574fa4e6 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -46,7 +46,7 @@ namespace framework{ */ #define THROW_PARSEEXCEPTION(COMMENT) \ { \ - ::rtl::OUStringBuffer sMessage(256); \ + OUStringBuffer sMessage(256); \ sMessage.append (implts_getErrorLineString()); \ sMessage.appendAscii(COMMENT ); \ \ @@ -102,7 +102,7 @@ void SAL_CALL AcceleratorConfigurationReader::endDocument() } //----------------------------------------------- -void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString& sElement , +void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& sElement , const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList) throw(css::xml::sax::SAXException, css::uno::RuntimeException ) @@ -119,15 +119,15 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString THROW_PARSEEXCEPTION("An element \"accel:item\" is not a container.") m_bInsideAcceleratorItem = sal_True; - ::rtl::OUString sCommand; + OUString sCommand; css::awt::KeyEvent aEvent ; sal_Int16 c = xAttributeList->getLength(); sal_Int16 i = 0; for (i=0; i<c; ++i) { - ::rtl::OUString sAttribute = xAttributeList->getNameByIndex(i); - ::rtl::OUString sValue = xAttributeList->getValueByIndex(i); + OUString sAttribute = xAttributeList->getNameByIndex(i); + OUString sValue = xAttributeList->getValueByIndex(i); EXMLAttribute eAttribute = AcceleratorConfigurationReader::implst_classifyAttribute(sAttribute); switch(eAttribute) { @@ -175,7 +175,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString // Attention: Its not realy a reason to throw an exception and kill the office, if the configuration contains // multiple registrations for the same key :-) Show a warning ... and ignore the second item. // THROW_PARSEEXCEPTION("Command is registered for the same key more then once.") - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("Double registration detected.\nCommand = \""); sMsg.append (sCommand ); sMsg.appendAscii("\"\nKeyCode = " ); @@ -198,7 +198,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString } //----------------------------------------------- -void SAL_CALL AcceleratorConfigurationReader::endElement(const ::rtl::OUString& sElement) +void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElement) throw(css::xml::sax::SAXException, css::uno::RuntimeException ) { @@ -222,22 +222,22 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const ::rtl::OUString& } //----------------------------------------------- -void SAL_CALL AcceleratorConfigurationReader::characters(const ::rtl::OUString&) +void SAL_CALL AcceleratorConfigurationReader::characters(const OUString&) throw(css::xml::sax::SAXException, css::uno::RuntimeException ) { } //----------------------------------------------- -void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const ::rtl::OUString&) +void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const OUString&) throw(css::xml::sax::SAXException, css::uno::RuntimeException ) { } //----------------------------------------------- -void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const ::rtl::OUString& /*sTarget*/, - const ::rtl::OUString& /*sData*/ ) +void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUString& /*sTarget*/, + const OUString& /*sData*/ ) throw(css::xml::sax::SAXException, css::uno::RuntimeException ) { @@ -252,7 +252,7 @@ void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno: } //----------------------------------------------- -AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::implst_classifyElement(const ::rtl::OUString& sElement) +AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::implst_classifyElement(const OUString& sElement) { AcceleratorConfigurationReader::EXMLElement eElement; @@ -269,7 +269,7 @@ AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::impl } //----------------------------------------------- -AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::implst_classifyAttribute(const ::rtl::OUString& sAttribute) +AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::implst_classifyAttribute(const OUString& sAttribute) { AcceleratorConfigurationReader::EXMLAttribute eAttribute; @@ -294,12 +294,12 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im } //----------------------------------------------- -::rtl::OUString AcceleratorConfigurationReader::implts_getErrorLineString() +OUString AcceleratorConfigurationReader::implts_getErrorLineString() { if (!m_xLocator.is()) return DECLARE_ASCII("Error during parsing XML. (No further info available ...)"); - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("Error during parsing XML in\nline = "); sMsg.append (m_xLocator->getLineNumber() ); sMsg.appendAscii("\ncolumn = " ); diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index 136373580dfb..70fa9ab70adf 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -72,10 +72,10 @@ void AcceleratorConfigurationWriter::flush() xCFG->startDocument(); xExtendedCFG->unknown(DOCTYPE_ACCELERATORS); - xCFG->ignorableWhitespace(::rtl::OUString()); + xCFG->ignorableWhitespace(OUString()); xCFG->startElement(AL_ELEMENT_ACCELERATORLIST, xAttribs); - xCFG->ignorableWhitespace(::rtl::OUString()); + xCFG->ignorableWhitespace(OUString()); // TODO think about threadsafe using of cache AcceleratorCache::TKeyList lKeys = m_rContainer.getAllKeys(); @@ -85,7 +85,7 @@ void AcceleratorConfigurationWriter::flush() ++pKey ) { const css::awt::KeyEvent& rKey = *pKey; - const ::rtl::OUString& rCommand = m_rContainer.getCommandByKey(rKey); + const OUString& rCommand = m_rContainer.getCommandByKey(rKey); impl_ts_writeKeyCommandPair(rKey, rCommand, xCFG); } @@ -95,43 +95,43 @@ void AcceleratorConfigurationWriter::flush() WriteAcceleratorItem( *p ); */ - xCFG->ignorableWhitespace(::rtl::OUString()); + xCFG->ignorableWhitespace(OUString()); xCFG->endElement(AL_ELEMENT_ACCELERATORLIST); - xCFG->ignorableWhitespace(::rtl::OUString()); + xCFG->ignorableWhitespace(OUString()); xCFG->endDocument(); } //----------------------------------------------- void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey , - const ::rtl::OUString& sCommand, + const OUString& sCommand, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ) { ::comphelper::AttributeList* pAttribs = new ::comphelper::AttributeList; css::uno::Reference< css::xml::sax::XAttributeList > xAttribs (static_cast< css::xml::sax::XAttributeList* >(pAttribs) , css::uno::UNO_QUERY_THROW); - ::rtl::OUString sKey = m_rKeyMapping->mapCodeToIdentifier(aKey.KeyCode); + OUString sKey = m_rKeyMapping->mapCodeToIdentifier(aKey.KeyCode); // TODO check if key is empty! pAttribs->AddAttribute(AL_ATTRIBUTE_KEYCODE, ATTRIBUTE_TYPE_CDATA, sKey ); pAttribs->AddAttribute(AL_ATTRIBUTE_URL , ATTRIBUTE_TYPE_CDATA, sCommand); if ((aKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, OUString("true")); if ((aKey.Modifiers & css::awt::KeyModifier::MOD1) == css::awt::KeyModifier::MOD1) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, OUString("true")); if ((aKey.Modifiers & css::awt::KeyModifier::MOD2) == css::awt::KeyModifier::MOD2) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, OUString("true")); if ((aKey.Modifiers & css::awt::KeyModifier::MOD3) == css::awt::KeyModifier::MOD3) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, OUString("true")); - xConfig->ignorableWhitespace(::rtl::OUString()); + xConfig->ignorableWhitespace(OUString()); xConfig->startElement(AL_ELEMENT_ITEM, xAttribs); - xConfig->ignorableWhitespace(::rtl::OUString()); + xConfig->ignorableWhitespace(OUString()); xConfig->endElement(AL_ELEMENT_ITEM); - xConfig->ignorableWhitespace(::rtl::OUString()); + xConfig->ignorableWhitespace(OUString()); } } // namespace framework |