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

[Caolán McNamara]

 extensions/source/resource/ResourceIndexAccess.cxx |    6 +-----
 extensions/source/resource/ResourceIndexAccess.hxx |    3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit e777637ffccd88a7aa51dc93bcf1744eb5367fd5
Author: Caolán McNamara <caol...@redhat.com>
Date:   Sun Jan 1 20:28:47 2017 +0000

    so we can drop StringList access from ResourceIndexAccess
    
    Change-Id: Ie855a45f7994e9d58ddecc51b54c25424fc544d6

diff --git a/extensions/source/resource/ResourceIndexAccess.cxx 
b/extensions/source/resource/ResourceIndexAccess.cxx
index f8a35b8..6f24b2b 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -97,9 +97,6 @@ Any SAL_CALL ResourceIndexAccess::getByName(const OUString& 
aName)
         case 0:
             xResult.set(new ResourceStringIndexAccess(m_pResMgr));
             break;
-        case 1:
-            xResult.set(new ResourceStringListIndexAccess(m_pResMgr));
-            break;
         default:
             throw NoSuchElementException();
     }
@@ -112,9 +109,8 @@ Sequence<OUString> SAL_CALL 
ResourceIndexAccess::getElementNames(  )
     static Sequence<OUString> aResult;
     if( aResult.getLength() == 0)
     {
-        aResult.realloc(2);
+        aResult.realloc(1);
         aResult[0] = "String";
-        aResult[1] = "StringList";
     }
     return aResult;
 }
diff --git a/extensions/source/resource/ResourceIndexAccess.hxx 
b/extensions/source/resource/ResourceIndexAccess.hxx
index 4e84215..fb466f8 100644
--- a/extensions/source/resource/ResourceIndexAccess.hxx
+++ b/extensions/source/resource/ResourceIndexAccess.hxx
@@ -32,9 +32,8 @@ namespace extensions { namespace resource
             /** The ctor takes a sequence with one element: the name of the 
resource, e.g. svt */
             ResourceIndexAccess(css::uno::Sequence< css::uno::Any> const& 
rArgs, css::uno::Reference< css::uno::XComponentContext> const&);
             // XNameAccess
-            // The XNameAccess provides access to two named elements:
+            // The XNameAccess provides access to one named elements:
             //    "String" returns a XIndexAccess to String resources
-            //    "StringList" returns a XIndexAccess to 
StringList/StringArray resources
             virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 
throw (css::container::NoSuchElementException, 
css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) 
override;
             virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  
) throw (css::uno::RuntimeException, std::exception) override;
             virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw 
(css::uno::RuntimeException, std::exception) override;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits