diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 05:36:33 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 05:36:33 -0500 |
| commit | 84660a54284fe27d294daa11490edbaa81b32376 (patch) | |
| tree | 23b1eaf949c2774faa72df8371094598a65d5a08 /oox/source/drawingml/chart/chartconverter.cxx | |
| parent | cef1ab56b2e955f48bf016e77e7129fab6c85f33 (diff) | |
fix mis-merge in oox
Diffstat (limited to 'oox/source/drawingml/chart/chartconverter.cxx')
| -rw-r--r-- | oox/source/drawingml/chart/chartconverter.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx index da8bf26527fa..2e7ea2814f7d 100644 --- a/oox/source/drawingml/chart/chartconverter.cxx +++ b/oox/source/drawingml/chart/chartconverter.cxx @@ -31,6 +31,8 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include "oox/drawingml/chart/chartspaceconverter.hxx" #include "oox/drawingml/chart/chartspacemodel.hxx" +#include "oox/helper/containerhelper.hxx" +#include "oox/core/xmlfilterbase.hxx" using ::oox::drawingml::chart::DataSequenceModel; using ::com::sun::star::uno::Any; @@ -67,7 +69,7 @@ static OUString lclGenerateApiString( const OUString& rString ) return OUStringBuffer().append( sal_Unicode( '"' ) ).append( aRetString ).append( sal_Unicode( '"' ) ).makeStringAndClear(); } -static OUString lclGenerateApiArray( const Matrix< Any >& rMatrix ) + static ::rtl::OUString lclGenerateApiArray( const Matrix< Any >& rMatrix ) { OSL_ENSURE( !rMatrix.empty(), "ChartConverter::lclGenerateApiArray - missing matrix values" ); OUStringBuffer aBuffer; @@ -79,7 +81,7 @@ static OUString lclGenerateApiArray( const Matrix< Any >& rMatrix ) for( Matrix< Any >::const_iterator aBeg = rMatrix.row_begin( nRow ), aIt = aBeg, aEnd = rMatrix.row_end( nRow ); aIt != aEnd; ++aIt ) { double fValue = 0.0; - OUString aString; + ::rtl::OUString aString; if( aIt != aBeg ) aBuffer.append( API_TOKEN_ARRAY_COLSEP ); if( *aIt >>= fValue ) @@ -134,7 +136,7 @@ Reference< XDataSequence > ChartConverter::createDataSequence( const Reference< Reference< XDataSequence > xDataSeq; if( rxDataProvider.is() ) { - OUString aRangeRep; + ::rtl::OUString aRangeRep; if( !rDataSeq.maData.empty() ) { // create a single-row array from constant source data @@ -167,4 +169,4 @@ Reference< XDataSequence > ChartConverter::createDataSequence( const Reference< } // namespace drawingml } // namespace oox -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |