diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-19 15:02:01 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-19 15:02:01 +0000 |
| commit | bc389339d22ebe32a7337f9f297fabe2eb9c8338 (patch) | |
| tree | 68bafae5b2b44f00c94f3911b8a59bd089e8b0e9 /dbaccess/source/ui/browser/dbloader.cxx | |
| parent | e85b9cef0368aad2700d7e301763f421942620f4 (diff) | |
INTEGRATION: CWS warningfixes02 (1.25.6); FILE MERGED
2006/06/30 11:53:08 sb 1.25.6.1: #i66577# Made the code compile (warning-free) on a unxlngi6.pro GCC 4.1.1 Linux box.
Diffstat (limited to 'dbaccess/source/ui/browser/dbloader.cxx')
| -rw-r--r-- | dbaccess/source/ui/browser/dbloader.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 37f67282960a..2ef6be8520ec 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dbloader.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: hr $ $Date: 2006-06-20 02:56:42 $ + * last change: $Author: kz $ $Date: 2006-07-19 16:02:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -234,22 +234,22 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: // ich benutze nicht maURL, sondern rURL, denn zwischen dem Constructor und diesem Load hier kann sich die ::com::sun::star::util::URL des Objektes // schon geaendert haben (zum Beispiel durch Umbenennen) Reference< XController > xController; - sal_Bool bSuccess = sal_True; sal_Bool bAttachModel = sal_False; if(aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_FORMGRIDVIEW) xController.set(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OFormGridView")),UNO_QUERY); else if(aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_DATASOURCEBROWSER )// construct the control xController.set(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.ODatasourceBrowser")),UNO_QUERY); - else if ( bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_QUERYDESIGN) )// construct the control + else if ( (bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_QUERYDESIGN)) )// construct the control xController.set(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OQueryDesign")),UNO_QUERY); - else if ( bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_TABLEDESIGN) ) // construct the control + else if ( (bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_TABLEDESIGN)) ) // construct the control xController.set(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OTableDesign")),UNO_QUERY); - else if ( bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_RELATIONDESIGN) )// construct the control + else if ( (bAttachModel = (aParser.GetMainURL(INetURLObject::DECODE_TO_IURI) == URL_COMPONENT_RELATIONDESIGN)) )// construct the control xController.set(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.ORelationDesign")),UNO_QUERY); else OSL_ENSURE(0,"wrong dispatch url!"); - if(bSuccess = xController.is()) + sal_Bool bSuccess = xController.is(); + if(bSuccess) { Reference<XModel> xModel; if ( bAttachModel ) @@ -286,7 +286,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: } } } - if ( bSuccess = ( xModel.is() && xModel->getURL().getLength() != 0) ) + if ( (bSuccess = ( xModel.is() && xModel->getURL().getLength() != 0)) ) { try { |