diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-17 18:08:30 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-17 21:10:00 +0000 |
| commit | 04314cc1244a5c681c2a0ea743e3675665ed7b7c (patch) | |
| tree | 27ab4749d5baa677e083ae21af8b0fa6e5ae9a35 /sw | |
| parent | 4fae4a48726462f1eb548a0afb244d8c7f93dd7e (diff) | |
String to OUString
Change-Id: Ib8309e687c375a05739e8b6f4db95d004a3b97cb
Reviewed-on: https://gerrit.libreoffice.org/5482
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/doc.hxx | 6 | ||||
| -rw-r--r-- | sw/inc/editsh.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/edit/edtox.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/uno/unotxdoc.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index ab19f769dc61..7e0dae64b355 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -284,7 +284,7 @@ class SW_DLLPUBLIC SwDoc : Timer maStatsUpdateTimer; ///< Timer for asynchronous stats calculation SwDBData maDBData; ///< database descriptor ::com::sun::star::uno::Sequence <sal_Int8 > maRedlinePasswd; - String msTOIAutoMarkURL; ///< ::com::sun::star::util::URL of table of index AutoMark file + OUString msTOIAutoMarkURL; ///< ::com::sun::star::util::URL of table of index AutoMark file boost::ptr_vector< boost::nullable<String> > maPatternNms; // Array for names of document-templates com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> mxXForms; ///< container with XForms models @@ -1409,8 +1409,8 @@ public: void SetUpdateTOX( bool bFlag = true ) { mbUpdateTOX = bFlag; } bool IsUpdateTOX() const { return mbUpdateTOX; } - const String& GetTOIAutoMarkURL() const {return msTOIAutoMarkURL;} - void SetTOIAutoMarkURL(const String& rSet) {msTOIAutoMarkURL = rSet;} + OUString GetTOIAutoMarkURL() const {return msTOIAutoMarkURL;} + void SetTOIAutoMarkURL(const OUString& rSet) {msTOIAutoMarkURL = rSet;} void ApplyAutoMark(); bool IsInReading() const { return mbInReading; } diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 4247e90bd27d..86ed749f72e1 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -446,8 +446,8 @@ public: void InsertTOXType(const SwTOXType& rTyp); /// AutoMark file - const String& GetTOIAutoMarkURL() const; - void SetTOIAutoMarkURL(const String& rSet); + OUString GetTOIAutoMarkURL() const; + void SetTOIAutoMarkURL(const OUString& rSet); void ApplyAutoMark(); /// Key for managing index. diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index 426ec63d819a..ab7f7ecc22e8 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -263,12 +263,12 @@ sal_Bool SwEditShell::IsUpdateTOX() const return GetDoc()->IsUpdateTOX(); } -const String& SwEditShell::GetTOIAutoMarkURL() const +OUString SwEditShell::GetTOIAutoMarkURL() const { return GetDoc()->GetTOIAutoMarkURL(); } -void SwEditShell::SetTOIAutoMarkURL(const String& rSet) +void SwEditShell::SetTOIAutoMarkURL(const OUString& rSet) { GetDoc()->SetTOIAutoMarkURL(rSet); } diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index ee9e00602106..5d96e875a9f4 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -2070,7 +2070,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) } break; case WID_DOC_AUTO_MARK_URL : - aAny <<= OUString(pDocShell->GetDoc()->GetTOIAutoMarkURL()); + aAny <<= pDocShell->GetDoc()->GetTOIAutoMarkURL(); break; case WID_DOC_HIDE_TIPS : { |