[Libreoffice-commits] core.git: sw/inc sw/source

[Matteo Casalin]

 sw/inc/doc.hxx                |    6 +++---
 sw/inc/editsh.hxx             |    4 ++--
 sw/source/core/edit/edtox.cxx |    4 ++--
 sw/source/ui/uno/unotxdoc.cxx |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 04314cc1244a5c681c2a0ea743e3675665ed7b7c
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Sat Aug 17 18:08:30 2013 +0200

    String to OUString
    
    Change-Id: Ib8309e687c375a05739e8b6f4db95d004a3b97cb
    Reviewed-on: https://gerrit.libreoffice.org/5482
    Reviewed-by: Matteo Casalin <matteo.casalin at yahoo.com>
    Tested-by: Matteo Casalin <matteo.casalin at yahoo.com>

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ab19f76..7e0dae6 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 4247e90..86ed749 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 426ec63..ab7f7ec 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 ee9e006..5d96e87 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 :
         {