summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/misc
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/misc')
-rw-r--r--dbaccess/source/ui/misc/WCPage.cxx12
-rw-r--r--dbaccess/source/ui/misc/WColumnSelect.cxx42
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx6
-rw-r--r--dbaccess/source/ui/misc/WExtendPages.cxx8
-rw-r--r--dbaccess/source/ui/misc/WNameMatch.cxx24
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx8
6 files changed, 50 insertions, 50 deletions
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index e849e91984ed..7cfb2b9b5ebd 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -265,8 +265,8 @@ bool OCopyTable::checkAppendData()
xTables = xSup->getTables();
if(xTables.is() && xTables->hasByName(m_pEdTableName->GetText()))
{
- const ODatabaseExport::TColumnVector* pSrcColumns = m_pParent->getSrcVector();
- const sal_uInt32 nSrcSize = pSrcColumns->size();
+ const ODatabaseExport::TColumnVector& rSrcColumns = m_pParent->getSrcVector();
+ const sal_uInt32 nSrcSize = rSrcColumns.size();
m_pParent->m_vColumnPos.resize( nSrcSize, ODatabaseExport::TPositions::value_type( COLUMN_POSITION_NOT_FOUND, COLUMN_POSITION_NOT_FOUND ) );
m_pParent->m_vColumnTypes.resize( nSrcSize , COLUMN_POSITION_NOT_FOUND );
@@ -274,10 +274,10 @@ bool OCopyTable::checkAppendData()
xTables->getByName( m_pEdTableName->GetText() ) >>= xTable;
ObjectCopySource aTableCopySource( m_pParent->m_xDestConnection, xTable );
m_pParent->loadData( aTableCopySource, m_pParent->m_vDestColumns, m_pParent->m_aDestVec );
- const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector();
- ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin();
- ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end();
- const sal_uInt32 nDestSize = pDestColumns->size();
+ const ODatabaseExport::TColumnVector& rDestColumns = m_pParent->getDestVector();
+ ODatabaseExport::TColumnVector::const_iterator aDestIter = rDestColumns.begin();
+ ODatabaseExport::TColumnVector::const_iterator aDestEnd = rDestColumns.end();
+ const sal_uInt32 nDestSize = rDestColumns.size();
bool bNotConvert;
sal_uInt32 i = 0;
for(sal_Int32 nPos = 1;aDestIter != aDestEnd && i < nDestSize && i < nSrcSize;++aDestIter,++nPos,++i)
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 26cccda6131c..fab9f5e7f6bf 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -108,9 +108,9 @@ void OWizColumnSelect::Reset()
m_pParent->m_mNameMapping.clear();
// insert the source columns in the left listbox
- const ODatabaseExport::TColumnVector* pSrcColumns = m_pParent->getSrcVector();
- ODatabaseExport::TColumnVector::const_iterator aIter = pSrcColumns->begin();
- ODatabaseExport::TColumnVector::const_iterator aEnd = pSrcColumns->end();
+ const ODatabaseExport::TColumnVector& rSrcColumns = m_pParent->getSrcVector();
+ ODatabaseExport::TColumnVector::const_iterator aIter = rSrcColumns.begin();
+ ODatabaseExport::TColumnVector::const_iterator aEnd = rSrcColumns.end();
for(;aIter != aEnd;++aIter)
{
@@ -127,15 +127,15 @@ void OWizColumnSelect::Reset()
void OWizColumnSelect::ActivatePage( )
{
// if there are no dest columns reset the left side with the origibnal columns
- if(m_pParent->getDestColumns()->empty())
+ if(m_pParent->getDestColumns().empty())
Reset();
clearListBox(*m_pNewColumnNames);
- const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector();
+ const ODatabaseExport::TColumnVector& rDestColumns = m_pParent->getDestVector();
- ODatabaseExport::TColumnVector::const_iterator aIter = pDestColumns->begin();
- ODatabaseExport::TColumnVector::const_iterator aEnd = pDestColumns->end();
+ ODatabaseExport::TColumnVector::const_iterator aIter = rDestColumns.begin();
+ ODatabaseExport::TColumnVector::const_iterator aEnd = rDestColumns.end();
for(;aIter != aEnd;++aIter)
{
sal_uInt16 nPos = m_pNewColumnNames->InsertEntry((*aIter)->first);
@@ -164,7 +164,7 @@ bool OWizColumnSelect::LeavePage()
if ( m_pParent->GetPressedButton() == OCopyTableWizard::WIZARD_NEXT
|| m_pParent->GetPressedButton() == OCopyTableWizard::WIZARD_FINISH
)
- return m_pParent->getDestColumns()->size() != 0;
+ return m_pParent->getDestColumns().size() != 0;
else
return true;
}
@@ -331,15 +331,15 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight,
OSL_ENSURE(aIter != m_pParent->m_mNameMapping.end(),"Column must be defined");
if ( aIter == m_pParent->m_mNameMapping.end() )
return; // do nothing
- const ODatabaseExport::TColumns* pSrcColumns = m_pParent->getSourceColumns();
- ODatabaseExport::TColumns::const_iterator aSrcIter = pSrcColumns->find((*aIter).first);
- if ( aSrcIter != pSrcColumns->end() )
+ const ODatabaseExport::TColumns& rSrcColumns = m_pParent->getSourceColumns();
+ ODatabaseExport::TColumns::const_iterator aSrcIter = rSrcColumns.find((*aIter).first);
+ if ( aSrcIter != rSrcColumns.end() )
{
// we need also the old position of this column to insert it back on that position again
- const ODatabaseExport::TColumnVector* pSrcVector = m_pParent->getSrcVector();
- ODatabaseExport::TColumnVector::const_iterator aPos = ::std::find(pSrcVector->begin(),pSrcVector->end(),aSrcIter);
- OSL_ENSURE( aPos != pSrcVector->end(),"Invalid position for the iterator here!");
- ODatabaseExport::TColumnVector::size_type nPos = (aPos - pSrcVector->begin()) - adjustColumnPosition(_pLeft, _sColumnName, (aPos - pSrcVector->begin()), _aCase);
+ const ODatabaseExport::TColumnVector& rSrcVector = m_pParent->getSrcVector();
+ ODatabaseExport::TColumnVector::const_iterator aPos = ::std::find(rSrcVector.begin(), rSrcVector.end(), aSrcIter);
+ OSL_ENSURE( aPos != rSrcVector.end(),"Invalid position for the iterator here!");
+ ODatabaseExport::TColumnVector::size_type nPos = (aPos - rSrcVector.begin()) - adjustColumnPosition(_pLeft, _sColumnName, (aPos - rSrcVector.begin()), _aCase);
_pRight->SetEntryData( _pRight->InsertEntry( (*aIter).first, sal::static_int_cast< sal_uInt16 >(nPos)),aSrcIter->second );
_rRightColumns.push_back((*aIter).first);
@@ -379,14 +379,14 @@ sal_uInt16 OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft,
);
OSL_ENSURE(aIter != m_pParent->m_mNameMapping.end(),"Column must be defined");
- const ODatabaseExport::TColumns* pSrcColumns = m_pParent->getSourceColumns();
- ODatabaseExport::TColumns::const_iterator aSrcIter = pSrcColumns->find((*aIter).first);
- if ( aSrcIter != pSrcColumns->end() )
+ const ODatabaseExport::TColumns& rSrcColumns = m_pParent->getSourceColumns();
+ ODatabaseExport::TColumns::const_iterator aSrcIter = rSrcColumns.find((*aIter).first);
+ if ( aSrcIter != rSrcColumns.end() )
{
// we need also the old position of this column to insert it back on that position again
- const ODatabaseExport::TColumnVector* pSrcVector = m_pParent->getSrcVector();
- ODatabaseExport::TColumnVector::const_iterator aPos = ::std::find(pSrcVector->begin(),pSrcVector->end(),aSrcIter);
- ODatabaseExport::TColumnVector::size_type nPos = aPos - pSrcVector->begin();
+ const ODatabaseExport::TColumnVector& rSrcVector = m_pParent->getSrcVector();
+ ODatabaseExport::TColumnVector::const_iterator aPos = ::std::find(rSrcVector.begin(), rSrcVector.end(), aSrcIter);
+ ODatabaseExport::TColumnVector::size_type nPos = aPos - rSrcVector.begin();
if( nPos < nCurrentPos)
{
nAdjustedPos++;
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index d293ea777ded..6e6fcd299fed 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -1225,11 +1225,11 @@ Reference< XPropertySet > OCopyTableWizard::createTable()
Reference< XColumnsSupplier > xSuppDestinationColumns( xTable, UNO_QUERY );
// now append the columns
- const ODatabaseExport::TColumnVector* pVec = getDestVector();
- appendColumns( xSuppDestinationColumns, pVec );
+ const ODatabaseExport::TColumnVector& rVec = getDestVector();
+ appendColumns( xSuppDestinationColumns, &rVec );
// now append the primary key
Reference<XKeysSupplier> xKeySup(xTable,UNO_QUERY);
- appendKey(xKeySup,pVec);
+ appendKey(xKeySup, &rVec);
Reference<XAppend> xAppend(xTables,UNO_QUERY);
if(xAppend.is())
diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx
index 9f6839b1e819..7d1646fcf682 100644
--- a/dbaccess/source/ui/misc/WExtendPages.cxx
+++ b/dbaccess/source/ui/misc/WExtendPages.cxx
@@ -31,8 +31,8 @@ SvParser* OWizHTMLExtend::createReader(sal_Int32 _nRows)
m_pParent->GetColumnPositions(),
m_pParent->GetFormatter(),
m_pParent->GetComponentContext(),
- m_pParent->getDestVector(),
- m_pParent->getTypeInfo(),
+ &m_pParent->getDestVector(),
+ &m_pParent->getTypeInfo(),
m_pParent->shouldCreatePrimaryKey());
}
@@ -43,8 +43,8 @@ SvParser* OWizRTFExtend::createReader(sal_Int32 _nRows)
m_pParent->GetColumnPositions(),
m_pParent->GetFormatter(),
m_pParent->GetComponentContext(),
- m_pParent->getDestVector(),
- m_pParent->getTypeInfo(),
+ &m_pParent->getDestVector(),
+ &m_pParent->getTypeInfo(),
m_pParent->shouldCreatePrimaryKey());
}
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 088a850bf173..b274ba277401 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -104,8 +104,8 @@ void OWizNameMatching::ActivatePage( )
aName += m_pParent->m_sName;
m_FT_TABLE_RIGHT.SetText(aName);
- m_CTRL_LEFT.FillListBox(*m_pParent->getSrcVector());
- m_CTRL_RIGHT.FillListBox(*m_pParent->getDestVector());
+ m_CTRL_LEFT.FillListBox(m_pParent->getSrcVector());
+ m_CTRL_RIGHT.FillListBox(m_pParent->getDestVector());
m_ibColumn_up.Enable( m_CTRL_LEFT.GetEntryCount() > 1 );
m_ibColumn_down.Enable( m_CTRL_LEFT.GetEntryCount() > 1 );
@@ -120,12 +120,12 @@ void OWizNameMatching::ActivatePage( )
bool OWizNameMatching::LeavePage()
{
- const ODatabaseExport::TColumnVector* pSrcColumns = m_pParent->getSrcVector();
+ const ODatabaseExport::TColumnVector& rSrcColumns = m_pParent->getSrcVector();
m_pParent->m_vColumnPos.clear();
m_pParent->m_vColumnTypes.clear();
- m_pParent->m_vColumnPos.resize( pSrcColumns->size(), ODatabaseExport::TPositions::value_type( COLUMN_POSITION_NOT_FOUND, COLUMN_POSITION_NOT_FOUND ) );
- m_pParent->m_vColumnTypes.resize( pSrcColumns->size(), COLUMN_POSITION_NOT_FOUND );
+ m_pParent->m_vColumnPos.resize( rSrcColumns.size(), ODatabaseExport::TPositions::value_type( COLUMN_POSITION_NOT_FOUND, COLUMN_POSITION_NOT_FOUND ) );
+ m_pParent->m_vColumnTypes.resize( rSrcColumns.size(), COLUMN_POSITION_NOT_FOUND );
sal_Int32 nParamPos = 0;
SvTreeListEntry* pLeftEntry = m_CTRL_LEFT.GetModel()->First();
@@ -135,26 +135,26 @@ bool OWizNameMatching::LeavePage()
OFieldDescription* pSrcField = static_cast<OFieldDescription*>(pLeftEntry->GetUserData());
OSL_ENSURE(pSrcField,"OWizNameMatching: OColumn can not be null!");
- ODatabaseExport::TColumnVector::const_iterator aSrcIter = pSrcColumns->begin();
- ODatabaseExport::TColumnVector::const_iterator aSrcEnd = pSrcColumns->end();
+ ODatabaseExport::TColumnVector::const_iterator aSrcIter = rSrcColumns.begin();
+ ODatabaseExport::TColumnVector::const_iterator aSrcEnd = rSrcColumns.end();
for(;aSrcIter != aSrcEnd && (*aSrcIter)->second != pSrcField;++aSrcIter)
;
- const sal_Int32 nPos = ::std::distance(pSrcColumns->begin(),aSrcIter);
+ const sal_Int32 nPos = ::std::distance(rSrcColumns.begin(),aSrcIter);
if(m_CTRL_LEFT.GetCheckButtonState(pLeftEntry) == SV_BUTTON_CHECKED)
{
OFieldDescription* pDestField = static_cast<OFieldDescription*>(pRightEntry->GetUserData());
OSL_ENSURE(pDestField,"OWizNameMatching: OColumn can not be null!");
- const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector();
- ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin();
- ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end();
+ const ODatabaseExport::TColumnVector& rDestColumns = m_pParent->getDestVector();
+ ODatabaseExport::TColumnVector::const_iterator aDestIter = rDestColumns.begin();
+ ODatabaseExport::TColumnVector::const_iterator aDestEnd = rDestColumns.end();
for(;aDestIter != aDestEnd && (*aDestIter)->second != pDestField;++aDestIter)
;
OSL_ENSURE((nPos) < static_cast<sal_Int32>(m_pParent->m_vColumnPos.size()),"m_pParent->m_vColumnPos: Illegal index for vector");
m_pParent->m_vColumnPos[nPos].first = ++nParamPos;
- m_pParent->m_vColumnPos[nPos].second = ::std::distance(pDestColumns->begin(),aDestIter) + 1;
+ m_pParent->m_vColumnPos[nPos].second = ::std::distance(rDestColumns.begin(),aDestIter) + 1;
bool bNotConvert = true;
TOTypeInfoSP pTypeInfo;
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 6c3180dc641d..018e797123be 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -186,7 +186,7 @@ TOTypeInfoSP OWizTypeSelectControl::getTypeInfo(sal_Int32 _nPos)
const OTypeInfoMap* OWizTypeSelectControl::getTypeInfo() const
{
- return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->getDestTypeInfo();
+ return &static_cast<OWizTypeSelect*>(GetParent())->m_pParent->getDestTypeInfo();
}
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> OWizTypeSelectControl::getMetaData()
@@ -285,9 +285,9 @@ void OWizTypeSelect::Reset()
sal_Int32 nBreakPos;
m_pParent->CheckColumns(nBreakPos);
- const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector();
- ODatabaseExport::TColumnVector::const_iterator aIter = pDestColumns->begin();
- ODatabaseExport::TColumnVector::const_iterator aEnd = pDestColumns->end();
+ const ODatabaseExport::TColumnVector& rDestColumns = m_pParent->getDestVector();
+ ODatabaseExport::TColumnVector::const_iterator aIter = rDestColumns.begin();
+ ODatabaseExport::TColumnVector::const_iterator aEnd = rDestColumns.end();
for(;aIter != aEnd;++aIter)
{
sal_uInt16 nPos;
generated by cgit (git 2.34.1) at 2025-05-06 08:35:37 +0000