CWS-TOOLING: integrate CWS dr69

2009-09-09 11:45:28 +0200 dr  r275979 : suncc failure
2009-09-09 11:33:34 +0200 dr  r275977 : gcc warning
2009-09-09 11:09:02 +0200 er  r275976 : #i87171# reworked name check for creating defined names
2009-09-09 10:38:02 +0200 dr  r275973 : adapt changes in oox base class
2009-09-09 10:21:03 +0200 dr  r275969 : remove faulty pagesize stuff
2009-09-09 10:20:13 +0200 dr  r275968 : remove faulty pagesize stuff
2009-09-08 20:24:39 +0200 nn  r275958 : #i104899# interpret cells when creating chart listener after loading
2009-09-08 16:05:37 +0200 er  r275937 : ScXMLDDELinkContext::EndElement: Excel writes bad ODF <table:dde-link> <table:table> without <table:table-column>'s table:number-columns-repeated attribute; be lenient ...
2009-09-08 13:14:54 +0200 er  r275925 : #i103315# handle external references in Excel's ODF msoxl namespace
2009-09-07 17:37:18 +0200 dr  r275907 : #i104753# crash when deleting cell with note
2009-09-07 14:02:29 +0200 dr  r275896 : #i103520# reworked sheet name buffer to resolve internal hyperlinks, fix almost all remaining problems with external links in BIFF, fix auto color import for BIFF
2009-09-06 20:01:05 +0200 er  r275862 : #i35913# fix regression introduced by integration of CWS fhawfixes1; patch from <wsfulton>
2009-09-05 18:32:00 +0200 er  r275847 : #i104156# merge #i103918# from uncloned dr68ooo311
2009-09-05 18:19:23 +0200 er  r275846 : #i104156# merge #i103317# from uncloned dr68ooo311
2009-09-05 17:32:12 +0200 er  r275844 : #i104484# glueState: correct casts in range bounds; patch from <cmc> slightly modified
2009-09-03 17:26:38 +0200 dr  r275764 : #i103520# handle apostrophs in sheet names in internal URLs
2009-09-03 17:21:26 +0200 dr  r275763 : #i95271# show text formatting in temp notes
2009-09-03 12:24:52 +0200 dr  r275747 : unused declaration
2009-09-02 21:33:03 +0200 dr  r275727 : #i96438# cleanup color handling in xls filter, extend VML color parser
2009-09-02 15:39:57 +0200 dr  r275715 : #158571# #i96438# accept also VML colors in the form '#RRGGBB [xyz]'
2009-09-02 15:16:36 +0200 dr  r275714 : #158571# #i96438# set note text
2009-09-02 14:59:33 +0200 dr  r275713 : #158571# #i96438# load custom line dashes from DrawingML and VML
2009-09-02 11:53:35 +0200 dr  r275702 : #158571# #i96438# import VML fill gradients
2009-08-31 19:28:10 +0200 dr  r275632 : #158571# #i96438# more vml formatting
2009-08-31 14:29:30 +0200 dr  r275606 : #158571# #i96438# changed handling of xml token ids/names
2009-08-28 18:25:26 +0200 dr  r275545 : #158571# #i96438# preparations for and basic support of VML shape formatting, load spreadsheet cell notes position, formatting, and visibility
2009-08-25 19:08:31 +0200 dr  r275378 : #i103390# dump BIFF STYLEEXT
2009-08-25 18:28:50 +0200 dr  r275377 : #i103390# improve built-in style handling
2009-08-25 18:27:38 +0200 dr  r275376 : #i103390# improve built-in style handling
2009-08-04 18:49:40 +0200 dr  r274629 : CWS-TOOLING: rebase CWS dr69 to trunk@274622 (milestone: DEV300:m54)

1 files changed, 16 insertions, 8 deletions

diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index ccc5cfdd62b4..a40b4a737bd3 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include "properties.hxx"
+#include "oox/token/propertylist.hxx"
 
 using ::rtl::OUString;
 using ::com::sun::star::uno::Any;
@@ -59,7 +60,7 @@ namespace oox {
 namespace {
 
 /** Thread-save singleton of a vector of all supported property names. */
-struct PropertyNamesPool : public ::rtl::Static< PropertyNamesList, PropertyNamesPool > {};
+struct StaticPropertyList : public ::rtl::Static< PropertyList, StaticPropertyList > {};
 
 // ----------------------------------------------------------------------------
 
@@ -103,7 +104,7 @@ GenericPropertySet::GenericPropertySet()
 
 GenericPropertySet::GenericPropertySet( const PropertyMap& rPropMap )
 {
-    const PropertyNamesList& rPropNames = PropertyNamesPool::get();
+    const PropertyList& rPropNames = StaticPropertyList::get();
     for( PropertyMap::const_iterator aIt = rPropMap.begin(), aEnd = rPropMap.end(); aIt != aEnd; ++aIt )
         maPropMap[ rPropNames[ aIt->first ] ] = aIt->second;
 }
@@ -170,10 +171,19 @@ sal_Bool SAL_CALL GenericPropertySet::hasPropertyByName( const OUString& rProper
 
 // ============================================================================
 
-const OUString& PropertyMap::getPropertyName( sal_Int32 nPropId )
+PropertyMap::PropertyMap() :
+    mpPropNames( &StaticPropertyList::get() )
+{
+}
+
+PropertyMap::~PropertyMap()
+{
+}
+
+/*static*/ const OUString& PropertyMap::getPropertyName( sal_Int32 nPropId )
 {
     OSL_ENSURE( (0 <= nPropId) && (nPropId < PROP_COUNT), "PropertyMap::getPropertyName - invalid property identifier" );
-    return PropertyNamesPool::get()[ nPropId ];
+    return StaticPropertyList::get()[ nPropId ];
 }
 
 const Any* PropertyMap::getProperty( sal_Int32 nPropId ) const
@@ -187,12 +197,11 @@ Sequence< PropertyValue > PropertyMap::makePropertyValueSequence() const
     Sequence< PropertyValue > aSeq( static_cast< sal_Int32 >( size() ) );
     if( !empty() )
     {
-        const PropertyNamesList& rPropNames = PropertyNamesPool::get();
         PropertyValue* pValues = aSeq.getArray();
         for( const_iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt, ++pValues )
         {
             OSL_ENSURE( (0 <= aIt->first) && (aIt->first < PROP_COUNT), "PropertyMap::makePropertyValueSequence - invalid property identifier" );
-            pValues->Name = rPropNames[ aIt->first ];
+            pValues->Name = (*mpPropNames)[ aIt->first ];
             pValues->Value = aIt->second;
             pValues->State = ::com::sun::star::beans::PropertyState_DIRECT_VALUE;
         }
@@ -206,13 +215,12 @@ void PropertyMap::fillSequences( Sequence< OUString >& rNames, Sequence< Any >&
     rValues.realloc( static_cast< sal_Int32 >( size() ) );
     if( !empty() )
     {
-        const PropertyNamesList& rPropNames = PropertyNamesPool::get();
         OUString* pNames = rNames.getArray();
         Any* pValues = rValues.getArray();
         for( const_iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt, ++pNames, ++pValues )
         {
             OSL_ENSURE( (0 <= aIt->first) && (aIt->first < PROP_COUNT), "PropertyMap::fillSequences - invalid property identifier" );
-            *pNames = rPropNames[ aIt->first ];
+            *pNames = (*mpPropNames)[ aIt->first ];
             *pValues = aIt->second;
         }
     }