diff options
author | Noel Grandin <noel@peralex.com> | 2014-07-09 10:40:50 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-07-10 11:04:12 +0200 |
commit | 1dcef2a123fb54bfc1360c04f8e49783445c734c (patch) | |
tree | c8268d55ff820b8fdc16851db85edfde9c130104 /include/dbaccess | |
parent | 06d18374deabe00712d80eaee291fc966ce6cd99 (diff) |
fold dbaccess::IReference interface into the only place it is in use
Change-Id: I978a528e1da6f73c94549c2ced95b244ad5b6147
Diffstat (limited to 'include/dbaccess')
-rw-r--r-- | include/dbaccess/IController.hxx | 6 | ||||
-rw-r--r-- | include/dbaccess/IReference.hxx | 40 |
2 files changed, 4 insertions, 42 deletions
diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx index 7b76dee98577..6bc22d9d75e5 100644 --- a/include/dbaccess/IController.hxx +++ b/include/dbaccess/IController.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <dbaccess/IReference.hxx> #include <dbaccess/dbaccessdllapi.h> namespace com { namespace sun { namespace star { @@ -39,7 +38,7 @@ class NotifyEvent; namespace dbaui { // interface for controller depended calls like commands - class DBACCESS_DLLPUBLIC IController : public IReference + class DBACCESS_DLLPUBLIC IController { public: /** executes the given command without checking if it is allowed @@ -122,6 +121,9 @@ namespace dbaui */ virtual bool interceptUserInput( const NotifyEvent& _rEvent ) = 0; + virtual void SAL_CALL acquire( ) throw () = 0; + virtual void SAL_CALL release( ) throw () = 0; + protected: ~IController() {} }; diff --git a/include/dbaccess/IReference.hxx b/include/dbaccess/IReference.hxx deleted file mode 100644 index 7da1fd947884..000000000000 --- a/include/dbaccess/IReference.hxx +++ /dev/null @@ -1,40 +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 INCLUDED_DBACCESS_IREFERENCE_HXX -#define INCLUDED_DBACCESS_IREFERENCE_HXX - -#include <dbaccess/dbaccessdllapi.h> - -namespace dbaui -{ - // interface for controller depended calls like commands - class DBACCESS_DLLPUBLIC SAL_NO_VTABLE IReference - { - public: - virtual void SAL_CALL acquire( ) throw () = 0; - virtual void SAL_CALL release( ) throw () = 0; - - protected: - ~IReference() {} - }; -} -#endif // INCLUDED_DBACCESS_IREFERENCE_HXX - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |