Tag: cws_dev300_dba30c User: oj Date: 2008-05-06 09:31:52+0000 Modified: dba/connectivity/source/drivers/file/FResultSet.cxx
Log: stl problems under linux solved File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FResultSet.cxx?r1=1.101.10.1&r2=1.101.10.2 Delta lines: +6 -4 ------------------- --- FResultSet.cxx 2008-05-02 10:58:47+0000 1.101.10.1 +++ FResultSet.cxx 2008-05-06 09:31:49+0000 1.101.10.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FResultSet.cxx,v $ - * $Revision: 1.101.10.1 $ + * $Revision: 1.101.10.2 $ * * This file is part of OpenOffice.org. * @@ -1373,13 +1373,15 @@ // Sort on all columns, saving original order for later if(IsSorted()) { - aOrderbyColumnNumberSave.assign(m_aOrderbyColumnNumber.begin(), m_aOrderbyColumnNumber.end()); + aOrderbyColumnNumberSave = m_aOrderbyColumnNumber;// .assign(m_aOrderbyColumnNumber.begin(), m_aOrderbyColumnNumber.end()); aOrderbyAscendingSave.assign(m_aOrderbyAscending.begin(), m_aOrderbyAscending.end()); bWasSorted = TRUE; } // the first column is the bookmark column - m_aOrderbyColumnNumber.assign(m_aColMapping.begin()+1, m_aColMapping.end()); + ::std::vector<sal_Int32>::iterator aColStart = (m_aColMapping.begin()+1); + ::std::copy(aColStart, m_aColMapping.end(),::std::back_inserter(m_aOrderbyColumnNumber)); +// m_aOrderbyColumnNumber.assign(aColStart, m_aColMapping.end()); m_aOrderbyAscending.assign(m_aColMapping.size()-1, SQL_ASC); bDistinct = TRUE; } @@ -1468,7 +1470,7 @@ if (bWasSorted) { // Re-sort on original requested order - m_aOrderbyColumnNumber.assign(aOrderbyColumnNumberSave.begin(), aOrderbyColumnNumberSave.end()); + m_aOrderbyColumnNumber = aOrderbyColumnNumberSave; m_aOrderbyAscending.assign(aOrderbyAscendingSave.begin(), aOrderbyAscendingSave.end()); TIntVector aEvaluationKeySet(*m_pFileSet); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
