summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/relationdesign
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2011-01-14 15:00:11 +0100
committerMikhail Voytenko <mav@openoffice.org>2011-01-14 15:00:11 +0100
commit409873c1c1267b71eb53e4d5536fc240510438d9 (patch)
treefae3b8b1e8fb79bb7fe873bd81bd53f5a77c1e60 /dbaccess/source/ui/relationdesign
parente1ac951c62beaadf44722d8a43b4dd0c6f6d7e29 (diff)
removetooltypes01: #i112600# remove tooltypes from dbaccess
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx26
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx4
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx12
3 files changed, 21 insertions, 21 deletions
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index a8e34493e320..130263130d38 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -96,7 +96,7 @@ ORelationTableConnectionData::~ORelationTableConnectionData()
}
//------------------------------------------------------------------------
-BOOL ORelationTableConnectionData::DropRelation()
+sal_Bool ORelationTableConnectionData::DropRelation()
{
DBG_CHKTHIS(ORelationTableConnectionData,NULL);
::osl::MutexGuard aGuard( m_aMutex );
@@ -125,7 +125,7 @@ BOOL ORelationTableConnectionData::DropRelation()
}
}
}
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
@@ -174,10 +174,10 @@ void ORelationTableConnectionData::SetCardinality()
}
// -----------------------------------------------------------------------------
-BOOL ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const
+sal_Bool ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const
{
// check if Table has the primary key column dependig on _eEConnectionSide
- USHORT nPrimKeysCount = 0,
+ sal_uInt16 nPrimKeysCount = 0,
nValidLinesCount = 0;
const Reference< XNameAccess> xKeyColumns = dbtools::getPrimaryKeyColumns_throw(i_xTable);
if ( xKeyColumns.is() )
@@ -201,15 +201,15 @@ BOOL ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet
}
}
if ( nPrimKeysCount != aKeyColumns.getLength() )
- return FALSE;
+ return sal_False;
}
if ( !nPrimKeysCount || nPrimKeysCount != nValidLinesCount )
- return FALSE;
+ return sal_False;
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
-BOOL ORelationTableConnectionData::IsConnectionPossible()
+sal_Bool ORelationTableConnectionData::IsConnectionPossible()
{
DBG_CHKTHIS(ORelationTableConnectionData,NULL);
::osl::MutexGuard aGuard( m_aMutex );
@@ -219,7 +219,7 @@ BOOL ORelationTableConnectionData::IsConnectionPossible()
if ( IsSourcePrimKey() && !IsDestPrimKey() )
ChangeOrientation();
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
@@ -282,7 +282,7 @@ bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableCon
}
}
//------------------------------------------------------------------------
-BOOL ORelationTableConnectionData::Update()
+sal_Bool ORelationTableConnectionData::Update()
{
::osl::MutexGuard aGuard( m_aMutex );
////////////////////////////////////////////////////////////
@@ -290,7 +290,7 @@ BOOL ORelationTableConnectionData::Update()
{
DropRelation();
if( !IsConnectionPossible() )
- return FALSE;
+ return sal_False;
}
// reassign the keys because the orientaion could be changed
@@ -298,7 +298,7 @@ BOOL ORelationTableConnectionData::Update()
Reference< XIndexAccess> xKeys ( getReferencingTable()->getKeys());
if ( !xKeys.is() )
- return FALSE;
+ return sal_False;
////////////////////////////////////////////////////////////
// Neue Relation erzeugen
Reference<XDataDescriptorFactory> xKeyFactory(xKeys,UNO_QUERY);
@@ -460,7 +460,7 @@ xKey.clear();
// Kardinalitaet bestimmen
SetCardinality();
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 99fe03a7004d..9ac01a24a49a 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -370,7 +370,7 @@ namespace
if ( aFind == m_aTableData.end() )
{
aFind = m_aTableData.insert(TTableDataHelper::value_type(sSourceName,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xTableProp,sSourceName, sSourceName)))).first;
- aFind->second->ShowAll(FALSE);
+ aFind->second->ShowAll(sal_False);
bAdded = true;
}
TTableWindowData::value_type pReferencingTable = aFind->second;
@@ -405,7 +405,7 @@ namespace
{
Reference<XPropertySet> xReferencedTable(m_xTables->getByName(sReferencedTable),UNO_QUERY);
aRefFind = m_aTableData.insert(TTableDataHelper::value_type(sReferencedTable,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xReferencedTable,sReferencedTable, sReferencedTable)))).first;
- aRefFind->second->ShowAll(FALSE);
+ aRefFind->second->ShowAll(sal_False);
}
else
continue; // table name could not be found so we do not show this table releation
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 0c9d0cc1a456..48eeae8df245 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -188,7 +188,7 @@ void ORelationTableView::ReSync()
GetTabWinMap()->begin()->second->GrabFocus();
}
//------------------------------------------------------------------------------
-BOOL ORelationTableView::IsAddAllowed()
+sal_Bool ORelationTableView::IsAddAllowed()
{
DBG_CHKTHIS(ORelationTableView,NULL);
@@ -291,9 +291,9 @@ void ORelationTableView::AddNewRelation()
DBG_CHKTHIS(ORelationTableView,NULL);
TTableConnectionData::value_type pNewConnData( new ORelationTableConnectionData() );
- ORelationDialog aRelDlg(this, pNewConnData, TRUE);
+ ORelationDialog aRelDlg(this, pNewConnData, sal_True);
- BOOL bSuccess = (aRelDlg.Execute() == RET_OK);
+ sal_Bool bSuccess = (aRelDlg.Execute() == RET_OK);
if (bSuccess)
{
// already updated by the dialog
@@ -324,7 +324,7 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_
}
//------------------------------------------------------------------------------
-void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, BOOL /*bNewTable*/)
+void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool /*bNewTable*/)
{
DBG_CHKTHIS(ORelationTableView,NULL);
OSL_ENSURE(_rComposedName.getLength(),"There must be a table name supplied!");
@@ -342,7 +342,7 @@ void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const
//////////////////////////////////////////////////////////////////
// Neue Datenstruktur in DocShell eintragen
TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName ));
- pNewTabWinData->ShowAll(FALSE);
+ pNewTabWinData->ShowAll(sal_False);
//////////////////////////////////////////////////////////////////
// Neues Fenster in Fensterliste eintragen
@@ -420,7 +420,7 @@ void ORelationTableView::lookForUiActivities()
aDlg.AddButton( ModuleRes(STR_QUERY_REL_EDIT), BUTTONID_OK, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON);
aDlg.AddButton( ModuleRes(STR_QUERY_REL_CREATE), BUTTONID_YES, 0);
aDlg.AddButton(BUTTON_CANCEL,BUTTONID_CANCEL,0);
- UINT16 nRet = aDlg.Execute();
+ sal_uInt16 nRet = aDlg.Execute();
if( nRet == RET_CANCEL)
{
m_pCurrentlyTabConnData.reset();