summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/relationdesign
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-17 16:09:38 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-17 16:09:38 +0100
commit41bc9ff8d750b4af10d20a36539c57da14695dcf (patch)
treedc2ee437c54daba12ac442fd0e10baf97eadf184 /dbaccess/source/ui/relationdesign
parentf6ccb8354a350fce31f8c6c7d04b86d5c0a126d1 (diff)
parente35c56815d43a06c53488e3efa35f062a6a2d60c (diff)
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts: dbaccess/source/core/misc/services.cxx dbaccess/source/filter/migration/cfgimport.cxx reportdesign/source/core/api/ReportDefinition.cxx
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx26
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx6
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx18
3 files changed, 25 insertions, 25 deletions
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index b4dc806ea161..713f2677b255 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -97,7 +97,7 @@ ORelationTableConnectionData::~ORelationTableConnectionData()
}
//------------------------------------------------------------------------
-BOOL ORelationTableConnectionData::DropRelation()
+sal_Bool ORelationTableConnectionData::DropRelation()
{
DBG_CHKTHIS(ORelationTableConnectionData,NULL);
::osl::MutexGuard aGuard( m_aMutex );
@@ -126,7 +126,7 @@ BOOL ORelationTableConnectionData::DropRelation()
}
}
}
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
@@ -175,10 +175,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() )
@@ -202,15 +202,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 );
@@ -220,7 +220,7 @@ BOOL ORelationTableConnectionData::IsConnectionPossible()
if ( IsSourcePrimKey() && !IsDestPrimKey() )
ChangeOrientation();
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
@@ -283,7 +283,7 @@ bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableCon
}
}
//------------------------------------------------------------------------
-BOOL ORelationTableConnectionData::Update()
+sal_Bool ORelationTableConnectionData::Update()
{
::osl::MutexGuard aGuard( m_aMutex );
////////////////////////////////////////////////////////////
@@ -291,7 +291,7 @@ BOOL ORelationTableConnectionData::Update()
{
DropRelation();
if( !IsConnectionPossible() )
- return FALSE;
+ return sal_False;
}
// reassign the keys because the orientaion could be changed
@@ -299,7 +299,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);
@@ -459,7 +459,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 eae22012b8b7..9af062981e78 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -368,7 +368,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);
}
TTableWindowData::value_type pReferencingTable = aFind->second;
Reference<XIndexAccess> xKeys = pReferencingTable->getKeys();
@@ -401,7 +401,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
@@ -490,7 +490,7 @@ IMPL_LINK( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ )
{
getView()->initialize(); // show the windows and fill with our informations
getView()->Invalidate(INVALIDATE_NOERASE);
- getUndoMgr()->Clear(); // clear all undo redo things
+ ClearUndoManager();
setModified(sal_False); // and we are not modified yet
if(m_vTableData.empty())
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index e42211609361..d334aa93b133 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -171,7 +171,7 @@ void ORelationTableView::ReSync()
GetTabWinMap()->begin()->second->GrabFocus();
}
//------------------------------------------------------------------------------
-BOOL ORelationTableView::IsAddAllowed()
+sal_Bool ORelationTableView::IsAddAllowed()
{
DBG_CHKTHIS(ORelationTableView,NULL);
@@ -274,9 +274,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
@@ -307,7 +307,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!");
@@ -325,7 +325,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
@@ -358,7 +358,7 @@ void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin )
OSQLWarningBox aDlg( this, ModuleRes( STR_QUERY_REL_DELETE_WINDOW ), WB_YES_NO | WB_DEF_YES );
if ( m_bInRemove || aDlg.Execute() == RET_YES )
{
- m_pView->getController().getUndoMgr()->Clear();
+ m_pView->getController().ClearUndoManager();
OJoinTableView::RemoveTabWin( pTabWin );
m_pView->getController().InvalidateFeature(SID_RELATION_ADD_RELATION);
@@ -366,7 +366,7 @@ void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin )
m_pView->getController().InvalidateFeature(ID_BROWSER_REDO);
}
}
-// -----------------------------------------------------------------------------
+
void ORelationTableView::lookForUiActivities()
{
if(m_pExistingConnection)
@@ -379,7 +379,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();
@@ -428,7 +428,7 @@ void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEve
OTableWindow* pTableWindow = GetTabWindow(sName);
if ( pTableWindow )
{
- m_pView->getController().getUndoMgr()->Clear();
+ m_pView->getController().ClearUndoManager();
OJoinTableView::RemoveTabWin( pTableWindow );
m_pView->getController().InvalidateFeature(SID_RELATION_ADD_RELATION);