summaryrefslogtreecommitdiffstats
path: root/dbaccess/source/ui/querydesign
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/querydesign')
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLine.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx8
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx5
-rw-r--r--dbaccess/source/ui/querydesign/TableWindow.cxx12
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowListBox.cxx12
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx14
8 files changed, 33 insertions, 30 deletions
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index 10c0cad4701c..89df41cae188 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -82,7 +82,7 @@ namespace
@param _rNewConPos (in/out) the connection pos
@param _rNewDescrPos (in/out) the description pos
*/
- void calcPointsYValue(const OTableWindow* _pWin,SvLBoxEntry* _pEntry,Point& _rNewConPos,Point& _rNewDescrPos)
+ void calcPointsYValue(const OTableWindow* _pWin,SvTreeListEntry* _pEntry,Point& _rNewConPos,Point& _rNewDescrPos)
{
const OTableWindowListBox* pListBox = _pWin->GetListBox();
_rNewConPos.Y() = _pWin->GetPosPixel().Y();
@@ -232,8 +232,8 @@ sal_Bool OConnectionLine::RecalcLine()
if( !pSourceWin || !pDestWin )
return sal_False;
- SvLBoxEntry* pSourceEntry = pSourceWin->GetListBox()->GetEntryFromText( GetData()->GetSourceFieldName() );
- SvLBoxEntry* pDestEntry = pDestWin->GetListBox()->GetEntryFromText( GetData()->GetDestFieldName() );
+ SvTreeListEntry* pSourceEntry = pSourceWin->GetListBox()->GetEntryFromText( GetData()->GetSourceFieldName() );
+ SvTreeListEntry* pDestEntry = pDestWin->GetListBox()->GetEntryFromText( GetData()->GetDestFieldName() );
//////////////////////////////////////////////////////////////////////
// X-Koordinaten bestimmen
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 022f38668a91..de041132fb80 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -968,8 +968,8 @@ void OJoinTableView::SelectConn(OTableConnection* pConn)
pSourceBox->SelectAll(sal_False);
pDestBox->SelectAll(sal_False);
- SvLBoxEntry* pFirstSourceVisible = pSourceBox->GetFirstEntryInView();
- SvLBoxEntry* pFirstDestVisible = pDestBox->GetFirstEntryInView();
+ SvTreeListEntry* pFirstSourceVisible = pSourceBox->GetFirstEntryInView();
+ SvTreeListEntry* pFirstDestVisible = pDestBox->GetFirstEntryInView();
const ::std::vector<OConnectionLine*>* pLines = pConn->GetConnLineList();
::std::vector<OConnectionLine*>::const_reverse_iterator aIter = pLines->rbegin();
@@ -977,14 +977,14 @@ void OJoinTableView::SelectConn(OTableConnection* pConn)
{
if ((*aIter)->IsValid())
{
- SvLBoxEntry* pSourceEntry = pSourceBox->GetEntryFromText((*aIter)->GetData()->GetSourceFieldName());
+ SvTreeListEntry* pSourceEntry = pSourceBox->GetEntryFromText((*aIter)->GetData()->GetSourceFieldName());
if (pSourceEntry)
{
pSourceBox->Select(pSourceEntry, sal_True);
pSourceBox->MakeVisible(pSourceEntry);
}
- SvLBoxEntry* pDestEntry = pDestBox->GetEntryFromText((*aIter)->GetData()->GetDestFieldName());
+ SvTreeListEntry* pDestEntry = pDestBox->GetEntryFromText((*aIter)->GetData()->GetDestFieldName());
if (pDestEntry)
{
pDestBox->Select(pDestEntry, sal_True);
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 0bcbb0e0ed48..d07ab1eb3408 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -151,7 +151,7 @@ void OQueryTableWindow::deleteUserData(void*& _pUserData)
_pUserData = NULL;
}
//------------------------------------------------------------------------------
-void OQueryTableWindow::OnEntryDoubleClicked(SvLBoxEntry* pEntry)
+void OQueryTableWindow::OnEntryDoubleClicked(SvTreeListEntry* pEntry)
{
OSL_ENSURE(pEntry != NULL, "OQueryTableWindow::OnEntryDoubleClicked : pEntry darf nicht NULL sein !");
// man koennte das auch abfragen und dann ein return hinsetzen, aber so weist es vielleicht auf Fehler bei Aufrufer hin
@@ -182,7 +182,7 @@ sal_Bool OQueryTableWindow::ExistsField(const ::rtl::OUString& strFieldName, OTa
sal_Bool bExists = sal_False;
if(xConnection.is())
{
- SvLBoxEntry* pEntry = m_pListBox->First();
+ SvTreeListEntry* pEntry = m_pListBox->First();
try
{
Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx
index 7f6b8921cb0c..247bb68ec375 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx
@@ -57,7 +57,7 @@ namespace dbaui
protected:
virtual void KeyInput( const KeyEvent& rEvt );
- virtual void OnEntryDoubleClicked(SvLBoxEntry* pEntry);
+ virtual void OnEntryDoubleClicked(SvTreeListEntry* pEntry);
// wird aus dem DoubleClickHdl der ListBox heraus aufgerufen
/** delete the user data with the equal type as created within createUserData
@param _pUserData
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index ebddbfc41813..13446b2d9c53 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -3085,7 +3085,10 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
nType,
sal_False,
sal_False,
- xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers());
+ xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),
+ ::rtl::OUString(),
+ ::rtl::OUString(),
+ ::rtl::OUString());
_rxColumn = pColumn;
pColumn->setFunction(sal_True);
pColumn->setRealName(pEntry->GetField());
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index a78a05c22638..27cd818442fb 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -183,7 +183,7 @@ sal_Bool OTableWindow::FillListBox()
if (GetData()->IsShowAll())
{
- SvLBoxEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) );
+ SvTreeListEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) );
pEntry->SetUserData( createUserData(NULL,false) );
}
@@ -205,7 +205,7 @@ sal_Bool OTableWindow::FillListBox()
const ::rtl::OUString* pIter = aColumns.getConstArray();
const ::rtl::OUString* pEnd = pIter + aColumns.getLength();
- SvLBoxEntry* pEntry = NULL;
+ SvTreeListEntry* pEntry = NULL;
for (; pIter != pEnd; ++pIter)
{
bool bPrimaryKeyColumn = xPKeyColumns.is() && xPKeyColumns->hasByName( *pIter );
@@ -244,13 +244,13 @@ void OTableWindow::clearListBox()
{
if ( m_pListBox )
{
- SvLBoxEntry* pEntry = m_pListBox->First();
+ SvTreeListEntry* pEntry = m_pListBox->First();
while(pEntry)
{
void* pUserData = pEntry->GetUserData();
deleteUserData(pUserData);
- SvLBoxEntry* pNextEntry = m_pListBox->Next(pEntry);
+ SvTreeListEntry* pNextEntry = m_pListBox->Next(pEntry);
m_pListBox->GetModel()->Remove(pEntry);
pEntry = pNextEntry;
}
@@ -563,7 +563,7 @@ void OTableWindow::EnumValidFields(::std::vector< ::rtl::OUString>& arrstrFields
if ( m_pListBox )
{
arrstrFields.reserve(m_pListBox->GetEntryCount());
- SvLBoxEntry* pEntryLoop = m_pListBox->First();
+ SvTreeListEntry* pEntryLoop = m_pListBox->First();
while (pEntryLoop)
{
arrstrFields.push_back(m_pListBox->GetEntryText(pEntryLoop));
@@ -613,7 +613,7 @@ void OTableWindow::Command(const CommandEvent& rEvt)
ptWhere = rEvt.GetMousePosPixel();
else
{
- SvLBoxEntry* pCurrent = m_pListBox->GetCurEntry();
+ SvTreeListEntry* pCurrent = m_pListBox->GetCurEntry();
if ( pCurrent )
ptWhere = m_pListBox->GetEntryPosition(pCurrent);
else
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 87ca37dbba6b..ab97283db94a 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -86,12 +86,12 @@ OTableWindowListBox::~OTableWindowListBox()
}
//------------------------------------------------------------------------------
-SvLBoxEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText )
+SvTreeListEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText )
{
//////////////////////////////////////////////////////////////////////
// Liste durchiterieren
SvTreeList* pTreeList = GetModel();
- SvLBoxEntry* pEntry = (SvLBoxEntry*)pTreeList->First();
+ SvTreeListEntry* pEntry = pTreeList->First();
OJoinDesignView* pView = m_pTabWin->getDesignView();
OJoinController& rController = pView->getController();
@@ -111,7 +111,7 @@ SvLBoxEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText )
{
return pEntry;
}
- pEntry = (SvLBoxEntry*)pTreeList->Next( pEntry );
+ pEntry = pTreeList->Next(pEntry);
}
}
catch(SQLException&)
@@ -174,7 +174,7 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
//------------------------------------------------------------------------------
IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ )
{
- SvLBoxEntry* pEntry = GetEntry( m_aMousePos );
+ SvTreeListEntry* pEntry = GetEntry( m_aMousePos );
if( !pEntry )
return 0;
@@ -191,7 +191,7 @@ IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ )
//------------------------------------------------------------------------------
IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ )
{
- SvLBoxEntry* pEntry = GetEntry( m_aMousePos );
+ SvTreeListEntry* pEntry = GetEntry( m_aMousePos );
if( !pEntry )
return 0;
@@ -240,7 +240,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
// hit test
m_aMousePos = _rEvt.maPosPixel;
Size aOutputSize = GetOutputSizePixel();
- SvLBoxEntry* pEntry = GetEntry( m_aMousePos );
+ SvTreeListEntry* pEntry = GetEntry( m_aMousePos );
if( !pEntry )
return DND_ACTION_NONE;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 9bdd3a7f6208..752031dc377e 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -141,7 +141,7 @@ namespace dbaui
namespace
{
// -----------------------------------------------------------------------------
- void insertParseTree(SvTreeListBox* _pBox,::connectivity::OSQLParseNode* _pNode,SvLBoxEntry* _pParent = NULL)
+ void insertParseTree(SvTreeListBox* _pBox,::connectivity::OSQLParseNode* _pNode,SvTreeListEntry* _pParent = NULL)
{
::rtl::OUString rString;
if (!_pNode->isToken())
@@ -324,7 +324,7 @@ OQueryController::OQueryController(const Reference< XMultiServiceFactory >& _rM)
:OJoinController(_rM)
,OQueryController_PBase( getBroadcastHelper() )
,m_pParseContext( new svxform::OSystemParseContext )
- ,m_aSqlParser( _rM, m_pParseContext )
+ ,m_aSqlParser( comphelper::getComponentContext(_rM), m_pParseContext )
,m_pSqlIterator(NULL)
,m_nVisibleRows(0x400)
,m_nSplitPos(-1)
@@ -1598,7 +1598,7 @@ struct CommentStrip
static ::std::vector< CommentStrip > getComment( const ::rtl::OUString& rQuery )
{
::std::vector< CommentStrip > aRet;
- // First a quick search if there is any "--" or "//" or "/*", if not then
+ // First a quick search if there is any "--" or "//" or "/*", if not then
// the whole copying loop is pointless.
if (rQuery.indexOfAsciiL( "--", 2, 0) < 0 && rQuery.indexOfAsciiL( "//", 2, 0) < 0 &&
rQuery.indexOfAsciiL( "/*", 2, 0) < 0)
@@ -1667,10 +1667,10 @@ static ::std::vector< CommentStrip > getComment( const ::rtl::OUString& rQuery )
/** Concat/insert comments that were previously obtained with getComment().
- NOTE: The current parser implementation does not preserve newlines, so all
- comments are always appended to the entire query, also inline comments
- that would need positioning anyway that can't be obtained after
- recomposition. This is ugly but at least allows commented queries while
+ NOTE: The current parser implementation does not preserve newlines, so all
+ comments are always appended to the entire query, also inline comments
+ that would need positioning anyway that can't be obtained after
+ recomposition. This is ugly but at least allows commented queries while
preserving the comments _somehow_.
*/
static ::rtl::OUString concatComment( const ::rtl::OUString& rQuery, const ::std::vector< CommentStrip >& rComments )
generated by cgit (git 2.34.1) at 2024-09-14 11:58:04 +0000