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

[Stephan Bergmann]

 sdext/source/presenter/PresenterConfigurationAccess.cxx |    2 +-
 sdext/source/presenter/PresenterConfigurationAccess.hxx |    1 -
 sdext/source/presenter/PresenterScreen.cxx              |   14 ++++----------
 sdext/source/presenter/PresenterScreen.hxx              |    2 --
 sdext/source/presenter/PresenterTheme.cxx               |   15 ++++-----------
 5 files changed, 9 insertions(+), 25 deletions(-)

New commits:
commit 2c355e3a76b7a167a61200ab749b2d88d5fbe3a7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 27 13:48:33 2017 +0200

    Remove unused ItemProcessor argument
    
    Change-Id: Ie650f8c046f60a749999e1819edb5abad79e5362

diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index 23867f4bc931..262e2b145b8a 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -210,7 +210,7 @@ void PresenterConfigurationAccess::ForAll (
             else
                 bHasAllValues = false;
             if (bHasAllValues)
-                rProcessor(rsKey,aValues);
+                rProcessor(aValues);
         }
     }
 }
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx
index a92736811643..cf0d5058c1d8 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.hxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx
@@ -123,7 +123,6 @@ public:
     void CommitChanges();
 
     typedef ::std::function<void (
-        const OUString&,
         const ::std::vector<css::uno::Any>&) > ItemProcessor;
     typedef ::std::function<void (
         const OUString&,
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 234664ceb84f..b19b7a540f0d 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -687,9 +687,9 @@ void PresenterScreen::ProcessLayout (
         PresenterConfigurationAccess::ForAll(
             xList,
             aProperties,
-            [this, rxContext, rxAnchorId](OUString const& rString, std::vector<uno::Any> const& rArgs)
+            [this, rxContext, rxAnchorId](std::vector<uno::Any> const& rArgs)
             {
-                this->ProcessComponent(rString, rArgs, rxContext, rxAnchorId);
+                this->ProcessComponent(rArgs, rxContext, rxAnchorId);
             });
     }
     catch (const RuntimeException&)
@@ -714,9 +714,9 @@ void PresenterScreen::ProcessViewDescriptions (
         PresenterConfigurationAccess::ForAll(
             xViewDescriptionsNode,
             aProperties,
-            [this](OUString const& rString, std::vector<uno::Any> const& rArgs)
+            [this](std::vector<uno::Any> const& rArgs)
             {
-                return this->ProcessViewDescription(rString, rArgs);
+                return this->ProcessViewDescription(rArgs);
             });
     }
     catch (const RuntimeException&)
@@ -726,13 +726,10 @@ void PresenterScreen::ProcessViewDescriptions (
 }
 
 void PresenterScreen::ProcessComponent (
-    const OUString& rsKey,
     const ::std::vector<Any>& rValues,
     const Reference<XComponentContext>& rxContext,
     const Reference<XResourceId>& rxAnchorId)
 {
-    (void)rsKey;
-
     if (rValues.size() != 6)
         return;
 
@@ -768,11 +765,8 @@ void PresenterScreen::ProcessComponent (
 }
 
 void PresenterScreen::ProcessViewDescription (
-    const OUString& rsKey,
     const ::std::vector<Any>& rValues)
 {
-    (void)rsKey;
-
     if (rValues.size() != 4)
         return;
 
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index 963582b62159..8cfadd3a4ce9 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -182,7 +182,6 @@ private:
         configuration list.
     */
     void ProcessComponent (
-        const OUString& rsKey,
         const ::std::vector<css::uno::Any>& rValues,
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId);
@@ -195,7 +194,6 @@ private:
     /** Called by ProcessViewDescriptions for a single entry.
     */
     void ProcessViewDescription (
-        const OUString& rsKey,
         const ::std::vector<css::uno::Any>& rValues);
 
     void SetupView (
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 10c7cf023482..f5cc34a28937 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -155,7 +155,6 @@ public:
 private:
     void ProcessPaneStyle (
         ReadContext& rReadContext,
-        const OUString& rsKey,
         const ::std::vector<css::uno::Any>& rValues);
 };
 
@@ -217,7 +216,6 @@ private:
 
     void ProcessStyleAssociation(
         ReadContext& rReadContext,
-        const OUString& rsKey,
         const ::std::vector<css::uno::Any>& rValues);
 };
 
@@ -847,20 +845,17 @@ void PaneStyleContainer::Read (
         PresenterConfigurationAccess::ForAll(
             xPaneStyleList,
             aProperties,
-            [this, &rReadContext] (OUString const& rKey, std::vector<uno::Any> const& rValues)
+            [this, &rReadContext] (std::vector<uno::Any> const& rValues)
             {
-                return this->ProcessPaneStyle(rReadContext, rKey, rValues);
+                return this->ProcessPaneStyle(rReadContext, rValues);
             });
     }
 }
 
 void PaneStyleContainer::ProcessPaneStyle(
     ReadContext& rReadContext,
-    const OUString& rsKey,
     const ::std::vector<Any>& rValues)
 {
-    (void)rsKey;
-
     if (rValues.size() != 6)
         return;
 
@@ -1086,9 +1081,9 @@ void StyleAssociationContainer::Read (
         PresenterConfigurationAccess::ForAll(
             xStyleAssociationList,
             aProperties,
-            [this, &rReadContext] (OUString const& rKey, std::vector<uno::Any> const& rValues)
+            [this, &rReadContext] (std::vector<uno::Any> const& rValues)
             {
-                return this->ProcessStyleAssociation(rReadContext, rKey, rValues);
+                return this->ProcessStyleAssociation(rReadContext, rValues);
             });
     }
 }
@@ -1104,11 +1099,9 @@ OUString StyleAssociationContainer::GetStyleName (const OUString& rsResourceName
 
 void StyleAssociationContainer::ProcessStyleAssociation(
     ReadContext& rReadContext,
-    const OUString& rsKey,
     const ::std::vector<Any>& rValues)
 {
     (void)rReadContext;
-    (void)rsKey;
 
     if (rValues.size() != 2)
         return;