summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/relationdesign
diff options
context:
space:
mode:
authorJelle van der Waa <jelle@vdwaa.nl>2013-08-17 23:43:14 +0200
committerPetr Mladek <pmladek@suse.cz>2013-08-27 16:11:09 +0000
commit2ec606730bc95b58390a609df0a88958869a4066 (patch)
tree9c530b3f6b200305ba224dda2d02c9bf5aca2233 /dbaccess/source/ui/relationdesign
parent434f3c8e7fac0644cfe1d7a15f97f0c267bac048 (diff)
fdo#62475 removed pointless comments
Conflicts: dbaccess/source/filter/xml/xmlfilter.cxx dbaccess/source/ui/dlg/ConnectionPage.cxx dbaccess/source/ui/dlg/detailpages.cxx dbaccess/source/ui/dlg/odbcconfig.cxx dbaccess/source/ui/querydesign/querycontroller.cxx Change-Id: I3a05649efa3a43dd8d8fb069fc1bce14ca0a6338 Reviewed-on: https://gerrit.libreoffice.org/5484 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnection.cxx12
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnection.hxx4
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx31
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx50
-rw-r--r--dbaccess/source/ui/relationdesign/RelationDesignView.cxx17
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx30
6 files changed, 37 insertions, 107 deletions
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
index 42fe9096fa57..eabdf23c9c79 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
@@ -24,11 +24,8 @@
#include "ConnectionLine.hxx"
using namespace dbaui;
-//========================================================================
// class ORelationTableConnection
-//========================================================================
DBG_NAME(ORelationTableConnection)
-//------------------------------------------------------------------------
ORelationTableConnection::ORelationTableConnection( ORelationTableView* pContainer,
const TTableConnectionData::value_type& pTabConnData )
:OTableConnection( pContainer, pTabConnData )
@@ -36,7 +33,6 @@ ORelationTableConnection::ORelationTableConnection( ORelationTableView* pContain
DBG_CTOR(ORelationTableConnection,NULL);
}
-//------------------------------------------------------------------------
ORelationTableConnection::ORelationTableConnection( const ORelationTableConnection& rConn )
: OTableConnection( rConn )
{
@@ -44,13 +40,11 @@ ORelationTableConnection::ORelationTableConnection( const ORelationTableConnecti
// keine eigenen Members, also reicht die Basisklassenfunktionalitaet
}
-//------------------------------------------------------------------------
ORelationTableConnection::~ORelationTableConnection()
{
DBG_DTOR(ORelationTableConnection,NULL);
}
-//------------------------------------------------------------------------
ORelationTableConnection& ORelationTableConnection::operator=( const ORelationTableConnection& rConn )
{
DBG_CHKTHIS(ORelationTableConnection,NULL);
@@ -62,8 +56,6 @@ ORelationTableConnection& ORelationTableConnection::operator=( const ORelationTa
return *this;
}
-
-//------------------------------------------------------------------------
void ORelationTableConnection::Draw( const Rectangle& rRect )
{
DBG_CHKTHIS(ORelationTableConnection,NULL);
@@ -72,7 +64,6 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
if ( pData && (pData->GetCardinality() == CARDINAL_UNDEFINED) )
return;
- //////////////////////////////////////////////////////////////////////
// Linien nach oberster Linie durchsuchen
Rectangle aBoundingRect;
long nTop = GetBoundingRect().Bottom();
@@ -96,7 +87,6 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
}
}
- //////////////////////////////////////////////////////////////////////
// Kardinalitaet antragen
if( !pTopLine )
return;
@@ -130,10 +120,8 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
else
GetParent()->SetTextColor(Application::GetSettings().GetStyleSettings().GetWindowTextColor());
-
GetParent()->DrawText( aSourcePos, aSourceText, TEXT_DRAW_CLIP | TEXT_DRAW_CENTER | TEXT_DRAW_BOTTOM);
GetParent()->DrawText( aDestPos, aDestText, TEXT_DRAW_CLIP | TEXT_DRAW_CENTER | TEXT_DRAW_BOTTOM);
}
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx
index fe3ca777cce4..f8d83d80f192 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx
@@ -25,7 +25,6 @@
namespace dbaui
{
class ORelationTableView;
- //==================================================================
class ORelationTableConnection : public OTableConnection
{
public:
@@ -42,7 +41,4 @@ namespace dbaui
}
#endif // DBAUI_RTABLECONNECTION_HXX
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 57b8fdf0f3db..ed16d84860a2 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -43,10 +43,7 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
DBG_NAME(ORelationTableConnectionData)
-//========================================================================
// class ORelationTableConnectionData
-//========================================================================
-//------------------------------------------------------------------------
ORelationTableConnectionData::ORelationTableConnectionData()
:OTableConnectionData()
,m_nUpdateRules(KeyRule::NO_ACTION)
@@ -55,7 +52,7 @@ ORelationTableConnectionData::ORelationTableConnectionData()
{
DBG_CTOR(ORelationTableConnectionData,NULL);
}
-//------------------------------------------------------------------------
+
ORelationTableConnectionData::ORelationTableConnectionData( const TTableWindowData::value_type& _pReferencingTable,
const TTableWindowData::value_type& _pReferencedTable,
const OUString& rConnName )
@@ -71,7 +68,6 @@ ORelationTableConnectionData::ORelationTableConnectionData( const TTableWindowDa
SetCardinality();
}
-//------------------------------------------------------------------------
ORelationTableConnectionData::ORelationTableConnectionData( const ORelationTableConnectionData& rConnData )
:OTableConnectionData( rConnData )
{
@@ -79,18 +75,15 @@ ORelationTableConnectionData::ORelationTableConnectionData( const ORelationTable
*this = rConnData;
}
-//------------------------------------------------------------------------
ORelationTableConnectionData::~ORelationTableConnectionData()
{
DBG_DTOR(ORelationTableConnectionData,NULL);
}
-//------------------------------------------------------------------------
sal_Bool ORelationTableConnectionData::DropRelation()
{
DBG_CHKTHIS(ORelationTableConnectionData,NULL);
::osl::MutexGuard aGuard( m_aMutex );
- ////////////////////////////////////////////////////////////
// Relation loeschen
Reference< XIndexAccess> xKeys = getReferencingTable()->getKeys();
if( m_aConnName.Len() && xKeys.is() )
@@ -118,11 +111,9 @@ sal_Bool ORelationTableConnectionData::DropRelation()
return sal_True;
}
-//------------------------------------------------------------------------
void ORelationTableConnectionData::ChangeOrientation()
{
DBG_CHKTHIS(ORelationTableConnectionData,NULL);
- //////////////////////////////////////////////////////////////////////
// Source- und DestFieldName der Linien austauschen
OUString sTempString;
OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin();
@@ -134,14 +125,12 @@ void ORelationTableConnectionData::ChangeOrientation()
(*aIter)->SetDestFieldName( sTempString );
}
- //////////////////////////////////////////////////////////////////////
// Member anpassen
TTableWindowData::value_type pTemp = m_pReferencingTable;
m_pReferencingTable = m_pReferencedTable;
m_pReferencedTable = pTemp;
}
-//------------------------------------------------------------------------
void ORelationTableConnectionData::SetCardinality()
{
DBG_CHKTHIS(ORelationTableConnectionData,NULL);
@@ -163,7 +152,7 @@ void ORelationTableConnectionData::SetCardinality()
}
}
-// -----------------------------------------------------------------------------
+
sal_Bool ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const
{
// check if Table has the primary key column dependig on _eEConnectionSide
@@ -198,13 +187,12 @@ sal_Bool ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropert
return sal_True;
}
-//------------------------------------------------------------------------
+
sal_Bool ORelationTableConnectionData::IsConnectionPossible()
{
DBG_CHKTHIS(ORelationTableConnectionData,NULL);
::osl::MutexGuard aGuard( m_aMutex );
- //////////////////////////////////////////////////////////////////////
// Wenn die SourceFelder ein PrimKey sind, ist nur die Orientierung falsch
if ( IsSourcePrimKey() && !IsDestPrimKey() )
ChangeOrientation();
@@ -212,26 +200,22 @@ sal_Bool ORelationTableConnectionData::IsConnectionPossible()
return sal_True;
}
-//------------------------------------------------------------------------
OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj()
{
return new OConnectionLineData();
}
-//------------------------------------------------------------------------
OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj( const OConnectionLineData& rConnLineData )
{
return new OConnectionLineData( rConnLineData );
}
-//------------------------------------------------------------------------
void ORelationTableConnectionData::CopyFrom(const OTableConnectionData& rSource)
{
// wie in der Basisklasse zurueckziehen auf das (nicht-virtuelle) operator=
*this = *static_cast<const ORelationTableConnectionData*>(&rSource);
}
-//------------------------------------------------------------------------
ORelationTableConnectionData& ORelationTableConnectionData::operator=( const ORelationTableConnectionData& rConnData )
{
if (&rConnData == this)
@@ -244,9 +228,9 @@ ORelationTableConnectionData& ORelationTableConnectionData::operator=( const ORe
return *this;
}
+
namespace dbaui
{
-//-------------------------------------------------------------------------
bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs)
{
bool bEqual = (lhs.m_nUpdateRules == rhs.m_nUpdateRules)
@@ -270,12 +254,12 @@ bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableCon
}
return bEqual;
}
+
}
-//------------------------------------------------------------------------
+
sal_Bool ORelationTableConnectionData::Update()
{
::osl::MutexGuard aGuard( m_aMutex );
- ////////////////////////////////////////////////////////////
// Alte Relation loeschen
{
DropRelation();
@@ -289,7 +273,6 @@ sal_Bool ORelationTableConnectionData::Update()
if ( !xKeys.is() )
return sal_False;
- ////////////////////////////////////////////////////////////
// Neue Relation erzeugen
Reference<XDataDescriptorFactory> xKeyFactory(xKeys,UNO_QUERY);
OSL_ENSURE(xKeyFactory.is(),"No XDataDescriptorFactory Interface!");
@@ -444,12 +427,10 @@ xKey.clear();
}
// NOTE : the caller is responsible for updating any other objects referencing the old LineDatas (for instance a ConnLine)
- ////////////////////////////////////////////////////////////
// Kardinalitaet bestimmen
SetCardinality();
return sal_True;
}
-// -----------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 1555fa909a5a..2cd7d52d8e40 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -64,7 +64,6 @@
#include <osl/thread.hxx>
#include <osl/mutex.hxx>
-
#define MAX_THREADS 10
extern "C" void SAL_CALL createRegistryInfo_ORelationControl()
@@ -72,7 +71,6 @@ extern "C" void SAL_CALL createRegistryInfo_ORelationControl()
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::ORelationController > aAutoRegistration;
}
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::beans;
@@ -89,36 +87,34 @@ using namespace ::dbaui;
using namespace ::comphelper;
using namespace ::osl;
-//------------------------------------------------------------------------------
OUString SAL_CALL ORelationController::getImplementationName() throw( RuntimeException )
{
return getImplementationName_Static();
}
-//------------------------------------------------------------------------------
OUString ORelationController::getImplementationName_Static() throw( RuntimeException )
{
return OUString("org.openoffice.comp.dbu.ORelationDesign");
}
-//------------------------------------------------------------------------------
+
Sequence< OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException )
{
Sequence< OUString> aSupported(1);
aSupported.getArray()[0] = OUString("com.sun.star.sdb.RelationDesign");
return aSupported;
}
-//-------------------------------------------------------------------------
+
Sequence< OUString> SAL_CALL ORelationController::getSupportedServiceNames() throw(RuntimeException)
{
return getSupportedServiceNames_Static();
}
-// -------------------------------------------------------------------------
+
Reference< XInterface > SAL_CALL ORelationController::Create(const Reference<XMultiServiceFactory >& _rxFactory)
{
return *(new ORelationController(comphelper::getComponentContext(_rxFactory)));
}
+
DBG_NAME(ORelationController);
-// -----------------------------------------------------------------------------
ORelationController::ORelationController(const Reference< XComponentContext >& _rM)
: OJoinController(_rM)
,m_nThreadEvent(0)
@@ -127,12 +123,12 @@ ORelationController::ORelationController(const Reference< XComponentContext >& _
DBG_CTOR(ORelationController,NULL);
InvalidateAll();
}
-// -----------------------------------------------------------------------------
+
ORelationController::~ORelationController()
{
DBG_DTOR(ORelationController,NULL);
}
-// -----------------------------------------------------------------------------
+
FeatureState ORelationController::GetState(sal_uInt16 _nId) const
{
FeatureState aReturn;
@@ -152,7 +148,7 @@ FeatureState ORelationController::GetState(sal_uInt16 _nId) const
}
return aReturn;
}
-// -----------------------------------------------------------------------------
+
void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& aArgs)
{
switch(_nId)
@@ -195,7 +191,7 @@ void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue
}
InvalidateFeature(_nId);
}
-// -----------------------------------------------------------------------------
+
void ORelationController::impl_initialize()
{
OJoinController::impl_initialize();
@@ -239,20 +235,20 @@ void ORelationController::impl_initialize()
}
}
-// -----------------------------------------------------------------------------
+
OUString ORelationController::getPrivateTitle( ) const
{
OUString sName = getDataSourceName();
return ::dbaui::getStrippedDatabaseName(getDataSource(),sName);
}
-// -----------------------------------------------------------------------------
+
sal_Bool ORelationController::Construct(Window* pParent)
{
setView( * new ORelationDesignView( pParent, *this, getORB() ) );
OJoinController::Construct(pParent);
return sal_True;
}
-// -----------------------------------------------------------------------------
+
short ORelationController::saveModified()
{
short nSaved = RET_YES;
@@ -265,12 +261,13 @@ short ORelationController::saveModified()
}
return nSaved;
}
-// -----------------------------------------------------------------------------
+
void ORelationController::describeSupportedFeatures()
{
OJoinController::describeSupportedFeatures();
implDescribeSupportedFeature( ".uno:DBAddRelation", SID_RELATION_ADD_RELATION, CommandGroup::EDIT );
}
+
namespace
{
class RelationLoader : public ::osl::Thread
@@ -380,7 +377,7 @@ namespace
{
OUString sReferencedTable;
xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable;
- //////////////////////////////////////////////////////////////////////
+
// insert windows
TTableDataHelper::iterator aRefFind = m_aTableData.find(sReferencedTable);
if ( aRefFind == m_aTableData.end() )
@@ -398,11 +395,9 @@ namespace
OUString sKeyName;
xKey->getPropertyValue(PROPERTY_NAME) >>= sKeyName;
- //////////////////////////////////////////////////////////////////////
// insert connection
ORelationTableConnectionData* pTabConnData = new ORelationTableConnectionData( pReferencingTable, pReferencedTable, sKeyName );
m_vTableConnectionData.push_back(TTableConnectionData::value_type(pTabConnData));
- //////////////////////////////////////////////////////////////////////
// insert columns
const Reference<XColumnsSupplier> xColsSup(xKey,UNO_QUERY);
OSL_ENSURE(xColsSup.is(),"Key is no XColumnsSupplier!");
@@ -422,7 +417,6 @@ namespace
}
pTabConnData->SetConnLine( j, sColumnName, sRelatedName );
}
- //////////////////////////////////////////////////////////////////////
// Update/Del-Flags setzen
sal_Int32 nUpdateRule = 0;
sal_Int32 nDeleteRule = 0;
@@ -432,7 +426,6 @@ namespace
pTabConnData->SetUpdateRules( nUpdateRule );
pTabConnData->SetDeleteRules( nDeleteRule );
- //////////////////////////////////////////////////////////////////////
// Kardinalitaet setzen
pTabConnData->SetCardinality();
}
@@ -469,7 +462,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData
Application::PostUserEvent(LINK(this, ORelationController, OnThreadFinished));
}
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ )
{
::SolarMutexGuard aSolarGuard;
@@ -491,7 +484,7 @@ IMPL_LINK( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ )
m_pWaitObject.reset();
return 0L;
}
-// -----------------------------------------------------------------------------
+
void ORelationController::loadData()
{
m_pWaitObject.reset( new WaitObject(getView()) );
@@ -536,7 +529,7 @@ void ORelationController::loadData()
DBG_UNHANDLED_EXCEPTION();
}
}
-// -----------------------------------------------------------------------------
+
TTableWindowData::value_type ORelationController::existsTable(const OUString& _rComposedTableName,sal_Bool _bCase) const
{
::comphelper::UStringMixEqual bCase(_bCase);
@@ -549,7 +542,7 @@ TTableWindowData::value_type ORelationController::existsTable(const OUString& _r
}
return ( aIter != aEnd) ? *aIter : TTableWindowData::value_type();
}
-// -----------------------------------------------------------------------------
+
void ORelationController::loadLayoutInformation()
{
try
@@ -569,7 +562,7 @@ void ORelationController::loadLayoutInformation()
{
}
}
-// -----------------------------------------------------------------------------
+
void ORelationController::reset()
{
loadLayoutInformation();
@@ -582,19 +575,14 @@ void ORelationController::reset()
}
}
-// -----------------------------------------------------------------------------
bool ORelationController::allowViews() const
{
return false;
}
-// -----------------------------------------------------------------------------
bool ORelationController::allowQueries() const
{
return false;
}
-// -----------------------------------------------------------------------------
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 602b79323d89..9f72313c1a98 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -51,18 +51,18 @@ ORelationDesignView::ORelationDesignView(Window* _pParent, ORelationController&
{
DBG_CTOR(ORelationDesignView,NULL);
}
-// -----------------------------------------------------------------------------
+
ORelationDesignView::~ORelationDesignView()
{
DBG_DTOR(ORelationDesignView,NULL);
}
-// -------------------------------------------------------------------------
+
void ORelationDesignView::Construct()
{
m_pTableView = new ORelationTableView(m_pScrollWindow,this);
OJoinDesignView::Construct();
}
-// -----------------------------------------------------------------------------
+
void ORelationDesignView::initialize()
{
m_pTableView->clearLayoutInformation();
@@ -70,7 +70,7 @@ void ORelationDesignView::initialize()
OJoinDesignView::initialize();
}
-// -----------------------------------------------------------------------------
+
long ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
{
long nDone = 0L;
@@ -86,19 +86,12 @@ long ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
nDone = OJoinDesignView::PreNotify(rNEvt);
return nDone;
}
-// -----------------------------------------------------------------------------
+
void ORelationDesignView::GetFocus()
{
OJoinDesignView::GetFocus();
if ( m_pTableView && m_pTableView->IsVisible() && !m_pTableView->GetTabWinMap()->empty() )
m_pTableView->GrabTabWinFocus();
}
-// -----------------------------------------------------------------------------
-
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index f6a0ac614298..a3d870a10c38 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -60,11 +60,8 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::accessibility;
-//==================================================================
// class ORelationTableView
-//==================================================================
DBG_NAME(ORelationTableView)
-//------------------------------------------------------------------------
ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pView )
:OJoinTableView( pParent, pView )
, ::comphelper::OContainerListener(m_aMutex)
@@ -76,7 +73,6 @@ ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pV
SetHelpId(HID_CTL_RELATIONTAB);
}
-//------------------------------------------------------------------------
ORelationTableView::~ORelationTableView()
{
DBG_DTOR(ORelationTableView,NULL);
@@ -84,7 +80,6 @@ ORelationTableView::~ORelationTableView()
m_pContainerListener->dispose();
}
-//------------------------------------------------------------------------
void ORelationTableView::ReSync()
{
DBG_CHKTHIS(ORelationTableView,NULL);
@@ -102,7 +97,6 @@ void ORelationTableView::ReSync()
// gehen, und alle solchen TabWinDatas oder darauf bezogenen ConnDatas muss ich dann loeschen.
::std::vector< OUString> arrInvalidTables;
- //////////////////////////////////////////////////////////////////////
// create and insert windows
TTableWindowData* pTabWinDataList = m_pView->getController().getTableWindowData();
TTableWindowData::reverse_iterator aIter = pTabWinDataList->rbegin();
@@ -159,14 +153,14 @@ void ORelationTableView::ReSync()
if ( !GetTabWinMap()->empty() )
GetTabWinMap()->begin()->second->GrabFocus();
}
-//------------------------------------------------------------------------------
+
sal_Bool ORelationTableView::IsAddAllowed()
{
DBG_CHKTHIS(ORelationTableView,NULL);
return !m_pView->getController().isReadOnly();
}
-//------------------------------------------------------------------------
+
void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest)
{
DBG_CHKTHIS(ORelationTableView,NULL);
@@ -208,11 +202,9 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const
{
try
{
- //////////////////////////////////////////////////////////////////////
// Daten der Datenbank uebergeben
if( pTabConnData->Update() )
{
- //////////////////////////////////////////////////////////////////////
// UI-Object in ConnListe eintragen
addConnection( new ORelationTableConnection( this, pTabConnData ) );
}
@@ -228,8 +220,6 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const
}
}
-
-//------------------------------------------------------------------------
void ORelationTableView::ConnDoubleClicked( OTableConnection* pConnection )
{
DBG_CHKTHIS(ORelationTableView,NULL);
@@ -257,7 +247,6 @@ void ORelationTableView::ConnDoubleClicked( OTableConnection* pConnection )
Invalidate(INVALIDATE_NOCHILDREN);
}
-//------------------------------------------------------------------------------
void ORelationTableView::AddNewRelation()
{
DBG_CHKTHIS(ORelationTableView,NULL);
@@ -274,7 +263,6 @@ void ORelationTableView::AddNewRelation()
}
}
-//------------------------------------------------------------------------------
bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_bDelete*/)
{
DBG_CHKTHIS(ORelationTableView,NULL);
@@ -295,7 +283,6 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_
return false;
}
-//------------------------------------------------------------------------------
void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUString& rWinName, sal_Bool /*bNewTable*/)
{
DBG_CHKTHIS(ORelationTableView,NULL);
@@ -311,12 +298,10 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin
return;
}
- //////////////////////////////////////////////////////////////////
// Neue Datenstruktur in DocShell eintragen
TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName ));
pNewTabWinData->ShowAll(sal_False);
- //////////////////////////////////////////////////////////////////
// Neues Fenster in Fensterliste eintragen
OTableWindow* pNewTabWin = createWindow( pNewTabWinData );
if(pNewTabWin->Init())
@@ -341,7 +326,7 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin
delete pNewTabWin;
}
}
-// -----------------------------------------------------------------------------
+
void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin )
{
OSQLWarningBox aDlg( this, ModuleRes( STR_QUERY_REL_DELETE_WINDOW ), WB_YES_NO | WB_DEF_YES );
@@ -392,22 +377,21 @@ void ORelationTableView::lookForUiActivities()
}
}
-// -----------------------------------------------------------------------------
OTableWindow* ORelationTableView::createWindow(const TTableWindowData::value_type& _pData)
{
return new ORelationTableWindow(this,_pData);
}
-// -----------------------------------------------------------------------------
+
bool ORelationTableView::allowQueries() const
{
return false;
}
-// -----------------------------------------------------------------------------
+
void ORelationTableView::_elementInserted( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException)
{
}
-// -----------------------------------------------------------------------------
+
void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException)
{
m_bInRemove = true;
@@ -427,7 +411,7 @@ void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEve
}
m_bInRemove = false;
}
-// -----------------------------------------------------------------------------
+
void ORelationTableView::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException)
{
}