From ef900e20e14a2b4d693a55c2e2d2b9b2e9a43992 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 25 Jun 2008 11:51:45 +0000 Subject: [PATCH] INTEGRATION: CWS dba30d (1.12.30); FILE MERGED 2008/05/29 11:30:21 fs 1.12.30.1: during #i80943#: refactoring: IController now passed around as reference, not as pointer --- dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 5 +++-- dbaccess/source/ui/querydesign/JAccess.cxx | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 603181f6b6c0..ecabea880895 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ConnectionLineAccess.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -260,7 +260,8 @@ namespace dbaui // ----------------------------------------------------------------------------- sal_Bool OConnectionLineAccess::isEditable() const { - return m_pLine ? !m_pLine->GetParent()->getDesignView()->getController()->isReadOnly() : sal_False; + + return m_pLine ? !m_pLine->GetParent()->getDesignView()->getController().isReadOnly() : sal_False; } // ----------------------------------------------------------------------------- Reference< XAccessibleContext > SAL_CALL OConnectionLineAccess::getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException) diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 876bea75175f..db5e6e05989c 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: JAccess.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -121,7 +121,7 @@ namespace dbaui // ----------------------------------------------------------------------------- sal_Bool OJoinDesignViewAccess::isEditable() const { - return m_pTableView && !m_pTableView->getDesignView()->getController()->isReadOnly(); + return m_pTableView && !m_pTableView->getDesignView()->getController().isReadOnly(); } // ----------------------------------------------------------------------------- sal_Int16 SAL_CALL OJoinDesignViewAccess::getAccessibleRole( ) throw (RuntimeException)