diff options
Diffstat (limited to 'ucbhelper/source/provider/contentinfo.hxx')
| -rw-r--r-- | ucbhelper/source/provider/contentinfo.hxx | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/ucbhelper/source/provider/contentinfo.hxx b/ucbhelper/source/provider/contentinfo.hxx index 15a122d3c83d..eaff22c4ea05 100644 --- a/ucbhelper/source/provider/contentinfo.hxx +++ b/ucbhelper/source/provider/contentinfo.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <cppuhelper/implbase.hxx> -#include <osl/mutex.hxx> #include <mutex> namespace com::sun::star::ucb { class XCommandEnvironment; } @@ -88,7 +87,7 @@ class CommandProcessorInfo : m_xEnv; std::optional<css::uno::Sequence< css::ucb::CommandInfo >> m_xCommands; - osl::Mutex m_aMutex; + std::mutex m_aMutex; ContentImplHelper* m_pContent; private: @@ -96,6 +95,7 @@ private: css::ucb::CommandInfo& rCommand ); bool queryCommand( sal_Int32 nHandle, css::ucb::CommandInfo& rCommand ); + const css::uno::Sequence< css::ucb::CommandInfo > & getCommandsImpl(); public: CommandProcessorInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, @@ -103,17 +103,11 @@ public: virtual ~CommandProcessorInfo() override; // XCommandInfo - virtual css::uno::Sequence< - css::ucb::CommandInfo > SAL_CALL - getCommands() override; - virtual css::ucb::CommandInfo SAL_CALL - getCommandInfoByName( const OUString& Name ) override; - virtual css::ucb::CommandInfo SAL_CALL - getCommandInfoByHandle( sal_Int32 Handle ) override; - virtual sal_Bool SAL_CALL - hasCommandByName( const OUString& Name ) override; - virtual sal_Bool SAL_CALL - hasCommandByHandle( sal_Int32 Handle ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > SAL_CALL getCommands() override; + virtual css::ucb::CommandInfo SAL_CALL getCommandInfoByName( const OUString& Name ) override; + virtual css::ucb::CommandInfo SAL_CALL getCommandInfoByHandle( sal_Int32 Handle ) override; + virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) override; + virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) override; // Non-Interface methods. void reset(); |