CWS-TOOLING: integrate CWS dr68

2009-06-19 17:43:48 +0200 oc  r273175 : #i102946# some lines for new dialog added
2009-06-19 14:17:45 +0200 oc  r273158 : #i102946# three lines added
2009-05-19 11:56:14 +0200 dr  r272065 : #i99677# wrong attribute name
2009-05-18 18:37:05 +0200 dr  r272045 : #i10000# suncc warning
2009-05-05 16:46:13 +0200 dr  r271536 : #i10000# adoptions after rebase to master containing dr67
2009-05-05 16:01:19 +0200 dr  r271530 : #i10000# adoptions after rebase to master containing dr67
2009-05-04 14:20:39 +0200 dr  r271453 : CWS-TOOLING: rebase CWS dr68 to trunk@271427 (milestone: DEV300:m47)
2009-04-28 17:01:14 +0200 dr  r271332 : CWS-TOOLING: rebase CWS dr68 to trunk@270723 (milestone: DEV300:m46)
2009-04-23 12:21:40 +0200 dr  r271149 : #i100688# missing checkins
2009-04-23 12:18:16 +0200 dr  r271147 : #i100978# relations path handling
2009-04-22 19:25:45 +0200 nn  r271136 : #i49491# show navigator for double click on document position status bar control
2009-04-22 11:28:36 +0200 nn  r271085 : #i60401# small text change
2009-04-21 16:53:23 +0200 dr  r271044 : #i10000# missing dtor
2009-04-20 13:39:25 +0200 nn  r270977 : #i60401# add dialog to extend sort range (patch from maoyg)
2009-04-08 12:11:08 +0200 dr  r270630 : #i100943# prevent assertion when loading chart with empty category ranges
2009-04-07 19:03:00 +0200 dr  r270609 : #i100688# missing bits for OLE
2009-04-07 17:14:06 +0200 dr  r270605 : ported fix for #i100710#
2009-04-07 17:12:50 +0200 dr  r270604 : #i10000# wae
2009-04-07 15:31:55 +0200 dr  r270598 : import system colors moved to FilterBase class, more rework on fill and color contexts
2009-04-06 15:00:03 +0200 dr  r270552 : #i99677# prevent recursive loading of the current document
2009-04-03 18:28:42 +0200 dr  r270515 : added import of brightness/contrast and mono/grayscale color effects for image shapes
2009-04-03 17:36:03 +0200 dr  r270509 : cache already imported embedded graphics
2009-04-03 16:46:34 +0200 dr  r270500 : more rework on bitmap fill and graphic object handling
2009-03-31 12:28:10 +0200 dr  r270271 : #i10000# unxlngi6 wae
2009-03-31 09:04:10 +0200 dr  r270261 : CWS-TOOLING: rebase CWS dr68 to trunk@270033 (milestone: DEV300:m45)
2009-03-30 17:42:05 +0200 dr  r270249 : #i91122# add missing doc
2009-03-30 17:37:08 +0200 dr  r270248 : #i91122# add missing doc
2009-03-30 16:59:15 +0200 dr  r270241 : #i99677# add import of ActiveX scrollbar controls
2009-03-30 14:30:36 +0200 dr  r270230 : #i91122# missing/wrong documentation
2009-03-30 13:03:38 +0200 dr  r270220 : #i99677# add import of ActiveX combobox and spinbutton controls
2009-03-27 11:46:59 +0100 dr  r270144 : #i99677# import ActiveX listbox controls (Forms.ListBox.1)
2009-03-26 19:58:00 +0100 dr  r270104 : #i99677# move more OLE import code into ole submodule
2009-03-26 15:15:02 +0100 dr  r270082 : #i100546# add import of chart bitmap fills, add import of X/Y offset in tiled bitmap fills of all shapes
2009-03-25 12:54:59 +0100 dr  r270018 : #i99677# import ActiveX edit text control (Forms.TextBox.1)
2009-03-24 10:59:29 +0100 dr  r269921 : #i99677# moved import of OLE StdHlink to 'ole' submodule, added string import helpers to BinaryStreamBase class, removed implementation of ST_XString import from docprop in favour of the implementation in class AttributeList
2009-03-24 10:40:18 +0100 dr  r269919 : #i100502# implicit precedence of '&&' was intended
2009-03-24 10:18:29 +0100 dr  r269917 : #i100502# missing parentheses
2009-03-23 15:17:48 +0100 dr  r269876 : #i99677# more code reorg, added graphic helper and OLE helper object per filter, added OLE/control import to PPTX/XLSX filter, moved helpers from XmlFilterBase to FilterBase
2009-03-19 12:45:20 +0100 dr  r269740 : #i99677# interface changes in oox
2009-03-18 15:51:50 +0100 dr  r269683 : #i99677# improved relation handling (internal/external), added preprocessor for VML streams to eat MS specific instructions, added OCX ToggleButton/OptionButton import, added DIB import for BIFF (page background picture, lots of other minor improvements
2009-03-16 15:25:30 +0100 dr  r269551 : #i99677# import excel form control client data (printable, cell link)
2009-03-13 18:37:17 +0100 dr  r269494 : #i99677# import image controls and check boxes
2009-03-12 15:08:18 +0100 dr  r269420 : #i10000# rebase problems
2009-03-12 14:43:09 +0100 dr  r269418 : #i10000# rebase problems
2009-03-12 14:42:41 +0100 dr  r269417 : #i10000# missing delivered header
2009-03-12 13:57:06 +0100 dr  r269405 : #i10000# typos
2009-03-12 12:58:52 +0100 dr  r269391 : CWS-TOOLING: rebase CWS dr68 to trunk@269297 (milestone: DEV300:m43)
2009-03-12 11:11:46 +0100 dr  r269374 : #i99677# first step to import BIFF8 page background
2009-03-12 10:21:53 +0100 dr  r269364 : #i99677# rework of graphic import in entire filter, added import of AX Label controls
2009-03-09 16:44:50 +0100 dr  r269202 : #i99677# import some formatting attributes of command buttons
2009-03-05 15:31:46 +0100 dr  r268911 : #i99677# use VML shape client data to import excel VML shape positions
2009-03-05 11:39:48 +0100 dr  r268888 : #i99677# create UNO control shapes from VML control shapes
2009-03-05 11:38:59 +0100 dr  r268886 : #i99677# change attribute Shapes to DrawPage for import of embedded form controls
2009-03-05 11:30:40 +0100 dr  r268885 : #i99677# change attribute Shapes to DrawPage for import of embedded form controls
2009-03-04 18:46:05 +0100 dr  r268860 : adapt namespace ids according to oox
2009-03-04 18:43:49 +0100 dr  r268859 : #i99677# more VML import rework
2009-03-03 13:38:36 +0100 dr  r268721 : #i99677# more cleanup for VML filter
2009-03-03 13:13:15 +0100 dr  r268719 : #i99807# do not iterate beyond end of std::list
2009-03-02 11:55:49 +0100 dr  r268644 : add ST_XString support (encoded characters in attribute values)
2009-02-26 17:07:18 +0100 dr  r268542 : #i99677# first steps of ax control import: dummy AX base classes, reimplement VML import (hopefully without breaking anything), register embedded AX controls at VML drawing
2009-02-23 17:43:50 +0100 dr  r268365 : #i99426# remaining work on scenario import
2009-02-19 16:56:25 +0100 dr  r268295 : #i99426# base implementations for scenarios import

1 files changed, 21 insertions, 21 deletions

diff --git a/oox/source/xls/pivottablebuffer.cxx b/oox/source/xls/pivottablebuffer.cxx
index a49a5cda70ae..73404d29612f 100644
--- a/oox/source/xls/pivottablebuffer.cxx
+++ b/oox/source/xls/pivottablebuffer.cxx
@@ -221,7 +221,7 @@ OUString lclReadPivotString( const WorkbookHelper& rHelper, BiffInputStream& rSt
 {
     if( nLen == BIFF_PT_NOSTRING )
         return OUString();
-    return (rHelper.getBiff() == BIFF8) ? rStrm.readUniString( nLen ) : rStrm.readCharArray( nLen, rHelper.getTextEncoding() );
+    return (rHelper.getBiff() == BIFF8) ? rStrm.readUniString( nLen ) : rStrm.readCharArrayUC( nLen, rHelper.getTextEncoding() );
 }
 
 } // namespace
@@ -381,7 +381,7 @@ void PivotTableField::importItem( const AttributeList& rAttribs )
 void PivotTableField::importReference( const AttributeList& rAttribs )
 {
     // field index is stored as unsigned integer
-    maModel.mnSortRefField = static_cast< sal_Int32 >( rAttribs.getUnsignedInteger( XML_field, SAL_MAX_UINT32 ) );
+    maModel.mnSortRefField = static_cast< sal_Int32 >( rAttribs.getUnsigned( XML_field, SAL_MAX_UINT32 ) );
 }
 
 void PivotTableField::importReferenceItem( const AttributeList& rAttribs )
