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

[Caolán McNamara]

 linguistic/source/gciterator.cxx |   16 ++++++++--------
 linguistic/source/gciterator.hxx |   10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit be13ca094dac91545a879905a34adb5fdb23afe9
Author: Caolán McNamara <caol...@redhat.com>
Date:   Sat Jun 2 17:10:42 2018 +0100

    mergedlibs failure with duplicate SwXStringKeyMap
    
    just rename this one for a quick fix
    
    Change-Id: Iae9152356640c3454a73b56f7e097d084d8eb3a0
    Reviewed-on: https://gerrit.libreoffice.org/55210
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index a1bba7cbf739..d124ab1865aa 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -233,9 +233,9 @@ static lang::Locale lcl_GetPrimaryLanguageOfSentence(
 }
 
 
-SwXStringKeyMap::SwXStringKeyMap() {}
+LngXStringKeyMap::LngXStringKeyMap() {}
 
-void SAL_CALL SwXStringKeyMap::insertValue(const OUString& aKey, const 
css::uno::Any& aValue)
+void SAL_CALL LngXStringKeyMap::insertValue(const OUString& aKey, const 
css::uno::Any& aValue)
 {
     std::map<OUString, css::uno::Any>::const_iterator aIter = maMap.find(aKey);
     if (aIter != maMap.end())
@@ -244,7 +244,7 @@ void SAL_CALL SwXStringKeyMap::insertValue(const OUString& 
aKey, const css::uno:
     maMap[aKey] = aValue;
 }
 
-css::uno::Any SAL_CALL SwXStringKeyMap::getValue(const OUString& aKey)
+css::uno::Any SAL_CALL LngXStringKeyMap::getValue(const OUString& aKey)
 {
     std::map<OUString, css::uno::Any>::const_iterator aIter = maMap.find(aKey);
     if (aIter == maMap.end())
@@ -253,14 +253,14 @@ css::uno::Any SAL_CALL SwXStringKeyMap::getValue(const 
OUString& aKey)
     return (*aIter).second;
 }
 
-sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const OUString& aKey)
+sal_Bool SAL_CALL LngXStringKeyMap::hasValue(const OUString& aKey)
 {
     return maMap.find(aKey) != maMap.end();
 }
 
-::sal_Int32 SAL_CALL SwXStringKeyMap::getCount() { return maMap.size(); }
+::sal_Int32 SAL_CALL LngXStringKeyMap::getCount() { return maMap.size(); }
 
-OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex)
+OUString SAL_CALL LngXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex)
 {
     if (static_cast<sal_uInt32>(nIndex) >= maMap.size())
         throw css::lang::IndexOutOfBoundsException();
@@ -268,7 +268,7 @@ OUString SAL_CALL 
SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex)
     return OUString();
 }
 
-css::uno::Any SAL_CALL SwXStringKeyMap::getValueByIndex(::sal_Int32 nIndex)
+css::uno::Any SAL_CALL LngXStringKeyMap::getValueByIndex(::sal_Int32 nIndex)
 {
     if (static_cast<sal_uInt32>(nIndex) >= maMap.size())
         throw css::lang::IndexOutOfBoundsException();
@@ -428,7 +428,7 @@ void GrammarCheckingIterator::ProcessResult(
                         rDesc.nType = text::TextMarkupType::PROOFREADING;
 
                     uno::Reference< container::XStringKeyMap > xKeyMap(
-                        new SwXStringKeyMap());
+                        new LngXStringKeyMap());
                     for( const beans::PropertyValue& rProperty : 
rError.aProperties )
                     {
                         if ( rProperty.Name == "LineColor" )
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index 9241b4136dd7..03abfa2ac450 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
@@ -186,10 +186,10 @@ public:
 
 /** Implementation of the css::container::XStringKeyMap interface
  */
-class SwXStringKeyMap : public 
::cppu::WeakImplHelper<css::container::XStringKeyMap>
+class LngXStringKeyMap : public 
::cppu::WeakImplHelper<css::container::XStringKeyMap>
 {
 public:
-    SwXStringKeyMap();
+    LngXStringKeyMap();
 
     virtual css::uno::Any SAL_CALL getValue(const OUString& aKey) override;
     virtual sal_Bool SAL_CALL hasValue(const OUString& aKey) override;
@@ -199,10 +199,10 @@ public:
     virtual css::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) 
override;
 
 private:
-    SwXStringKeyMap(SwXStringKeyMap&) = delete;
-    void operator=(SwXStringKeyMap&) = delete;
+    LngXStringKeyMap(LngXStringKeyMap&) = delete;
+    void operator=(LngXStringKeyMap&) = delete;
 
-    ~SwXStringKeyMap() override{};
+    ~LngXStringKeyMap() override{};
 
     std::map<OUString, css::uno::Any> maMap;
 };
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits