DataSourceHelper.cxx (cde9e8dc) | DataSourceHelper.cxx (9ec58d04) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 334 unchanged lines hidden (view full) --- 343 if( !xDataProvider.is() ) 344 return bSomethingDetected; 345 346 try 347 { 348 DataSourceHelper::readArguments( 349 xDataProvider->detectArguments( pressUsedDataIntoRectangularFormat( xChartDocument ) ), 350 rOutRangeString, rSequenceMapping, rOutUseColumns, rOutFirstCellAsLabel, rOutHasCategories ); | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 334 unchanged lines hidden (view full) --- 343 if( !xDataProvider.is() ) 344 return bSomethingDetected; 345 346 try 347 { 348 DataSourceHelper::readArguments( 349 xDataProvider->detectArguments( pressUsedDataIntoRectangularFormat( xChartDocument ) ), 350 rOutRangeString, rSequenceMapping, rOutUseColumns, rOutFirstCellAsLabel, rOutHasCategories ); |
351 bSomethingDetected = (rOutRangeString.getLength() > 0); | 351 bSomethingDetected = !rOutRangeString.isEmpty(); |
352 353 uno::Reference< chart2::data::XLabeledDataSequence > xCategories( 354 DiagramHelper::getCategoriesFromDiagram( xChartDocument->getFirstDiagram() )); 355 rOutHasCategories = xCategories.is(); 356 } 357 catch( uno::Exception & ex ) 358 { 359 ASSERT_EXCEPTION( ex ); --- 38 unchanged lines hidden (view full) --- 398// { 399// bHasHasCategories = 400// (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(::getBooleanCppuType())); 401// } 402 else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CellRangeRepresentation" ) )) 403 { 404 ::rtl::OUString aRange; 405 bHasCellRangeRepresentation = | 352 353 uno::Reference< chart2::data::XLabeledDataSequence > xCategories( 354 DiagramHelper::getCategoriesFromDiagram( xChartDocument->getFirstDiagram() )); 355 rOutHasCategories = xCategories.is(); 356 } 357 catch( uno::Exception & ex ) 358 { 359 ASSERT_EXCEPTION( ex ); --- 38 unchanged lines hidden (view full) --- 398// { 399// bHasHasCategories = 400// (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(::getBooleanCppuType())); 401// } 402 else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CellRangeRepresentation" ) )) 403 { 404 ::rtl::OUString aRange; 405 bHasCellRangeRepresentation = |
406 (aProperty.Value.hasValue() && (aProperty.Value >>= aRange) && aRange.getLength() > 0); | 406 (aProperty.Value.hasValue() && (aProperty.Value >>= aRange) && !aRange.isEmpty()); |
407 } 408// else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SequenceMapping" ) )) 409// { 410// bHasSequenceMapping = 411// (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo( 412// ::getCppuType( reinterpret_cast< 413// const uno::Sequence< sal_Int32 > * >(0)))); 414// } --- 117 unchanged lines hidden --- | 407 } 408// else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SequenceMapping" ) )) 409// { 410// bHasSequenceMapping = 411// (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo( 412// ::getCppuType( reinterpret_cast< 413// const uno::Sequence< sal_Int32 > * >(0)))); 414// } --- 117 unchanged lines hidden --- |