@@ -891,10 +891,10 @@ PivotTableFilter::PivotTableFilter( const PivotTable& rPivotTable ) :
 
 void PivotTableFilter::importFilter( const AttributeList& rAttribs )
 {
-    maModel.maName         = rAttribs.getString( XML_name, OUString() );
-    maModel.maDescription  = rAttribs.getString( XML_description, OUString() );
-    maModel.maStrValue1    = rAttribs.getString( XML_stringValue1, OUString() );
-    maModel.maStrValue2    = rAttribs.getString( XML_stringValue2, OUString() );
+    maModel.maName         = rAttribs.getXString( XML_name, OUString() );
+    maModel.maDescription  = rAttribs.getXString( XML_description, OUString() );
+    maModel.maStrValue1    = rAttribs.getXString( XML_stringValue1, OUString() );
+    maModel.maStrValue2    = rAttribs.getXString( XML_stringValue2, OUString() );
     maModel.mnField        = rAttribs.getInteger( XML_fld, -1 );
     maModel.mnMemPropField = rAttribs.getInteger( XML_mpFld, -1 );
     maModel.mnType         = rAttribs.getToken( XML_type, XML_TOKEN_INVALID );
@@ -1040,17 +1040,17 @@ PivotTable::PivotTable( const WorkbookHelper& rHelper ) :
 
 void PivotTable::importPivotTableDefinition( const AttributeList& rAttribs )
 {
-    maDefModel.maName                = rAttribs.getString( XML_name, OUString() );
-    maDefModel.maDataCaption         = rAttribs.getString( XML_dataCaption , OUString() );
-    maDefModel.maGrandTotalCaption   = rAttribs.getString( XML_grandTotalCaption, OUString() );
-    maDefModel.maRowHeaderCaption    = rAttribs.getString( XML_rowHeaderCaption, OUString() );
-    maDefModel.maColHeaderCaption    = rAttribs.getString( XML_colHeaderCaption, OUString() );
-    maDefModel.maErrorCaption        = rAttribs.getString( XML_errorCaption, OUString() );
-    maDefModel.maMissingCaption      = rAttribs.getString( XML_missingCaption, OUString() );
-    maDefModel.maPageStyle           = rAttribs.getString( XML_pageStyle, OUString() );
-    maDefModel.maPivotTableStyle     = rAttribs.getString( XML_pivotTableStyle, OUString() );
-    maDefModel.maVacatedStyle        = rAttribs.getString( XML_vacatedStyle, OUString() );
-    maDefModel.maTag                 = rAttribs.getString( XML_tag, OUString() );
+    maDefModel.maName                = rAttribs.getXString( XML_name, OUString() );
+    maDefModel.maDataCaption         = rAttribs.getXString( XML_dataCaption , OUString() );
+    maDefModel.maGrandTotalCaption   = rAttribs.getXString( XML_grandTotalCaption, OUString() );
+    maDefModel.maRowHeaderCaption    = rAttribs.getXString( XML_rowHeaderCaption, OUString() );
+    maDefModel.maColHeaderCaption    = rAttribs.getXString( XML_colHeaderCaption, OUString() );
+    maDefModel.maErrorCaption        = rAttribs.getXString( XML_errorCaption, OUString() );
+    maDefModel.maMissingCaption      = rAttribs.getXString( XML_missingCaption, OUString() );
+    maDefModel.maPageStyle           = rAttribs.getXString( XML_pageStyle, OUString() );
+    maDefModel.maPivotTableStyle     = rAttribs.getXString( XML_pivotTableStyle, OUString() );
+    maDefModel.maVacatedStyle        = rAttribs.getXString( XML_vacatedStyle, OUString() );
+    maDefModel.maTag                 = rAttribs.getXString( XML_tag, OUString() );
     maDefModel.mnCacheId             = rAttribs.getInteger( XML_cacheId, -1 );
     maDefModel.mnDataPosition        = rAttribs.getInteger( XML_dataPosition, 0 );
     maDefModel.mnPageWrap            = rAttribs.getInteger( XML_pageWrap, 0 );
@@ -1104,7 +1104,7 @@ void PivotTable::importColField( const AttributeList& rAttribs )
 void PivotTable::importPageField( const AttributeList& rAttribs )
 {
     PTPageFieldModel aModel;
-    aModel.maName      = rAttribs.getString( XML_name, OUString() );
+    aModel.maName      = rAttribs.getXString( XML_name, OUString() );
     aModel.mnField     = rAttribs.getInteger( XML_fld, -1 );
     // specification is wrong, XML_item is not the cache item, but the field item
     aModel.mnItem      = rAttribs.getInteger( XML_item, OOBIN_PTPAGEFIELD_MULTIITEMS );
@@ -1114,7 +1114,7 @@ void PivotTable::importPageField( const AttributeList& rAttribs )
 void PivotTable::importDataField( const AttributeList& rAttribs )
 {
     PTDataFieldModel aModel;
-    aModel.maName       = rAttribs.getString( XML_name, OUString() );
+    aModel.maName       = rAttribs.getXString( XML_name, OUString() );
     aModel.mnField      = rAttribs.getInteger( XML_fld, -1 );
     aModel.mnSubtotal   = rAttribs.getToken( XML_subtotal, XML_sum );
     aModel.mnShowDataAs = rAttribs.getToken( XML_showDataAs, XML_normal );
@@ -1378,7 +1378,7 @@ void PivotTable::finalizeImport()
                 aDescProp.setProperty( PROP_DrillDownOnDoubleClick, maDefModel.mbEnableDrill );
 
                 // finalize all fields, this finds field names and creates grouping fields
-                maFields.forEachMem( &PivotTableField::finalizeImport, mxDPDescriptor );
+                maFields.forEachMem( &PivotTableField::finalizeImport, ::boost::cref( mxDPDescriptor ) );
 
                 // all row fields
                 for( IndexVector::iterator aIt = maRowFields.begin(), aEnd = maRowFields.end(); aIt != aEnd; ++aIt )
@@ -1434,7 +1434,7 @@ void PivotTable::finalizeImport()
 void PivotTable::finalizeDateGroupingImport( const Reference< XDataPilotField >& rxBaseDPField, sal_Int32 nBaseFieldIdx )
 {
     // process all fields, there is no chaining information in the cache fields
-    maFields.forEachMem( &PivotTableField::finalizeDateGroupingImport, rxBaseDPField, nBaseFieldIdx );
+    maFields.forEachMem( &PivotTableField::finalizeDateGroupingImport, ::boost::cref( rxBaseDPField ), nBaseFieldIdx );
 }
 
 void PivotTable::finalizeParentGroupingImport( const Reference< XDataPilotField >& rxBaseDPField,