CWS-TOOLING: integrate CWS rtlcontrols

2008-12-11 21:08:49 +0100 fs  r265367 : CONTEXT_WRITING_MODE is transient
2008-12-11 21:08:00 +0100 fs  r265365 : REGISTER_PROP_3
2008-12-11 20:53:44 +0100 fs  r265362 : ContextWritingMode is not MAYBEVOID
2008-12-11 15:29:08 +0100 fs  r265315 : prevent a deadlock during complex.dbaccess.DatabaseDocument test
2008-12-11 15:01:13 +0100 fs  r265304 : manual RESYNC to m37
2008-12-10 20:04:38 +0100 pl  r265230 : #i30631# fix a snafu in mirroring
2008-12-10 19:14:45 +0100 pl  r265229 : #i30631# rework PaintToDevice for RTL controls
2008-12-05 10:19:13 +0100 fs  r264893 : #i10000# ImplInitSettings => ImplInitWindow (ImplInitSettings clashed with base classes ImplInitSettings on unxsols4)
2008-12-03 12:55:24 +0100 fs  r264768 : #i100000#
2008-12-03 07:11:48 +0100 fs  r264741 : #i10000#
2008-12-02 10:37:51 +0100 fs  r264670 : CWS-TOOLING: rebase CWS rtlcontrols to trunk@264325 (milestone: DEV300:m36)
2008-12-02 09:27:50 +0100 fs  r264660 : merge from trunk
2008-11-25 10:28:36 +0100 ama  r264277 : Fix #i94572#
2008-11-24 11:46:48 +0100 fs  r264218 : #i30631# proper context writing mode
2008-11-24 09:38:04 +0100 fs  r264204 : #i30631# (approved by PL)
2008-11-24 09:35:47 +0100 fs  r264203 : #i30631# Context/WritingMode
2008-11-24 09:33:36 +0100 fs  r264202 : #i30631# Context/WritingMode
2008-11-24 09:31:53 +0100 fs  r264200 : #i30631# RTL
2008-11-19 08:51:48 +0100 fs  r263963 : #i10000#
2008-11-18 20:58:11 +0100 fs  r263878 : #i10000#
2008-11-18 15:30:44 +0100 fs  r263778 : migrate the CWS from CVS to SVN
the CVS changes contained in this change set are the ones between the
following two CVS tags:
CWS_DEV300_RTLCONTROLS_ANCHOR
CWS_DEV300_RTLCONTROLS_PRE_MIGRATION
2008-11-18 12:29:04 +0100 ama  r263762 : Fix #i94572#: Context direction for drawing objects
2008-11-18 12:25:50 +0100 ama  r263761 : Fix #i94572#: Context direction for drawing objects
2008-11-18 12:02:30 +0100 ama  r263759 : Fix #i94572#: Context direction for drawing objects

1 files changed, 20 insertions, 25 deletions

diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 72e90c7be47e..5d14026d4bd9 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -167,14 +167,7 @@ void XMLPropertyStates_Impl::FillPropertyStateVector(
     if (nCount)
     {
         rVector.resize(nCount, XMLPropertyState(-1));
-        XMLPropertyStateList_Impl::iterator aItr = aPropStates.begin();
-        sal_Int32 i (0);
-        while (aItr != aPropStates.end())
-        {
-            rVector[i] = *aItr;
-            aItr++;
-            i++;
-        }
+        ::std::copy( aPropStates.begin(), aPropStates.end(), rVector.begin() );
     }
 }
 
@@ -447,7 +440,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
                 sal_uInt32 nValueCount = 0;
                 sal_uInt32 i;
 
-                for( i = 0; i < nCount; i++, pStates++ )
+                for( i = 0; i < nCount; ++i, ++pStates )
                 {
                     if( (*pStates == PropertyState_DIRECT_VALUE)/* || (bDefault && (*pStates == PropertyState_DEFAULT_VALUE))*/ )
                         nValueCount++;
@@ -459,9 +452,8 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
                     Sequence < OUString > aAPINames( nValueCount );
                     OUString *pAPINames = aAPINames.getArray();
 
-                    FilterPropertyInfoList_Impl::iterator *aPropIters =
-                        new FilterPropertyInfoList_Impl::iterator[nValueCount];
-                    FilterPropertyInfoList_Impl::iterator *pPropIter = aPropIters;
+                    ::std::vector< FilterPropertyInfoList_Impl::iterator > aPropIters;
+                    aPropIters.reserve( nValueCount );
 
                     FilterPropertyInfoList_Impl::iterator aItr = aPropInfos.begin();
                     OSL_ENSURE(aItr != aPropInfos.end(),"Invalid iterator!");
@@ -473,35 +465,38 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
                         if( (*pStates == PropertyState_DIRECT_VALUE)/* || (bDefault && (*pStates == PropertyState_DEFAULT_VALUE))*/ )
                         {
                             *pAPINames++ = aItr->GetApiName();
-                            *pPropIter++ = aItr;
-                            i++;
+                            aPropIters.push_back( aItr );
+                            ++i;
                         }
-                        aItr++;
-                        pStates++;
+                        ++aItr;
+                        ++pStates;
                     }
 
                     aValues = xMultiPropSet->getPropertyValues( aAPINames );
                     const Any *pValues = aValues.getConstArray();
-                    pPropIter = aPropIters;
+
+                    ::std::vector< FilterPropertyInfoList_Impl::iterator >::const_iterator
+                        pPropIter = aPropIters.begin();
+
                     XMLPropertyState aNewProperty( -1 );
                     for( i = 0; i < nValueCount; i++ )
                     {
                         aNewProperty.mnIndex = -1;
                         aNewProperty.maValue = *pValues;
 
-                        for( std::list<sal_uInt32>::iterator aIndexItr =
-                                    (*pPropIter)->GetIndexes().begin();
-                            aIndexItr != (*pPropIter)->GetIndexes().end();
-                            aIndexItr++ )
+                        const ::std::list< sal_uInt32 >& rIndexes( (*pPropIter)->GetIndexes() );
+                        for (   std::list<sal_uInt32>::const_iterator aIndexItr = rIndexes.begin();
+                                aIndexItr != rIndexes.end();
+                                ++aIndexItr
+                            )
                         {
                             aNewProperty.mnIndex = *aIndexItr;
                             aPropStates.AddPropertyState( aNewProperty );
                         }
 
-                        pPropIter++;
-                        pValues++;
+                        ++pPropIter;
+                        ++pValues;
                     }
-                    delete[] aPropIters;
                 }
             }
             else
@@ -540,7 +535,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
                     // The value is stored in the PropertySet itself, add to list.
                     sal_Bool bGotValue = sal_False;
                     XMLPropertyState aNewProperty( -1 );
-                    for( std::list<sal_uInt32>::iterator aIndexItr =
+                    for( std::list<sal_uInt32>::const_iterator aIndexItr =
                             aItr->GetIndexes().begin();
                         aIndexItr != aItr->GetIndexes().end();
                         aIndexItr++ )