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

Caolán McNamara caolanm at redhat.com
Sun Sep 1 07:07:38 PDT 2013


 sw/source/core/inc/noteurl.hxx  |   12 ++++++------
 sw/source/core/text/noteurl.cxx |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 2f9fca080d8f558681da4c0730b274968afab1a8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Sep 1 14:49:02 2013 +0100

    XubString->OUString
    
    Change-Id: Ib14fef2055d90b2427c41865b0ad42d5f7b81d6a

diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx
index 8c73f6d..4c6f26c 100644
--- a/sw/source/core/inc/noteurl.hxx
+++ b/sw/source/core/inc/noteurl.hxx
@@ -30,15 +30,15 @@ class MapMode;
 
 class SwURLNote
 {
-    String aURL;
-    String aTarget;
+    OUString aURL;
+    OUString aTarget;
     SwRect aRect;
 public:
-    SwURLNote( const String& rURL, const String& rTarget, const SwRect& rRect )
+    SwURLNote( const OUString& rURL, const OUString& rTarget, const SwRect& rRect )
     : aURL( rURL ), aTarget( rTarget ), aRect( rRect )
     {}
-    const String& GetURL()      const { return aURL; }
-    const String& GetTarget()   const { return aTarget; }
+    const OUString& GetURL()      const { return aURL; }
+    const OUString& GetTarget()   const { return aTarget; }
     const SwRect& GetRect()     const { return aRect; }
     sal_Bool operator==( const SwURLNote& rSwURLNote ) const
     { return aRect == rSwURLNote.aRect; }
@@ -52,7 +52,7 @@ class SwNoteURL
 public:
     SwNoteURL() {}
     sal_uInt16 Count() const { return aList.size(); }
-    void InsertURLNote( const String& rURL, const String& rTarget,
+    void InsertURLNote( const OUString& rURL, const OUString& rTarget,
                  const SwRect& rRect );
     const SwURLNote& GetURLNote( sal_uInt16 nPos ) const
         { return aList[ nPos ]; }
diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx
index f70bcf0..fa42983 100644
--- a/sw/source/core/text/noteurl.cxx
+++ b/sw/source/core/text/noteurl.cxx
@@ -29,7 +29,7 @@
 SwNoteURL *pNoteURL = NULL;
 
 
-void SwNoteURL::InsertURLNote( const XubString& rURL, const XubString& rTarget,
+void SwNoteURL::InsertURLNote( const OUString& rURL, const OUString& rTarget,
     const SwRect& rRect )
 {
     MSHORT i;


More information about the Libreoffice-commits mailing list