diff options
| -rw-r--r-- | dbaccess/inc/IEnvironment.hxx | 77 | ||||
| -rw-r--r-- | dbaccess/inc/singledoccontroller.hxx | 15 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/singledoccontroller.cxx | 3 |
3 files changed, 8 insertions, 87 deletions
diff --git a/dbaccess/inc/IEnvironment.hxx b/dbaccess/inc/IEnvironment.hxx deleted file mode 100644 index bc6766c91ebb..000000000000 --- a/dbaccess/inc/IEnvironment.hxx +++ /dev/null @@ -1,77 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef DBAUI_IENVIRONMENT_HXX -#define DBAUI_IENVIRONMENT_HXX - -#include <com/sun/star/sdbc/SQLException.hpp> - -#include <connectivity/standardsqlstate.hxx> - -namespace dbtools -{ - class SQLExceptionInfo; -} - -namespace dbaui -{ - // interface class for a generell environment - class IEnvironment - { - public: - /** appends an error in the current environment. - */ - virtual void appendError( - const ::rtl::OUString& _rErrorMessage, - const ::dbtools::StandardSQLState _eSQLState = ::dbtools::SQL_GENERAL_ERROR, - const sal_Int32 _nErrorCode = 1000 - ) = 0; - - /** clears the error state. - */ - virtual void clearError() = 0; - - /** @retrun - returns <TRUE/> when an error was set otherwise <FALSE/> - */ - virtual sal_Bool hasError() const = 0; - - /** returns the current error - */ - virtual const ::dbtools::SQLExceptionInfo& getError() const = 0; - - /** displays the current error, or does nothing if there is no current error - */ - virtual void displayError() = 0; - - /** gives access to the currently used connection - @return - the currently used connection. - */ - virtual const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& getConnection() const = 0; - }; -} -#endif // DBAUI_IENVIRONMENT_HXX diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx index 255a34500e97..8e11446ad8d9 100644 --- a/dbaccess/inc/singledoccontroller.hxx +++ b/dbaccess/inc/singledoccontroller.hxx @@ -29,7 +29,6 @@ #define DBAUI_SINGLEDOCCONTROLLER_HXX #include "genericcontroller.hxx" -#include "IEnvironment.hxx" /** === begin UNO includes === **/ #include <com/sun/star/document/XScriptInvocationContext.hpp> @@ -69,7 +68,6 @@ namespace dbaui struct OSingleDocumentControllerImpl; class DBACCESS_DLLPUBLIC OSingleDocumentController :public OSingleDocumentController_Base - ,public IEnvironment { private: ::std::auto_ptr<OSingleDocumentControllerImpl> m_pImpl; @@ -130,10 +128,9 @@ namespace dbaui */ const ::dbtools::DatabaseMetaData& getSdbMetaData() const; - // IEnvironment /** appends an error in the current environment. */ - virtual void appendError( + void appendError( const ::rtl::OUString& _rErrorMessage, const ::dbtools::StandardSQLState _eSQLState = ::dbtools::SQL_GENERAL_ERROR, const sal_Int32 _nErrorCode = 1000 @@ -141,20 +138,20 @@ namespace dbaui /** clears the error state. */ - virtual void clearError(); + void clearError(); /** @return <TRUE/> when an error was set otherwise <FALSE/> */ - virtual sal_Bool hasError() const; + sal_Bool hasError() const; /** returns the current error */ - virtual const ::dbtools::SQLExceptionInfo& getError() const; + const ::dbtools::SQLExceptionInfo& getError() const; /** displays the current error, or does nothing if there is no current error */ - virtual void displayError(); + void displayError(); /** shows an info box with the string conntection lost. */ @@ -164,7 +161,7 @@ namespace dbaui @return the currently used connection. */ - virtual const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& getConnection() const; /** returns the number formatter diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index c074aed76392..a382f245347a 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -141,7 +141,7 @@ namespace dbaui public: OModuleClient m_aModuleClient; - ::dbtools::SQLExceptionInfo m_aCurrentError; // contains the current error which can be set through IEnvironment + ::dbtools::SQLExceptionInfo m_aCurrentError; ::cppu::OInterfaceContainerHelper m_aModifyListeners; @@ -367,6 +367,7 @@ namespace dbaui { // our connection was disposed so we need a new one reconnect( sal_True ); + InvalidateAll(); } //-------------------------------------------------------------------- |