[Libreoffice-commits] .: 2 commits - scripting/source xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Sun Dec 19 08:44:52 PST 2010
scripting/source/stringresource/stringresource.cxx | 16 +++++++--------
xmloff/source/style/xmlexppr.cxx | 22 ++++++++++-----------
2 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 8d48aa5baefe4bb77a28c37b56e78b7144758449
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Dec 19 16:44:05 2010 +0000
prefix prefix variant
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index f923348..6115dbf 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -270,7 +270,7 @@ Sequence< ::rtl::OUString > StringResourceImpl::implGetResourceIDs( LocaleItem*
IdToStringMap::const_iterator it;
int iTarget = 0;
- for( it = rHashMap.begin(); it != rHashMap.end(); it++ )
+ for( it = rHashMap.begin(); it != rHashMap.end(); ++it )
{
::rtl::OUString aStr = (*it).first;
pStrings[iTarget] = aStr;
@@ -512,7 +512,7 @@ void StringResourceImpl::newLocale( const Locale& locale )
const IdToStringMap& rSourceMap = pCopyFromItem->m_aIdToStringMap;
IdToStringMap& rTargetMap = pLocaleItem->m_aIdToStringMap;
IdToStringMap::const_iterator it;
- for( it = rSourceMap.begin(); it != rSourceMap.end(); it++ )
+ for( it = rSourceMap.begin(); it != rSourceMap.end(); ++it )
{
::rtl::OUString aId = (*it).first;
::rtl::OUString aStr = (*it).second;
@@ -522,7 +522,7 @@ void StringResourceImpl::newLocale( const Locale& locale )
const IdToIndexMap& rSourceIndexMap = pCopyFromItem->m_aIdToIndexMap;
IdToIndexMap& rTargetIndexMap = pLocaleItem->m_aIdToIndexMap;
IdToIndexMap::const_iterator it_index;
- for( it_index = rSourceIndexMap.begin(); it_index != rSourceIndexMap.end(); it_index++ )
+ for( it_index = rSourceIndexMap.begin(); it_index != rSourceIndexMap.end(); ++it_index )
{
::rtl::OUString aId = (*it_index).first;
sal_Int32 nIndex = (*it_index).second;
@@ -1294,10 +1294,10 @@ public:
BinaryOutput( Reference< XMultiComponentFactory > xMCF,
Reference< XComponentContext > xContext );
- Reference< io::XOutputStream > getOutputStream( void )
+ Reference< io::XOutputStream > getOutputStream() const
{ return m_xOutputStream; }
- Sequence< ::sal_Int8 > closeAndGetData( void );
+ Sequence< ::sal_Int8 > closeAndGetData();
// Template to be used with sal_Int16 and sal_Unicode
template< class T >
@@ -1365,7 +1365,7 @@ void BinaryOutput::writeString( const ::rtl::OUString& aStr )
writeUnicodeChar( 0 );
}
-Sequence< ::sal_Int8 > BinaryOutput::closeAndGetData( void )
+Sequence< ::sal_Int8 > BinaryOutput::closeAndGetData()
{
Sequence< ::sal_Int8 > aRetSeq;
if( !m_xOutputStream.is() )
@@ -2264,7 +2264,7 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale
// Find max/min index
sal_Int32 nMinIndex = -1;
sal_Int32 nMaxIndex = -1;
- for( it_index = rIndexMap.begin(); it_index != rIndexMap.end(); it_index++ )
+ for( it_index = rIndexMap.begin(); it_index != rIndexMap.end(); ++it_index )
{
sal_Int32 nIndex = (*it_index).second;
if( nMinIndex > nIndex || nMinIndex == -1 )
@@ -2279,7 +2279,7 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale
sal_Int32 i;
for( i = 0 ; i < nTabSize ; i++ )
pIdPtrs[i] = NULL;
- for( it_index = rIndexMap.begin(); it_index != rIndexMap.end(); it_index++ )
+ for( it_index = rIndexMap.begin(); it_index != rIndexMap.end(); ++it_index )
{
sal_Int32 nIndex = (*it_index).second;
pIdPtrs[nIndex - nMinIndex] = &((*it_index).first);
commit 813527ac60ceafeb6d35b3fcb3794914e610a373
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Dec 19 16:36:43 2010 +0000
prefix prefix variant
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 1059063..b0404e7 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -308,7 +308,7 @@ const uno::Sequence<OUString>& FilterPropertiesInfo_Impl::GetApiNames()
FilterPropertyInfoList_Impl::iterator aOld = aPropInfos.begin();
FilterPropertyInfoList_Impl::iterator aEnd = aPropInfos.end();
FilterPropertyInfoList_Impl::iterator aCurrent = aOld;
- aCurrent++;
+ ++aCurrent;
while ( aCurrent != aEnd )
{
@@ -325,7 +325,7 @@ const uno::Sequence<OUString>& FilterPropertiesInfo_Impl::GetApiNames()
{
// remember old element and continue with next
aOld = aCurrent;
- aCurrent++;
+ ++aCurrent;
}
}
}
@@ -335,7 +335,7 @@ const uno::Sequence<OUString>& FilterPropertiesInfo_Impl::GetApiNames()
OUString *pNames = pApiNames->getArray();
FilterPropertyInfoList_Impl::iterator aItr = aPropInfos.begin();
FilterPropertyInfoList_Impl::iterator aEnd = aPropInfos.end();
- for ( ; aItr != aEnd; aItr++, pNames++)
+ for ( ; aItr != aEnd; ++aItr, ++pNames)
*pNames = aItr->GetApiName();
}
@@ -477,7 +477,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
pPropIter = aPropIters.begin();
XMLPropertyState aNewProperty( -1 );
- for( i = 0; i < nValueCount; i++ )
+ for( i = 0; i < nValueCount; ++i )
{
aNewProperty.mnIndex = -1;
aNewProperty.maValue = *pValues;
@@ -503,7 +503,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
const Any *pValues = aValues.getConstArray();
FilterPropertyInfoList_Impl::iterator aItr = aPropInfos.begin();
- for(sal_uInt32 i = 0; i < nCount; i++ )
+ for(sal_uInt32 i = 0; i < nCount; ++i)
{
// The value is stored in the PropertySet itself, add to list.
XMLPropertyState aNewProperty( -1 );
@@ -512,19 +512,19 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
for( std::list<sal_uInt32>::iterator aIndexItr =
aItr->GetIndexes().begin();
aIndexItr != aItr->GetIndexes().end();
- aIndexItr++ )
+ ++aIndexItr )
{
aNewProperty.mnIndex = *aIndexItr;
aPropStates.AddPropertyState( aNewProperty );
}
- aItr++;
+ ++aItr;
}
}
}
else
{
FilterPropertyInfoList_Impl::iterator aItr = aPropInfos.begin();
- for(sal_uInt32 i = 0; i < nCount; i++ )
+ for(sal_uInt32 i = 0; i < nCount; ++i)
{
sal_Bool bDirectValue =
!pStates || *pStates == PropertyState_DIRECT_VALUE;
@@ -536,7 +536,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
for( std::list<sal_uInt32>::const_iterator aIndexItr =
aItr->GetIndexes().begin();
aIndexItr != aItr->GetIndexes().end();
- aIndexItr++ )
+ ++aIndexItr )
{
if( bDirectValue ||
(rPropMapper->GetEntryFlags( *aIndexItr ) &
@@ -563,9 +563,9 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
}
}
- aItr++;
+ ++aItr;
if( pStates )
- pStates++;
+ ++pStates;
}
}
}
More information about the Libreoffice-commits
mailing list