rpms/openoffice.org/devel openoffice.org-1.9.114.oooXXXXX.nostlport.patch, NONE, 1.1 openoffice.org.spec, 1.271, 1.272
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 6 15:23:15 UTC 2005
- Previous message (by thread): rpms/cairo/devel cairo.spec,1.14,1.15
- Next message (by thread): rpms/subversion/FC-4 subversion-1.2.1.tar.gz.asc, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.17, 1.18 subversion.spec, 1.57, 1.58 upstream, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14395
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.114.oooXXXXX.nostlport.patch
Log Message:
build without stlport
openoffice.org-1.9.114.oooXXXXX.nostlport.patch:
dbaccess/source/core/api/RowSet.cxx | 17 +++
dbaccess/source/core/api/RowSet.hxx | 2
dbaccess/source/core/api/RowSetBase.cxx | 24 ++---
dbaccess/source/core/api/RowSetCache.cxx | 14 +--
dbaccess/source/core/api/RowSetCacheIterator.cxx | 17 +--
dbaccess/source/core/api/RowSetCacheIterator.hxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 2
dbaccess/source/filter/xml/xmlDataSource.cxx | 2
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 4
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2
dbaccess/source/ui/dlg/indexdialog.cxx | 42 ++++-----
dbaccess/source/ui/inc/indexcollection.hxx | 26 ++---
dbaccess/source/ui/misc/indexcollection.cxx | 40 ++++----
forms/source/xforms/propertysetbase.cxx | 2
forms/source/xforms/submission.cxx | 2
openoffice.org/stlport/systemstl/numeric | 79 +++++++++++++++++
source/accessibility/AccessibleEmptyEditSource.cxx | 0
source/core/api/RowSet.cxx | 0
source/core/api/RowSet.hxx | 0
source/core/api/RowSetBase.cxx | 0
source/core/api/RowSetCache.cxx | 0
source/core/api/RowSetCacheIterator.cxx | 0
source/core/api/RowSetCacheIterator.hxx | 0
source/core/dataaccess/datasource.cxx | 0
source/filter/xml/xmlDataSource.cxx | 0
source/filter/xml/xmlTableFilterList.cxx | 0
source/ui/dlg/DbAdminImpl.cxx | 0
source/ui/dlg/indexdialog.cxx | 0
source/ui/inc/indexcollection.hxx | 0
source/ui/misc/indexcollection.cxx | 0
source/ure/makefile.mk | 4
source/xforms/propertysetbase.cxx | 0
source/xforms/submission.cxx | 0
stlport/makefile.mk | 1
stlport/systemstl/functional | 4
stlport/systemstl/rope | 2
stlport/systemstl/vector | 16 ---
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 4
systemstl/functional | 0
systemstl/rope | 0
systemstl/vector | 0
41 files changed, 197 insertions(+), 111 deletions(-)
--- NEW FILE openoffice.org-1.9.114.oooXXXXX.nostlport.patch ---
Index: source/core/api/RowSet.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSet.cxx,v
retrieving revision 1.133
diff -u -p -r1.133 RowSet.cxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSet.cxx 10 Mar 2005 16:30:55 -0000 1.133
+++ openoffice.org/dbaccess/source/core/api/RowSet.cxx 6 Jul 2005 14:09:56 -0000
@@ -370,6 +370,17 @@ ORowSet::ORowSet(const Reference< ::com:
m_aParameterRow.clear(); // because it was constructed with one element as default
}
+
+ORowSet::~ORowSet()
+{
+ if ( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose )
+ {
+ OSL_ENSURE(0, "Please check who doesn't dispose this component!");
+ osl_incrementInterlockedCount( &m_refCount );
+ dispose();
+ }
+}
+
// -----------------------------------------------------------------------------
Any ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
{
@@ -1152,7 +1163,7 @@ void SAL_CALL ORowSet::deleteRow( ) thr
notifyClonesRowDeleted(m_aBookmark);
m_aBookmark = Any();
- m_aCurrentRow = NULL;
+ m_aCurrentRow = ORowSetCacheIterator();
m_aCurrentRow.setBookmark(Any());
ORowSetNotifier aNotifier( this );
@@ -2511,7 +2522,7 @@ void ORowSet::checkUpdateIterator()
// -----------------------------------------------------------------------------
void ORowSet::checkUpdateConditions(sal_Int32 columnIndex)
{
- if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
+ if(!m_pCache || columnIndex <= 0 || m_aCurrentRow.isNull() || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
throwFunctionSequenceException(*this);
}
// -----------------------------------------------------------------------------
@@ -2757,7 +2768,7 @@ void ORowSetClone::rowDeleted(const ::co
if(compareBookmarks(_rBookmark,m_aBookmark) == 0)
{
m_aBookmark = Any();
- m_aCurrentRow = NULL;
+ m_aCurrentRow = ORowSetCacheIterator();
m_aCurrentRow.setBookmark(Any());
}
}
Index: source/core/api/RowSet.hxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSet.hxx,v
retrieving revision 1.39
diff -u -p -r1.39 RowSet.hxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSet.hxx 10 Mar 2005 16:31:10 -0000 1.39
+++ openoffice.org/dbaccess/source/core/api/RowSet.hxx 6 Jul 2005 14:09:56 -0000
@@ -243,6 +243,8 @@ namespace dbaccess
virtual sal_Bool isModified( );
virtual sal_Bool isNew( );
+ virtual ~ORowSet();
+
public:
ORowSet(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
Index: source/core/api/RowSetBase.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSetBase.cxx,v
retrieving revision 1.75
diff -u -p -r1.75 RowSetBase.cxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSetBase.cxx 18 Mar 2005 10:05:00 -0000 1.75
+++ openoffice.org/dbaccess/source/core/api/RowSetBase.cxx 6 Jul 2005 14:09:56 -0000
@@ -264,7 +264,7 @@ sal_Bool SAL_CALL ORowSetBase::wasNull(
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
- return ((m_nLastColumnIndex != -1) && m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd() && !m_aCurrentRow.isNull() && m_aCurrentRow->isValid()) ? (*(*m_aCurrentRow))[m_nLastColumnIndex].isNull() : sal_True;
+ return ((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && !m_aCurrentRow.isNull() && m_aCurrentRow->isValid()) ? (*(*m_aCurrentRow))[m_nLastColumnIndex].isNull() : sal_True;
}
// -----------------------------------------------------------------------------
const ORowSetValue& ORowSetBase::getValue(sal_Int32 columnIndex)
@@ -273,26 +273,26 @@ const ORowSetValue& ORowSetBase::getValu
checkCache();
OSL_ENSURE(!(m_bBeforeFirst || m_bAfterLast),"ORowSetBase::getValue: Illegal call here (we're before first or after last)!");
- if ( m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd() && !m_aCurrentRow.isNull() && m_aCurrentRow->isValid() )
+ if ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && !m_aCurrentRow.isNull() && m_aCurrentRow->isValid() )
{
#if OSL_DEBUG_LEVEL > 0
ORowSetMatrix::iterator aCacheEnd = m_pCache->getEnd();
ORowSetMatrix::iterator aCurrentRow = m_aCurrentRow;
#endif
- OSL_ENSURE(m_aCurrentRow && m_aCurrentRow <= m_pCache->getEnd(),"Invalid iterator set for currentrow!");
+ OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow <= m_pCache->getEnd(),"Invalid iterator set for currentrow!");
return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
}
else
{ // currentrow is null when the clone move the window
- if(!m_aCurrentRow || m_aCurrentRow.isNull())
+ if ( m_aCurrentRow.isNull() )
{
positionCache();
m_aCurrentRow = m_pCache->m_aMatrixIter;
- OSL_ENSURE(m_aCurrentRow,"ORowSetBase::getValue: we don't stand on a valid row! Row is null.");
+ OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getValue: we don't stand on a valid row! Row is null.");
return getValue(columnIndex);
}
- OSL_ENSURE(m_aCurrentRow && (m_bBeforeFirst || m_bAfterLast),"ORowSetBase::getValue: we don't stand on a valid row! Row is equal to end of matrix");
+ OSL_ENSURE(!m_aCurrentRow.isNull() && (m_bBeforeFirst || m_bAfterLast),"ORowSetBase::getValue: we don't stand on a valid row! Row is equal to end of matrix");
}
// we should normally never reach this here
return m_aEmptyValue;
@@ -363,18 +363,18 @@ Reference< ::com::sun::star::io::XInputS
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
- if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
+ if( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd())
return new ::comphelper::SequenceInputStream((*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex].getSequence());
else
{
- if(m_aCurrentRow)
+ if(!m_aCurrentRow.isNull())
OSL_ENSURE((m_bBeforeFirst || m_bAfterLast),"ORowSetBase::getValue: we don't stand on a valid row! Row is equal to end of matrix");
else
{
positionCache();
m_aCurrentRow = m_pCache->m_aMatrixIter;
- OSL_ENSURE(m_aCurrentRow,"ORowSetBase::getValue: we don't stand on a valid row! Row is null.");
+ OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getValue: we don't stand on a valid row! Row is null.");
return getBinaryStream(columnIndex);
}
}
@@ -1046,7 +1046,7 @@ void ORowSetBase::setCurrentRow(sal_Bool
m_aBookmark = m_pCache->getBookmark();
OSL_ENSURE(m_aBookmark.hasValue(),"Bookmark has no value!");
m_aCurrentRow = m_pCache->m_aMatrixIter;
- OSL_ENSURE(m_aCurrentRow,"CurrentRow is null!");
+ OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is null!");
m_aCurrentRow.setBookmark(m_aBookmark);
OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd(),"Position of matrix iterator isn't valid!");
OSL_ENSURE(m_aCurrentRow->isValid(),"Currentrow isn't valid");
@@ -1057,7 +1057,7 @@ void ORowSetBase::setCurrentRow(sal_Bool
sal_Int32 nNewRow = m_pCache->getRow();
OSL_ENSURE(nOldRow == nNewRow,"Old position is not equal to new postion");
m_aCurrentRow = m_pCache->m_aMatrixIter;
- OSL_ENSURE(m_aCurrentRow,"CurrentRow is nul after positionCache!");
+ OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!");
}
else
{
@@ -1075,7 +1075,7 @@ void ORowSetBase::setCurrentRow(sal_Bool
{
positionCache();
m_aCurrentRow = m_pCache->m_aMatrixIter;
- OSL_ENSURE(m_aCurrentRow,"CurrentRow is nul after positionCache!");
+ OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!");
}
}
Index: source/core/api/RowSetCache.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSetCache.cxx,v
retrieving revision 1.75
diff -u -p -r1.75 RowSetCache.cxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSetCache.cxx 18 Mar 2005 10:05:15 -0000 1.75
+++ openoffice.org/dbaccess/source/core/api/RowSetCache.cxx 6 Jul 2005 14:09:58 -0000
@@ -431,7 +431,7 @@ void ORowSetCache::setMaxRowSize(sal_Int
for(;aCacheIter != m_aCacheIterators.end();++aCacheIter)
{
aCacheIterToChange[aCacheIter->first] = sal_False;
- if(!aCacheIter->second.aIterator)
+ if ( aCacheIter->second.aIterator == m_pMatrix->end() )
continue;
if(aCacheIter->second.aIterator != m_aInsertRow && !m_bInserted && !m_bModified)
{
@@ -979,14 +979,14 @@ sal_Bool ORowSetCache::moveWindow()
ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin();
for(;aCacheIter != m_aCacheIterators.end();++aCacheIter)
{
- if ( aCacheIter->second.aIterator
+ if ( aCacheIter->second.aIterator != m_pMatrix->end()
&& aCacheIter->second.aIterator != m_aInsertRow
&& !m_bInserted && !m_bModified )
{
sal_Int16 nDist = (aCacheIter->second.aIterator - m_pMatrix->begin());
if ( nDist >= nNewDist )
{
- aCacheIter->second.aIterator = NULL;
+ aCacheIter->second.aIterator = m_pMatrix->end();
}
else
{
@@ -1417,11 +1417,11 @@ void ORowSetCache::cancelRowModification
ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin();
for(;aCacheIter != m_aCacheIterators.end();++aCacheIter)
{
- if(aCacheIter->second.aIterator)
+ if ( aCacheIter->second.aIterator != m_pMatrix->end() )
{
ORowSetMatrix::iterator aOldIter = aCacheIter->second.aIterator;
if(aOldIter == m_aInsertRow)
- aCacheIter->second.aIterator = NULL;
+ aCacheIter->second.aIterator = m_pMatrix->end();
}
}
}
@@ -1596,12 +1596,12 @@ void ORowSetCache::rotateCacheIterator(s
ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin();
for(;aCacheIter != m_aCacheIterators.end();++aCacheIter)
{
- if(aCacheIter->second.aIterator && aCacheIter->second.aIterator != m_aInsertRow && !m_bInserted && !m_bModified)
+ if ( aCacheIter->second.aIterator != m_pMatrix->end() && aCacheIter->second.aIterator != m_aInsertRow && !m_bInserted && !m_bModified)
{
sal_Int16 nDist = (aCacheIter->second.aIterator - m_pMatrix->begin());
if(nDist < _nDist)
{
- aCacheIter->second.aIterator = NULL;
+ aCacheIter->second.aIterator = m_pMatrix->end();
}
else
{
Index: source/core/api/RowSetCacheIterator.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSetCacheIterator.cxx,v
retrieving revision 1.7
diff -u -p -r1.7 RowSetCacheIterator.cxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSetCacheIterator.cxx 13 Nov 2002 06:56:59 -0000 1.7
+++ openoffice.org/dbaccess/source/core/api/RowSetCacheIterator.cxx 6 Jul 2005 14:09:58 -0000
@@ -74,8 +74,7 @@ ORowSetCacheIterator::ORowSetCacheIterat
// -----------------------------------------------------------------------------
ORowSetCacheIterator::operator ORowSetMatrix::iterator()
{
- if(m_aIter->second.aIterator == NULL ||
- m_aIter->second.aIterator == m_pCache->m_pMatrix->end())
+ if ( m_aIter->second.aIterator == m_pCache->m_pMatrix->end() )
{
// OSL_ENSURE(m_aIter->second.aBookmark.hasValue(),"bookmark has no value!");
// m_pCache->moveToBookmark(m_aIter->second.aBookmark);
@@ -108,8 +107,7 @@ ORowSetRow& ORowSetCacheIterator::operat
// -----------------------------------------------------------------------------
const ORowSetRow& ORowSetCacheIterator::operator *() const
{
- if(m_aIter->second.aIterator == NULL ||
- m_aIter->second.aIterator == m_pCache->m_pMatrix->end())
+ if ( m_aIter->second.aIterator == m_pCache->m_pMatrix->end() )
{
OSL_ENSURE(m_aIter->second.aBookmark.hasValue(),"bookmark has no value!");
m_pCache->moveToBookmark(m_aIter->second.aBookmark);
@@ -125,8 +123,7 @@ ORowSetMatrix::iterator& ORowSetCacheIte
// -----------------------------------------------------------------------------
const ORowSetMatrix::iterator& ORowSetCacheIterator::operator ->() const
{
- if(m_aIter->second.aIterator == NULL ||
- m_aIter->second.aIterator == m_pCache->m_pMatrix->end())
+ if ( m_aIter->second.aIterator == m_pCache->m_pMatrix->end() )
{
OSL_ENSURE(m_aIter->second.aBookmark.hasValue(),"bookmark has no value!");
m_pCache->moveToBookmark(m_aIter->second.aBookmark);
@@ -155,7 +152,7 @@ void ORowSetCacheIterator::setBookmark(c
m_aIter->second.aBookmark = _rBookmark;
}
// -----------------------------------------------------------------------------
-
-
-
-
+sal_Bool ORowSetCacheIterator::isNull() const
+{
+ return !m_pCache || m_aIter == m_pCache->m_aCacheIterators.end() || m_aIter->second.aIterator == m_pCache->m_pMatrix->end();
+}
Index: source/core/api/RowSetCacheIterator.hxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSetCacheIterator.hxx,v
retrieving revision 1.5
diff -u -p -r1.5 RowSetCacheIterator.hxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSetCacheIterator.hxx 13 Nov 2002 06:56:59 -0000 1.5
+++ openoffice.org/dbaccess/source/core/api/RowSetCacheIterator.hxx 6 Jul 2005 14:09:58 -0000
@@ -95,7 +95,7 @@ namespace dbaccess
ORowSetCacheIterator(const ORowSetCacheIterator& _rRH);
ORowSetCacheIterator& operator =(const ORowSetCacheIterator&);
- sal_Bool isNull() const { return m_aIter->second.aIterator == NULL; }
+ sal_Bool isNull() const;
ORowSetCacheIterator& operator =(const ORowSetMatrix::iterator&);
operator ORowSetMatrix::iterator();
Index: source/core/dataaccess/datasource.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/dataaccess/datasource.cxx,v
retrieving revision 1.59
diff -u -p -r1.59 datasource.cxx
--- openoffice.org.orig/dbaccess/source/core/dataaccess/datasource.cxx 23 Mar 2005 09:46:37 -0000 1.59
+++ openoffice.org/dbaccess/source/core/dataaccess/datasource.cxx 6 Jul 2005 14:10:06 -0000
@@ -506,7 +506,7 @@ namespace dbaccess
}
}
- return Sequence< PropertyValue >(aRet.begin(),aRet.size());
+ return Sequence< PropertyValue >(&(*aRet.begin()),aRet.size());
}
return Sequence< PropertyValue >();
}
Index: source/filter/xml/xmlDataSource.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/filter/xml/xmlDataSource.cxx,v
retrieving revision 1.3
diff -u -p -r1.3 xmlDataSource.cxx
--- openoffice.org.orig/dbaccess/source/filter/xml/xmlDataSource.cxx 10 Mar 2005 16:39:17 -0000 1.3
+++ openoffice.org/dbaccess/source/filter/xml/xmlDataSource.cxx 6 Jul 2005 14:10:17 -0000
@@ -276,7 +276,7 @@ void OXMLDataSource::EndElement()
{
try
{
- xDataSource->setPropertyValue(PROPERTY_INFO,makeAny(Sequence<PropertyValue>(m_aInfoSequence.begin(),m_aInfoSequence.size())));
+ xDataSource->setPropertyValue(PROPERTY_INFO,makeAny(Sequence<PropertyValue>(&(*m_aInfoSequence.begin()),m_aInfoSequence.size())));
}
catch(Exception)
{
Index: source/filter/xml/xmlTableFilterList.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/filter/xml/xmlTableFilterList.cxx,v
retrieving revision 1.3
diff -u -p -r1.3 xmlTableFilterList.cxx
--- openoffice.org.orig/dbaccess/source/filter/xml/xmlTableFilterList.cxx 10 Mar 2005 16:41:01 -0000 1.3
+++ openoffice.org/dbaccess/source/filter/xml/xmlTableFilterList.cxx 6 Jul 2005 14:10:17 -0000
@@ -148,9 +148,9 @@ void OXMLTableFilterList::EndElement()
if ( xDataSource.is() )
{
if ( !m_aPatterns.empty() )
- xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(Sequence< ::rtl::OUString>(m_aPatterns.begin(),m_aPatterns.size())));
+ xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(Sequence< ::rtl::OUString>(&(*m_aPatterns.begin()),m_aPatterns.size())));
if ( !m_aTypes.empty() )
- xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(Sequence< ::rtl::OUString>(m_aTypes.begin(),m_aTypes.size())));
+ xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(Sequence< ::rtl::OUString>(&(*m_aTypes.begin()),m_aTypes.size())));
}
}
//----------------------------------------------------------------------------
Index: source/ui/dlg/DbAdminImpl.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx,v
retrieving revision 1.8
diff -u -p -r1.8 DbAdminImpl.cxx
--- openoffice.org.orig/dbaccess/source/ui/dlg/DbAdminImpl.cxx 10 Mar 2005 16:48:20 -0000 1.8
+++ openoffice.org/dbaccess/source/ui/dlg/DbAdminImpl.cxx 6 Jul 2005 14:10:46 -0000
@@ -361,7 +361,7 @@ sal_Bool ODbDataSourceAdministrationHelp
makeAny(::rtl::OUString(sPassword)), PropertyState_DIRECT_VALUE));
}
- _rDriverParam = Sequence< PropertyValue >(aReturn.begin(), aReturn.size());
+ _rDriverParam = Sequence< PropertyValue >(&(*aReturn.begin()), aReturn.size());
// append all the other stuff (charset etc.)
fillDatasourceInfo(*m_pItemSetHelper->getOutputSet(), _rDriverParam);
Index: source/ui/dlg/indexdialog.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/dlg/indexdialog.cxx,v
retrieving revision 1.19
diff -u -p -r1.19 indexdialog.cxx
--- openoffice.org.orig/dbaccess/source/ui/dlg/indexdialog.cxx 23 Mar 2005 09:48:55 -0000 1.19
+++ openoffice.org/dbaccess/source/ui/dlg/indexdialog.cxx 6 Jul 2005 14:10:54 -0000
@@ -301,7 +301,7 @@ namespace dbaui
// }
// if all of the indexes have an empty description, we're not interested in displaying it
- OIndexCollection::const_iterator aCheck;
+ Indexes::const_iterator aCheck;
for ( aCheck = m_pIndexes->begin();
aCheck != m_pIndexes->end();
@@ -352,7 +352,7 @@ namespace dbaui
if (pSelected)
{
// is the current entry modified?
- OIndexCollection::const_iterator aSelectedPos = reinterpret_cast<OIndexCollection::const_iterator>(pSelected->GetUserData());
+ Indexes::const_iterator aSelectedPos = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(pSelected->GetUserData());
m_aActions.EnableItem(ID_INDEX_SAVE, aSelectedPos->isModified() || aSelectedPos->isNew());
m_aActions.EnableItem(ID_INDEX_RESET, aSelectedPos->isModified() || aSelectedPos->isNew());
bSelectedAnything = bSelectedAnything && !aSelectedPos->bPrimaryKey;
@@ -373,8 +373,8 @@ namespace dbaui
Image aPKeyIcon(ModuleRes( bHiContrast ? IMG_PKEYICON_SCH : IMG_PKEYICON));
// fill the list with the index names
m_aIndexes.Clear();
- OIndexCollection::iterator aIndexLoop = m_pIndexes->begin();
- OIndexCollection::iterator aEnd = m_pIndexes->end();
+ Indexes::iterator aIndexLoop = m_pIndexes->begin();
+ Indexes::iterator aEnd = m_pIndexes->end();
for (; aIndexLoop != aEnd; ++aIndexLoop)
{
SvLBoxEntry* pNewEntry = NULL;
@@ -383,7 +383,7 @@ namespace dbaui
else
pNewEntry = m_aIndexes.InsertEntry(aIndexLoop->sName);
- pNewEntry->SetUserData(aIndexLoop);
+ pNewEntry->SetUserData(reinterpret_cast< void* >(sal_Int32(aIndexLoop - m_pIndexes->begin())));
}
OnIndexSelected(&m_aIndexes);
@@ -406,7 +406,7 @@ namespace dbaui
{
DBG_ASSERT(_pEntry, "DbaIndexDialog::implCommit: invalid entry!");
- OIndexCollection::iterator aCommitPos = static_cast< OIndexCollection::iterator >(_pEntry->GetUserData());
+ Indexes::iterator aCommitPos = m_pIndexes->begin() + reinterpret_cast< sal_Int32 >(_pEntry->GetUserData());
// if it's not a new index, remove it
// (we can't modify indexes, only drop'n'insert)
@@ -465,16 +465,16 @@ namespace dbaui
}
SvLBoxEntry* pNewEntry = m_aIndexes.InsertEntry(sNewIndexName);
- OIndexCollection::iterator aIndexDescriptor = m_pIndexes->insert(sNewIndexName);
+ Indexes::iterator aIndexDescriptor = m_pIndexes->insert(sNewIndexName);
// pNewEntry->SetUserData(aIndexDescriptor);
// update the user data on the entries in the list box:
// they're iterators of the index collection, and thus they have changed when removing the index
for (SvLBoxEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust))
{
- OIndexCollection::iterator aAfterInsertPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust));
+ Indexes::iterator aAfterInsertPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust));
DBG_ASSERT(aAfterInsertPos != m_pIndexes->end(), "DbaIndexDialog::OnNewIndex: problems with on of the entries!");
- pAdjust->SetUserData(aAfterInsertPos);
+ pAdjust->SetUserData(reinterpret_cast< void* >(sal_Int32(aAfterInsertPos - m_pIndexes->begin())));
}
// select the entry and start in-place editing
@@ -514,7 +514,7 @@ namespace dbaui
sal_Bool DbaIndexDialog::implDropIndex(SvLBoxEntry* _pEntry, sal_Bool _bRemoveFromCollection)
{
// do the drop
- OIndexCollection::iterator aDropPos = static_cast< OIndexCollection::iterator >(_pEntry->GetUserData());
+ Indexes::iterator aDropPos = m_pIndexes->begin() + reinterpret_cast< sal_Int32 >(_pEntry->GetUserData());
DBG_ASSERT(aDropPos != m_pIndexes->end(), "DbaIndexDialog::OnDropIndex: did not find the index in my collection!");
SQLExceptionInfo aExceptionInfo;
@@ -545,9 +545,9 @@ namespace dbaui
// they're iterators of the index collection, and thus they have changed when removing the index
for (SvLBoxEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust))
{
- OIndexCollection::iterator aAfterDropPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust));
+ Indexes::iterator aAfterDropPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust));
DBG_ASSERT(aAfterDropPos != m_pIndexes->end(), "DbaIndexDialog::OnDropIndex: problems with on of the remaining entries!");
- pAdjust->SetUserData(aAfterDropPos);
+ pAdjust->SetUserData(reinterpret_cast< void* >(sal_Int32(aAfterDropPos - m_pIndexes->begin())));
}
// if the remvoved entry was the selected on ...
@@ -596,7 +596,7 @@ namespace dbaui
SvLBoxEntry* pSelected = m_aIndexes.FirstSelected();
DBG_ASSERT(pSelected, "DbaIndexDialog::OnResetIndex: invalid call!");
- OIndexCollection::iterator aResetPos = static_cast< OIndexCollection::iterator >(pSelected->GetUserData());
+ Indexes::iterator aResetPos = m_pIndexes->begin() + reinterpret_cast< sal_Int32 >(pSelected->GetUserData());
if (aResetPos->isNew())
{
@@ -669,7 +669,8 @@ namespace dbaui
if (pSelected)
{
// the descriptor
- OIndexCollection::const_iterator aSelected = static_cast<OIndexCollection::iterator>(pSelected->GetUserData());
+ Indexes::const_iterator aSelected = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(pSelected->GetUserData());
+
if (aSelected->isModified() || aSelected->isNew())
{
QueryBox aQuestion(this, ModuleRes(QUERY_SAVE_CURRENT_INDEX));
@@ -705,13 +706,14 @@ namespace dbaui
//------------------------------------------------------------------
IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvLBoxEntry*, _pEntry )
{
- OIndexCollection::iterator aPosition = static_cast< OIndexCollection::iterator >(_pEntry->GetUserData());
+ Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(_pEntry->GetUserData());
+
DBG_ASSERT(aPosition >= m_pIndexes->begin() && aPosition < m_pIndexes->end(),
"DbaIndexDialog::OnEntryEdited: invalid entry!");
String sNewName = m_aIndexes.GetEntryText(_pEntry);
- OIndexCollection::const_iterator aSameName = m_pIndexes->find(sNewName);
+ Indexes::const_iterator aSameName = m_pIndexes->find(sNewName);
if ((aSameName != aPosition) && (m_pIndexes->end() != aSameName))
{
String sError(ModuleRes(STR_INDEX_NAME_ALREADY_USED));
@@ -753,7 +755,7 @@ namespace dbaui
if (m_pFields->IsModified() && !m_pFields->SaveModified())
return sal_False;
- OIndexCollection::iterator aPreviouslySelected = static_cast<OIndexCollection::iterator>(m_pPreviousSelection->GetUserData());
+ Indexes::iterator aPreviouslySelected = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(m_pPreviousSelection->GetUserData());
// the unique flag
aPreviouslySelected->bUnique = m_aUnique.IsChecked();
@@ -814,7 +816,7 @@ namespace dbaui
{
if (m_pPreviousSelection)
{
- OIndexCollection::iterator aPreviouslySelected = static_cast<OIndexCollection::iterator>(m_pPreviousSelection->GetUserData());
+ Indexes::iterator aPreviouslySelected = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(m_pPreviousSelection->GetUserData());
if (!implSaveModified())
return sal_False;
@@ -831,7 +833,7 @@ namespace dbaui
IMPL_LINK( DbaIndexDialog, OnModified, void*, NOTINTERESTEDIN )
{
DBG_ASSERT(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!");
- OIndexCollection::iterator aPosition = static_cast< OIndexCollection::iterator >(m_pPreviousSelection->GetUserData());
+ Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(m_pPreviousSelection->GetUserData());
aPosition->setModified(sal_True);
updateToolbox();
@@ -845,7 +847,7 @@ namespace dbaui
if (_pEntry)
{
// the descriptor of the selected index
- OIndexCollection::const_iterator aSelectedIndex = static_cast<OIndexCollection::iterator>(_pEntry->GetUserData());
+ Indexes::const_iterator aSelectedIndex = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(_pEntry->GetUserData());
// fill the controls
m_aUnique.Check(aSelectedIndex->bUnique);
Index: source/ui/inc/indexcollection.hxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/inc/indexcollection.hxx,v
retrieving revision 1.4
diff -u -p -r1.4 indexcollection.hxx
--- openoffice.org.orig/dbaccess/source/ui/inc/indexcollection.hxx 19 Mar 2003 17:52:40 -0000 1.4
+++ openoffice.org/dbaccess/source/ui/inc/indexcollection.hxx 6 Jul 2005 14:11:32 -0000
@@ -126,29 +126,29 @@ namespace dbaui
typedef OIndex const* const_iterator;
/// get access to the first element of the index collection
- const_iterator begin() const { return m_aIndexes.begin(); }
+ Indexes::const_iterator begin() const { return m_aIndexes.begin(); }
/// get access to the first element of the index collection
- iterator begin() { return m_aIndexes.begin(); }
+ Indexes::iterator begin() { return m_aIndexes.begin(); }
/// get access to the (last + 1st) element of the index collection
- const_iterator end() const { return m_aIndexes.end(); }
+ Indexes::const_iterator end() const { return m_aIndexes.end(); }
/// get access to the (last + 1st) element of the index collection
- iterator end() { return m_aIndexes.end(); }
+ Indexes::iterator end() { return m_aIndexes.end(); }
// searching
- const_iterator find(const String& _rName) const;
- iterator find(const String& _rName);
- const_iterator findOriginal(const String& _rName) const;
- iterator findOriginal(const String& _rName);
+ Indexes::const_iterator find(const String& _rName) const;
+ Indexes::iterator find(const String& _rName);
+ Indexes::const_iterator findOriginal(const String& _rName) const;
+ Indexes::iterator findOriginal(const String& _rName);
// inserting without committing
// the OriginalName of the newly inserted index will be empty, thus indicating that it's new
- iterator insert(const String& _rName);
+ Indexes::iterator insert(const String& _rName);
// commit a new index, which is already part if the collection, but does not have an equivalent in the
// data source, yet
- void commitNewIndex(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+ void commitNewIndex(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
// reset the data for the given index
- void resetIndex(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+ void resetIndex(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
// attach to a new key container
void attach(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes);
@@ -161,9 +161,9 @@ namespace dbaui
sal_Int32 size() const { return m_aIndexes.size(); }
/// drop an index, and remove it from the collection
- sal_Bool drop(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+ sal_Bool drop(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
/// simply drop the index described by the name, but don't remove the descriptor from the collection
- sal_Bool dropNoRemove(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+ sal_Bool dropNoRemove(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
protected:
void implConstructFrom(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes);
Index: source/ui/misc/indexcollection.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/misc/indexcollection.cxx,v
retrieving revision 1.5
diff -u -p -r1.5 indexcollection.cxx
--- openoffice.org.orig/dbaccess/source/ui/misc/indexcollection.cxx 19 Mar 2003 17:52:53 -0000 1.5
+++ openoffice.org/dbaccess/source/ui/misc/indexcollection.cxx 6 Jul 2005 14:11:44 -0000
@@ -141,12 +141,12 @@ namespace dbaui
}
//------------------------------------------------------------------
- OIndexCollection::const_iterator OIndexCollection::find(const String& _rName) const
+ Indexes::const_iterator OIndexCollection::find(const String& _rName) const
{
::rtl::OUString sNameCompare(_rName);
// loop'n'compare
- const_iterator aSearch = m_aIndexes.begin();
+ Indexes::const_iterator aSearch = m_aIndexes.begin();
for (; aSearch != m_aIndexes.end(); ++aSearch)
if (aSearch->sName == sNameCompare)
break;
@@ -155,12 +155,12 @@ namespace dbaui
}
//------------------------------------------------------------------
- OIndexCollection::iterator OIndexCollection::find(const String& _rName)
+ Indexes::iterator OIndexCollection::find(const String& _rName)
{
::rtl::OUString sNameCompare(_rName);
// loop'n'compare
- iterator aSearch = m_aIndexes.begin();
+ Indexes::iterator aSearch = m_aIndexes.begin();
for (; aSearch != m_aIndexes.end(); ++aSearch)
if (aSearch->sName == sNameCompare)
break;
@@ -169,12 +169,12 @@ namespace dbaui
}
//------------------------------------------------------------------
- OIndexCollection::const_iterator OIndexCollection::findOriginal(const String& _rName) const
+ Indexes::const_iterator OIndexCollection::findOriginal(const String& _rName) const
{
::rtl::OUString sNameCompare(_rName);
// loop'n'compare
- const_iterator aSearch = m_aIndexes.begin();
+ Indexes::const_iterator aSearch = m_aIndexes.begin();
for (; aSearch != m_aIndexes.end(); ++aSearch)
if (aSearch->getOriginalName() == sNameCompare)
break;
@@ -183,12 +183,12 @@ namespace dbaui
}
//------------------------------------------------------------------
- OIndexCollection::iterator OIndexCollection::findOriginal(const String& _rName)
+ Indexes::iterator OIndexCollection::findOriginal(const String& _rName)
{
::rtl::OUString sNameCompare(_rName);
// loop'n'compare
- iterator aSearch = m_aIndexes.begin();
+ Indexes::iterator aSearch = m_aIndexes.begin();
for (; aSearch != m_aIndexes.end(); ++aSearch)
if (aSearch->getOriginalName() == sNameCompare)
break;
@@ -197,7 +197,7 @@ namespace dbaui
}
//------------------------------------------------------------------
- void OIndexCollection::commitNewIndex(const iterator& _rPos) SAL_THROW((SQLException))
+ void OIndexCollection::commitNewIndex(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
{
OSL_ENSURE(_rPos->isNew(), "OIndexCollection::commitNewIndex: index must be new!");
@@ -268,7 +268,7 @@ namespace dbaui
}
//------------------------------------------------------------------
- sal_Bool OIndexCollection::dropNoRemove(const iterator& _rPos) SAL_THROW((SQLException))
+ sal_Bool OIndexCollection::dropNoRemove(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
{
try
{
@@ -294,7 +294,7 @@ namespace dbaui
}
// adjust the OIndex structure
- iterator aDropped = findOriginal(_rPos->getOriginalName());
+ Indexes::iterator aDropped = findOriginal(_rPos->getOriginalName());
OSL_ENSURE(aDropped != m_aIndexes.end(), "OIndexCollection::drop: invalid original name, but successfull commit?!");
aDropped->flagAsNew(GrantIndexAccess());
@@ -302,7 +302,7 @@ namespace dbaui
}
//------------------------------------------------------------------
- sal_Bool OIndexCollection::drop(const iterator& _rPos) SAL_THROW((SQLException))
+ sal_Bool OIndexCollection::drop(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
{
OSL_ENSURE((_rPos >= m_aIndexes.begin()) && (_rPos < m_aIndexes.end()),
"OIndexCollection::drop: invalid position (fasten your seatbelt .... this will crash)!");
@@ -355,10 +355,10 @@ namespace dbaui
const ::rtl::OUString* pFieldNames = aFieldNames.getConstArray();
const ::rtl::OUString* pFieldNamesEnd = pFieldNames + aFieldNames.getLength();
- OIndexField* pCopyTo = _rIndex.aFields.begin();
+ IndexFields::iterator aCopyTo = _rIndex.aFields.begin();
Reference< XPropertySet > xIndexColumn;
- for (;pFieldNames < pFieldNamesEnd; ++pFieldNames, ++pCopyTo)
+ for (;pFieldNames < pFieldNamesEnd; ++pFieldNames, ++aCopyTo)
{
// extract the column
xIndexColumn.clear();
@@ -366,22 +366,22 @@ namespace dbaui
if (!xIndexColumn.is())
{
OSL_ENSURE(sal_False, "OIndexCollection::implFillIndexInfo: invalid index column!");
- --pCopyTo;
+ --aCopyTo;
continue;
}
// get the relevant properties
- pCopyTo->sFieldName = *pFieldNames;
- pCopyTo->bSortAscending = ::cppu::any2bool(xIndexColumn->getPropertyValue(s_sSortPropertyName));
+ aCopyTo->sFieldName = *pFieldNames;
+ aCopyTo->bSortAscending = ::cppu::any2bool(xIndexColumn->getPropertyValue(s_sSortPropertyName));
}
- _rIndex.aFields.resize(pCopyTo - _rIndex.aFields.begin());
+ _rIndex.aFields.resize(aCopyTo - _rIndex.aFields.begin());
// (just in case some fields were invalid ...)
}
}
//------------------------------------------------------------------
- void OIndexCollection::resetIndex(const iterator& _rPos) SAL_THROW((SQLException))
+ void OIndexCollection::resetIndex(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
{
OSL_ENSURE(_rPos >= m_aIndexes.begin() && _rPos < m_aIndexes.end(),
"OIndexCollection::resetIndex: invalid position!");
@@ -405,7 +405,7 @@ namespace dbaui
}
//------------------------------------------------------------------
- OIndexCollection::iterator OIndexCollection::insert(const String& _rName)
+ Indexes::iterator OIndexCollection::insert(const String& _rName)
{
OSL_ENSURE(end() == find(_rName), "OIndexCollection::insert: invalid new name!");
String tmpName;
Index: source/xforms/propertysetbase.cxx
===================================================================
RCS file: /cvs/gsl/forms/source/xforms/propertysetbase.cxx,v
retrieving revision 1.3
diff -u -p -r1.3 propertysetbase.cxx
--- openoffice.org.orig/forms/source/xforms/propertysetbase.cxx 23 Mar 2005 11:38:13 -0000 1.3
+++ openoffice.org/forms/source/xforms/propertysetbase.cxx 6 Jul 2005 10:32:50 -0000
@@ -114,7 +114,7 @@ cppu::IPropertyArrayHelper& SAL_CALL Pro
if ( !m_pProperties )
{
DBG_ASSERT( !m_aProperties.empty(), "PropertySetBase::getInfoHelper: no registered properties!" );
- m_pProperties = new cppu::OPropertyArrayHelper( m_aProperties.begin(), m_aProperties.size(), sal_False );
+ m_pProperties = new cppu::OPropertyArrayHelper( &m_aProperties[0], m_aProperties.size(), sal_False );
}
return *m_pProperties;
}
Index: source/xforms/submission.cxx
===================================================================
RCS file: /cvs/gsl/forms/source/xforms/submission.cxx,v
retrieving revision 1.5
diff -u -p -r1.5 submission.cxx
--- openoffice.org.orig/forms/source/xforms/submission.cxx 3 May 2005 14:41:36 -0000 1.5
+++ openoffice.org/forms/source/xforms/submission.cxx 6 Jul 2005 10:32:50 -0000
@@ -497,7 +497,7 @@ sal_Bool SAL_CALL Submission::convertFas
while ( p >= 0 )
aPrefixes.push_back( sTokenList.getToken( 0, ',', p ) );
- Sequence< ::rtl::OUString > aConvertedPrefixes( aPrefixes.begin(), aPrefixes.size() );
+ Sequence< ::rtl::OUString > aConvertedPrefixes( &aPrefixes[0], aPrefixes.size() );
return PropertySetBase::convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, makeAny( aConvertedPrefixes ) );
}
}
? source/base/localize.sdf
Index: source/ure/makefile.mk
===================================================================
RCS file: /cvs/installation/scp2/source/ure/makefile.mk,v
retrieving revision 1.2
diff -u -p -r1.2 makefile.mk
--- openoffice.org.orig/scp2/openoffice.org.orig/scp2/source/ure/makefile.mk 17 Jun 2005 10:18:23 -0000 1.2
+++ source/ure/makefile.mk 6 Jul 2005 15:04:52 -0000
@@ -68,4 +68,8 @@ TARGET := ure
SCP_PRODUCT_TYPE = ure
PARFILES = ure.par
+.IF "$(USE_SYSTEM_STL)" == "YES"
+SCPDEFS+=-DUSE_SYSTEM_STL
+.ENDIF
+
.INCLUDE: target.mk
? systemstl/numeric
Index: makefile.mk
===================================================================
RCS file: /cvs/external/stlport/makefile.mk,v
retrieving revision 1.30
diff -u -p -r1.30 makefile.mk
--- openoffice.org.orig/stlport/makefile.mk 31 May 2005 17:04:13 -0000 1.30
+++ openoffice.org/stlport/makefile.mk 6 Jul 2005 15:05:35 -0000
@@ -76,6 +76,7 @@ $(INCCOM)$/stlport$/hash_map : systemstl
+$(COPY) systemstl/functional $(INCCOM)$/stlport
+$(COPY) systemstl/hash_map $(INCCOM)$/stlport
+$(COPY) systemstl/hash_set $(INCCOM)$/stlport
+ +$(COPY) systemstl/numeric $(INCCOM)$/stlport
+$(COPY) systemstl/slist $(INCCOM)$/stlport
+$(COPY) systemstl/rope $(INCCOM)$/stlport
+$(COPY) systemstl/vector $(INCCOM)$/stlport
Index: systemstl/functional
===================================================================
RCS file: /cvs/external/stlport/systemstl/functional,v
retrieving revision 1.3
diff -u -p -r1.3 functional
--- openoffice.org.orig/stlport/systemstl/functional 24 Feb 2005 14:47:25 -0000 1.3
+++ openoffice.org/stlport/systemstl/functional 6 Jul 2005 15:11:37 -0000
@@ -63,9 +63,7 @@
#define SYSTEM_STL_FUNCTIONAL
#ifdef GCC
-#include <bits/c++config.h>
-#include <cstddef>
-#include <bits/stl_function.h>
+#include <ext/../functional>
#include <ext/functional>
namespace std
Index: systemstl/rope
===================================================================
RCS file: /cvs/external/stlport/systemstl/rope,v
retrieving revision 1.2
diff -u -p -r1.2 rope
--- openoffice.org.orig/stlport/systemstl/rope 24 Feb 2005 14:47:52 -0000 1.2
+++ openoffice.org/stlport/systemstl/rope 6 Jul 2005 15:11:37 -0000
@@ -63,7 +63,9 @@
#define SYSTEM_STL_ROPE
#include <functional>
+#include <numeric>
#include <ext/rope>
+
#ifdef GCC
namespace std
{
Index: systemstl/vector
===================================================================
RCS file: /cvs/external/stlport/systemstl/vector,v
retrieving revision 1.2
diff -u -p -r1.2 vector
--- openoffice.org.orig/stlport/systemstl/vector 24 Feb 2005 14:48:01 -0000 1.2
+++ openoffice.org/stlport/systemstl/vector 6 Jul 2005 15:11:37 -0000
@@ -64,21 +64,7 @@
#ifdef GCC
-#include <bits/functexcept.h>
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_vector.h>
-#include <bits/stl_bvector.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/vector.tcc>
-#endif
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/vector>
-#endif
+#include <ext/../vector>
namespace std
{
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ openoffice.org/stlport/systemstl/numeric 2005-07-06 10:15:34.000000000 +0000
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef SYSTEM_STL_NUMERIC
+#define SYSTEM_STL_NUMERIC
+
+#ifdef GCC
+#include <ext/../numeric>
+#include <ext/numeric>
+
+namespace std
+{
+ using __gnu_cxx::iota;
+}
+
+#else
+#error UNSUPPORTED COMPILER
+#endif
+
+#endif
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
Index: source/accessibility/AccessibleEmptyEditSource.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/AccessibleEmptyEditSource.cxx,v
retrieving revision 1.2
diff -u -p -r1.2 AccessibleEmptyEditSource.cxx
--- openoffice.org.orig/svx/source/accessibility/AccessibleEmptyEditSource.cxx 1 Apr 2003 13:46:55 -0000 1.2
+++ openoffice.org/svx/source/accessibility/AccessibleEmptyEditSource.cxx 6 Jul 2005 10:02:37 -0000
@@ -316,8 +316,12 @@ namespace accessibility
if( mrObj.GetModel() )
EndListening( *mrObj.GetModel() );
+#if 1
+ mpEditSource = ::std::auto_ptr<SvxEditSource>(new AccessibleProxyEditSource_Impl(mrObj, mrView, mrViewWindow));
+#else
::std::auto_ptr< SvxEditSource > pProxySource( new AccessibleProxyEditSource_Impl(mrObj, mrView, mrViewWindow) );
::std::swap(pProxySource, mpEditSource);
+#endif
// register as listener
StartListening( mpEditSource->GetBroadcaster() );
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- openoffice.org.spec 6 Jul 2005 14:16:23 -0000 1.271
+++ openoffice.org.spec 6 Jul 2005 15:23:12 -0000 1.272
@@ -113,6 +113,7 @@
Patch50: openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch
Patch51: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
Patch52: openoffice.org-1.9.114.ooo51638.mailmerge.patch
+Patch53: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -744,6 +745,7 @@
%patch50 -p1 -b .ooo50745.cruxcrash.vcl.patch
%patch51 -p1 -b .ooo51637.solenv.pyuno.patch
%patch52 -p1 -b .ooo51638.mailmerge.patch
+%patch53 -p1 -b .oooXXXXX.nostlport.patch
#start ludicrous workaround
#while we include these libs we need this, if/when we move to system
#libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped
@@ -776,7 +778,7 @@
fi
cd config_office
autoconf
-%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --disable-fontooo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-nas --without-system-sndfile --without-system-portaudio --without-system-db --without-fonts %{withlang}
+%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --disable-fontooo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-nas --without-system-sndfile --without-system-portaudio --without-system-db --without-fonts --without-stlport4 %{withlang}
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -2114,7 +2116,6 @@
%{instdir}/program/libspell680*.so
%{instdir}/program/libspl680*.so
%{instdir}/program/libsrtrs1.so
-%{instdir}/program/libstlport_gcc.so
%{instdir}/program/libstore.so
%{instdir}/program/libstore.so.3
%{instdir}/program/libsts680*.so
@@ -2914,6 +2915,7 @@
multiple pyuno registering failures
- add openoffice.org-1.9.114.ooo51638.mailmerge.patch to provide email
support for maill merge
+- add openoffice.org-1.9.114.oooXXXXX.nostlport.patch and use systemstl
* Mon Jul 04 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.114-1
- bump to next version
- Previous message (by thread): rpms/cairo/devel cairo.spec,1.14,1.15
- Next message (by thread): rpms/subversion/FC-4 subversion-1.2.1.tar.gz.asc, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.17, 1.18 subversion.spec, 1.57, 1.58 upstream, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list