[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/split-icons-search-usr-share.diff.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e33f8318029dfbd2e2952bb78bdf99d75f6c7d74
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 14 20:36:32 2011 +0200

    fix split-icons-search-usr-share.diff.in to apply

diff --git a/patches/dev300/split-icons-search-usr-share.diff.in b/patches/dev300/split-icons-search-usr-share.diff.in
index e2d656b..b0eaa60 100644
--- a/patches/dev300/split-icons-search-usr-share.diff.in
+++ b/patches/dev300/split-icons-search-usr-share.diff.in
@@ -1,7 +1,7 @@
 --- vcl/inc/vcl/impimagetree.hxx.old	2010-06-18 10:32:12.000000000 +0200
 +++ vcl/inc/vcl/impimagetree.hxx	2010-07-27 17:21:18.000000000 +0200
 @@ -76,6 +76,10 @@ private:
-     typedef std::hash_map<
+     typedef boost::unordered_map<
          rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache;
  
 +    // we want to search zip files (icons) also in /usr/share/
@@ -89,7 +89,7 @@
 -                css::uno::Reference< css::container::XNameAccess >()));
 +        addUrlToZips(u.GetMainURL(INetURLObject::NO_DECODE));
      }
-     if ( m_style.equals(::rtl::OUString::createFromAscii("default")) )
+     if ( m_style.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"))) )
      {
 @@ -278,9 +290,7 @@ void ImplImageTree::resetZips() {
              RTL_CONSTASCII_USTRINGPARAM(
@@ -105,7 +105,7 @@
 --- xmlhelp/source/cxxhelp/provider/provider.cxx.old	2010-06-18 10:32:13.000000000 +0200
 +++ xmlhelp/source/cxxhelp/provider/provider.cxx	2010-07-27 17:35:56.000000000 +0200
 @@ -347,7 +347,7 @@ void ContentProvider::init()
-         rtl::OUString::createFromAscii( " " ) +
+         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) +
          setupextension );
  
 -    uno::Sequence< rtl::OUString > aImagesZipPaths( 2 );