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/inc | |
| 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/inc')
140 files changed, 1046 insertions, 1046 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; }; |