[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - odk/examples

[Stephan Bergmann]

 odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 4d678d76b51a14e81b0a29c7e96a338bd058526a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 17 10:52:48 2013 +0100

    Do not use Boost in SDK examples
    
    Change-Id: I8b2af447fe3ee29261e538a53b4624ff8b6c4d1e
    (cherry picked from commit ca4065680a402e3d0ff43e41744b24a9c980b2ef)
    Reviewed-on: https://gerrit.libreoffice.org/7118
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
index a1e633e..0fe4bd0 100644
--- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
+++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <map>
 #include <vector>
-#include <boost/unordered_map.hpp>
 
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
@@ -29,14 +29,11 @@
 
 typedef std::vector < com::sun::star::uno::Reference < com::sun::star::frame::XStatusListener > > StatusListeners;
 
-typedef boost::unordered_map < ::rtl::OUString,
-                               StatusListeners,
-                               rtl::OUStringHash,
-                               std::equal_to< rtl::OUString > > ListenerMap;
+typedef std::map < ::rtl::OUString, StatusListeners > ListenerMap;
 
 // For every frame there is *one* Dispatch object for all possible commands
 // this struct contains an array of listeners for every supported command
-// these arrays are accessed by a boost::unordered_map (with the command string as index)
+// these arrays are accessed by a std::map (with the command string as index)
 struct ListenerItem
 {
     ListenerMap aContainer;