diff options
Diffstat (limited to 'dbaccess/source/ui/relationdesign/RelationController.cxx')
-rw-r--r-- | dbaccess/source/ui/relationdesign/RelationController.cxx | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 43400cb2c6a9..bd4269f413af 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -32,7 +32,7 @@ #include <sfx2/sfxsids.hrc> #include "dbu_rel.hrc" #include <vcl/svapp.hxx> -#include "browserids.hxx" +#include "browserids.hxx" #include <comphelper/types.hxx> #include "dbustrings.hrc" #include <connectivity/dbtools.hxx> @@ -96,8 +96,8 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::util; -// using namespace ::com::sun::star::sdbcx; -// using namespace ::connectivity; +// using namespace ::com::sun::star::sdbcx; +// using namespace ::connectivity; using namespace ::dbtools; using namespace ::dbaui; using namespace ::comphelper; @@ -133,7 +133,7 @@ Reference< XInterface > SAL_CALL ORelationController::Create(const Reference<XMu } DBG_NAME(ORelationController); // ----------------------------------------------------------------------------- -ORelationController::ORelationController(const Reference< XMultiServiceFactory >& _rM) +ORelationController::ORelationController(const Reference< XMultiServiceFactory >& _rM) : OJoinController(_rM) ,m_nThreadEvent(0) ,m_bRelationsPossible(sal_True) @@ -182,7 +182,7 @@ void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue else { // now we save the layout information - // create the output stream + // create the output stream try { if ( haveDataSource() && getDataSource()->getPropertySetInfo()->hasPropertyByName(PROPERTY_LAYOUTINFORMATION) ) @@ -218,7 +218,7 @@ void ORelationController::impl_initialize() {// check if this database supports relations setEditable(sal_False); - m_bRelationsPossible = sal_False; + m_bRelationsPossible = sal_False; { String sTitle(ModuleRes(STR_RELATIONDESIGN)); sTitle.Erase(0,3); @@ -251,7 +251,7 @@ void ORelationController::impl_initialize() { DBG_UNHANDLED_EXCEPTION(); } - + } // ----------------------------------------------------------------------------- ::rtl::OUString ORelationController::getPrivateTitle( ) const @@ -295,17 +295,17 @@ namespace const Sequence< ::rtl::OUString> m_aTableList; ORelationController* m_pParent; const Reference< XDatabaseMetaData> m_xMetaData; - const Reference< XNameAccess > m_xTables; + const Reference< XNameAccess > m_xTables; const sal_Int32 m_nStartIndex; const sal_Int32 m_nEndIndex; - + public: RelationLoader(ORelationController* _pParent ,const Reference< XDatabaseMetaData>& _xMetaData ,const Reference< XNameAccess >& _xTables ,const Sequence< ::rtl::OUString>& _aTableList ,const sal_Int32 _nStartIndex - ,const sal_Int32 _nEndIndex) + ,const sal_Int32 _nEndIndex) :m_aTableData(_xMetaData.is() && _xMetaData->supportsMixedCaseQuotedIdentifiers()) ,m_aTableList(_aTableList) ,m_pParent(_pParent) @@ -320,8 +320,8 @@ namespace virtual void SAL_CALL run(); virtual void SAL_CALL onTerminated(); protected: - virtual ~RelationLoader(){} - + virtual ~RelationLoader(){} + void loadTableData(const Any& _aTable); }; @@ -333,8 +333,8 @@ namespace ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, *pIter, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); Any aCatalog; @@ -377,14 +377,14 @@ namespace TTableWindowData::value_type pReferencingTable = aFind->second; Reference<XIndexAccess> xKeys = pReferencingTable->getKeys(); const Reference<XKeysSupplier> xKeySup(xTableProp,UNO_QUERY); - + if ( !xKeys.is() && xKeySup.is() ) { xKeys = xKeySup->getKeys(); } - + if ( xKeys.is() ) - { + { Reference<XPropertySet> xKey; const sal_Int32 nCount = xKeys->getCount(); for(sal_Int32 i = 0 ; i < nCount ; ++i) @@ -423,10 +423,10 @@ namespace // insert columns const Reference<XColumnsSupplier> xColsSup(xKey,UNO_QUERY); OSL_ENSURE(xColsSup.is(),"Key is no XColumnsSupplier!"); - const Reference<XNameAccess> xColumns = xColsSup->getColumns(); - const Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const Reference<XNameAccess> xColumns = xColsSup->getColumns(); + const Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); ::rtl::OUString sColumnName,sRelatedName; for(sal_uInt16 j=0;pIter != pEnd;++pIter,++j) { @@ -434,18 +434,18 @@ namespace OSL_ENSURE(xPropSet.is(),"Invalid column found in KeyColumns!"); if ( xPropSet.is() ) { - xPropSet->getPropertyValue(PROPERTY_NAME) >>= sColumnName; - xPropSet->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedName; + xPropSet->getPropertyValue(PROPERTY_NAME) >>= sColumnName; + xPropSet->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedName; } pTabConnData->SetConnLine( j, sColumnName, sRelatedName ); } ////////////////////////////////////////////////////////////////////// // Update/Del-Flags setzen - sal_Int32 nUpdateRule = 0; - sal_Int32 nDeleteRule = 0; + sal_Int32 nUpdateRule = 0; + sal_Int32 nDeleteRule = 0; xKey->getPropertyValue(PROPERTY_UPDATERULE) >>= nUpdateRule; xKey->getPropertyValue(PROPERTY_DELETERULE) >>= nDeleteRule; - + pTabConnData->SetUpdateRules( nUpdateRule ); pTabConnData->SetDeleteRules( nDeleteRule ); @@ -493,11 +493,11 @@ IMPL_LINK( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ ) ::osl::MutexGuard aGuard( getMutex() ); try { - getView()->initialize(); // show the windows and fill with our informations + getView()->initialize(); // show the windows and fill with our informations getView()->Invalidate(INVALIDATE_NOERASE); - getUndoMgr()->Clear(); // clear all undo redo things - setModified(sal_False); // and we are not modified yet - + getUndoMgr()->Clear(); // clear all undo redo things + setModified(sal_False); // and we are not modified yet + if(m_vTableData.empty()) Execute(ID_BROWSER_ADDTABLE,Sequence<PropertyValue>()); } @@ -551,7 +551,7 @@ void ORelationController::loadData() catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); - } + } } // ----------------------------------------------------------------------------- TTableWindowData::value_type ORelationController::existsTable(const ::rtl::OUString& _rComposedTableName,sal_Bool _bCase) const |