diff options
Diffstat (limited to 'framework/inc/services')
| -rw-r--r-- | framework/inc/services/frame.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/services/substitutepathvars.hxx | 6 | ||||
| -rw-r--r-- | framework/inc/services/tabwindowservice.hxx | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index fc559880107e..7edb072493b9 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -105,6 +105,8 @@ enum EActiveState E_FOCUS // I have the focus now. I must a member of an active path! }; +class WindowCommandDispatch; + //_________________________________________________________________________________________________________________ // exported definitions //_________________________________________________________________________________________________________________ @@ -438,6 +440,8 @@ class Frame : // interfaces css::uno::Reference< css::frame::XDispatchInformationProvider > m_xDispatchInfoHelper ; css::uno::Reference< css::frame::XTitle > m_xTitleHelper ; + WindowCommandDispatch* m_pWindowCommandDispatch ; + protected: FrameContainer m_aChildFrameContainer ; /// array of child frames diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index e575ff7ee469..be65a5e54041 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -34,7 +34,7 @@ */ #include <vector> #include <list> -#include <hash_map> +#include <boost/unordered_map.hpp> //_________________________________________________________________________________________________________________ // my own includes @@ -110,7 +110,7 @@ struct SubstitutePathNotify const com::sun::star::uno::Sequence<rtl::OUString> aPropertyNames; }; -class SubstituteVariables : public ::std::hash_map< ::rtl::OUString, +class SubstituteVariables : public ::boost::unordered_map< ::rtl::OUString, SubstituteRule, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > @@ -277,7 +277,7 @@ class SubstitutePathVariables : private ThreadHelpBase throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); private: - class VarNameToIndexMap : public std::hash_map< ::rtl::OUString, + class VarNameToIndexMap : public boost::unordered_map< ::rtl::OUString, PreDefVariable, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx index 21977c666aef..2c5f6968d726 100644 --- a/framework/inc/services/tabwindowservice.hxx +++ b/framework/inc/services/tabwindowservice.hxx @@ -104,7 +104,7 @@ struct TTabPageInfo css::uno::Sequence< css::beans::NamedValue > m_lProperties; }; -typedef ::std::hash_map< ::sal_Int32 , +typedef ::boost::unordered_map< ::sal_Int32 , TTabPageInfo , Int32HashCode , ::std::equal_to< ::sal_Int32 > > TTabPageInfoHash; |