Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4266

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/4266/1

String=>OUString svl touch-up

Change-Id: Iaab1e0a2fdbfdac9d66fe158fca397336c6e84d1
---
M include/svl/urlbmk.hxx
M svl/source/misc/inethist.cxx
2 files changed, 15 insertions(+), 15 deletions(-)



diff --git a/include/svl/urlbmk.hxx b/include/svl/urlbmk.hxx
index cc04b22..2f2a11b 100644
--- a/include/svl/urlbmk.hxx
+++ b/include/svl/urlbmk.hxx
@@ -21,7 +21,7 @@
 #define _URLBMK_HXX
 
 
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
 
 //=========================================================================
 
@@ -37,23 +37,23 @@
 */
 
 {
-    String          aUrl;
-    String          aDescr;
+    OUString          aUrl;
+    OUString          aDescr;
 
 protected:
 
-    void            SetURL( const String& rS )          { aUrl = rS; }
-    void            SetDescription( const String& rS )  { aDescr = rS; }
+    void            SetURL( const OUString& rS )          { aUrl = rS; }
+    void            SetDescription( const OUString& rS )  { aDescr = rS; }
 
 public:
-                    INetBookmark( const String &rUrl, const String &rDescr )
+                    INetBookmark( const OUString &rUrl, const OUString &rDescr )
                         : aUrl( rUrl ), aDescr( rDescr )
                     {}
                     INetBookmark()
                     {}
 
-    const String&   GetURL() const          { return aUrl; }
-    const String&   GetDescription() const  { return aDescr; }
+    const OUString&   GetURL() const          { return aUrl; }
+    const OUString&   GetDescription() const  { return aDescr; }
 };
 
 
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 7eb8c6e..c846182 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -24,9 +24,9 @@
 
 #include "rtl/instance.hxx"
 #include "rtl/crc.h"
+#include "rtl/ustring.hxx"
 #include <tools/solar.h>
 #include <tools/debug.hxx>
-#include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 
 /*========================================================================
@@ -201,8 +201,8 @@
 
     /** putUrl/queryUrl.
     */
-    void putUrl   (const String &rUrl);
-    sal_Bool queryUrl (const String &rUrl);
+    void putUrl   (const OUString &rUrl);
+    sal_Bool queryUrl (const OUString &rUrl);
 };
 
 /*========================================================================
@@ -292,7 +292,7 @@
 /*
  * putUrl.
  */
-void INetURLHistory_Impl::putUrl (const String &rUrl)
+void INetURLHistory_Impl::putUrl (const OUString &rUrl)
 {
     sal_uInt32 h = crc32 (rUrl);
     sal_uInt16 k = find (h);
@@ -349,7 +349,7 @@
 /*
  * queryUrl.
  */
-sal_Bool INetURLHistory_Impl::queryUrl (const String &rUrl)
+sal_Bool INetURLHistory_Impl::queryUrl (const OUString &rUrl)
 {
     sal_uInt32 h = crc32 (rUrl);
     sal_uInt16 k = find (h);
@@ -417,8 +417,8 @@
         case INET_PROT_FILE:
             if (!rUrl.IsCaseSensitive())
             {
-                String aPath (rUrl.GetURLPath(INetURLObject::NO_DECODE));
-                aPath.ToLowerAscii();
+                OUString aPath (rUrl.GetURLPath(INetURLObject::NO_DECODE));
+                aPath = aPath.toAsciiLowerCase();
                 rUrl.SetURLPath (aPath, INetURLObject::NOT_CANONIC);
             }
             break;

-- 
To view, visit https://gerrit.libreoffice.org/4266
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaab1e0a2fdbfdac9d66fe158fca397336c6e84d1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud <nthiebaud@gmail.com>
Gerrit-Reviewer: LibreOffice gerrit bot <gerrit@libreoffice.org>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.