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 /sfx2/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 'sfx2/inc')
56 files changed, 304 insertions, 304 deletions
diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx index 6768ccc449fe..18b31de66bcb 100644 --- a/sfx2/inc/bluthsndapi.hxx +++ b/sfx2/inc/bluthsndapi.hxx @@ -45,7 +45,7 @@ class SFX2_DLLPUBLIC SfxBluetoothModel:public SfxMailModel { public: SendMailResult SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& rType ); + const OUString& rType ); SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); }; diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx index 35f106ee8b2e..a62ea316a1e7 100644 --- a/sfx2/inc/frmload.hxx +++ b/sfx2/inc/frmload.hxx @@ -64,16 +64,16 @@ protected: private: const SfxFilter* impl_getFilterFromServiceName_nothrow( - const ::rtl::OUString& i_rServiceName + const OUString& i_rServiceName ) const; - ::rtl::OUString impl_askForFilter_nothrow( + OUString impl_askForFilter_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& i_rxHandler, - const ::rtl::OUString& i_rDocumentURL + const OUString& i_rDocumentURL ) const; const SfxFilter* impl_detectFilterForURL( - const ::rtl::OUString& _rURL, + const OUString& _rURL, const ::comphelper::NamedValueCollection& i_rDescriptor, const SfxFilterMatcher& rMatcher ) const; @@ -93,7 +93,7 @@ private: ) const; sal_uInt16 impl_findSlotParam( - const ::rtl::OUString& i_rFactoryURL + const OUString& i_rFactoryURL ) const; SfxObjectShellRef impl_findObjectShell( @@ -129,7 +129,7 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel2 >& i_rModel, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::comphelper::NamedValueCollection& i_rViewFactoryArgs, - const ::rtl::OUString& i_rViewName + const OUString& i_rViewName ); }; diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx index 906e22f67cf2..a6d6b7c7ba12 100644 --- a/sfx2/inc/guisaveas.hxx +++ b/sfx2/inc/guisaveas.hxx @@ -59,15 +59,15 @@ public: sal_Bool GUIStoreModel( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel, - const ::rtl::OUString& aSlotName, + const OUString& aSlotName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsSequence, sal_Bool bPreselectPassword, - ::rtl::OUString aUserSelectedName, + OUString aUserSelectedName, sal_uInt16 nDocumentSignatureState = SIGNATURESTATE_NOSIGNATURES ); static sal_Bool CheckFilterOptionsAppearence( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG, - const ::rtl::OUString& aFilterName ); + const OUString& aFilterName ); static void SetDocInfoState( @@ -78,8 +78,8 @@ public: static sal_Bool WarnUnacceptableFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel, - ::rtl::OUString aOldUIName, - ::rtl::OUString aDefUIName, + OUString aOldUIName, + OUString aDefUIName, sal_Bool bCanProceedFurther ); static Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); diff --git a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx index 33808a4b916b..d81401266ac3 100644 --- a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx +++ b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx @@ -67,8 +67,8 @@ createBaseURI( const & i_xContext, ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> const & i_xStorage, - ::rtl::OUString const & i_rPkgURI, - ::rtl::OUString const & i_rSubDocument = ::rtl::OUString()); + OUString const & i_rPkgURI, + OUString const & i_rSubDocument = OUString()); class IXmlIdRegistrySupplier; @@ -84,7 +84,7 @@ public: explicit DocumentMetadataAccess(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_xContext, IXmlIdRegistrySupplier const & i_rRegistrySupplier, - ::rtl::OUString const & i_rBaseURI); + OUString const & i_rBaseURI); // N.B.: in contrast to previous, this constructor does _not_ initialize! // caller must immediately call loadFromStorage/Medium! explicit DocumentMetadataAccess(::com::sun::star::uno::Reference< @@ -93,13 +93,13 @@ public: virtual ~DocumentMetadataAccess(); // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() + virtual OUString SAL_CALL getStringValue() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::rdf::XURI: - virtual ::rtl::OUString SAL_CALL getNamespace() + virtual OUString SAL_CALL getNamespace() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLocalName() + virtual OUString SAL_CALL getLocalName() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::rdf::XRepositorySupplier: @@ -127,7 +127,7 @@ public: ::com::sun::star::lang::IllegalArgumentException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI> SAL_CALL - addMetadataFile(const ::rtl::OUString & i_rFileName, + addMetadataFile(const OUString & i_rFileName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > > & i_rTypes) @@ -139,7 +139,7 @@ public: importMetadataFile(::sal_Int16 i_Format, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & i_xInStream, - const ::rtl::OUString & i_rFileName, + const OUString & i_rFileName, const ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > & i_xBaseURI, const ::com::sun::star::uno::Sequence< @@ -158,12 +158,12 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException); virtual void SAL_CALL addContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException); virtual void SAL_CALL removeContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException); diff --git a/sfx2/inc/sfx2/Metadatable.hxx b/sfx2/inc/sfx2/Metadatable.hxx index 432f02eed213..70737da920ce 100644 --- a/sfx2/inc/sfx2/Metadatable.hxx +++ b/sfx2/inc/sfx2/Metadatable.hxx @@ -146,13 +146,13 @@ public: virtual ~MetadatableMixin() {} // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() + virtual OUString SAL_CALL getStringValue() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::rdf::XURI: - virtual ::rtl::OUString SAL_CALL getLocalName() + virtual OUString SAL_CALL getLocalName() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNamespace() + virtual OUString SAL_CALL getNamespace() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::rdf::XMetadatable: diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/sfx2/inc/sfx2/XmlIdRegistry.hxx index d93eaacb0cbd..a7540dc469b0 100644 --- a/sfx2/inc/sfx2/XmlIdRegistry.hxx +++ b/sfx2/inc/sfx2/XmlIdRegistry.hxx @@ -36,10 +36,10 @@ namespace sfx2 { // XML ID utilities -------------------------------------------------- /** is i_rIdref a valid NCName ? */ -bool SFX2_DLLPUBLIC isValidNCName(::rtl::OUString const & i_rIdref); +bool SFX2_DLLPUBLIC isValidNCName(OUString const & i_rIdref); -bool SFX2_DLLPUBLIC isValidXmlId(::rtl::OUString const & i_rStreamName, - ::rtl::OUString const & i_rIdref); +bool SFX2_DLLPUBLIC isValidXmlId(OUString const & i_rStreamName, + OUString const & i_rIdref); // XML ID handling --------------------------------------------------- diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index bc8613fadce6..2f81d6d61335 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -183,7 +183,7 @@ public: // Basic/Scripting static sal_Bool IsXScriptURL( const String& rScriptURL ); - static ::rtl::OUString ChooseScript(); + static OUString ChooseScript(); static void MacroOrganizer( sal_Int16 nTabId ); static ErrCode CallBasic( const String&, BasicManager*, SbxArray *pArgs, SbxValue *pRet ); static ErrCode CallAppBasic( const String& i_macroName, SbxArray* i_args = NULL, SbxValue* i_ret = NULL ) diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx index 3679eb26dc7c..90bf2d5edf58 100644 --- a/sfx2/inc/sfx2/appuno.hxx +++ b/sfx2/inc/sfx2/appuno.hxx @@ -65,10 +65,10 @@ public: SfxMacroLoader( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) {} - static ErrCode loadMacro( const ::rtl::OUString& aURL, ::com::sun::star::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) throw( ::com::sun::star::uno::RuntimeException ); + static ErrCode loadMacro( const OUString& aURL, ::com::sun::star::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) 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 ::rtl::OUString& sTargetFrameName, + queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTargetFrameName, FrameSearchFlags eSearchFlags ) throw( ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence < ::com::sun::star::frame::DispatchDescriptor >& seqDescriptor ) @@ -93,7 +93,7 @@ public: SFX_DECL_XSERVICEINFO virtual ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > SAL_CALL - queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTargetFrameName, + queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTargetFrameName, FrameSearchFlags eSearchFlags ) throw( ::com::sun::star::uno::RuntimeException ) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence < ::com::sun::star::frame::DispatchDescriptor >& seqDescriptor ) diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index fe86e3d0d659..95278e89e605 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -69,7 +69,7 @@ private: protected: SfxModalDialog(Window *pParent, const ResId& ); - SfxModalDialog(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription); + SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); SfxModalDialog(Window* pParent, sal_uInt32 nUniqueId, WinBits nWinStyle = WB_STDMODAL ); String& GetExtraData() { return aExtraData; } @@ -104,7 +104,7 @@ protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, Window*, const ResId& ); SfxModelessDialog( SfxBindings*, SfxChildWindow*, - Window*, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ); + Window*, const OString& rID, const OUString& rUIXMLDescription ); ~SfxModelessDialog(); virtual sal_Bool Close(); virtual void Resize(); diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx index 73fce08a118e..73ac3dc6bc3b 100644 --- a/sfx2/inc/sfx2/bindings.hxx +++ b/sfx2/inc/sfx2/bindings.hxx @@ -206,9 +206,9 @@ public: #define ENTERREGISTRATIONS() EnterRegistrations(__FILE__, __LINE__) #define LEAVEREGISTRATIONS() LeaveRegistrations(USHRT_MAX, __FILE__, __LINE__) #define DENTERREGISTRATIONS() \ - EnterRegistrations( rtl::OStringBuffer(__FILE__).append('(').append(reinterpret_cast<sal_Int64>(this)).append(')').getStr(), __LINE__ ) + EnterRegistrations( OStringBuffer(__FILE__).append('(').append(reinterpret_cast<sal_Int64>(this)).append(')').getStr(), __LINE__ ) #define DLEAVEREGISTRATIONS( ) \ - LeaveRegistrations( USHRT_MAX, rtl::OStringBuffer(__FILE__).append('(').append(reinterpret_cast<sal_Int64>(this)).append(')').getStr(), __LINE__ ) + LeaveRegistrations( USHRT_MAX, OStringBuffer(__FILE__).append('(').append(reinterpret_cast<sal_Int64>(this)).append(')').getStr(), __LINE__ ) #else #define ENTERREGISTRATIONS() EnterRegistrations() #define LEAVEREGISTRATIONS() LeaveRegistrations() diff --git a/sfx2/inc/sfx2/brokenpackageint.hxx b/sfx2/inc/sfx2/brokenpackageint.hxx index 747e888dab84..85cd33402f3c 100644 --- a/sfx2/inc/sfx2/brokenpackageint.hxx +++ b/sfx2/inc/sfx2/brokenpackageint.hxx @@ -28,7 +28,7 @@ class SFX2_DLLPUBLIC RequestPackageReparation { RequestPackageReparation_Impl* pImp; public: - RequestPackageReparation( ::rtl::OUString aName ); + RequestPackageReparation( OUString aName ); ~RequestPackageReparation(); sal_Bool isApproved(); com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); @@ -39,7 +39,7 @@ class SFX2_DLLPUBLIC NotifyBrokenPackage { NotifyBrokenPackage_Impl* pImp; public: - NotifyBrokenPackage( ::rtl::OUString aName ); + NotifyBrokenPackage( OUString aName ); ~NotifyBrokenPackage(); sal_Bool isAborted(); com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); diff --git a/sfx2/inc/sfx2/checkin.hxx b/sfx2/inc/sfx2/checkin.hxx index 65aa2e75cd1b..9a9c20f485d7 100644 --- a/sfx2/inc/sfx2/checkin.hxx +++ b/sfx2/inc/sfx2/checkin.hxx @@ -26,7 +26,7 @@ class SfxCheckinDialog : public ModalDialog public: SfxCheckinDialog( Window* pParent ); - rtl::OUString GetComment( ); + OUString GetComment( ); bool IsMajor( ); }; diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx index 017bf2809f6f..d0c5e50fce1f 100644 --- a/sfx2/inc/sfx2/childwin.hxx +++ b/sfx2/inc/sfx2/childwin.hxx @@ -55,7 +55,7 @@ struct SfxChildWinInfo Size aSize; sal_uInt16 nFlags; String aExtraString; - rtl::OString aWinState; + OString aWinState; SfxChildWinInfo() { diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx index 4743952d334e..c0758b56bc00 100644 --- a/sfx2/inc/sfx2/dinfdlg.hxx +++ b/sfx2/inc/sfx2/dinfdlg.hxx @@ -57,22 +57,22 @@ class SFX2_DLLPUBLIC SfxDocumentInfoItem : public SfxStringItem { private: sal_Int32 m_AutoloadDelay; - ::rtl::OUString m_AutoloadURL; + OUString m_AutoloadURL; sal_Bool m_isAutoloadEnabled; - ::rtl::OUString m_DefaultTarget; - ::rtl::OUString m_TemplateName; - ::rtl::OUString m_Author; + OUString m_DefaultTarget; + OUString m_TemplateName; + OUString m_Author; ::com::sun::star::util::DateTime m_CreationDate; - ::rtl::OUString m_ModifiedBy; + OUString m_ModifiedBy; ::com::sun::star::util::DateTime m_ModificationDate; - ::rtl::OUString m_PrintedBy; + OUString m_PrintedBy; ::com::sun::star::util::DateTime m_PrintDate; sal_Int16 m_EditingCycles; sal_Int32 m_EditingDuration; - ::rtl::OUString m_Description; - ::rtl::OUString m_Keywords; - ::rtl::OUString m_Subject; - ::rtl::OUString m_Title; + OUString m_Description; + OUString m_Keywords; + OUString m_Subject; + OUString m_Title; sal_Bool m_bHasTemplate; sal_Bool m_bDeleteUserData; sal_Bool m_bUseUserData; @@ -99,30 +99,30 @@ public: void setAutoloadEnabled(sal_Bool i_val) { m_isAutoloadEnabled = i_val; } sal_Int32 getAutoloadDelay() const { return m_AutoloadDelay; } void setAutoloadDelay(sal_Int32 i_val) { m_AutoloadDelay = i_val; } - ::rtl::OUString getAutoloadURL() const { return m_AutoloadURL; } - void setAutoloadURL(::rtl::OUString i_val) { m_AutoloadURL = i_val; } - ::rtl::OUString getDefaultTarget() const { return m_DefaultTarget; } - void setDefaultTarget(::rtl::OUString i_val) { m_DefaultTarget = i_val; } - ::rtl::OUString getTemplateName() const { return m_TemplateName; } - void setTemplateName(::rtl::OUString i_val) { m_TemplateName = i_val; } - ::rtl::OUString getAuthor() const { return m_Author; } - void setAuthor(::rtl::OUString i_val) { m_Author = i_val; } + OUString getAutoloadURL() const { return m_AutoloadURL; } + void setAutoloadURL(OUString i_val) { m_AutoloadURL = i_val; } + OUString getDefaultTarget() const { return m_DefaultTarget; } + void setDefaultTarget(OUString i_val) { m_DefaultTarget = i_val; } + OUString getTemplateName() const { return m_TemplateName; } + void setTemplateName(OUString i_val) { m_TemplateName = i_val; } + OUString getAuthor() const { return m_Author; } + void setAuthor(OUString i_val) { m_Author = i_val; } ::com::sun::star::util::DateTime getCreationDate() const { return m_CreationDate; } void setCreationDate(::com::sun::star::util::DateTime i_val) { m_CreationDate = i_val; } - ::rtl::OUString getModifiedBy() const { return m_ModifiedBy; } - void setModifiedBy(::rtl::OUString i_val) { m_ModifiedBy = i_val; } + OUString getModifiedBy() const { return m_ModifiedBy; } + void setModifiedBy(OUString i_val) { m_ModifiedBy = i_val; } ::com::sun::star::util::DateTime getModificationDate() const { return m_ModificationDate; } void setModificationDate(::com::sun::star::util::DateTime i_val) { m_ModificationDate = i_val; } - ::rtl::OUString getPrintedBy() const { return m_PrintedBy; } - void setPrintedBy(::rtl::OUString i_val) { m_PrintedBy = i_val; } + OUString getPrintedBy() const { return m_PrintedBy; } + void setPrintedBy(OUString i_val) { m_PrintedBy = i_val; } ::com::sun::star::util::DateTime getPrintDate() const { return m_PrintDate; } void setPrintDate(::com::sun::star::util::DateTime i_val) { @@ -132,17 +132,17 @@ public: void setEditingCycles(sal_Int16 i_val) { m_EditingCycles = i_val; } sal_Int32 getEditingDuration() const { return m_EditingDuration; } void setEditingDuration(sal_Int32 i_val) { m_EditingDuration = i_val; } - ::rtl::OUString getDescription() const { return m_Description; } - void setDescription(::rtl::OUString i_val) { m_Description = i_val; } - ::rtl::OUString getKeywords() const { return m_Keywords; } - void setKeywords(::rtl::OUString i_val) { m_Keywords = i_val; } - ::rtl::OUString getSubject() const { return m_Subject; } - void setSubject(::rtl::OUString i_val) { m_Subject = i_val; } - ::rtl::OUString getTitle() const { return m_Title; } - void setTitle(::rtl::OUString i_val) { m_Title = i_val; } + OUString getDescription() const { return m_Description; } + void setDescription(OUString i_val) { m_Description = i_val; } + OUString getKeywords() const { return m_Keywords; } + void setKeywords(OUString i_val) { m_Keywords = i_val; } + OUString getSubject() const { return m_Subject; } + void setSubject(OUString i_val) { m_Subject = i_val; } + OUString getTitle() const { return m_Title; } + void setTitle(OUString i_val) { m_Title = i_val; } /// reset user-specific data (author, modified-by, ...) - void resetUserData(const ::rtl::OUString & i_rAuthor); + void resetUserData(const OUString & i_rAuthor); void SetTemplate( sal_Bool b ) { m_bHasTemplate = b; } sal_Bool HasTemplate() const { return m_bHasTemplate; } @@ -153,7 +153,7 @@ public: std::vector< CustomProperty* > GetCustomProperties() const; void ClearCustomProperties(); - void AddCustomProperty( const ::rtl::OUString& sName, + void AddCustomProperty( const OUString& sName, const com::sun::star::uno::Any& rValue ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; @@ -431,7 +431,7 @@ public: void InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar ); sal_uInt16 GetVisibleLineCount() const; inline sal_Int32 GetLineHeight() const { return m_nLineHeight; } - void AddLine( const ::rtl::OUString& sName, com::sun::star::uno::Any& rAny ); + void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny ); bool AreAllLinesValid() const; void ClearAllLines(); void DoScroll( sal_Int32 nNewPos ); @@ -463,7 +463,7 @@ public: CustomPropertiesControl(Window* pParent); ~CustomPropertiesControl(); - void AddLine( const ::rtl::OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive ); + void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive ); inline bool AreAllLinesValid() const { return m_pPropertiesWin->AreAllLinesValid(); } inline void ClearAllLines() { m_pPropertiesWin->ClearAllLines(); } diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx index 168050f4be54..e8d15a8366cd 100644 --- a/sfx2/inc/sfx2/docfac.hxx +++ b/sfx2/inc/sfx2/docfac.hxx @@ -74,7 +74,7 @@ public: SfxObjectShellFlags GetFlags() { return nFlags; } const char* GetShortName() const { return pShortName; } String GetFactoryURL() const; // shortcut for "private:factory/GetShortName()" - String GetFactoryName() const { return rtl::OUString::createFromAscii(pShortName); } + String GetFactoryName() const { return OUString::createFromAscii(pShortName); } String GetModuleName() const; SfxFilterContainer *GetFilterContainer( sal_Bool bForceLoad = sal_True) const; @@ -92,8 +92,8 @@ public: static void SetStandardTemplate( const String& rServiceName, const String& rTemplateName ); static void SetSystemTemplate( const String& rServiceName, const String& rTemplateName ); - void SetDocumentServiceName( const rtl::OUString& rServiceName ); - const rtl::OUString& GetDocumentServiceName() const; + void SetDocumentServiceName( const OUString& rServiceName ); + const OUString& GetDocumentServiceName() const; SfxModule* GetModule() const; diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index ae055b5db0bd..5aef2f2e1e7d 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -118,14 +118,14 @@ public: void SetFilter(const SfxFilter *pFlt, sal_Bool bResetOrig = sal_False); const SfxFilter* GetFilter() const; const SfxFilter * GetOrigFilter( sal_Bool bNotCurrent = sal_False ) const; - const rtl::OUString& GetOrigURL() const; + const OUString& GetOrigURL() const; SfxItemSet * GetItemSet() const; void Close(); void CloseAndRelease(); void ReOpen(); void CompleteReOpen(); - const rtl::OUString& GetName() const; + const OUString& GetName() const; const INetURLObject& GetURLObject() const; void CheckFileDate( const css::util::DateTime& aInitDate ); @@ -133,7 +133,7 @@ public: css::util::DateTime GetInitFileDate( sal_Bool bIgnoreOldValue ); css::uno::Reference< css::ucb::XContent > GetContent() const; - const rtl::OUString& GetPhysicalName() const; + const OUString& GetPhysicalName() const; sal_Bool IsRemote(); sal_Bool IsOpen() const; // { return aStorage.Is() || pInStream; } void DownLoad( const Link& aLink = Link()); @@ -144,9 +144,9 @@ public: { return ERRCODE_TOERROR(GetErrorCode()); } sal_uInt32 GetLastStorageCreationState(); - void SetError( sal_uInt32 nError, const ::rtl::OUString& aLogMessage ); + void SetError( sal_uInt32 nError, const OUString& aLogMessage ); - void AddLog( const ::rtl::OUString& aMessage ); + void AddLog( const OUString& aMessage ); void CloseInStream(); sal_Bool CloseOutStream(); @@ -162,7 +162,7 @@ public: sal_Bool Commit(); sal_Bool IsStorage(); - sal_Int8 ShowLockedDocumentDialog( const css::uno::Sequence< ::rtl::OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock ); + sal_Int8 ShowLockedDocumentDialog( const css::uno::Sequence< OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock ); bool LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ); void UnlockFile( sal_Bool bReleaseLockStream ); @@ -189,17 +189,17 @@ public: void CreateTempFile( sal_Bool bReplace = sal_True ); void CreateTempFileNoCopy(); - ::rtl::OUString SwitchDocumentToTempFile(); - sal_Bool SwitchDocumentToFile( const rtl::OUString& aURL ); + OUString SwitchDocumentToTempFile(); + sal_Bool SwitchDocumentToFile( const OUString& aURL ); - ::rtl::OUString GetBaseURL( bool bForSaving=false ); + OUString GetBaseURL( bool bForSaving=false ); void SetInCheckIn( bool bInCheckIn ); bool IsInCheckIn( ); SAL_DLLPRIVATE sal_Bool HasStorage_Impl() const; SAL_DLLPRIVATE void StorageBackup_Impl(); - SAL_DLLPRIVATE ::rtl::OUString GetBackup_Impl(); + SAL_DLLPRIVATE OUString GetBackup_Impl(); SAL_DLLPRIVATE css::uno::Reference< css::embed::XStorage > GetZipStorageToSign_Impl( sal_Bool bReadOnly = sal_True ); SAL_DLLPRIVATE void CloseZipStorage_Impl(); @@ -212,7 +212,7 @@ public: SAL_DLLPRIVATE sal_uInt16 AddVersion_Impl( css::util::RevisionTag& rVersion ); SAL_DLLPRIVATE sal_Bool TransferVersionList_Impl( SfxMedium& rMedium ); SAL_DLLPRIVATE sal_Bool SaveVersionList_Impl( sal_Bool bUseXML ); - SAL_DLLPRIVATE sal_Bool RemoveVersion_Impl( const ::rtl::OUString& rVersion ); + SAL_DLLPRIVATE sal_Bool RemoveVersion_Impl( const OUString& rVersion ); SAL_DLLPRIVATE void SetExpired_Impl( const DateTime& rDateTime ); SAL_DLLPRIVATE SvKeyValueIterator* GetHeaderAttributes_Impl(); @@ -225,19 +225,19 @@ public: SAL_DLLPRIVATE void GetLockingStream_Impl(); SAL_DLLPRIVATE void GetMedium_Impl(); - SAL_DLLPRIVATE sal_Bool TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& aTargetSet ); + SAL_DLLPRIVATE sal_Bool TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet ); SAL_DLLPRIVATE void Transfer_Impl(); SAL_DLLPRIVATE void CreateFileStream(); SAL_DLLPRIVATE void SetUpdatePickList(sal_Bool); SAL_DLLPRIVATE sal_Bool IsUpdatePickList() const; - SAL_DLLPRIVATE void SetLongName(const rtl::OUString &rName); - SAL_DLLPRIVATE const rtl::OUString & GetLongName() const; + SAL_DLLPRIVATE void SetLongName(const OUString &rName); + SAL_DLLPRIVATE const OUString & GetLongName() const; SAL_DLLPRIVATE ErrCode CheckOpenMode_Impl( sal_Bool bSilent, sal_Bool bAllowRO = sal_True ); SAL_DLLPRIVATE sal_Bool IsPreview_Impl(); SAL_DLLPRIVATE void ClearBackup_Impl(); SAL_DLLPRIVATE void Done_Impl( ErrCode ); - SAL_DLLPRIVATE void SetPhysicalName_Impl(const rtl::OUString& rName); + SAL_DLLPRIVATE void SetPhysicalName_Impl(const OUString& rName); SAL_DLLPRIVATE void CanDisposeStorage_Impl( sal_Bool bDisposeStorage ); SAL_DLLPRIVATE sal_Bool WillDisposeStorageOnClose_Impl(); @@ -257,7 +257,7 @@ public: const INetURLObject& aDest, const css::uno::Reference< css::ucb::XCommandEnvironment >& xComEnv ); - SAL_DLLPRIVATE sal_Bool SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::OUString& aODFVersion, sal_Bool bHasValidDocumentSignature ); + SAL_DLLPRIVATE sal_Bool SignContents_Impl( sal_Bool bScriptingContent, const OUString& aODFVersion, sal_Bool bHasValidDocumentSignature ); // the following two methods must be used and make sence only during saving currently // TODO/LATER: in future the signature state should be controlled by the medium not by the document @@ -267,11 +267,11 @@ public: static css::uno::Sequence < css::util::RevisionTag > GetVersionList( const css::uno::Reference< css::embed::XStorage >& xStorage ); - static ::rtl::OUString CreateTempCopyWithExt( const ::rtl::OUString& aURL ); + static OUString CreateTempCopyWithExt( const OUString& aURL ); static sal_Bool CallApproveHandler( const css::uno::Reference< css::task::XInteractionHandler >& xHandler, css::uno::Any aRequest, sal_Bool bAllowAbort ); - static sal_Bool SetWritableForUserOnly( const ::rtl::OUString& aURL ); - static sal_uInt32 CreatePasswordToModifyHash( const ::rtl::OUString& aPasswd, sal_Bool bWriter ); + static sal_Bool SetWritableForUserOnly( const OUString& aURL ); + static sal_uInt32 CreatePasswordToModifyHash( const OUString& aPasswd, sal_Bool bWriter ); }; SV_DECL_IMPL_REF( SfxMedium ) diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx index c017f849be8e..18ccfc80f389 100644 --- a/sfx2/inc/sfx2/docfilt.hxx +++ b/sfx2/inc/sfx2/docfilt.hxx @@ -44,11 +44,11 @@ friend class SfxFilterContainer; WildCard aWildCard; sal_uIntPtr lFormat; String aTypeName; - rtl::OUString aUserData; + OUString aUserData; SfxFilterFlags nFormatType; sal_uInt16 nDocIcon; - rtl::OUString aServiceName; - rtl::OUString aMimeType; + OUString aServiceName; + OUString aMimeType; String aFilterName; String aPattern; sal_uIntPtr nVersion; @@ -76,7 +76,7 @@ public: bool IsInternal() const { return nFormatType & SFX_FILTER_INTERNAL; } SfxFilterFlags GetFilterFlags() const { return nFormatType; } const String& GetFilterName() const { return aFilterName; } - const ::rtl::OUString& GetMimeType() const { return aMimeType; } + const OUString& GetMimeType() const { return aMimeType; } const String& GetName() const { return aFilterName; } const WildCard& GetWildcard() const { return aWildCard; } const String& GetRealTypeName() const { return aTypeName; } @@ -84,7 +84,7 @@ public: const String& GetTypeName() const { return aTypeName; } const String& GetUIName() const { return aUIName; } sal_uInt16 GetDocIconId() const { return nDocIcon; } - const rtl::OUString& GetUserData() const { return aUserData; } + const OUString& GetUserData() const { return aUserData; } const String& GetDefaultTemplate() const { return aDefaultTemplate; } void SetDefaultTemplate( const String& rStr ) { aDefaultTemplate = rStr; } sal_Bool UsesStorage() const { return GetFormat() != 0; } @@ -95,7 +95,7 @@ public: sal_uIntPtr GetVersion() const { return nVersion; } String GetSuffixes() const; String GetDefaultExtension() const; - const rtl::OUString& GetServiceName() const { return aServiceName; } + const OUString& GetServiceName() const { return aServiceName; } static const SfxFilter* GetDefaultFilter( const String& rName ); static const SfxFilter* GetFilterByName( const String& rName ); diff --git a/sfx2/inc/sfx2/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx index 6372b619c484..cefcf034f48e 100644 --- a/sfx2/inc/sfx2/docinsert.hxx +++ b/sfx2/inc/sfx2/docinsert.hxx @@ -47,7 +47,7 @@ private: sfx2::FileDialogHelper* m_pFileDlg; SfxItemSet* m_pItemSet; - std::vector<rtl::OUString> m_pURLList; + std::vector<OUString> m_pURLList; DECL_LINK(DialogClosedHdl, void *); diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx index dca8e563cc91..d64b6ed7a6f7 100644 --- a/sfx2/inc/sfx2/dockwin.hxx +++ b/sfx2/inc/sfx2/dockwin.hxx @@ -33,8 +33,8 @@ class SfxSplitWindow; class SfxDockingWindow_Impl; -void SFX2_DLLPUBLIC SAL_CALL SfxDockingWindowFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName ); -bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName ); +void SFX2_DLLPUBLIC SAL_CALL SfxDockingWindowFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); +bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); class SFX2_DLLPUBLIC SfxDockingWindow : public DockingWindow { diff --git a/sfx2/inc/sfx2/docmacromode.hxx b/sfx2/inc/sfx2/docmacromode.hxx index 1b5857f8ae43..4e089d7e3d55 100644 --- a/sfx2/inc/sfx2/docmacromode.hxx +++ b/sfx2/inc/sfx2/docmacromode.hxx @@ -98,7 +98,7 @@ namespace sfx2 we could replace this method with a newly introduced method getDocumentModel and some internal code. */ - virtual ::rtl::OUString + virtual OUString getDocumentLocation() const = 0; /** returns a zip-storage based on the last commited version of the document, diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx index a84ac1195542..a5b24cf81993 100644 --- a/sfx2/inc/sfx2/doctempl.hxx +++ b/sfx2/inc/sfx2/doctempl.hxx @@ -71,15 +71,15 @@ public: String GetPath(sal_uInt16 nRegion, sal_uInt16 nIdx) const; // Allows to retrieve the target template URL from the UCB - ::rtl::OUString GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName, - const ::rtl::OUString& aTitle ); + OUString GetTemplateTargetURLFromComponent( const OUString& aGroupName, + const OUString& aTitle ); // Convert a resource string - a template name - to its localised pair // if it exists in templatelocnames.src - static ::rtl::OUString ConvertResourceString(int nSourceResIds, + static OUString ConvertResourceString(int nSourceResIds, int nDestResIds, int nCount, - const ::rtl::OUString& rString); + const OUString& rString); sal_Bool Copy(sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, @@ -107,7 +107,7 @@ public: sal_True if the action could be performed, sal_False otherwise */ - sal_Bool SetName(const rtl::OUString &rName, sal_uInt16 nRegion, sal_uInt16 nIdx); + sal_Bool SetName(const OUString &rName, sal_uInt16 nRegion, sal_uInt16 nIdx); sal_Bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const String &rName) const; sal_Bool CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, String &rName); diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx index 760a90627aa2..bcdc88ec2edb 100644 --- a/sfx2/inc/sfx2/event.hxx +++ b/sfx2/inc/sfx2/event.hxx @@ -37,12 +37,12 @@ class SfxObjectShell; class SFX2_DLLPUBLIC SfxEventHint : public SfxHint { SfxObjectShell* pObjShell; - ::rtl::OUString aEventName; + OUString aEventName; sal_uInt16 nEventId; public: TYPEINFO(); - SfxEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj = 0 ) + SfxEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj = 0 ) : pObjShell(pObj), aEventName(aName), nEventId(nId) @@ -51,7 +51,7 @@ public: sal_uInt16 GetEventId() const { return nEventId; } - ::rtl::OUString GetEventName() const + OUString GetEventName() const { return aEventName; } SfxObjectShell* GetObjShell() const @@ -67,12 +67,12 @@ class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint public: TYPEINFO(); - SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) + SfxViewEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) : SfxEventHint( nId, aName, pObj ) , xViewController( xController, ::com::sun::star::uno::UNO_QUERY ) {} - SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController ) + SfxViewEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController ) : SfxEventHint( nId, aName, pObj ) , xViewController( xController ) {} diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx index 6e6331a86213..2f181ad820b1 100644 --- a/sfx2/inc/sfx2/evntconf.hxx +++ b/sfx2/inc/sfx2/evntconf.hxx @@ -111,7 +111,7 @@ public: class SFX2_DLLPUBLIC SfxEventConfiguration { public: - static void ConfigureEvent( ::rtl::OUString aName, const SvxMacro&, SfxObjectShell* pObjSh); + static void ConfigureEvent( OUString aName, const SvxMacro&, SfxObjectShell* pObjSh); static SvxMacro* ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp ); }; diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index b2eb214f2cda..de7d9a961de4 100644 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -94,7 +94,7 @@ public: const SfxFilter* GetFilter4FilterName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; SAL_DLLPRIVATE static void ReadFilters_Impl( sal_Bool bUpdate=sal_False ); - SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const ::rtl::OUString& rName, + SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG, sal_Bool bUpdate ); @@ -120,7 +120,7 @@ public: sal_uInt32 GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, sal_Bool bDefUI = sal_True ) const; sal_uInt32 DetectFilter( SfxMedium& rMedium, const SfxFilter **, sal_Bool bPlugIn, sal_Bool bAPI = sal_False ) const; - const SfxFilter* GetFilter4Mime( const ::rtl::OUString& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const; + const SfxFilter* GetFilter4Mime( const OUString& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const; const SfxFilter* GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; const SfxFilter* GetFilter4EA( const String& rEA, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; const SfxFilter* GetFilter4Extension( const String& rExt, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index d576c208dbb1..304fd5cdff58 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -122,14 +122,14 @@ public: SfxFilterFlags nMust, SfxFilterFlags nDont, const String& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList); + const ::com::sun::star::uno::Sequence< OUString >& rBlackList); FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - const ::rtl::OUString& aFilterUIName, - const ::rtl::OUString& aExtName, - const ::rtl::OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList, + const OUString& aFilterUIName, + const OUString& aExtName, + const OUString& rStandardDir, + const ::com::sun::star::uno::Sequence< OUString >& rBlackList, Window* _pPreferredParent = NULL ); @@ -150,10 +150,10 @@ public: to different folders. As this method always provides the root folder for all selected files this cannot work. */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetMPath() const; + ::com::sun::star::uno::Sequence< OUString > GetMPath() const; /** Provides the selected files with full path information */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSelectedFiles() const; + ::com::sun::star::uno::Sequence< OUString > GetSelectedFiles() const; void AddFilter( const String& rFilterName, const String& rExtension ); void SetCurrentFilter( const String& rFilter ); @@ -206,7 +206,7 @@ public: virtual void SAL_CALL DirectoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); virtual void SAL_CALL ControlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); virtual void SAL_CALL DialogSizeChanged(); - virtual ::rtl::OUString SAL_CALL HelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); + virtual OUString SAL_CALL HelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); // XDialogClosedListener methods virtual void SAL_CALL DialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ); @@ -230,7 +230,7 @@ public: DECL_LINK( ExecuteSystemFilePicker, void* ); - ErrCode Execute( std::vector<rtl::OUString>& rpURLList, + ErrCode Execute( std::vector<OUString>& rpURLList, SfxItemSet *& rpSet, String& rFilter, const String& rDirPath ); @@ -245,16 +245,16 @@ public: ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, sal_Int64 nFlags, const String& rFact, - std::vector<rtl::OUString>& rpURLList, + std::vector<OUString>& rpURLList, String& rFilter, SfxItemSet *& rpSet, const String* pPath = NULL, sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, - const String& rStandardDir = rtl::OUString(), - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >()); + const String& rStandardDir = OUString(), + const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >()); -ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, SfxItemSet* pSet); +ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItemSet* pSet); } #endif diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx index ba4f7f984a57..3abdfbee3107 100644 --- a/sfx2/inc/sfx2/frmhtmlw.hxx +++ b/sfx2/inc/sfx2/frmhtmlw.hxx @@ -73,7 +73,7 @@ inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, rtl_TextEncoding eDestEnc, String *pNonConvertableChars ) { - String sTmp = rtl::OUString::createFromAscii(pName); + String sTmp = OUString::createFromAscii(pName); OutMeta( rStrm, pIndent, sTmp, rContent, bHTTPEquiv, eDestEnc, pNonConvertableChars ); } diff --git a/sfx2/inc/sfx2/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx index 85143abb01d7..92df8e70c573 100644 --- a/sfx2/inc/sfx2/imagemgr.hxx +++ b/sfx2/inc/sfx2/imagemgr.hxx @@ -27,7 +27,7 @@ SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& aURL, + const OUString& aURL, bool bBig ); diff --git a/sfx2/inc/sfx2/infobar.hxx b/sfx2/inc/sfx2/infobar.hxx index b72dbbdb85f5..b91d01ad4927 100644 --- a/sfx2/inc/sfx2/infobar.hxx +++ b/sfx2/inc/sfx2/infobar.hxx @@ -41,18 +41,18 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow class SfxInfoBarWindow : public Window { private: - rtl::OUString m_sId; + OUString m_sId; FixedText* m_pMessage; Button* m_pCloseBtn; std::vector< PushButton* > m_aActionBtns; public: - SfxInfoBarWindow( Window* parent, const rtl::OUString& sId, - const rtl::OUString& sMessage, + SfxInfoBarWindow( Window* parent, const OUString& sId, + const OUString& sMessage, std::vector< PushButton* > aButtons ); ~SfxInfoBarWindow( ); - virtual const rtl::OUString& getId() const { return m_sId; } + virtual const OUString& getId() const { return m_sId; } virtual void Paint( const Rectangle& ); virtual void Resize( ); @@ -70,8 +70,8 @@ class SfxInfoBarContainerWindow : public Window SfxInfoBarContainerWindow( SfxInfoBarContainerChild* pChildWin ); ~SfxInfoBarContainerWindow( ); - void appendInfoBar( const rtl::OUString& sId, const rtl::OUString& sMessage, std::vector< PushButton* > aButtons ); - SfxInfoBarWindow* getInfoBar( const rtl::OUString& sId ); + void appendInfoBar( const OUString& sId, const OUString& sMessage, std::vector< PushButton* > aButtons ); + SfxInfoBarWindow* getInfoBar( const OUString& sId ); void removeInfoBar( SfxInfoBarWindow* pInfoBar ); virtual void Resize( ); diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx index 39c3beda9886..24a5f6315edb 100644 --- a/sfx2/inc/sfx2/linkmgr.hxx +++ b/sfx2/inc/sfx2/linkmgr.hxx @@ -110,8 +110,8 @@ public: const String* pRange = 0 ); bool InsertFileLink( - sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const rtl::OUString& rFileNm, - const rtl::OUString* pFilterNm = NULL, const rtl::OUString* pRange = NULL); + sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const OUString& rFileNm, + const OUString* pFilterNm = NULL, const OUString* pRange = NULL); void ReconnectDdeLink(SfxObjectShell& rServer); @@ -122,7 +122,7 @@ public: * @param rServer server document shell instance * @param rLink link object of the client document */ - void LinkServerShell(const ::rtl::OUString& rPath, SfxObjectShell& rServer, ::sfx2::SvBaseLink& rLink) const; + void LinkServerShell(const OUString& rPath, SfxObjectShell& rServer, ::sfx2::SvBaseLink& rLink) const; // Obtain the string for the dialog bool GetDisplayNames( const SvBaseLink *, @@ -132,8 +132,8 @@ public: String* pFilter = 0 ) const; bool GetDisplayNames( - const SvBaseLink* pLink, rtl::OUString* pType, rtl::OUString* pFile = NULL, - rtl::OUString* pLinkStr = NULL, rtl::OUString* pFilter = NULL) const; + const SvBaseLink* pLink, OUString* pType, OUString* pFile = NULL, + OUString* pLinkStr = NULL, OUString* pFilter = NULL) const; SvLinkSourceRef CreateObj( SvBaseLink* ); diff --git a/sfx2/inc/sfx2/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx index 47bae9b7b870..042a364e2b5a 100644 --- a/sfx2/inc/sfx2/mailmodelapi.hxx +++ b/sfx2/inc/sfx2/mailmodelapi.hxx @@ -64,11 +64,11 @@ protected: SAVE_CANCELLED, SAVE_ERROR }; - ::std::vector< ::rtl::OUString > maAttachedDocuments; - SaveResult SaveDocumentAsFormat( const rtl::OUString& aSaveFileName, + ::std::vector< OUString > maAttachedDocuments; + SaveResult SaveDocumentAsFormat( const OUString& aSaveFileName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel, - const rtl::OUString& rType, - rtl::OUString& rFileNamePath ); + const OUString& rType, + OUString& rFileNamePath ); private: AddressList_Impl* mpToList; @@ -83,8 +83,8 @@ private: void ClearList( AddressList_Impl* pList ); SaveResult ShowFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel, - const ::rtl::OUString& rFilterName, - const ::rtl::OUString& rType, + const OUString& rFilterName, + const OUString& rType, bool bModified, sal_Int32& rNumArgs, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); @@ -118,12 +118,12 @@ public: The title which will be used as attachment title * \return @see error code */ - SendMailResult AttachDocument( const ::rtl::OUString& sDocumentType, + SendMailResult AttachDocument( const OUString& sDocumentType, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel, - const ::rtl::OUString& sAttachmentTitle ); + const OUString& sAttachmentTitle ); SendMailResult SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& rType ); + const OUString& rType ); SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); sal_Bool IsEmpty() const; diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx index 78f4140b2042..eca6618cc118 100644 --- a/sfx2/inc/sfx2/msg.hxx +++ b/sfx2/inc/sfx2/msg.hxx @@ -272,8 +272,8 @@ public: sal_uInt16 GetValue() const { return nValue; } const SfxType* GetType() const { return pType; } const char* GetUnoName() const { return pUnoName; } - SFX2_DLLPUBLIC rtl::OString GetCommand() const; - SFX2_DLLPUBLIC rtl::OUString GetCommandString() const; + SFX2_DLLPUBLIC OString GetCommand() const; + SFX2_DLLPUBLIC OUString GetCommandString() const; sal_uInt16 GetFormalArgumentCount() const { return nArgDefCount; } const SfxFormalArgument& GetFormalArgument( sal_uInt16 nNo ) const diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx index 667094f7e95b..90315d0ad755 100644 --- a/sfx2/inc/sfx2/objface.hxx +++ b/sfx2/inc/sfx2/objface.hxx @@ -70,8 +70,8 @@ public: const char* GetClassName() const { return pName; } bool HasName() const { return 0 != aNameResId.GetId(); } - rtl::OUString GetName() const - { return HasName() ? aNameResId.toString() : rtl::OUString(); } + OUString GetName() const + { return HasName() ? aNameResId.toString() : OUString(); } ResMgr* GetResMgr() const { return aNameResId.GetResMgr(); } diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 2070f6b12f4c..5f1018e6ad6e 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -275,18 +275,18 @@ public: #if HAVE_FEATURE_MULTIUSER_ENVIRONMENT sal_Bool IsDocShared() const; - ::rtl::OUString GetSharedFileURL() const; + OUString GetSharedFileURL() const; sal_Bool SwitchToShared( sal_Bool bShared, sal_Bool bSave ); SAL_DLLPRIVATE void FreeSharedFile(); - SAL_DLLPRIVATE void FreeSharedFile( const ::rtl::OUString& aTempFileURL ); + SAL_DLLPRIVATE void FreeSharedFile( const OUString& aTempFileURL ); SAL_DLLPRIVATE void DoNotCleanShareControlFile(); void SetSharedXMLFlag( sal_Bool bFlag ) const; sal_Bool HasSharedXMLFlagSet() const; #else sal_Bool IsDocShared() const { return sal_False; }; - ::rtl::OUString GetSharedFileURL() const - { return ::rtl::OUString(); }; + OUString GetSharedFileURL() const + { return OUString(); }; #endif SAL_DLLPRIVATE void SetModalMode_Impl(sal_Bool bModal=sal_True); @@ -295,9 +295,9 @@ public: void ResetError(); sal_uInt32 GetError() const; sal_uInt32 GetErrorCode() const; - void SetError( sal_uInt32 rErr, const ::rtl::OUString& aLogMessage ); + void SetError( sal_uInt32 rErr, const OUString& aLogMessage ); - void AddLog( const ::rtl::OUString& aMessage ); + void AddLog( const OUString& aMessage ); void StoreLog(); /** @@ -308,7 +308,7 @@ public: bool DoInitUnitTest(); sal_Bool DoInitNew( SfxMedium* pMedium=0 ); sal_Bool DoLoad( SfxMedium* pMedium ); - bool DoLoadExternal(SfxMedium* pMed, const rtl::OUString& rProvider); + bool DoLoadExternal(SfxMedium* pMed, const OUString& rProvider); sal_Bool DoSave(); sal_Bool DoSaveAs( SfxMedium &rNewStor ); sal_Bool DoSaveObjectAs( SfxMedium &rNewStor, sal_Bool bCommit ); @@ -329,7 +329,7 @@ public: virtual sal_Bool SwitchPersistance( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); virtual void UpdateLinks(); - virtual bool LoadExternal(SfxMedium& rMedium, const rtl::OUString& rProvider); + virtual bool LoadExternal(SfxMedium& rMedium, const OUString& rProvider); /** * Called when the Options dialog is dismissed with the OK button, to * handle potentially conflicting option settings. @@ -374,7 +374,7 @@ public: static ErrCode CallXScript( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxScriptContext, - const ::rtl::OUString& rScriptURL, + const OUString& rScriptURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Any& aRet, ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex, @@ -553,7 +553,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetBaseModel() const; // Only temporarily for the applications! - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames(); + virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames(); Window* GetDialogParent( SfxMedium* pMedium=0 ); static SfxObjectShell* CreateObject( const String& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); @@ -656,11 +656,11 @@ public: SAL_DLLPRIVATE sal_Bool DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& rTargetMedium ); SAL_DLLPRIVATE sal_Bool PutURLContentsToVersionStream_Impl( - ::rtl::OUString aURL, + OUString aURL, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDocStorage, - ::rtl::OUString aStreamName ); + OUString aStreamName ); - SAL_DLLPRIVATE ::rtl::OUString CreateTempCopyOfStorage_Impl( + SAL_DLLPRIVATE OUString CreateTempCopyOfStorage_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); SAL_DLLPRIVATE void InitOwnModel_Impl(); diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx index daa7950d3325..475d3cd00765 100644 --- a/sfx2/inc/sfx2/querystatus.hxx +++ b/sfx2/inc/sfx2/querystatus.hxx @@ -35,7 +35,7 @@ class SfxQueryStatus_Impl; class SFX2_DLLPUBLIC SfxQueryStatus { public: - SfxQueryStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand ); + SfxQueryStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand ); ~SfxQueryStatus(); // Query method diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx index b502c7270342..df2635f711ed 100644 --- a/sfx2/inc/sfx2/sfxbasecontroller.hxx +++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx @@ -123,7 +123,7 @@ public: // XController2 //____________________________________________________________________________________________________ virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException); //____________________________________________________________________________________________________ @@ -253,7 +253,7 @@ public: */ virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , - const ::rtl::OUString & sTargetFrameName, + const OUString & sTargetFrameName, FrameSearchFlags eSearchFlags ) throw( css::uno::RuntimeException ) ; /**___________________________________________________________________________________________________ @@ -343,8 +343,8 @@ public: virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException); // css::frame::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); // css::frame::XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException); diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 6839bcb72b80..9c15b500cd79 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -308,21 +308,21 @@ public: /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ - virtual void SAL_CALL createLibrary( const ::rtl::OUString& LibName, const ::rtl::OUString& Password, - const ::rtl::OUString& ExternalSourceURL, const ::rtl::OUString& LinkTargetURL ) + virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password, + const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) throw(css::container::ElementExistException, css::uno::RuntimeException); /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ - virtual void SAL_CALL addModule( const ::rtl::OUString& LibraryName, const ::rtl::OUString& ModuleName, - const ::rtl::OUString& Language, const ::rtl::OUString& Source ) + virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName, + const OUString& Language, const OUString& Source ) throw( css::container::NoSuchElementException, css::uno::RuntimeException); /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ - virtual void SAL_CALL addDialog( const ::rtl::OUString& LibraryName, const ::rtl::OUString& DialogName, + virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName, const css::uno::Sequence< sal_Int8 >& Data ) throw(css::container::NoSuchElementException, css::uno::RuntimeException); @@ -452,7 +452,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL attachResource(const ::rtl::OUString& sURL, + virtual sal_Bool SAL_CALL attachResource(const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) throw (css::uno::RuntimeException); @@ -469,7 +469,7 @@ public: @onerror - */ - virtual ::rtl::OUString SAL_CALL getURL() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException); /**___________________________________________________________________________________________________ @short - @@ -613,7 +613,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers() throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableViewControllerNames() + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createDefaultViewController(const css::uno::Reference< css::frame::XFrame >& Frame ) @@ -621,7 +621,7 @@ public: css::lang::IllegalArgumentException, css::uno::Exception ); - virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController(const ::rtl::OUString& ViewName , + virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController(const OUString& ViewName , const css::uno::Sequence< css::beans::PropertyValue >& Arguments , const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::uno::RuntimeException , @@ -806,7 +806,7 @@ public: @onerror - */ - virtual ::rtl::OUString SAL_CALL getLocation() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLocation() throw (css::uno::RuntimeException); /**___________________________________________________________________________________________________ @short - @@ -851,7 +851,7 @@ public: @onerror - */ - virtual void SAL_CALL storeAsURL( const ::rtl::OUString& sURL, + virtual void SAL_CALL storeAsURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) throw (css::io::IOException, css::uno::RuntimeException) ; @@ -868,7 +868,7 @@ public: @onerror - */ - virtual void SAL_CALL storeToURL( const ::rtl::OUString& sURL, + virtual void SAL_CALL storeToURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) throw (css::io::IOException, css::uno::RuntimeException); @@ -920,10 +920,10 @@ public: // XDocumentSubStorageSupplier //____________________________________________________________________________________________________ - virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw ( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getDocumentSubStoragesNames() + virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames() throw ( css::io::IOException, css::uno::RuntimeException ); //____________________________________________________________________________________________________ @@ -1131,7 +1131,7 @@ public: virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException); virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException); + virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException); //____________________________________________________________________________________________________ // XUnoTunnel @@ -1140,19 +1140,19 @@ public: virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException); // css.frame.XModule - virtual void SAL_CALL setIdentifier(const ::rtl::OUString& sIdentifier) + virtual void SAL_CALL setIdentifier(const OUString& sIdentifier) throw (css::uno::RuntimeException); // css.frame.XModule - virtual ::rtl::OUString SAL_CALL getIdentifier() + virtual OUString SAL_CALL getIdentifier() throw (css::uno::RuntimeException); // css.frame.XTitle - virtual ::rtl::OUString SAL_CALL getTitle() + virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException); // css.frame.XTitle - virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException); // css.frame.XTitleChangeBroadcaster @@ -1179,17 +1179,17 @@ public: css::uno::RuntimeException ); // css.frame.XUntitledNumbers - virtual ::rtl::OUString SAL_CALL getUntitledPrefix() + virtual OUString SAL_CALL getUntitledPrefix() throw (css::uno::RuntimeException); // css.document.XDocumentRecovery virtual ::sal_Bool SAL_CALL wasModifiedSinceLastSave() throw ( css::uno::RuntimeException ); - virtual void SAL_CALL storeToRecoveryFile( const ::rtl::OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) + virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, css::lang::WrappedTargetException ); - virtual void SAL_CALL recoverFromFile( const ::rtl::OUString& i_SourceLocation, const ::rtl::OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) + virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, css::lang::WrappedTargetException ); @@ -1200,13 +1200,13 @@ public: //____________________________________________________________________________________________________ // css::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); // css::rdf::XURI: - virtual ::rtl::OUString SAL_CALL getNamespace() + virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLocalName() + virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException); // css::rdf::XRepositorySupplier: @@ -1234,7 +1234,7 @@ public: css::lang::IllegalArgumentException); virtual css::uno::Reference< css::rdf::XURI> SAL_CALL - addMetadataFile(const ::rtl::OUString & i_rFileName, + addMetadataFile(const OUString & i_rFileName, const css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > & i_rTypes) @@ -1246,7 +1246,7 @@ public: importMetadataFile(::sal_Int16 i_Format, const css::uno::Reference< css::io::XInputStream > & i_xInStream, - const ::rtl::OUString & i_rFileName, + const OUString & i_rFileName, const css::uno::Reference< css::rdf::XURI > & i_xBaseURI, const css::uno::Sequence< @@ -1265,12 +1265,12 @@ public: css::lang::IllegalArgumentException, css::container::NoSuchElementException); virtual void SAL_CALL addContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException); virtual void SAL_CALL removeContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException); @@ -1323,7 +1323,7 @@ public: virtual void SAL_CALL checkOut( ) throw ( css::uno::RuntimeException ); virtual void SAL_CALL cancelCheckOut( ) throw ( css::uno::RuntimeException ); - virtual void SAL_CALL checkIn( sal_Bool bIsMajor, const rtl::OUString & rMessage ) + virtual void SAL_CALL checkIn( sal_Bool bIsMajor, const OUString & rMessage ) throw ( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL isVersionable( ) throw ( css::uno::RuntimeException ); @@ -1331,7 +1331,7 @@ public: virtual sal_Bool SAL_CALL canCancelCheckOut( ) throw ( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL canCheckIn( ) throw ( css::uno::RuntimeException ); - sal_Bool getBoolPropertyValue( const rtl::OUString& rName ) throw ( css::uno::RuntimeException ); + sal_Bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException ); //____________________________________________________________________________________________________ // SfxListener @@ -1406,7 +1406,7 @@ protected: /* returns a unique id for the model that is valid as long as the document is loaded. The id is not saved across document close/reload. */ - rtl::OUString getRuntimeUID() const; + OUString getRuntimeUID() const; /* returns true if the document signatures are valid, otherwise false */ sal_Bool hasValidSignatures() const; @@ -1433,13 +1433,13 @@ private: css::uno::Reference< css::ui::XUIConfigurationManager2 > getUIConfigurationManager2() throw ( css::uno::RuntimeException ); bool impl_getPrintHelper(); SAL_DLLPRIVATE void ListenForStorage_Impl( const css::uno::Reference< css::embed::XStorage >& xStorage ); - SAL_DLLPRIVATE ::rtl::OUString GetMediumFilterName_Impl(); + SAL_DLLPRIVATE OUString GetMediumFilterName_Impl(); - SAL_DLLPRIVATE void impl_store( const ::rtl::OUString& sURL, + SAL_DLLPRIVATE void impl_store( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& seqArguments , sal_Bool bSaveTo ) ; - SAL_DLLPRIVATE void postEvent_Impl( const ::rtl::OUString& aName, const css::uno::Reference< css::frame::XController2 >& xController = css::uno::Reference< css::frame::XController2 >() ); + SAL_DLLPRIVATE void postEvent_Impl( const OUString& aName, const css::uno::Reference< css::frame::XController2 >& xController = css::uno::Reference< css::frame::XController2 >() ); SAL_DLLPRIVATE String getEventName_Impl( long nID ); SAL_DLLPRIVATE bool QuerySaveSizeExceededModules( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler ); diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx index 2f69d442495b..a994c7dfa77a 100644 --- a/sfx2/inc/sfx2/sfxdlg.hxx +++ b/sfx2/inc/sfx2/sfxdlg.hxx @@ -82,7 +82,7 @@ class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog { public: virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()=0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType )=0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType )=0; virtual sal_Bool IsCreateNew()=0; }; @@ -130,10 +130,10 @@ public: const String *pUserButtonText=0 ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 )=0; - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, + virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0; virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0; virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML=sal_False, sfx2::SvBaseLink* p=0 )=0; @@ -150,7 +150,7 @@ public: Window* pParent, com::sun::star::uno::Any aException ) = 0; virtual VclAbstractDialog* CreateOptionsDialog( - Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& rApplicationContext ) = 0; + Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) = 0; }; #endif diff --git a/sfx2/inc/sfx2/sfxmodelfactory.hxx b/sfx2/inc/sfx2/sfxmodelfactory.hxx index 3ff0c317c72f..612aea61d07e 100644 --- a/sfx2/inc/sfx2/sfxmodelfactory.hxx +++ b/sfx2/inc/sfx2/sfxmodelfactory.hxx @@ -53,9 +53,9 @@ namespace sfx2 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SFX2_DLLPUBLIC createSfxModelFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceFactory, - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames + const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames ); //........................................................................ diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx index 8c1212f77536..9e6be020db10 100644 --- a/sfx2/inc/sfx2/sfxstatuslistener.hxx +++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx @@ -51,7 +51,7 @@ class SFX2_DLLPUBLIC SfxStatusListener : public: SFX_DECL_XINTERFACE_XTYPEPROVIDER - SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand ); + SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand ); virtual ~SfxStatusListener(); // old methods from SfxControllerItem diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx index 3f48698be7c8..6b0a2763497e 100644 --- a/sfx2/inc/sfx2/sfxuno.hxx +++ b/sfx2/inc/sfx2/sfxuno.hxx @@ -68,8 +68,8 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be // Macros to convert string -> unicode and unicode -> string. // We use UTF8 everytime. Its the best way to do this! -#define S2U(STRING) ::rtl::OStringToOUString(STRING, RTL_TEXTENCODING_UTF8) -#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8) +#define S2U(STRING) OStringToOUString(STRING, RTL_TEXTENCODING_UTF8) +#define U2S(STRING) OUStringToOString(STRING, RTL_TEXTENCODING_UTF8) //________________________________________________________________________________________________________________________ // macros for declaration and definition of uno-services @@ -111,13 +111,13 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be //************************************************************************************************************************ #define SFX_DECL_XSERVICEINFO_NOFACTORY \ /* 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 > impl_getStaticSupportedServiceNames(); \ - static rtl::OUString impl_getStaticImplementationName(); \ + static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); \ + static OUString 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 ); @@ -480,16 +480,16 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be #define SFX_IMPL_XSERVICEINFO( IMPLCLASS, IMPLSERVICENAME, IMPLNAME ) \ \ /* XServiceInfo */ \ - rtl::OUString SAL_CALL IMPLCLASS::getImplementationName() throw( css::uno::RuntimeException ) \ + OUString SAL_CALL IMPLCLASS::getImplementationName() throw( css::uno::RuntimeException ) \ { \ return impl_getStaticImplementationName(); \ } \ \ /* XServiceInfo */ \ - sal_Bool SAL_CALL IMPLCLASS::supportsService( const rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) \ + sal_Bool SAL_CALL IMPLCLASS::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) \ { \ - css::uno::Sequence< rtl::OUString > seqServiceNames = getSupportedServiceNames(); \ - const rtl::OUString* pArray = seqServiceNames.getConstArray(); \ + css::uno::Sequence< OUString > seqServiceNames = getSupportedServiceNames(); \ + const OUString* pArray = seqServiceNames.getConstArray(); \ for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) \ { \ if ( pArray[nCounter] == sServiceName ) \ @@ -501,23 +501,23 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be } \ \ /* XServiceInfo */ \ - css::uno::Sequence< rtl::OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \ + css::uno::Sequence< OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \ { \ return impl_getStaticSupportedServiceNames(); \ } \ \ /* Helper for XServiceInfo */ \ - css::uno::Sequence< rtl::OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \ + css::uno::Sequence< OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \ { \ - css::uno::Sequence< rtl::OUString > seqServiceNames( 1 ); \ - seqServiceNames.getArray() [0] = rtl::OUString::createFromAscii( IMPLSERVICENAME ); \ + css::uno::Sequence< OUString > seqServiceNames( 1 ); \ + seqServiceNames.getArray() [0] = OUString::createFromAscii( IMPLSERVICENAME ); \ return seqServiceNames ; \ } \ \ /* Helper for XServiceInfo */ \ - rtl::OUString IMPLCLASS::impl_getStaticImplementationName() \ + OUString IMPLCLASS::impl_getStaticImplementationName() \ { \ - return rtl::OUString::createFromAscii( IMPLNAME ); \ + return OUString::createFromAscii( IMPLNAME ); \ } \ \ /* Helper for registry */ \ @@ -537,16 +537,16 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be #define SFX_IMPL_XSERVICEINFO_CTX( IMPLCLASS, IMPLSERVICENAME, IMPLNAME ) \ \ /* XServiceInfo */ \ - rtl::OUString SAL_CALL IMPLCLASS::getImplementationName() throw( css::uno::RuntimeException ) \ + OUString SAL_CALL IMPLCLASS::getImplementationName() throw( css::uno::RuntimeException ) \ { \ return impl_getStaticImplementationName(); \ } \ \ /* XServiceInfo */ \ - sal_Bool SAL_CALL IMPLCLASS::supportsService( const rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) \ + sal_Bool SAL_CALL IMPLCLASS::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) \ { \ - css::uno::Sequence< rtl::OUString > seqServiceNames = getSupportedServiceNames(); \ - const rtl::OUString* pArray = seqServiceNames.getConstArray(); \ + css::uno::Sequence< OUString > seqServiceNames = getSupportedServiceNames(); \ + const OUString* pArray = seqServiceNames.getConstArray(); \ for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) \ { \ if ( pArray[nCounter] == sServiceName ) \ @@ -558,23 +558,23 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be } \ \ /* XServiceInfo */ \ - css::uno::Sequence< rtl::OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \ + css::uno::Sequence< OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \ { \ return impl_getStaticSupportedServiceNames(); \ } \ \ /* Helper for XServiceInfo */ \ - css::uno::Sequence< rtl::OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \ + css::uno::Sequence< OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \ { \ - css::uno::Sequence< rtl::OUString > seqServiceNames( 1 ); \ - seqServiceNames.getArray() [0] = rtl::OUString::createFromAscii( IMPLSERVICENAME ); \ + css::uno::Sequence< OUString > seqServiceNames( 1 ); \ + seqServiceNames.getArray() [0] = OUString::createFromAscii( IMPLSERVICENAME ); \ return seqServiceNames ; \ } \ \ /* Helper for XServiceInfo */ \ - rtl::OUString IMPLCLASS::impl_getStaticImplementationName() \ + OUString IMPLCLASS::impl_getStaticImplementationName() \ { \ - return rtl::OUString::createFromAscii( IMPLNAME ); \ + return OUString::createFromAscii( IMPLNAME ); \ } \ \ /* Helper for registry */ \ @@ -628,7 +628,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be //************************************************************************************************************************ #define IF_NAME_CREATECOMPONENTFACTORY(CLASS) \ \ - if ( CLASS::impl_getStaticImplementationName().equals( rtl::OUString::createFromAscii( pImplementationName ) ) ) \ + if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \ { \ CREATEFACTORY ( CLASS ) \ } diff --git a/sfx2/inc/sfx2/stbitem.hxx b/sfx2/inc/sfx2/stbitem.hxx index eee606529de1..d94e76841045 100644 --- a/sfx2/inc/sfx2/stbitem.hxx +++ b/sfx2/inc/sfx2/stbitem.hxx @@ -35,7 +35,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( 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 SfxStatusBarControl* (*SfxStatusBarControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); struct SfxStbCtrlFactory diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index 435a4158d0b0..17016489e917 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -252,7 +252,7 @@ private: protected: SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet ); - SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet &rAttrSet); + SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet); sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } diff --git a/sfx2/inc/sfx2/taskpane.hxx b/sfx2/inc/sfx2/taskpane.hxx index 0f42a0672b01..0d0dd6eea199 100644 --- a/sfx2/inc/sfx2/taskpane.hxx +++ b/sfx2/inc/sfx2/taskpane.hxx @@ -46,7 +46,7 @@ namespace sfx2 class SAL_NO_VTABLE ITaskPaneToolPanelAccess { public: - virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) = 0; + virtual void ActivateToolPanel( const OUString& i_rPanelURL ) = 0; protected: ~ITaskPaneToolPanelAccess() {} @@ -69,7 +69,7 @@ namespace sfx2 SFX_DECL_CHILDWINDOW( TaskPaneWrapper ); // ITaskPaneToolPanelAccess - virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ); + virtual void ActivateToolPanel( const OUString& i_rPanelURL ); }; //================================================================================================================== @@ -87,8 +87,8 @@ namespace sfx2 */ virtual short compareToolPanelsURLs( - const ::rtl::OUString& i_rLHS, - const ::rtl::OUString& i_rRHS + const OUString& i_rLHS, + const OUString& i_rRHS ) const = 0; protected: @@ -152,11 +152,11 @@ namespace sfx2 /** returns the position of the panel with the given resource URL */ ::boost::optional< size_t > - GetPanelPos( const ::rtl::OUString& i_rResourceURL ); + GetPanelPos( const OUString& i_rResourceURL ); /** returns the resource URL of the panel at the specified position */ - ::rtl::OUString + OUString GetPanelResourceURL( const size_t i_nPanelPos ) const; /// sets the "classical" layout of the tool panel deck, using drawers @@ -193,7 +193,7 @@ namespace sfx2 ~TaskPaneController(); /// activates the panel with the given URL - void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ); + void ActivateToolPanel( const OUString& i_rPanelURL ); private: ::boost::scoped_ptr< TaskPaneController_Impl > m_pImpl; @@ -210,7 +210,7 @@ namespace sfx2 Window* i_pParent, WinBits i_nBits ); // ITaskPaneToolPanelAccess - virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ); + virtual void ActivateToolPanel( const OUString& i_rPanelURL ); protected: // Window overridables diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index c5a890a2a87f..62331f3c9cdf 100644 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -45,7 +45,7 @@ class SfxBindings; class SfxModule; class SfxUnoControllerItem; -svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ); +svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ); typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); @@ -129,7 +129,7 @@ protected: void BindListener(); void UnbindListener(); - void AddStatusListener( const rtl::OUString& rCommandURL ); + void AddStatusListener( const OUString& rCommandURL ); // SfxStatusListenerInterface using FloatingWindow::StateChanged; @@ -237,8 +237,8 @@ protected: // XSubToolbarController virtual ::sal_Bool SAL_CALL opensSubToolbar( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateImage( ) throw (::com::sun::star::uno::RuntimeException); // XDockableWindowListener @@ -251,8 +251,8 @@ protected: virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException); // helper methods - void createAndPositionSubToolBar( const ::rtl::OUString& rSubToolBarResName ); - ::Size getPersistentFloatingSize( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const ::rtl::OUString& rSubToolBarResName ); + void createAndPositionSubToolBar( const OUString& rSubToolBarResName ); + ::Size getPersistentFloatingSize( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& rSubToolBarResName ); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -264,10 +264,10 @@ public: unsigned short GetId() const; unsigned short GetSlotId() const; - void Dispatch( const ::rtl::OUString& aCommand, + void Dispatch( const OUString& aCommand, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); static void Dispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, - const rtl::OUString& rCommand, + const OUString& rCommand, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); static SfxItemState GetItemState( const SfxPoolItem* pState ); diff --git a/sfx2/inc/sfx2/templateabstractview.hxx b/sfx2/inc/sfx2/templateabstractview.hxx index 71ce703e59bf..5f1eca6a80fa 100644 --- a/sfx2/inc/sfx2/templateabstractview.hxx +++ b/sfx2/inc/sfx2/templateabstractview.hxx @@ -53,7 +53,7 @@ public: virtual bool operator () (const ThumbnailViewItem *pItem); - bool isValid (const rtl::OUString& rPath) const; + bool isValid (const OUString& rPath) const; protected: @@ -120,7 +120,7 @@ public: static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height); - static BitmapEx getDefaultThumbnail( const rtl::OUString& rPath ); + static BitmapEx getDefaultThumbnail( const OUString& rPath ); static BitmapEx fetchThumbnail (const OUString &msURL, long width, long height); diff --git a/sfx2/inc/sfx2/templatelocalview.hxx b/sfx2/inc/sfx2/templatelocalview.hxx index fe7d50aa87a2..bd1b43130230 100644 --- a/sfx2/inc/sfx2/templatelocalview.hxx +++ b/sfx2/inc/sfx2/templatelocalview.hxx @@ -89,7 +89,7 @@ public: bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString &rName) const; - virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle); + virtual bool renameItem(ThumbnailViewItem* pItem, OUString sNewTitle); private: diff --git a/sfx2/inc/sfx2/templateproperties.hxx b/sfx2/inc/sfx2/templateproperties.hxx index 1f109c525105..f0db901073f0 100644 --- a/sfx2/inc/sfx2/templateproperties.hxx +++ b/sfx2/inc/sfx2/templateproperties.hxx @@ -19,8 +19,8 @@ struct TemplateItemProperties sal_uInt16 nId; ///< Index for ThumbnailView sal_uInt16 nDocId; ///< Index based on SfxTemplateDocument sal_uInt16 nRegionId; - rtl::OUString aName; - rtl::OUString aPath; + OUString aName; + OUString aPath; BitmapEx aThumbnail; }; diff --git a/sfx2/inc/sfx2/templaterepository.hxx b/sfx2/inc/sfx2/templaterepository.hxx index 0c7725c26067..f134c9897bf6 100644 --- a/sfx2/inc/sfx2/templaterepository.hxx +++ b/sfx2/inc/sfx2/templaterepository.hxx @@ -20,9 +20,9 @@ public: virtual ~TemplateRepository () { }; - void setURL (const rtl::OUString &rURL) { maUrl = rURL; } + void setURL (const OUString &rURL) { maUrl = rURL; } - const rtl::OUString& getURL () const { return maUrl; } + const OUString& getURL () const { return maUrl; } void insertTemplate (const TemplateItemProperties &prop) { maTemplates.push_back(prop); } @@ -33,11 +33,11 @@ public: public: sal_uInt16 mnId; - rtl::OUString maTitle; + OUString maTitle; private: - rtl::OUString maUrl; + OUString maUrl; std::vector<TemplateItemProperties> maTemplates; }; diff --git a/sfx2/inc/sfx2/templateviewitem.hxx b/sfx2/inc/sfx2/templateviewitem.hxx index 0a3cb3e10b44..efabd34ea4fd 100644 --- a/sfx2/inc/sfx2/templateviewitem.hxx +++ b/sfx2/inc/sfx2/templateviewitem.hxx @@ -20,21 +20,21 @@ public: virtual ~TemplateViewItem (); - void setPath (const rtl::OUString &rPath) { maPath = rPath; } + void setPath (const OUString &rPath) { maPath = rPath; } - const rtl::OUString& getPath () const { return maPath; } + const OUString& getPath () const { return maPath; } - void setAuthor (const rtl::OUString &rAuthor) { maAuthor = rAuthor; } + void setAuthor (const OUString &rAuthor) { maAuthor = rAuthor; } - const rtl::OUString& getAuthor () const { return maAuthor; } + const OUString& getAuthor () const { return maAuthor; } - void setKeywords (const rtl::OUString &rKeywords) { maKeywords = rKeywords; } + void setKeywords (const OUString &rKeywords) { maKeywords = rKeywords; } - const rtl::OUString& getKeywords () const { return maKeywords; } + const OUString& getKeywords () const { return maKeywords; } - void setSubTitle (const rtl::OUString &rTitle) { maSubTitle = rTitle; } + void setSubTitle (const OUString &rTitle) { maSubTitle = rTitle; } - const rtl::OUString& getSubTitle () const { return maSubTitle; } + const OUString& getSubTitle () const { return maSubTitle; } virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, const long nPadding, sal_uInt32 nMaxTextLenght, @@ -48,10 +48,10 @@ public: private: - rtl::OUString maPath; - rtl::OUString maAuthor; - rtl::OUString maKeywords; - rtl::OUString maSubTitle; + OUString maPath; + OUString maAuthor; + OUString maKeywords; + OUString maSubTitle; Point maSubTitlePos; }; diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx index 14bfd653ef0a..2bdf1b94ae09 100644 --- a/sfx2/inc/sfx2/thumbnailview.hxx +++ b/sfx2/inc/sfx2/thumbnailview.hxx @@ -240,7 +240,7 @@ public: virtual void Resize(); - virtual bool renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle); + virtual bool renameItem(ThumbnailViewItem* pItem, OUString sNewTitle); protected: diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx b/sfx2/inc/sfx2/thumbnailviewitem.hxx index 2acc8de9f9e3..64a20cda910f 100644 --- a/sfx2/inc/sfx2/thumbnailviewitem.hxx +++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx @@ -70,7 +70,7 @@ public: bool mbSelected; bool mbHover; BitmapEx maPreview1; - rtl::OUString maTitle; + OUString maTitle; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc; ThumbnailViewItem (ThumbnailView &rView); @@ -91,7 +91,7 @@ public: void setEditTitle (bool edit, bool bChangeFocus = true); void updateTitleEditSize (); - virtual void setTitle (const rtl::OUString& rTitle); + virtual void setTitle (const OUString& rTitle); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible( bool bIsTransientChildrenDisabled ); @@ -113,7 +113,7 @@ public: virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, const ThumbnailItemAttributes *pAttrs); - void addTextPrimitives (const rtl::OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, drawinglayer::primitive2d::Primitive2DSequence& rSeq); + void addTextPrimitives (const OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, drawinglayer::primitive2d::Primitive2DSequence& rSeq); static drawinglayer::primitive2d::PolygonHairlinePrimitive2D* createBorderLine (const basegfx::B2DPolygon &rPolygon); diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx index 00131fcedd61..09b500caa6bc 100644 --- a/sfx2/inc/sfx2/titledockwin.hxx +++ b/sfx2/inc/sfx2/titledockwin.hxx @@ -63,7 +63,7 @@ namespace sfx2 @return the ID of the newly created toolbox item */ - sal_uInt16 AddDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ) + sal_uInt16 AddDropDownToolBoxItem( const String& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ) { return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback ); } @@ -113,7 +113,7 @@ namespace sfx2 /** internal version of AddDropDownToolBoxItem */ - sal_uInt16 impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ); + sal_uInt16 impl_addDropDownToolBoxItem( const String& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ); /** returns the current title. diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx index fe2917c52565..d1d41b8ae689 100644 --- a/sfx2/inc/sfx2/unoctitm.hxx +++ b/sfx2/inc/sfx2/unoctitm.hxx @@ -78,11 +78,11 @@ public: struct SfxStatusDispatcher_Impl_hashType { - size_t operator()(const ::rtl::OUString& s) const + size_t operator()(const OUString& s) const { return s.hashCode(); } }; -typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, SfxStatusDispatcher_Impl_hashType, std::equal_to< ::rtl::OUString > > SfxStatusDispatcher_Impl_ListenerContainer ; +typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, SfxStatusDispatcher_Impl_hashType, std::equal_to< OUString > > SfxStatusDispatcher_Impl_ListenerContainer ; class SfxStatusDispatcher : public ::com::sun::star::frame::XNotifyingDispatch, public ::com::sun::star::lang::XTypeProvider, @@ -145,7 +145,7 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 >& impl_getStaticIdentifier(); static sal_Bool IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL ); - static rtl::OUString GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL ); + static OUString GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL ); void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); @@ -179,7 +179,7 @@ public: const ::com::sun::star::util::URL& rURL ); ~SfxDispatchController_Impl(); - static rtl::OUString getSlaveCommand( const ::com::sun::star::util::URL& rURL ); + static OUString getSlaveCommand( const ::com::sun::star::util::URL& rURL ); void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer* pServ ); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index 4373a52ae6c1..522b4719eac0 100644 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -150,7 +150,7 @@ public: void UpdateTitle(); - static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL ); + static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ); // interne Handler SAL_DLLPRIVATE virtual sal_Bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder ); @@ -190,8 +190,8 @@ public: The buttons will be added from Right to Left at the right of the info bar. The parent, size and position of each button will be changed: only the width will remain unchanged. */ - void AppendInfoBar( const rtl::OUString& sId, const rtl::OUString& sMessage, std::vector< PushButton* > aButtons ); - void RemoveInfoBar( const rtl::OUString& sId ); + void AppendInfoBar( const OUString& sId, const OUString& sMessage, std::vector< PushButton* > aButtons ); + void RemoveInfoBar( const OUString& sId ); SAL_DLLPRIVATE void SetDowning_Impl(); SAL_DLLPRIVATE void GetDocNumber_Impl(); @@ -224,14 +224,14 @@ public: SAL_DLLPRIVATE void MiscExec_Impl(SfxRequest &); SAL_DLLPRIVATE void MiscState_Impl(SfxItemSet &); SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( sal_uInt16 nId ); - SAL_DLLPRIVATE void AddDispatchMacroToBasic_Impl(const ::rtl::OUString& sMacro); + SAL_DLLPRIVATE void AddDispatchMacroToBasic_Impl(const OUString& sMacro); SAL_DLLPRIVATE void Exec_Impl(SfxRequest &); SAL_DLLPRIVATE void INetExecute_Impl(SfxRequest &); SAL_DLLPRIVATE void INetState_Impl(SfxItemSet &); SAL_DLLPRIVATE void SetCurViewId_Impl( const sal_uInt16 i_nID ); - SAL_DLLPRIVATE void ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL ); + SAL_DLLPRIVATE void ActivateToolPanel_Impl( const OUString& i_rPanelURL ); private: SAL_DLLPRIVATE sal_Bool SwitchToViewShell_Impl( sal_uInt16 nNo, sal_Bool bIsIndex = sal_False ); diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 5eea56a3481d..759394d77cf5 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -254,7 +254,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > GetController(); - sal_Bool TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent ); + sal_Bool TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent ); void ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool, sal_Bool ); diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index a4d4ad6dd70f..5913917592f8 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -49,8 +49,8 @@ private: Link m_aCloseHdl; String m_sToggleText; - ::rtl::OUString m_sConfigName; - ::rtl::OString m_sWinState; + OUString m_sConfigName; + OString m_sWinState; bool m_bIsConstructed; @@ -61,7 +61,7 @@ private: DECL_LINK(ToggleHdl, void *); public: - SearchDialog( Window* pWindow, const ::rtl::OUString& rConfigName ); + SearchDialog( Window* pWindow, const OUString& rConfigName ); ~SearchDialog(); inline void SetFindHdl( const Link& rLink ) { m_aFindHdl = rLink; } |