[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Stephan Bergmann]

 include/sfx2/sidebar/ResourceManager.hxx |    2 
 sfx2/source/sidebar/ResourceManager.cxx  |   68 +++++++++++++++----------------
 2 files changed, 34 insertions(+), 36 deletions(-)

New commits:
commit ec5250dcc63f5c83c9747bbd7e2aae57291a5e8e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 20 16:03:37 2015 +0100

    loplugin:staticmethods
    
    Change-Id: Ia306219fdcce4633e85c34db343a99b21e88157e

diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx
index 9a86bc0..01695ec 100644
--- a/include/sfx2/sidebar/ResourceManager.hxx
+++ b/include/sfx2/sidebar/ResourceManager.hxx
@@ -111,8 +111,6 @@ private:
                          ContextList& rContextList,
                          const OUString& rsDefaultMenuCommand);
 
-    css::uno::Sequence<OUString> BuildContextList (ContextList rContextList, bool isDeckEnabled);
-
     void ReadLegacyAddons(const css::uno::Reference<css::frame::XController>& rxController);
     static utl::OConfigurationTreeRoot GetLegacyAddonRootNode(const OUString& rsModuleName);
     static void GetToolPanelNodeNames(std::vector<OUString>& rMatchingNames,
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 7b639c4..97268e5 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -54,6 +54,40 @@ bool getBool(utl::OConfigurationNode const & aNode, const char* pNodeName)
     return comphelper::getBOOL(aNode.getNodeValue(pNodeName));
 }
 
+css::uno::Sequence<OUString> BuildContextList (ContextList rContextList, bool isEnabled)
+{
+    const ::std::vector<ContextList::Entry>& entries = rContextList.GetEntries();
+
+     css::uno::Sequence<OUString> result(entries.size());
+     long i = 0;
+
+    for (::std::vector<ContextList::Entry>::const_iterator iEntry(entries.begin()), iEnd(entries.end());
+                                                            iEntry!=iEnd; ++iEntry)
+         {
+            OUString appName = iEntry->maContext.msApplication;
+            OUString contextName = iEntry->maContext.msContext;
+            OUString menuCommand = iEntry->msMenuCommand;
+
+            OUString visibility;
+            if (isEnabled)
+                visibility = "visible";
+            else
+                visibility = "hidden";
+
+            OUString element = appName + ", " + contextName +", " + visibility;
+
+            if (menuCommand != "")
+                element += ", "+menuCommand;
+
+            result[i] = element;
+
+            i++;
+        }
+
+    return result;
+
+}
+
 } //end anonymous namespace
 
 ResourceManager::ResourceManager()
@@ -382,40 +416,6 @@ void ResourceManager::ReadPanelList()
         maPanels.resize(nWriteIndex);
 }
 
-css::uno::Sequence<OUString> ResourceManager::BuildContextList (ContextList rContextList, bool isEnabled)
-{
-    const ::std::vector<ContextList::Entry>& entries = rContextList.GetEntries();
-
-     css::uno::Sequence<OUString> result(entries.size());
-     long i = 0;
-
-    for (::std::vector<ContextList::Entry>::const_iterator iEntry(entries.begin()), iEnd(entries.end());
-                                                            iEntry!=iEnd; ++iEntry)
-         {
-            OUString appName = iEntry->maContext.msApplication;
-            OUString contextName = iEntry->maContext.msContext;
-            OUString menuCommand = iEntry->msMenuCommand;
-
-            OUString visibility;
-            if (isEnabled)
-                visibility = "visible";
-            else
-                visibility = "hidden";
-
-            OUString element = appName + ", " + contextName +", " + visibility;
-
-            if (menuCommand != "")
-                element += ", "+menuCommand;
-
-            result[i] = element;
-
-            i++;
-        }
-
-    return result;
-
-}
-
 void ResourceManager::ReadContextList (
                         const utl::OConfigurationNode& rParentNode,
                         ContextList& rContextList,