summaryrefslogtreecommitdiff
path: root/uui
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-01-30 13:28:40 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2014-02-05 19:08:43 +0100
commited9e1e739041c8ef30e68559e9e9415632b21d94 (patch)
tree4daba1e268ba16b0cdb0e3a23a26bb42e11a3940 /uui
parentfe537786a42abea57551395f73328db48bebd086 (diff)
Use anonymous namespace for UUIInteractionHandler.
After it's no longer used in uui_component_getFactory, since fe537786a42abea57551395f73328db48bebd086 Change-Id: I27f77b88c898f665d481931a55f1a0c1fce15818
Diffstat (limited to 'uui')
-rw-r--r--uui/source/interactionhandler.cxx64
-rw-r--r--uui/source/interactionhandler.hxx80
2 files changed, 60 insertions, 84 deletions
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index dd71174e408a..872bf5251f45 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -17,14 +17,68 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "iahndl.hxx"
-#include "interactionhandler.hxx"
-#include "comphelper/namedvaluecollection.hxx"
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/task/XInteractionHandler2.hpp>
+
+#include <iahndl.hxx>
+#include <comphelper/namedvaluecollection.hxx>
+#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include "com/sun/star/awt/XWindow.hpp"
using namespace com::sun::star;
+namespace {
+
+class UUIInteractionHandler:
+ public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo,
+ com::sun::star::lang::XInitialization,
+ com::sun::star::task::XInteractionHandler2 >
+{
+private:
+ UUIInteractionHelper * m_pImpl;
+
+ UUIInteractionHandler(UUIInteractionHandler &); // not implemented
+ void operator =(UUIInteractionHandler); // not implemented
+
+public:
+ UUIInteractionHandler(com::sun::star::uno::Reference<
+ com::sun::star::uno::XComponentContext >
+ const & rxContext)
+ SAL_THROW(());
+
+ virtual ~UUIInteractionHandler() SAL_THROW(());
+
+ virtual OUString SAL_CALL getImplementationName()
+ throw (com::sun::star::uno::RuntimeException);
+
+ virtual sal_Bool SAL_CALL supportsService(OUString const &
+ rServiceName)
+ throw (com::sun::star::uno::RuntimeException);
+
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
+ getSupportedServiceNames()
+ throw (com::sun::star::uno::RuntimeException);
+
+ virtual void SAL_CALL
+ initialize(
+ com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
+ rArguments)
+ throw (com::sun::star::uno::Exception);
+
+ virtual void SAL_CALL
+ handle(com::sun::star::uno::Reference<
+ com::sun::star::task::XInteractionRequest > const &
+ rRequest)
+ throw (com::sun::star::uno::RuntimeException);
+
+ virtual ::sal_Bool SAL_CALL
+ handleInteractionRequest(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _Request
+ ) throw ( ::com::sun::star::uno::RuntimeException );
+};
+
UUIInteractionHandler::UUIInteractionHandler(
uno::Reference< uno::XComponentContext > const &
rxContext)
@@ -124,6 +178,8 @@ UUIInteractionHandler::handle(
}
}
+}
+
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
com_sun_star_comp_uui_UUIInteractionHandler_get_implementation(
css::uno::XComponentContext *context,
diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx
deleted file mode 100644
index d5ea999bbe98..000000000000
--- a/uui/source/interactionhandler.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef UUI_INTERACTIONHANDLER_HXX
-#define UUI_INTERACTIONHANDLER_HXX
-
-#include "com/sun/star/lang/XInitialization.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/task/XInteractionHandler2.hpp"
-#include "cppuhelper/implbase3.hxx"
-
-class UUIInteractionHelper;
-
-class UUIInteractionHandler:
- public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo,
- com::sun::star::lang::XInitialization,
- com::sun::star::task::XInteractionHandler2 >
-{
-private:
- UUIInteractionHelper * m_pImpl;
-
- UUIInteractionHandler(UUIInteractionHandler &); // not implemented
- void operator =(UUIInteractionHandler); // not implemented
-
-public:
- UUIInteractionHandler(com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >
- const & rxContext)
- SAL_THROW(());
-
- virtual ~UUIInteractionHandler() SAL_THROW(());
-
- virtual OUString SAL_CALL getImplementationName()
- throw (com::sun::star::uno::RuntimeException);
-
- virtual sal_Bool SAL_CALL supportsService(OUString const &
- rServiceName)
- throw (com::sun::star::uno::RuntimeException);
-
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw (com::sun::star::uno::RuntimeException);
-
- virtual void SAL_CALL
- initialize(
- com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
- rArguments)
- throw (com::sun::star::uno::Exception);
-
- virtual void SAL_CALL
- handle(com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const &
- rRequest)
- throw (com::sun::star::uno::RuntimeException);
-
- virtual ::sal_Bool SAL_CALL
- handleInteractionRequest(
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _Request
- ) throw ( ::com::sun::star::uno::RuntimeException );
-};
-
-#endif // UUI_INTERACTIONHANDLER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */