diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-30 11:44:23 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-30 12:54:40 +0000 |
| commit | 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53 (patch) | |
| tree | a1a95b8249052d846a997ad1729758168d6a3b24 /chart2/source/view | |
| parent | f8569cd9a28a3a8856dba4ad53218aa6cc073521 (diff) | |
Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'chart2/source/view')
23 files changed, 378 insertions, 378 deletions
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index e50e543bbe5c..c2a12a6bcb7a 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -140,7 +140,7 @@ sal_Bool VAxisBase::isAnythingToDraw() if( xProps.is() ) { sal_Bool bShow = sal_False; - xProps->getPropertyValue( C2U( "Show" ) ) >>= bShow; + xProps->getPropertyValue( "Show" ) >>= bShow; if( !bShow ) return false; } @@ -187,7 +187,7 @@ bool VAxisBase::prepareShapeCreation() //----------------------------------------- //create named group shape - m_xGroupShape_Shapes = this->createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : C2U("")); + m_xGroupShape_Shapes = this->createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : ""); if( m_aAxisProperties.m_bDisplayLabels ) m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget, m_aCID ); diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 86ec8f2ac6b9..2ebe0f10652d 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -259,11 +259,11 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty { if( AxisHelper::isAxisPositioningEnabled() ) { - xAxisProp->getPropertyValue(C2U( "CrossoverPosition" )) >>= m_eCrossoverType; + xAxisProp->getPropertyValue("CrossoverPosition") >>= m_eCrossoverType; if( ::com::sun::star::chart::ChartAxisPosition_VALUE == m_eCrossoverType ) { double fValue = 0.0; - xAxisProp->getPropertyValue(C2U( "CrossoverValue" )) >>= fValue; + xAxisProp->getPropertyValue("CrossoverValue") >>= fValue; if( m_bCrossingAxisIsCategoryAxes ) fValue = ::rtl::math::round(fValue); @@ -272,8 +272,8 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty else if( ::com::sun::star::chart::ChartAxisPosition_ZERO == m_eCrossoverType ) m_pfMainLinePositionAtOtherAxis = new double(0.0); - xAxisProp->getPropertyValue(C2U( "LabelPosition" )) >>= m_eLabelPos; - xAxisProp->getPropertyValue(C2U( "MarkPosition" )) >>= m_eTickmarkPos; + xAxisProp->getPropertyValue("LabelPosition") >>= m_eLabelPos; + xAxisProp->getPropertyValue("MarkPosition") >>= m_eTickmarkPos; } else { @@ -350,11 +350,11 @@ void AxisProperties::init( bool bCartesian ) m_aLineProperties.initFromPropertySet( xProp ); //init display labels - xProp->getPropertyValue( C2U( "DisplayLabels" ) ) >>= m_bDisplayLabels; + xProp->getPropertyValue( "DisplayLabels" ) >>= m_bDisplayLabels; //init TickmarkProperties - xProp->getPropertyValue( C2U( "MajorTickmarks" ) ) >>= m_nMajorTickmarks; - xProp->getPropertyValue( C2U( "MinorTickmarks" ) ) >>= m_nMinorTickmarks; + xProp->getPropertyValue( "MajorTickmarks" ) >>= m_nMajorTickmarks; + xProp->getPropertyValue( "MinorTickmarks" ) >>= m_nMinorTickmarks; sal_Int32 nMaxDepth = 0; if(m_nMinorTickmarks!=0) @@ -400,13 +400,13 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel ) { try { - xProp->getPropertyValue( C2U( "TextBreak" ) ) >>= this->bLineBreakAllowed; - xProp->getPropertyValue( C2U( "TextOverlap" ) ) >>= this->bOverlapAllowed; - xProp->getPropertyValue( C2U( "StackCharacters" ) ) >>= this->bStackCharacters; - xProp->getPropertyValue( C2U( "TextRotation" ) ) >>= this->fRotationAngleDegree; + xProp->getPropertyValue( "TextBreak" ) >>= this->bLineBreakAllowed; + xProp->getPropertyValue( "TextOverlap" ) >>= this->bOverlapAllowed; + xProp->getPropertyValue( "StackCharacters" ) >>= this->bStackCharacters; + xProp->getPropertyValue( "TextRotation" ) >>= this->fRotationAngleDegree; ::com::sun::star::chart::ChartAxisArrangeOrderType eArrangeOrder; - xProp->getPropertyValue( C2U( "ArrangeOrder" ) ) >>= eArrangeOrder; + xProp->getPropertyValue( "ArrangeOrder" ) >>= eArrangeOrder; switch(eArrangeOrder) { case ::com::sun::star::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE: diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 40b48862d7c1..fee4c6b8878c 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -650,7 +650,7 @@ bool VCartesianAxis::createTextShapes( , m_aAxisLabelProperties.m_aFontReferenceSize ); LabelPositionHelper::changeTextAdjustment( aPropValues, aPropNames, m_aAxisProperties.m_aLabelAlignment ); - uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,C2U("CharColor")); + uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,"CharColor"); sal_Int32 nColor = Color( COL_AUTO ).GetColor(); if(pColorAny) *pColorAny >>= nColor; @@ -1512,7 +1512,7 @@ void VCartesianAxis::updatePositions() { try { - xProp->setPropertyValue( C2U( "Transformation" ), aATransformation ); + xProp->setPropertyValue( "Transformation", aATransformation ); } catch( const uno::Exception& e ) { @@ -1643,7 +1643,7 @@ void VCartesianAxis::createShapes() m_xGroupShape_Shapes, aPoints , &m_aAxisProperties.m_aLineProperties ); //because of this name this line will be used for marking the axis - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); } //----------------------------------------- //create an additional line at NULL diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 195a25c47c86..2c7ca4b4ba48 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -286,7 +286,7 @@ void VCartesianGrid::createShapes() aHandleLineProperties.LineStyle = uno::makeAny( drawing::LineStyle_NONE ); Reference< drawing::XShape > xHandleShape = m_pShapeFactory->createLine2D( xTarget, aHandlesPoints, &aHandleLineProperties ); - m_pShapeFactory->setShapeName( xHandleShape, C2U("HandlesOnly") ); + m_pShapeFactory->setShapeName( xHandleShape, "HandlesOnly" ); } //----------------------------------------- else //if(2!=m_nDimension) diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 6d8f1abc7808..90343690ee59 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -561,7 +561,7 @@ bool VCoordinateSystem::getPropertySwapXAndYAxis() const sal_Bool bSwapXAndY = false; if( xProp.is()) try { - xProp->getPropertyValue( C2U( "SwapXAndYAxis" ) ) >>= bSwapXAndY; + xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXAndY; } catch( const uno::Exception& e ) { diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 647d30873cb4..8d65bc74f392 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -73,7 +73,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( LabelPositionHelper::doDynamicFontResize( aPropValues, aPropNames, xProps , rAxisLabelProperties.m_aFontReferenceSize ); - uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,C2U("CharColor")); + uno::Any* pColorAny = PropertyMapper::getValuePointer(aPropValues,aPropNames,"CharColor"); sal_Int32 nColor = Color( COL_AUTO ).GetColor(); if(pColorAny) *pColorAny >>= nColor; @@ -212,7 +212,7 @@ void VPolarAngleAxis::createShapes() uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( m_xGroupShape_Shapes, aPoints, &m_aAxisProperties.m_aLineProperties ); //because of this name this line will be used for marking the axis - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); //----------------------------------------- //create labels diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index dc05b79f4618..fb485e3623bb 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -154,7 +154,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xMainTarget, aAllPoints, &rLinePropertiesList[nDepth] ); //because of this name this line will be used for marking - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); } } #endif @@ -218,7 +218,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xTarget, aAllPoints, &rLinePropertiesList[nDepth] ); //because of this name this line will be used for marking - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); } } diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 5058bc644896..c78a495506d3 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -53,8 +53,8 @@ BarChart::BarChart( const uno::Reference<XChartType>& xChartTypeModel { if( m_xChartTypeModelProps.is() ) { - m_xChartTypeModelProps->getPropertyValue( C2U( "OverlapSequence" ) ) >>= m_aOverlapSequence; - m_xChartTypeModelProps->getPropertyValue( C2U( "GapwidthSequence" ) ) >>= m_aGapwidthSequence; + m_xChartTypeModelProps->getPropertyValue( "OverlapSequence" ) >>= m_aOverlapSequence; + m_xChartTypeModelProps->getPropertyValue( "GapwidthSequence" ) >>= m_aGapwidthSequence; } } catch( const uno::Exception& e ) @@ -276,7 +276,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar( if( xObjectProperties.is() ) { sal_Int16 nPercentDiagonal = 0; - xObjectProperties->getPropertyValue( C2U( "PercentDiagonal" ) ) >>= nPercentDiagonal; + xObjectProperties->getPropertyValue( "PercentDiagonal" ) >>= nPercentDiagonal; if( nPercentDiagonal < 5 ) bRoundedEdges = false; } @@ -639,7 +639,7 @@ void BarChart::createShapes() sal_Int32 nGeometry3D = DataPointGeometry3D::CUBOID; if(m_nDimension==3) try { - xDataPointProperties->getPropertyValue( C2U( "Geometry3D" )) >>= nGeometry3D; + xDataPointProperties->getPropertyValue( "Geometry3D") >>= nGeometry3D; } catch( const uno::Exception& e ) { diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index 9177babffce6..0352621b3ca4 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -333,7 +333,7 @@ void BubbleChart::createShapes() , pSeries->getPropertiesOfPoint( nIndex ) , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); } //create data point label diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 5a9787f7b5d5..ad1a16405a22 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -127,13 +127,13 @@ void CandleStickChart::createShapes() { if( m_xChartTypeModelProps.is() ) { - m_xChartTypeModelProps->getPropertyValue( C2U( "ShowFirst" ) ) >>= bShowFirst; + m_xChartTypeModelProps->getPropertyValue( "ShowFirst" ) >>= bShowFirst; uno::Reference< beans::XPropertySet > xWhiteDayProps(0); uno::Reference< beans::XPropertySet > xBlackDayProps(0); - m_xChartTypeModelProps->getPropertyValue( C2U( "Japanese" ) ) >>= bJapaneseStyle; - m_xChartTypeModelProps->getPropertyValue( C2U( "WhiteDay" ) ) >>= xWhiteDayProps; - m_xChartTypeModelProps->getPropertyValue( C2U( "BlackDay" ) ) >>= xBlackDayProps; + m_xChartTypeModelProps->getPropertyValue( "Japanese" ) >>= bJapaneseStyle; + m_xChartTypeModelProps->getPropertyValue( "WhiteDay" ) >>= xWhiteDayProps; + m_xChartTypeModelProps->getPropertyValue( "BlackDay" ) >>= xBlackDayProps; tPropertyNameValueMap aWhiteBox_Map; PropertyMapper::getValueMap( aWhiteBox_Map, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xWhiteDayProps ); @@ -260,7 +260,7 @@ void CandleStickChart::createShapes() sal_Int32 nLineIndex =0; AddPointToPoly( aPoly, aPosMiddleMinimum, nLineIndex); AddPointToPoly( aPoly, aPosMiddleMaximum, nLineIndex); - xProp->setPropertyValue( C2U( UNO_NAME_POLYPOLYGON ), uno::makeAny( PolyToPointSequence(aPoly) ) ); + xProp->setPropertyValue( UNO_NAME_POLYPOLYGON, uno::makeAny( PolyToPointSequence(aPoly) ) ); } this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); } @@ -315,7 +315,7 @@ void CandleStickChart::createShapes() uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY ); if(xProp.is()) { - xProp->setPropertyValue( C2U( UNO_NAME_POLYPOLYGON ), uno::makeAny( PolyToPointSequence(aPoly) ) ); + xProp->setPropertyValue( UNO_NAME_POLYPOLYGON, uno::makeAny( PolyToPointSequence(aPoly) ) ); this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); } } diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index e8fc6892d89d..b5c307a86c87 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -124,7 +124,7 @@ PieChart::PieChart( const uno::Reference<XChartType>& xChartTypeModel uno::Reference< beans::XPropertySet > xChartTypeProps( xChartTypeModel, uno::UNO_QUERY ); if( xChartTypeProps.is() ) try { - xChartTypeProps->getPropertyValue( C2U( "UseRings" )) >>= m_bUseRings; + xChartTypeProps->getPropertyValue( "UseRings") >>= m_bUseRings; if( m_bUseRings ) { m_pPosHelper->m_fRadiusOffset = 1.0; @@ -245,14 +245,14 @@ double PieChart::getMaxOffset() return m_fMaxOffset; double fExplodePercentage=0.0; - xSeriesProp->getPropertyValue( C2U( "Offset" )) >>= fExplodePercentage; + xSeriesProp->getPropertyValue( "Offset") >>= fExplodePercentage; if(fExplodePercentage>m_fMaxOffset) m_fMaxOffset=fExplodePercentage; if(!m_bSizeExcludesLabelsAndExplodedSegments) { uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProp->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) { @@ -260,7 +260,7 @@ double PieChart::getMaxOffset() if(xPointProp.is()) { fExplodePercentage=0.0; - xPointProp->getPropertyValue( C2U( "Offset" )) >>= fExplodePercentage; + xPointProp->getPropertyValue( "Offset") >>= fExplodePercentage; if(fExplodePercentage>m_fMaxOffset) m_fMaxOffset=fExplodePercentage; } @@ -404,7 +404,7 @@ void PieChart::createShapes() bool bDoExplode = ( nExplodeableSlot == static_cast< ::std::vector< VDataSeriesGroup >::size_type >(fSlotX) ); if(bDoExplode) try { - xPointProperties->getPropertyValue( C2U( "Offset" )) >>= fExplodePercentage; + xPointProperties->getPropertyValue( "Offset") >>= fExplodePercentage; } catch( const uno::Exception& e ) { @@ -425,7 +425,7 @@ void PieChart::createShapes() if(!pSeries->hasPointOwnColor(nPointIndex) && m_xColorScheme.is()) { apOverwritePropertiesMap.reset( new tPropertyNameValueMap() ); - (*apOverwritePropertiesMap)[C2U("FillColor")] = uno::makeAny( + (*apOverwritePropertiesMap)["FillColor"] = uno::makeAny( m_xColorScheme->getColorByIndex( nPointIndex )); } } @@ -857,7 +857,7 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi if( xProp.is() ) { sal_Int32 nColor = 0; - xProp->getPropertyValue(C2U("CharColor")) >>= nColor; + xProp->getPropertyValue("CharColor") >>= nColor; if( nColor != -1 )//automatic font color does not work for lines -> fallback to black aVLineProperties.Color = uno::makeAny(nColor); } diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 533638d78935..3caa6604f673 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -454,7 +454,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re { uno::Reference< beans::XPropertySet > xProps( rDataSeries.getPropertiesOfPoint( nPointIndex ) ); if( xProps.is() ) - xProps->getPropertyValue( C2U( "CharHeight" )) >>= fViewFontSize; + xProps->getPropertyValue( "CharHeight") >>= fViewFontSize; // pt -> 1/100th mm fViewFontSize *= (2540.0f / 72.0f); } @@ -485,15 +485,15 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re uno::Reference< beans::XPropertySet > xPointProps( rDataSeries.getPropertiesOfPoint( nPointIndex ) ); if(xPointProps.is()) { - xPointProps->getPropertyValue( C2U( "LabelSeparator" ) ) >>= aSeparator; - xPointProps->getPropertyValue( C2U( "TextRotation" ) ) >>= fRotationDegrees; + xPointProps->getPropertyValue( "LabelSeparator" ) >>= aSeparator; + xPointProps->getPropertyValue( "TextRotation" ) >>= fRotationDegrees; } } catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } - bool bMultiLineLabel = aSeparator.equals(C2U("\n"));; + bool bMultiLineLabel = aSeparator.equals("\n");; sal_Int32 nLineCountForSymbolsize = 0; { if(pLabel->ShowCategoryName) @@ -564,7 +564,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re const double fDegreesPi( fRotationDegrees * ( F_PI / -180.0 ) ); uno::Reference< beans::XPropertySet > xProp( xTextShape, uno::UNO_QUERY ); if( xProp.is() ) - xProp->setPropertyValue( C2U( "Transformation" ), ShapeFactory::makeTransformation( aScreenPosition2D, fDegreesPi ) ); + xProp->setPropertyValue( "Transformation", ShapeFactory::makeTransformation( aScreenPosition2D, fDegreesPi ) ); LabelPositionHelper::correctPositionForRotation( xTextShape, eAlignment, fRotationDegrees, true /*bRotateAroundCenter*/ ); } @@ -642,8 +642,8 @@ double lcl_getErrorBarLogicLength( { double fPercent = 0; if( xProp->getPropertyValue( bPositive - ? C2U("PositiveError") - : C2U("NegativeError")) >>= fPercent ) + ? "PositiveError" + : "NegativeError") >>= fPercent ) { if( nIndex >=0 && nIndex < rData.getLength() && ! ::rtl::math::isNan( rData[nIndex] ) && @@ -656,16 +656,16 @@ double lcl_getErrorBarLogicLength( break; case ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE: xProp->getPropertyValue( bPositive - ? C2U("PositiveError") - : C2U("NegativeError")) >>= fResult; + ? "PositiveError" + : "NegativeError") >>= fResult; break; case ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: { // todo: check if this is really what's called error-margin double fPercent = 0; if( xProp->getPropertyValue( bPositive - ? C2U("PositiveError") - : C2U("NegativeError")) >>= fPercent ) + ? "PositiveError" + : "NegativeError") >>= fPercent ) { double fMaxValue; ::rtl::math::setInf(&fMaxValue, true); @@ -801,9 +801,9 @@ void VSeriesPlotter::createErrorBar( sal_Bool bShowNegative = sal_False; sal_Int32 nErrorBarStyle = ::com::sun::star::chart::ErrorBarStyle::VARIANCE; - xErrorBarProperties->getPropertyValue( C2U( "ShowPositiveError" )) >>= bShowPositive; - xErrorBarProperties->getPropertyValue( C2U( "ShowNegativeError" )) >>= bShowNegative; - xErrorBarProperties->getPropertyValue( C2U( "ErrorBarStyle" )) >>= nErrorBarStyle; + xErrorBarProperties->getPropertyValue( "ShowPositiveError") >>= bShowPositive; + xErrorBarProperties->getPropertyValue( "ShowNegativeError") >>= bShowNegative; + xErrorBarProperties->getPropertyValue( "ErrorBarStyle") >>= nErrorBarStyle; if(!bShowPositive && !bShowNegative) return; @@ -1050,7 +1050,7 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries& rVDataSeries createGroupShape( xTarget, rVDataSeries.getDataCurveCID( nN, bAverageLine ) ); uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xRegressionGroupShapes, PolyToPointSequence( aRegressionPoly ), &aVLineProperties ); - m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); + m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); aDefaultPos = xShape->getPosition(); } @@ -1080,15 +1080,15 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( bool bShowEquation = false; bool bShowCorrCoeff = false; OUString aSep( sal_Unicode('\n')); - if(( xEquationProperties->getPropertyValue( C2U("ShowEquation")) >>= bShowEquation ) && - ( xEquationProperties->getPropertyValue( C2U("ShowCorrelationCoefficient")) >>= bShowCorrCoeff )) + if(( xEquationProperties->getPropertyValue( "ShowEquation") >>= bShowEquation ) && + ( xEquationProperties->getPropertyValue( "ShowCorrelationCoefficient") >>= bShowCorrCoeff )) { if( ! (bShowEquation || bShowCorrCoeff)) return; ::rtl::OUStringBuffer aFormula; sal_Int32 nNumberFormatKey = 0; - xEquationProperties->getPropertyValue( C2U("NumberFormat")) >>= nNumberFormatKey; + xEquationProperties->getPropertyValue( "NumberFormat") >>= nNumberFormatKey; if( bShowEquation ) { @@ -1112,7 +1112,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( { aFormula.append( sal_Unicode( 'R' )); aFormula.append( sal_Unicode( 0x00b2 )); - aFormula.append( C2U( " = " )); + aFormula.append( " = "); double fR( xRegressionCurveCalculator->getCorrelationCoefficient()); if( m_apNumberFormatterWrapper.get()) { @@ -1133,7 +1133,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( awt::Point aScreenPosition2D; chart2::RelativePosition aRelativePosition; - if( xEquationProperties->getPropertyValue( C2U("RelativePosition")) >>= aRelativePosition ) + if( xEquationProperties->getPropertyValue( "RelativePosition") >>= aRelativePosition ) { //@todo decide whether x is primary or secondary double fX = aRelativePosition.Primary*m_aPageReferenceSize.Width; @@ -2071,7 +2071,7 @@ bool lcl_HasVisibleLine( const uno::Reference< beans::XPropertySet >& xProps, bo bool bHasVisibleLine = false; rbHasDashedLine = false; drawing::LineStyle aLineStyle = drawing::LineStyle_NONE; - if( xProps.is() && ( xProps->getPropertyValue( C2U("LineStyle")) >>= aLineStyle ) ) + if( xProps.is() && ( xProps->getPropertyValue( "LineStyle") >>= aLineStyle ) ) { if( aLineStyle != drawing::LineStyle_NONE ) bHasVisibleLine = true; @@ -2235,7 +2235,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint( OSL_ASSERT( xPointSet.is()); xPointSet->setPropertyValue( - C2U("Color"), uno::makeAny( m_xColorScheme->getColorByIndex( nPointIndex ))); + "Color", uno::makeAny( m_xColorScheme->getColorByIndex( nPointIndex ))); } } @@ -2319,7 +2319,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries( } // label - aLabelText = ( DataSeriesHelper::getDataSeriesLabel( rSeries.getModel(), m_xChartTypeModel.is() ? m_xChartTypeModel->getRoleOfSequenceForSeriesLabel() : C2U("values-y")) ); + aLabelText = ( DataSeriesHelper::getDataSeriesLabel( rSeries.getModel(), m_xChartTypeModel.is() ? m_xChartTypeModel->getRoleOfSequenceForSeriesLabel() : "values-y") ); aEntry.aLabel = FormattedStringHelper::createFormattedStringSequence( xContext, aLabelText, xTextProperties ); aResult.push_back(aEntry); @@ -2341,7 +2341,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries( { //label OUString aResStr( RegressionCurveHelper::getUINameForRegressionCurve( aCurves[i] ) ); - replaceParamterInString( aResStr, C2U("%SERIESNAME"), aLabelText ); + replaceParamterInString( aResStr, "%SERIESNAME", aLabelText ); aEntry.aLabel = FormattedStringHelper::createFormattedStringSequence( xContext, aResStr, xTextProperties ); // symbol diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index f3dd98ecdf32..4c26350b802f 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -78,7 +78,7 @@ VDiagram::VDiagram( DiagramHelper::getChartTypeByIndex( m_xDiagram, 0 ) ) ) { if(xSourceProp.is()) - xSourceProp->getPropertyValue(C2U( "RightAngledAxes" )) >>= m_bRightAngledAxes; + xSourceProp->getPropertyValue("RightAngledAxes") >>= m_bRightAngledAxes; if( m_bRightAngledAxes ) { ThreeDHelper::adaptRadAnglesForRightAngledAxes( m_fXAnglePi, m_fYAnglePi ); @@ -167,11 +167,11 @@ void VDiagram::createShapes_2d() uno::Reference< drawing::XShapes > xOuterGroup_Shapes = m_pShapeFactory->createGroup2D(m_xLogicTarget); m_xOuterGroupShape = uno::Reference<drawing::XShape>( xOuterGroup_Shapes, uno::UNO_QUERY ); - uno::Reference< drawing::XShapes > xGroupForWall( m_pShapeFactory->createGroup2D(xOuterGroup_Shapes,C2U("PlotAreaExcludingAxes")) ); + uno::Reference< drawing::XShapes > xGroupForWall( m_pShapeFactory->createGroup2D(xOuterGroup_Shapes,"PlotAreaExcludingAxes") ); //create independent group shape as container for datapoints and such things { - uno::Reference< drawing::XShapes > xShapes = m_pShapeFactory->createGroup2D(xOuterGroup_Shapes,C2U("testonly;CooContainer=XXX_CID")); + uno::Reference< drawing::XShapes > xShapes = m_pShapeFactory->createGroup2D(xOuterGroup_Shapes,"testonly;CooContainer=XXX_CID"); m_xCoordinateRegionShape = uno::Reference<drawing::XShape>( xShapes, uno::UNO_QUERY ); } @@ -181,8 +181,8 @@ void VDiagram::createShapes_2d() //add back wall { m_xWall2D = uno::Reference< drawing::XShape >( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.RectangleShape" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.RectangleShape" ), uno::UNO_QUERY ); xGroupForWall->add(m_xWall2D); uno::Reference< beans::XPropertySet > xProp( m_xWall2D, uno::UNO_QUERY ); @@ -207,7 +207,7 @@ void VDiagram::createShapes_2d() { //CID for selection handling rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model - xProp->setPropertyValue( C2U( UNO_NAME_MISC_OBJ_NAME ), uno::makeAny( aWallCID ) ); + xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME, uno::makeAny( aWallCID ) ); } } catch( const uno::Exception& e ) @@ -245,56 +245,56 @@ void lcl_setLightSources( const uno::Reference< beans::XPropertySet > & xSource, const uno::Reference< beans::XPropertySet > & xDest ) { - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_1 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_1 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_2 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_2 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_3 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_3 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_4 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_4 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_5 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_5 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_6 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_6 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_7 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_7 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_8 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTON_8 ))); - - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_1 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_1 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_3 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_3 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_4 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_4 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_5 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_5 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_6 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_6 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_7 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_7 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_8 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTDIRECTION_8 ))); - - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_1 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_1 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_2 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_2 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_3 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_3 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_4 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_4 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_5 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_5 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_6 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_6 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_7 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_7 ))); - xDest->setPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_8 ), - xSource->getPropertyValue( C2U( UNO_NAME_3D_SCENE_LIGHTCOLOR_8 ))); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_1, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_1)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_2)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_3, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_3)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_4, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_4)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_5, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_5)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_6, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_6)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8)); + + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_1, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_1)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_2)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_3, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_3)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_4, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_4)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_5, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_5)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_6, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_6)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_7, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_7)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_8, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTDIRECTION_8)); + + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_1, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_1)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_2, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_2)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_3, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_3)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_4, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_4)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_5, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_5)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_6, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_6)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_7, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_7)); + xDest->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_8, + xSource->getPropertyValue( UNO_NAME_3D_SCENE_LIGHTCOLOR_8)); } namespace @@ -453,7 +453,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize ) // and in it's destructor, calculates a new 2D SnapRect for the scene and it's modified 3D geometry. E3DModifySceneSnapRectUpdater aUpdater(lcl_getE3dScene( m_xOuterGroupShape )); - m_xAspectRatio3D->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + m_xAspectRatio3D->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aResult )) ); } catch( const uno::Exception& e ) @@ -488,9 +488,9 @@ void VDiagram::createShapes_3d() //create shape m_xOuterGroupShape = uno::Reference< drawing::XShape >( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DSceneObject" ) ), uno::UNO_QUERY ); - ShapeFactory::setShapeName( m_xOuterGroupShape, C2U("PlotAreaExcludingAxes") ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DSceneObject" ), uno::UNO_QUERY ); + ShapeFactory::setShapeName( m_xOuterGroupShape, "PlotAreaExcludingAxes" ); m_xLogicTarget->add(m_xOuterGroupShape); uno::Reference< drawing::XShapes > xOuterGroup_Shapes = @@ -591,20 +591,20 @@ void VDiagram::createShapes_3d() { //ignore distance and focal length from file format and model comcpletely //use vrp only to indicate the distance of the camera and thus influence the perspecitve - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_SCENE_DISTANCE ), uno::makeAny( + xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_DISTANCE, uno::makeAny( static_cast<sal_Int32>(ThreeDHelper::getCameraDistance( xSourceProp )))); - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_SCENE_PERSPECTIVE ), - xSourceProp->getPropertyValue( C2U( UNO_NAME_3D_SCENE_PERSPECTIVE ))); + xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_PERSPECTIVE, + xSourceProp->getPropertyValue( UNO_NAME_3D_SCENE_PERSPECTIVE)); } //light { - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_SCENE_SHADE_MODE ), - xSourceProp->getPropertyValue( C2U( UNO_NAME_3D_SCENE_SHADE_MODE ))); - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_SCENE_AMBIENTCOLOR ), - xSourceProp->getPropertyValue( C2U( UNO_NAME_3D_SCENE_AMBIENTCOLOR ))); - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING ), - xSourceProp->getPropertyValue( C2U( UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING ))); + xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_SHADE_MODE, + xSourceProp->getPropertyValue( UNO_NAME_3D_SCENE_SHADE_MODE)); + xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_AMBIENTCOLOR, + xSourceProp->getPropertyValue( UNO_NAME_3D_SCENE_AMBIENTCOLOR)); + xDestProp->setPropertyValue( UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING, + xSourceProp->getPropertyValue( UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING)); lcl_setLightSources( xSourceProp, xDestProp ); } @@ -624,7 +624,7 @@ void VDiagram::createShapes_3d() //#i98497# 3D charts are rendered with wrong size E3DModifySceneSnapRectUpdater aUpdater(lcl_getE3dScene( m_xOuterGroupShape )); - xDestProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ), + xDestProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX, uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aEffectiveTranformation ) ) ); } } @@ -665,7 +665,7 @@ void VDiagram::createShapes_3d() //create an additional scene for the smaller inner coordinate region: { - uno::Reference< drawing::XShapes > xShapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes,C2U("testonly;CooContainer=XXX_CID") ); + uno::Reference< drawing::XShapes > xShapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes,"testonly;CooContainer=XXX_CID" ); m_xCoordinateRegionShape = uno::Reference< drawing::XShape >( xShapes, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xShapeProp( m_xCoordinateRegionShape, uno::UNO_QUERY ); @@ -682,7 +682,7 @@ void VDiagram::createShapes_3d() aM.translate(GRID_TO_WALL_DISTANCE/fXScale, GRID_TO_WALL_DISTANCE/fYScale, GRID_TO_WALL_DISTANCE/fZScale); aM.scale( fXScale, fYScale, fZScale ); E3DModifySceneSnapRectUpdater aUpdater(lcl_getE3dScene( m_xOuterGroupShape )); - xShapeProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + xShapeProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(BaseGFXHelper::B3DHomMatrixToHomogenMatrix(aM)) ); } catch( const uno::Exception& e ) diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index e60f3345c2ca..8847ffad4ac4 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -49,7 +49,7 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_DATADESCR_SHOW_PERCENTAGE- SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_PERCENTAGE); ppPoolDefaults[SCHATTR_DATADESCR_SHOW_CATEGORY - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_CATEGORY); ppPoolDefaults[SCHATTR_DATADESCR_SHOW_SYMBOL - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_SHOW_SYMBOL); - ppPoolDefaults[SCHATTR_DATADESCR_SEPARATOR - SCHATTR_START] = new SfxStringItem(SCHATTR_DATADESCR_SEPARATOR,C2U(" ")); + ppPoolDefaults[SCHATTR_DATADESCR_SEPARATOR - SCHATTR_START] = new SfxStringItem(SCHATTR_DATADESCR_SEPARATOR," "); ppPoolDefaults[SCHATTR_DATADESCR_PLACEMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_DATADESCR_PLACEMENT,0); ppPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, ::std::vector < sal_Int32 >() ); ppPoolDefaults[SCHATTR_DATADESCR_NO_PERCENTVALUE - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_NO_PERCENTVALUE); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index f2ace4a0c072..fed30c56ed91 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -247,46 +247,46 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre // creating the graphic exporter uno::Reference< document::XExporter > xExporter( xFactory->createInstance( - C2U("com.sun.star.drawing.GraphicExportFilter")), uno::UNO_QUERY); + "com.sun.star.drawing.GraphicExportFilter"), uno::UNO_QUERY); uno::Reference< document::XFilter > xFilter( xExporter, uno::UNO_QUERY ); if( !xExporter.is() || !xFilter.is() ) return; uno::Sequence< beans::PropertyValue > aProps(3); - aProps[0].Name = C2U("FilterName"); - aProps[0].Value <<= C2U("SVM"); + aProps[0].Name = "FilterName"; + aProps[0].Value <<= OUString("SVM"); - aProps[1].Name = C2U("OutputStream"); + aProps[1].Name = "OutputStream"; aProps[1].Value <<= xOutStream; uno::Sequence< beans::PropertyValue > aFilterData(4); - aFilterData[0].Name = C2U("ExportOnlyBackground"); + aFilterData[0].Name = "ExportOnlyBackground"; aFilterData[0].Value <<= sal_False; - aFilterData[1].Name = C2U("HighContrast"); + aFilterData[1].Name = "HighContrast"; aFilterData[1].Value <<= bUseHighContrast; - aFilterData[2].Name = C2U("Version"); + aFilterData[2].Name = "Version"; const sal_Int32 nVersion = SOFFICE_FILEFORMAT_50; aFilterData[2].Value <<= nVersion; - aFilterData[3].Name = C2U("CurrentPage"); + aFilterData[3].Name = "CurrentPage"; aFilterData[3].Value <<= uno::Reference< uno::XInterface >( m_xDrawPage, uno::UNO_QUERY ); //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100% { aFilterData.realloc( aFilterData.getLength()+4 ); - aFilterData[4].Name = C2U("ScaleXNumerator"); + aFilterData[4].Name = "ScaleXNumerator"; aFilterData[4].Value = uno::makeAny( m_nScaleXNumerator ); - aFilterData[5].Name = C2U("ScaleXDenominator"); + aFilterData[5].Name = "ScaleXDenominator"; aFilterData[5].Value = uno::makeAny( m_nScaleXDenominator ); - aFilterData[6].Name = C2U("ScaleYNumerator"); + aFilterData[6].Name = "ScaleYNumerator"; aFilterData[6].Value = uno::makeAny( m_nScaleYNumerator ); - aFilterData[7].Name = C2U("ScaleYDenominator"); + aFilterData[7].Name = "ScaleYDenominator"; aFilterData[7].Value = uno::makeAny( m_nScaleYDenominator ); } - aProps[2].Name = C2U("FilterData"); + aProps[2].Name = "FilterData"; aProps[2].Value <<= aFilterData; xExporter->setSourceDocument( uno::Reference< lang::XComponent >( m_xDrawPage, uno::UNO_QUERY) ); @@ -340,10 +340,10 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla uno::Sequence< datatransfer::DataFlavor > aRet(2); aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMEType, - C2U( "GDIMetaFile" ), + "GDIMetaFile", ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); aRet[1] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast, - C2U( "GDIMetaFile" ), + "GDIMetaFile", ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); return aRet; @@ -624,11 +624,11 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( try { uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY_THROW ); - xDiaProp->getPropertyValue( C2U( "SortByXValues" ) ) >>= bSortByXValues; - xDiaProp->getPropertyValue( C2U( "ConnectBars" ) ) >>= bConnectBars; - xDiaProp->getPropertyValue( C2U( "GroupBarsPerAxis" ) ) >>= bGroupBarsPerAxis; - xDiaProp->getPropertyValue( C2U( "IncludeHiddenCells" ) ) >>= bIncludeHiddenCells; - xDiaProp->getPropertyValue( C2U( "StartingAngle" ) ) >>= nStartingAngle; + xDiaProp->getPropertyValue( "SortByXValues" ) >>= bSortByXValues; + xDiaProp->getPropertyValue( "ConnectBars" ) >>= bConnectBars; + xDiaProp->getPropertyValue( "GroupBarsPerAxis" ) >>= bGroupBarsPerAxis; + xDiaProp->getPropertyValue( "IncludeHiddenCells" ) >>= bIncludeHiddenCells; + xDiaProp->getPropertyValue( "StartingAngle" ) >>= nStartingAngle; } catch( const uno::Exception & ex ) { @@ -881,7 +881,7 @@ void SeriesPlotterContainer::setNumberFormatsFromAxes() if( xAxisProp.is()) { sal_Int32 nNumberFormatKey(0); - if( xAxisProp->getPropertyValue( C2U( "NumberFormat" ) ) >>= nNumberFormatKey ) + if( xAxisProp->getPropertyValue( "NumberFormat" ) >>= nNumberFormatKey ) { aAxesNumberFormats.setFormat( nNumberFormatKey, nDimensionIndex, nAxisIndex ); } @@ -1096,11 +1096,11 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno:: ::com::sun::star::chart::ChartAxisPosition eCrossingMainAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO ); if( xCrossingMainAxis.is() ) { - xCrossingMainAxis->getPropertyValue(C2U( "CrossoverPosition" )) >>= eCrossingMainAxisPos; + xCrossingMainAxis->getPropertyValue("CrossoverPosition") >>= eCrossingMainAxisPos; if( ::com::sun::star::chart::ChartAxisPosition_VALUE == eCrossingMainAxisPos ) { double fValue = 0.0; - xCrossingMainAxis->getPropertyValue(C2U( "CrossoverValue" )) >>= fValue; + xCrossingMainAxis->getPropertyValue("CrossoverValue") >>= fValue; aExplicitScale.Origin = fValue; } else if( ::com::sun::star::chart::ChartAxisPosition_ZERO == eCrossingMainAxisPos ) @@ -1194,20 +1194,20 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod uno::Reference< container::XNameAccess > xStylesFamilies( xStyleFamiliesSupplier->getStyleFamilies() ); if( xStylesFamilies.is() ) { - if( !xStylesFamilies->hasByName( C2U("PageStyles") ) ) + if( !xStylesFamilies->hasByName( "PageStyles" ) ) { //draw/impress is parent document uno::Reference< lang::XMultiServiceFactory > xFatcory( xParentProps, uno::UNO_QUERY ); if( xFatcory.is() ) { - uno::Reference< beans::XPropertySet > xDrawDefaults( xFatcory->createInstance( C2U( "com.sun.star.drawing.Defaults" ) ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xDrawDefaults( xFatcory->createInstance( "com.sun.star.drawing.Defaults" ), uno::UNO_QUERY ); if( xDrawDefaults.is() ) - xDrawDefaults->getPropertyValue( C2U("WritingMode") ) >>= nWritingMode; + xDrawDefaults->getPropertyValue( "WritingMode" ) >>= nWritingMode; } } else { - uno::Reference< container::XNameAccess > xPageStyles( xStylesFamilies->getByName( C2U("PageStyles") ), uno::UNO_QUERY ); + uno::Reference< container::XNameAccess > xPageStyles( xStylesFamilies->getByName( "PageStyles" ), uno::UNO_QUERY ); if( xPageStyles.is() ) { rtl::OUString aPageStyle; @@ -1234,11 +1234,11 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod { static rtl::OUString aChartCLSID = rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName()); rtl::OUString aCLSID; - xEmbeddedProps->getPropertyValue( C2U("CLSID") ) >>= aCLSID; + xEmbeddedProps->getPropertyValue( "CLSID" ) >>= aCLSID; if( aCLSID.equals(aChartCLSID) ) { uno::Reference< frame::XModel > xModel; - xEmbeddedProps->getPropertyValue( C2U("Model") ) >>= xModel; + xEmbeddedProps->getPropertyValue( "Model" ) >>= xModel; if( xModel == xChartModel ) { uno::Reference< text::XTextContent > xEmbeddedObject( xEmbeddedProps, uno::UNO_QUERY ); @@ -1250,14 +1250,14 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod uno::Reference< beans::XPropertySet > xAnchorProps( xAnchor, uno::UNO_QUERY ); if( xAnchorProps.is() ) { - xAnchorProps->getPropertyValue( C2U("WritingMode") ) >>= nWritingMode; + xAnchorProps->getPropertyValue( "WritingMode" ) >>= nWritingMode; } uno::Reference< text::XText > xText( xAnchor->getText() ); if( xText.is() ) { uno::Reference< beans::XPropertySet > xTextCursorProps( xText->createTextCursor(), uno::UNO_QUERY ); if( xTextCursorProps.is() ) - xTextCursorProps->getPropertyValue( C2U("PageStyleName") ) >>= aPageStyle; + xTextCursorProps->getPropertyValue( "PageStyleName" ) >>= aPageStyle; } } } @@ -1275,22 +1275,22 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod { uno::Reference< beans::XPropertySet > xTextCursorProps( xText->createTextCursor(), uno::UNO_QUERY ); if( xTextCursorProps.is() ) - xTextCursorProps->getPropertyValue( C2U("PageStyleName") ) >>= aPageStyle; + xTextCursorProps->getPropertyValue( "PageStyleName" ) >>= aPageStyle; } } } else { //Calc is parent document - xParentProps->getPropertyValue( C2U("PageStyle") ) >>= aPageStyle; + xParentProps->getPropertyValue( "PageStyle" ) >>= aPageStyle; if(aPageStyle.isEmpty()) - aPageStyle = C2U("Default"); + aPageStyle = "Default"; } if( nWritingMode == -1 || nWritingMode == text::WritingMode2::PAGE ) { uno::Reference< beans::XPropertySet > xPageStyle( xPageStyles->getByName( aPageStyle ), uno::UNO_QUERY ); if( xPageStyle.is() ) - xPageStyle->getPropertyValue( C2U("WritingMode") ) >>= nWritingMode; + xPageStyle->getPropertyValue( "WritingMode" ) >>= nWritingMode; } } } @@ -1577,7 +1577,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& if(bSnapRectToUsedArea) { if( bUseFixedInnerSize ) - m_aResultingDiagramRectangleExcludingAxes = getRectangleOfObject( C2U("PlotAreaExcludingAxes") ); + m_aResultingDiagramRectangleExcludingAxes = getRectangleOfObject( "PlotAreaExcludingAxes" ); else { ::basegfx::B2IRectangle aConsumedInnerRect = aVDiagram.getCurrentRectangle(); @@ -1602,7 +1602,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& bool bPosSizeExcludeAxesProperty = true; uno::Reference< beans::XPropertySet > xDiaProps( xDiagram, uno::UNO_QUERY_THROW ); if( xDiaProps.is() ) - xDiaProps->getPropertyValue(C2U("PosSizeExcludeAxes")) >>= bPosSizeExcludeAxesProperty; + xDiaProps->getPropertyValue("PosSizeExcludeAxes") >>= bPosSizeExcludeAxesProperty; if( bUseFixedInnerSize || bPosSizeExcludeAxesProperty ) { aPos = awt::Point( m_aResultingDiagramRectangleExcludingAxes.X, m_aResultingDiagramRectangleExcludingAxes.Y ); @@ -1724,9 +1724,9 @@ awt::Rectangle ChartView::getRectangleOfObject( const rtl::OUString& rObjectCID, SdrObjList* pRootList = pRootSdrObject->GetSubList(); if( pRootList ) { - OUString aShapeName = C2U("MarkHandles"); + OUString aShapeName = "MarkHandles"; if( eObjectType == OBJECTTYPE_DIAGRAM ) - aShapeName = C2U("PlotAreaIncludingAxes"); + aShapeName = "PlotAreaIncludingAxes"; SdrObject* pShape = DrawModelWrapper::getNamedSdrObject( aShapeName, pRootList ); if( pShape ) xShape = uno::Reference< drawing::XShape >( pShape->getUnoShape(), uno::UNO_QUERY); @@ -1780,7 +1780,7 @@ bool lcl_getPropertySwapXAndYAxis( const uno::Reference< XDiagram >& xDiagram ) uno::Reference<beans::XPropertySet> xProp(aCooSysList[0], uno::UNO_QUERY ); if( xProp.is()) try { - xProp->getPropertyValue( C2U( "SwapXAndYAxis" ) ) >>= bSwapXAndY; + xProp->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXAndY; } catch( const uno::Exception& e ) { @@ -1813,7 +1813,7 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( if( !xSeriesOrPointProp.is() ) return nFormat; - rtl::OUString aPropName( C2U( "NumberFormat" ) ); + rtl::OUString aPropName( "NumberFormat" ); if( !(xSeriesOrPointProp->getPropertyValue(aPropName) >>= nFormat) ) { uno::Reference< chart2::XChartType > xChartType( DataSeriesHelper::getChartTypeOfSeries( xSeries, xDiagram ) ); @@ -1852,7 +1852,7 @@ sal_Int32 ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabe sal_Int32 nFormat=0; if( !xSeriesOrPointProp.is() ) return nFormat; - if( !(xSeriesOrPointProp->getPropertyValue(C2U( "PercentageNumberFormat" )) >>= nFormat) ) + if( !(xSeriesOrPointProp->getPropertyValue("PercentageNumberFormat") >>= nFormat) ) { nFormat = DiagramHelper::getPercentNumberFormat( xNumberFormatsSupplier ); } @@ -2026,11 +2026,11 @@ bool getAvailablePosAndSizeForDiagram( bool bPosSizeExcludeAxes = false; if( xProp.is() ) - xProp->getPropertyValue( C2U( "PosSizeExcludeAxes" ) ) >>= bPosSizeExcludeAxes; + xProp->getPropertyValue( "PosSizeExcludeAxes" ) >>= bPosSizeExcludeAxes; //size: ::com::sun::star::chart2::RelativeSize aRelativeSize; - if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativeSize" ) )>>=aRelativeSize) ) + if( xProp.is() && (xProp->getPropertyValue( "RelativeSize" )>>=aRelativeSize) ) { rOutAvailableDiagramSize.Height = static_cast<sal_Int32>(aRelativeSize.Secondary*rPageSize.Height); rOutAvailableDiagramSize.Width = static_cast<sal_Int32>(aRelativeSize.Primary*rPageSize.Width); @@ -2041,7 +2041,7 @@ bool getAvailablePosAndSizeForDiagram( //position: chart2::RelativePosition aRelativePosition; - if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) ) + if( xProp.is() && (xProp->getPropertyValue( "RelativePosition" )>>=aRelativePosition) ) { //@todo decide whether x is primary or secondary @@ -2170,7 +2170,7 @@ boost::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType awt::Point aNewPosition(0,0); chart2::RelativePosition aRelativePosition; uno::Reference< beans::XPropertySet > xProp(xTitle, uno::UNO_QUERY); - if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) ) + if( xProp.is() && (xProp->getPropertyValue( "RelativePosition" )>>=aRelativePosition) ) { rbAutoPosition = false; @@ -2314,7 +2314,7 @@ void formatPage( { uno::Reference< drawing::XShape > xShape( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.RectangleShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY ); if( xTarget.is() && xShape.is()) { @@ -2323,7 +2323,7 @@ void formatPage( xPageProp.set( xShape, uno::UNO_QUERY ); if( xPageProp.is()) { - xPageProp->setPropertyValue( C2U("LineStyle"), uno::makeAny( drawing::LineStyle_NONE )); + xPageProp->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE )); } } } @@ -2335,7 +2335,7 @@ void formatPage( PropertyMapper::getValueMap( aNameValueMap, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xModelPage ); rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) ); - aNameValueMap.insert( tPropertyNameValueMap::value_type( C2U("Name"), uno::makeAny( aCID ) ) ); //CID rtl::OUString + aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID rtl::OUString tNameSequence aNames; tAnySequence aValues; @@ -2393,11 +2393,11 @@ void ChartView::impl_refreshAddIn() if( xProp.is()) try { uno::Reference< util::XRefreshable > xAddIn; - xProp->getPropertyValue( C2U( "AddIn" ) ) >>= xAddIn; + xProp->getPropertyValue( "AddIn" ) >>= xAddIn; if( xAddIn.is() ) { sal_Bool bRefreshAddInAllowed = sal_True; - xProp->getPropertyValue( C2U( "RefreshAddInAllowed" ) ) >>= bRefreshAddInAllowed; + xProp->getPropertyValue( "RefreshAddInAllowed" ) >>= bRefreshAddInAllowed; if( bRefreshAddInAllowed ) xAddIn->refresh(); } @@ -2463,11 +2463,11 @@ void ChartView::createShapes() uno::Reference< drawing::XShape > xDiagram_MarkHandles( ShapeFactory(m_xShapeFactory).createInvisibleRectangle( xDiagramPlusAxesPlusMarkHandlesGroup_Shapes, awt::Size(0,0) ) ); - ShapeFactory::setShapeName( xDiagram_MarkHandles, C2U("MarkHandles") ); + ShapeFactory::setShapeName( xDiagram_MarkHandles, "MarkHandles" ); uno::Reference< drawing::XShape > xDiagram_OuterRect( ShapeFactory(m_xShapeFactory).createInvisibleRectangle( xDiagramPlusAxesPlusMarkHandlesGroup_Shapes, awt::Size(0,0) ) ); - ShapeFactory::setShapeName( xDiagram_OuterRect, C2U("PlotAreaIncludingAxes") ); + ShapeFactory::setShapeName( xDiagram_OuterRect, "PlotAreaIncludingAxes" ); uno::Reference< drawing::XShapes > xDiagramPlusAxes_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxesPlusMarkHandlesGroup_Shapes ) ); @@ -2625,7 +2625,7 @@ void ChartView::impl_updateView() //m_bRefreshAddIn = false; try { - impl_notifyModeChangeListener(C2U("invalid")); + impl_notifyModeChangeListener("invalid"); //prepare draw model { @@ -2668,7 +2668,7 @@ void ChartView::impl_updateView() m_pDrawModelWrapper->unlockControllers(); } - impl_notifyModeChangeListener(C2U("valid")); + impl_notifyModeChangeListener("valid"); //m_bRefreshAddIn = bOldRefreshAddIn; } @@ -2682,7 +2682,7 @@ void SAL_CALL ChartView::modified( const lang::EventObject& /* aEvent */ ) if( m_bInViewUpdate ) m_bViewUpdatePending = true; - impl_notifyModeChangeListener(C2U("dirty")); + impl_notifyModeChangeListener("dirty"); } //SfxListener @@ -2825,11 +2825,11 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException , lang::WrappedTargetException, uno::RuntimeException) { - if( rPropertyName.equals(C2U("Resolution")) ) + if( rPropertyName.equals("Resolution") ) { awt::Size aNewResolution; if( ! (rValue >>= aNewResolution) ) - throw lang::IllegalArgumentException( C2U("Property 'Resolution' requires value of type awt::Size"), 0, 0 ); + throw lang::IllegalArgumentException( "Property 'Resolution' requires value of type awt::Size", 0, 0 ); if( m_aPageResolution.Width!=aNewResolution.Width || m_aPageResolution.Height!=aNewResolution.Height ) { @@ -2842,12 +2842,12 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName this->modified( lang::EventObject( static_cast< uno::XWeak* >( this ) ) ); } } - else if( rPropertyName.equals(C2U("ZoomFactors")) ) + else if( rPropertyName.equals("ZoomFactors") ) { //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100% uno::Sequence< beans::PropertyValue > aZoomFactors; if( ! (rValue >>= aZoomFactors) ) - throw lang::IllegalArgumentException( C2U("Property 'ZoomFactors' requires value of type Sequence< PropertyValue >"), 0, 0 ); + throw lang::IllegalArgumentException( "Property 'ZoomFactors' requires value of type Sequence< PropertyValue >", 0, 0 ); sal_Int32 nFilterArgs = aZoomFactors.getLength(); beans::PropertyValue* pDataValues = aZoomFactors.getArray(); @@ -2865,26 +2865,26 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName pDataValues++; } } - else if( rPropertyName.equals(C2U("SdrViewIsInEditMode")) ) + else if( rPropertyName.equals("SdrViewIsInEditMode") ) { //#i77362 change notification for changes on additional shapes are missing if( ! (rValue >>= m_bSdrViewIsInEditMode) ) - throw lang::IllegalArgumentException( C2U("Property 'SdrViewIsInEditMode' requires value of type sal_Bool"), 0, 0 ); + throw lang::IllegalArgumentException( "Property 'SdrViewIsInEditMode' requires value of type sal_Bool", 0, 0 ); } else - throw beans::UnknownPropertyException( C2U("unknown property was tried to set to chart wizard"), 0 ); + throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard", 0 ); } Any SAL_CALL ChartView::getPropertyValue( const ::rtl::OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; - if( rPropertyName.equals(C2U("Resolution")) ) + if( rPropertyName.equals("Resolution") ) { aRet = uno::makeAny( m_aPageResolution ); } else - throw beans::UnknownPropertyException( C2U("unknown property was tried to get from chart wizard"), 0 ); + throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard", 0 ); return aRet; } diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx index b07d7eefabd7..cdd80540093a 100644 --- a/chart2/source/view/main/DataPointSymbolSupplier.cxx +++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx @@ -34,8 +34,8 @@ uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList( , const drawing::Direction3D& rSize ) { uno::Reference< drawing::XShape > xGroup( - xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.GroupShape" ) ), uno::UNO_QUERY ); + xShapeFactory->createInstance( + "com.sun.star.drawing.GroupShape" ), uno::UNO_QUERY ); if(xTarget.is()) xTarget->add(xGroup); uno::Reference< drawing::XShapes > xGroupShapes = diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index 9a56c2c51fd8..2ef17307407b 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -66,7 +66,7 @@ void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const eHorizontalAdjust = drawing::TextHorizontalAdjust_LEFT; else if( LABEL_ALIGN_LEFT==eAlignment || LABEL_ALIGN_LEFT_TOP==eAlignment || LABEL_ALIGN_LEFT_BOTTOM==eAlignment ) eHorizontalAdjust = drawing::TextHorizontalAdjust_RIGHT; - uno::Any* pHorizontalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,C2U("TextHorizontalAdjust")); + uno::Any* pHorizontalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,"TextHorizontalAdjust"); if(pHorizontalAdjustAny) *pHorizontalAdjustAny = uno::makeAny(eHorizontalAdjust); } @@ -78,7 +78,7 @@ void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const eVerticalAdjust = drawing::TextVerticalAdjust_BOTTOM; else if( LABEL_ALIGN_BOTTOM==eAlignment || LABEL_ALIGN_RIGHT_BOTTOM==eAlignment || LABEL_ALIGN_LEFT_BOTTOM==eAlignment ) eVerticalAdjust = drawing::TextVerticalAdjust_TOP; - uno::Any* pVerticalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,C2U("TextVerticalAdjust")); + uno::Any* pVerticalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,"TextVerticalAdjust"); if(pVerticalAdjustAny) *pVerticalAdjustAny = uno::makeAny(eVerticalAdjust); } @@ -105,13 +105,13 @@ void LabelPositionHelper::doDynamicFontResize( tAnySequence& rPropValues //------------------------- //handle dynamic font resize: awt::Size aOldReferenceSize; - if( xAxisModelProps->getPropertyValue( C2U("ReferencePageSize")) >>= aOldReferenceSize ) + if( xAxisModelProps->getPropertyValue( "ReferencePageSize") >>= aOldReferenceSize ) { - uno::Any* pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, C2U("CharHeight") ); + uno::Any* pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, "CharHeight" ); lcl_doDynamicFontResize( pAOldAndNewFontHeightAny, aOldReferenceSize, rNewReferenceSize ); - pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, C2U("CharHeightAsian") ); + pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, "CharHeightAsian" ); lcl_doDynamicFontResize( pAOldAndNewFontHeightAny, aOldReferenceSize, rNewReferenceSize ); - pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, C2U("CharHeightComplex") ); + pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, "CharHeightComplex" ); lcl_doDynamicFontResize( pAOldAndNewFontHeightAny, aOldReferenceSize, rNewReferenceSize ); } } diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index e5b784bbe246..b022a92435d5 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -159,7 +159,7 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& rPropVal , bool bLimitedHeight) { return PropertyMapper::getValuePointer( rPropValues, rPropNames - , bLimitedHeight ? C2U("TextMaximumFrameHeight") : C2U("TextMaximumFrameWidth") ); + , bLimitedHeight ? OUString("TextMaximumFrameHeight") : OUString("TextMaximumFrameWidth") ); } const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProperties() @@ -410,21 +410,21 @@ void PropertyMapper::getTextLabelMultiPropertyLists( , xSourceProp ); //some more shape properties apart from character properties, position-matrix and label string - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("LineStyle"), uno::makeAny(drawing::LineStyle_NONE) ) ); // drawing::LineStyle - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextHorizontalAdjust"), uno::makeAny(drawing::TextHorizontalAdjust_CENTER) ) ); // drawing::TextHorizontalAdjust - needs to be overwritten - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextVerticalAdjust"), uno::makeAny(drawing::TextVerticalAdjust_CENTER) ) ); //drawing::TextVerticalAdjust - needs to be overwritten - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowHeight"), uno::makeAny(sal_True) ) ); // sal_Bool - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowWidth"), uno::makeAny(sal_True) ) ); // sal_Bool + aValueMap.insert( tPropertyNameValueMap::value_type( "LineStyle", uno::makeAny(drawing::LineStyle_NONE) ) ); // drawing::LineStyle + aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(drawing::TextHorizontalAdjust_CENTER) ) ); // drawing::TextHorizontalAdjust - needs to be overwritten + aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(drawing::TextVerticalAdjust_CENTER) ) ); //drawing::TextVerticalAdjust - needs to be overwritten + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(sal_True) ) ); // sal_Bool + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(sal_True) ) ); // sal_Bool if( bName ) - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("Name"), uno::makeAny( rtl::OUString() ) ) ); //CID rtl::OUString - needs to be overwritten for each point + aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( rtl::OUString() ) ) ); //CID rtl::OUString - needs to be overwritten for each point if( nLimitedSpace > 0 ) { if(bLimitedHeight) - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextMaximumFrameHeight"), uno::makeAny(nLimitedSpace) ) ); //sal_Int32 + aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameHeight", uno::makeAny(nLimitedSpace) ) ); //sal_Int32 else - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextMaximumFrameWidth"), uno::makeAny(nLimitedSpace) ) ); //sal_Int32 - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("ParaIsHyphenation"), uno::makeAny(sal_True) ) ); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameWidth", uno::makeAny(nLimitedSpace) ) ); //sal_Int32 + aValueMap.insert( tPropertyNameValueMap::value_type( "ParaIsHyphenation", uno::makeAny(sal_True) ) ); } PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap ); @@ -441,22 +441,22 @@ void PropertyMapper::getPreparedTextShapePropertyLists( , xSourceProp ); // auto-grow makes sure the shape has the correct size after setting text - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextHorizontalAdjust"), uno::makeAny( drawing::TextHorizontalAdjust_CENTER ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextVerticalAdjust"), uno::makeAny( drawing::TextVerticalAdjust_CENTER ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowHeight"), uno::makeAny( true ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowWidth"), uno::makeAny( true ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny( drawing::TextHorizontalAdjust_CENTER ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny( drawing::TextVerticalAdjust_CENTER ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny( true ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny( true ))); // set some distance to the border, in case it is shown const sal_Int32 nWidthDist = 250; const sal_Int32 nHeightDist = 125; - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextLeftDistance"), uno::makeAny( nWidthDist ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextRightDistance"), uno::makeAny( nWidthDist ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextUpperDistance"), uno::makeAny( nHeightDist ))); - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextLowerDistance"), uno::makeAny( nHeightDist ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextLeftDistance", uno::makeAny( nWidthDist ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextRightDistance", uno::makeAny( nWidthDist ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextUpperDistance", uno::makeAny( nHeightDist ))); + aValueMap.insert( tPropertyNameValueMap::value_type( "TextLowerDistance", uno::makeAny( nHeightDist ))); // use a line-joint showing the border of thick lines like two rectangles // filled in between. - aValueMap[C2U("LineJoint")] <<= drawing::LineJoint_ROUND; + aValueMap["LineJoint"] <<= drawing::LineJoint_ROUND; PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap ); } diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 6a4569399fc1..739ce751ad5b 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -77,7 +77,7 @@ void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape { try { - xProp->setPropertyValue( C2U( UNO_NAME_MISC_OBJ_NAME ) + xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME , uno::makeAny( rName ) ); } catch( const uno::Exception& e ) @@ -99,7 +99,7 @@ rtl::OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape { try { - xProp->getPropertyValue( C2U( UNO_NAME_MISC_OBJ_NAME ) ) >>= aRet; + xProp->getPropertyValue( UNO_NAME_MISC_OBJ_NAME ) >>= aRet; } catch( const uno::Exception& e ) { @@ -125,7 +125,7 @@ uno::Reference< drawing::XShapes > ShapeFactory::getChartRootShape( { if( xShapes->getByIndex( nN ) >>= xShape ) { - if( ShapeFactory::getShapeName( xShape ).equals(C2U("com.sun.star.chart2.shapes")) ) + if( ShapeFactory::getShapeName( xShape ).equals("com.sun.star.chart2.shapes") ) { xRet = uno::Reference< drawing::XShapes >( xShape, uno::UNO_QUERY ); break; @@ -147,7 +147,7 @@ uno::Reference< drawing::XShapes > ShapeFactory::getOrCreateChartRootShape( //create the root shape xRet = this->createGroup2D( uno::Reference<drawing::XShapes>( xDrawPage, uno::UNO_QUERY ) - , C2U("com.sun.star.chart2.shapes") ); + , "com.sun.star.chart2.shapes" ); } return xRet; } @@ -442,7 +442,7 @@ uno::Reference<drawing::XShape> if( xSourceProp.is() ) { drawing::LineStyle aLineStyle; - xSourceProp->getPropertyValue( C2U( "BorderStyle" ) ) >>= aLineStyle; + xSourceProp->getPropertyValue( "BorderStyle" ) >>= aLineStyle; if( aLineStyle == drawing::LineStyle_SOLID ) bRounded = false; } @@ -471,8 +471,8 @@ uno::Reference<drawing::XShape> //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DExtrudeObject") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DExtrudeObject" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -486,16 +486,16 @@ uno::Reference<drawing::XShape> double fDepth = rSize.DirectionZ; if(fDepth<0) fDepth*=-1.0; - xProp->setPropertyValue( C2U( UNO_NAME_3D_EXTRUDE_DEPTH ) + xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH , uno::makeAny((sal_Int32)fDepth) ); //PercentDiagonal sal_Int16 nPercentDiagonal = bRounded ? 3 : 0; - xProp->setPropertyValue( C2U( UNO_NAME_3D_PERCENT_DIAGONAL ) + xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL , uno::makeAny( nPercentDiagonal ) ); //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D , createPolyPolygon_Cube( rSize, double(nPercentDiagonal)/200.0,bRounded) ); //Matrix for position @@ -507,7 +507,7 @@ uno::Reference<drawing::XShape> , rPosition.PositionY , rPosition.PositionZ - (fDepth/2.0)); drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM); - xProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(aHM) ); } } @@ -710,8 +710,8 @@ uno::Reference<drawing::XShape> //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DLatheObject") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DLatheObject" ), uno::UNO_QUERY ); xTarget->add(xShape); double fWidth = rSize.DirectionX/2.0; //The depth will be corrrected within Matrix @@ -727,7 +727,7 @@ uno::Reference<drawing::XShape> { //PercentDiagonal sal_Int16 nPercentDiagonal = 5; - xProp->setPropertyValue( C2U( UNO_NAME_3D_PERCENT_DIAGONAL ) + xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL , uno::makeAny( nPercentDiagonal ) ); //Polygon @@ -736,7 +736,7 @@ uno::Reference<drawing::XShape> fHeight, fRadius, nVerticalSegmentCount) : createPolyPolygon_Cone( fHeight, fRadius, fTopHeight, nVerticalSegmentCount); - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ), aPPolygon ); + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D, aPPolygon ); //Matrix for position { @@ -747,18 +747,18 @@ uno::Reference<drawing::XShape> aM.scale(1.0,1.0,rSize.DirectionZ/rSize.DirectionX); aM.translate(rPosition.PositionX, rPosition.PositionY, rPosition.PositionZ); drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM); - xProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(aHM) ); } //Segments - xProp->setPropertyValue( C2U( UNO_NAME_3D_HORZ_SEGS ) + xProp->setPropertyValue( UNO_NAME_3D_HORZ_SEGS , uno::makeAny(CHART_3DOBJECT_SEGMENTCOUNT) ); - xProp->setPropertyValue( C2U( UNO_NAME_3D_VERT_SEGS ) + xProp->setPropertyValue( UNO_NAME_3D_VERT_SEGS , uno::makeAny((sal_Int32)nVerticalSegmentCount) );//depends on point count of the used polygon //Reduced lines - xProp->setPropertyValue( C2U( UNO_NAME_3D_REDUCED_LINE_GEOMETRY ) + xProp->setPropertyValue( UNO_NAME_3D_REDUCED_LINE_GEOMETRY , uno::makeAny((sal_Bool)sal_True) ); } catch( const uno::Exception& e ) @@ -961,7 +961,7 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( m_xShapeFactory->createInstance( - C2U("com.sun.star.drawing.ClosedBezierShape") ), uno::UNO_QUERY ); + "com.sun.star.drawing.ClosedBezierShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //need to add the shape before setting of properties //set properties @@ -981,7 +981,7 @@ uno::Reference< drawing::XShape > , fUnitCircleStartAngleDegree*F_PI/180.0, fUnitCircleWidthAngleDegree*F_PI/180.0 , aTransformationFromUnitCircle, fAngleSubdivisionRadian ); - xProp->setPropertyValue( C2U( "PolyPolygonBezier" ), uno::makeAny( aCoords ) ); + xProp->setPropertyValue( "PolyPolygonBezier", uno::makeAny( aCoords ) ); } catch( const uno::Exception& e ) { @@ -1013,8 +1013,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DExtrudeObject") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DExtrudeObject" ), uno::UNO_QUERY ); xTarget->add(xShape); //need to add the shape before setting of properties //set properties @@ -1035,36 +1035,36 @@ uno::Reference< drawing::XShape > , aTransformationFromUnitCircle, fAngleSubdivisionRadian ); //depth - xProp->setPropertyValue( C2U( UNO_NAME_3D_EXTRUDE_DEPTH ) + xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH , uno::makeAny((sal_Int32)fDepth) ); //PercentDiagonal sal_Int16 nPercentDiagonal = 0; - xProp->setPropertyValue( C2U( UNO_NAME_3D_PERCENT_DIAGONAL ) + xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL , uno::makeAny( nPercentDiagonal ) ); //Polygon drawing::PolyPolygonShape3D aPoly( BezierToPoly(aCoords) ); ShapeFactory::closePolygon( aPoly ); - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D , uno::makeAny( aPoly ) ); //DoubleSided - xProp->setPropertyValue( C2U( UNO_NAME_3D_DOUBLE_SIDED ) + xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED , uno::makeAny( (sal_Bool)true) ); //Reduced lines - xProp->setPropertyValue( C2U( UNO_NAME_3D_REDUCED_LINE_GEOMETRY ) + xProp->setPropertyValue( UNO_NAME_3D_REDUCED_LINE_GEOMETRY , uno::makeAny((sal_Bool)sal_True) ); //TextureProjectionMode - xProp->setPropertyValue( C2U( UNO_NAME_3D_TEXTURE_PROJ_Y ) + xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_Y , uno::makeAny( drawing::TextureProjectionMode_OBJECTSPECIFIC ) ); //TextureProjectionMode - xProp->setPropertyValue( C2U( UNO_NAME_3D_TEXTURE_PROJ_X ) + xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_X , uno::makeAny( drawing::TextureProjectionMode_PARALLEL ) ); - xProp->setPropertyValue( C2U( UNO_NAME_3D_TEXTURE_PROJ_Y ) + xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_Y , uno::makeAny( drawing::TextureProjectionMode_OBJECTSPECIFIC ) ); } catch( const uno::Exception& e ) @@ -1093,8 +1093,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DPolygonObject" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DPolygonObject" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -1105,27 +1105,27 @@ uno::Reference< drawing::XShape > try { //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D , rStripe.getPolyPolygonShape3D() ); //TexturePolygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_TEXTUREPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_TEXTUREPOLYGON3D , rStripe.getTexturePolygon( nRotatedTexture ) ); //Normals Polygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_NORMALSPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_NORMALSPOLYGON3D , rStripe.getNormalsPolygon() ); //NormalsKind if(bFlatNormals) - xProp->setPropertyValue( C2U( UNO_NAME_3D_NORMALS_KIND ) + xProp->setPropertyValue( UNO_NAME_3D_NORMALS_KIND , uno::makeAny( drawing::NormalsKind_FLAT ) ); //LineOnly - xProp->setPropertyValue( C2U( UNO_NAME_3D_LINEONLY ) + xProp->setPropertyValue( UNO_NAME_3D_LINEONLY , uno::makeAny( (sal_Bool)false) ); //DoubleSided - xProp->setPropertyValue( C2U( UNO_NAME_3D_DOUBLE_SIDED ) + xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED , uno::makeAny(bDoubleSided) ); if( xSourceProp.is()) @@ -1152,8 +1152,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DExtrudeObject") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DExtrudeObject" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -1164,20 +1164,20 @@ uno::Reference< drawing::XShape > try { //depth - xProp->setPropertyValue( C2U( UNO_NAME_3D_EXTRUDE_DEPTH ) + xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH , uno::makeAny((sal_Int32)fDepth) ); //PercentDiagonal sal_Int16 nPercentDiagonal = 0; - xProp->setPropertyValue( C2U( UNO_NAME_3D_PERCENT_DIAGONAL ) + xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL , uno::makeAny( nPercentDiagonal ) ); //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D , uno::makeAny( rPolyPolygon ) ); //DoubleSided - xProp->setPropertyValue( C2U( UNO_NAME_3D_DOUBLE_SIDED ) + xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED , uno::makeAny( (sal_Bool)true) ); //the z component of the polygon is now ignored by the drawing layer, @@ -1191,7 +1191,7 @@ uno::Reference< drawing::XShape > , 0 , rPolyPolygon.SequenceZ[0][0] ); drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM); - xProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(aHM) ); } } @@ -1212,8 +1212,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.PolyPolygonShape") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.PolyPolygonShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -1227,12 +1227,12 @@ uno::Reference< drawing::XShape > drawing::PointSequenceSequence aPoints( PolyToPointSequence(rPolyPolygon) ); //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_POLYPOLYGON ) + xProp->setPropertyValue( UNO_NAME_POLYPOLYGON , uno::makeAny( aPoints ) ); //ZOrder //an area should always be behind other shapes - xProp->setPropertyValue( C2U( UNO_NAME_MISC_OBJ_ZORDER ) + xProp->setPropertyValue( UNO_NAME_MISC_OBJ_ZORDER , uno::makeAny( sal_Int32(0) ) ); } catch( const uno::Exception& e ) @@ -1785,8 +1785,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.PolyPolygonShape") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.PolyPolygonShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -1800,15 +1800,15 @@ uno::Reference< drawing::XShape > createPolyPolygon_Symbol( rPosition, rSize, nStandardSymbol ) )); //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_POLYPOLYGON ) + xProp->setPropertyValue( UNO_NAME_POLYPOLYGON , uno::makeAny( aPoints ) ); //LineColor - xProp->setPropertyValue( C2U( UNO_NAME_LINECOLOR ) + xProp->setPropertyValue( UNO_NAME_LINECOLOR , uno::makeAny( nBorderColor ) ); //FillColor - xProp->setPropertyValue( C2U( UNO_NAME_FILLCOLOR ) + xProp->setPropertyValue( UNO_NAME_FILLCOLOR , uno::makeAny( nFillColor ) ); } catch( const uno::Exception& e ) @@ -1834,8 +1834,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.GraphicObjectShape") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.GraphicObjectShape" ), uno::UNO_QUERY ); xTarget->add(xShape); try @@ -1858,7 +1858,7 @@ uno::Reference< drawing::XShape > { try { - xProp->setPropertyValue( C2U("Graphic"), uno::makeAny( xGraphic )); + xProp->setPropertyValue( "Graphic", uno::makeAny( xGraphic )); } catch( const uno::Exception& e ) { @@ -1878,8 +1878,8 @@ uno::Reference< drawing::XShapes > { //create and add to target uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.GroupShape" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.GroupShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //set name @@ -1913,8 +1913,8 @@ uno::Reference< drawing::XShapes > { //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DSceneObject" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DSceneObject" ), uno::UNO_QUERY ); xTarget->add(xShape); @@ -1930,7 +1930,7 @@ uno::Reference< drawing::XShapes > try { ::basegfx::B3DHomMatrix aM; - xProp->setPropertyValue( C2U( UNO_NAME_3D_TRANSFORM_MATRIX ) + xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX , uno::makeAny(B3DHomMatrixToHomogenMatrix(aM)) ); } catch( const uno::Exception& e ) @@ -1966,8 +1966,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.EllipseShape") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.EllipseShape" ), uno::UNO_QUERY ); xTarget->add(xShape); try @@ -1992,7 +1992,7 @@ uno::Reference< drawing::XShape > try { drawing::CircleKind eKind = drawing::CircleKind_FULL; - xProp->setPropertyValue( C2U( UNO_NAME_CIRCKIND ) + xProp->setPropertyValue( UNO_NAME_CIRCKIND , uno::makeAny( eKind ) ); } catch( const uno::Exception& e ) @@ -2016,8 +2016,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.Shape3DPolygonObject") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.Shape3DPolygonObject" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -2028,31 +2028,31 @@ uno::Reference< drawing::XShape > try { //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D ) + xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D , uno::makeAny( rPoints ) ); //LineOnly - xProp->setPropertyValue( C2U( UNO_NAME_3D_LINEONLY ) + xProp->setPropertyValue( UNO_NAME_3D_LINEONLY , uno::makeAny( (sal_Bool)true ) ); //Transparency if(rLineProperties.Transparence.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINETRANSPARENCE ) + xProp->setPropertyValue( UNO_NAME_LINETRANSPARENCE , rLineProperties.Transparence ); //LineStyle if(rLineProperties.LineStyle.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINESTYLE ) + xProp->setPropertyValue( UNO_NAME_LINESTYLE , rLineProperties.LineStyle ); //LineWidth if(rLineProperties.Width.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINEWIDTH ) + xProp->setPropertyValue( UNO_NAME_LINEWIDTH , rLineProperties.Width ); //LineColor if(rLineProperties.Color.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINECOLOR ) + xProp->setPropertyValue( UNO_NAME_LINECOLOR , rLineProperties.Color ); //, uno::makeAny( sal_Int32( Color(COL_RED).GetColor()) ) ); } @@ -2077,8 +2077,8 @@ uno::Reference< drawing::XShape > //create shape uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.PolyLineShape") ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.PolyLineShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //set properties @@ -2089,34 +2089,34 @@ uno::Reference< drawing::XShape > try { //Polygon - xProp->setPropertyValue( C2U( UNO_NAME_POLYPOLYGON ) + xProp->setPropertyValue( UNO_NAME_POLYPOLYGON , uno::makeAny( rPoints ) ); if(pLineProperties) { //Transparency if(pLineProperties->Transparence.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINETRANSPARENCE ) + xProp->setPropertyValue( UNO_NAME_LINETRANSPARENCE , pLineProperties->Transparence ); //LineStyle if(pLineProperties->LineStyle.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINESTYLE ) + xProp->setPropertyValue( UNO_NAME_LINESTYLE , pLineProperties->LineStyle ); //LineWidth if(pLineProperties->Width.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINEWIDTH ) + xProp->setPropertyValue( UNO_NAME_LINEWIDTH , pLineProperties->Width ); //LineColor if(pLineProperties->Color.hasValue()) - xProp->setPropertyValue( C2U( UNO_NAME_LINECOLOR ) + xProp->setPropertyValue( UNO_NAME_LINECOLOR , pLineProperties->Color ); //LineDashName if(pLineProperties->DashName.hasValue()) - xProp->setPropertyValue( C2U( "LineDashName" ) + xProp->setPropertyValue( "LineDashName" , pLineProperties->DashName ); } } @@ -2148,8 +2148,8 @@ void ShapeFactory::makeShapeInvisible( const uno::Reference< drawing::XShape >& { try { - xShapeProp->setPropertyValue( C2U("LineStyle"), uno::makeAny( drawing::LineStyle_NONE )); - xShapeProp->setPropertyValue( C2U("FillStyle"), uno::makeAny( drawing::FillStyle_NONE )); + xShapeProp->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE )); + xShapeProp->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE )); } catch( const uno::Exception& e ) { @@ -2168,7 +2168,7 @@ uno::Reference< drawing::XShape > ShapeFactory::createInvisibleRectangle( return 0; uno::Reference< drawing::XShape > xShape( m_xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.RectangleShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY ); if( xTarget.is() && xShape.is()) { xTarget->add( xShape ); @@ -2199,8 +2199,8 @@ uno::Reference< drawing::XShape > //create shape and add to page uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.TextShape" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.TextShape" ), uno::UNO_QUERY ); xTarget->add(xShape); //set text @@ -2218,7 +2218,7 @@ uno::Reference< drawing::XShape > //the matrix needs to be set at the end behind autogrow and such position influencing properties try { - xProp->setPropertyValue( C2U( "Transformation" ), rATransformation ); + xProp->setPropertyValue( "Transformation", rATransformation ); } catch( const uno::Exception& e ) { diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 13b136d9d363..764274883e74 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -70,12 +70,12 @@ double lcl_CalcViewFontSize( awt::Size aPropRefSize; float fFontHeight( 0.0 ); - if( xProp.is() && ( xProp->getPropertyValue( C2U( "CharHeight" )) >>= fFontHeight )) + if( xProp.is() && ( xProp->getPropertyValue( "CharHeight") >>= fFontHeight )) { fResult = fFontHeight; try { - if( (xProp->getPropertyValue( C2U( "ReferencePageSize" )) >>= aPropRefSize) && + if( (xProp->getPropertyValue( "ReferencePageSize") >>= aPropRefSize) && (aPropRefSize.Height > 0)) { fResult = ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ); @@ -104,7 +104,7 @@ void lcl_getProperties( ::chart::tPropertyNameValueMap aLineFillValueMap; ::chart::PropertyMapper::getValueMap( aLineFillValueMap, ::chart::PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xLegendProp ); - aLineFillValueMap[ C2U("LineJoint") ] = uno::makeAny( drawing::LineJoint_ROUND ); + aLineFillValueMap[ "LineJoint" ] = uno::makeAny( drawing::LineJoint_ROUND ); ::chart::PropertyMapper::getMultiPropertyListsFromValueMap( rOutLineFillProperties.first, rOutLineFillProperties.second, aLineFillValueMap ); @@ -114,31 +114,31 @@ void lcl_getProperties( ::chart::PropertyMapper::getValueMap( aTextValueMap, ::chart::PropertyMapper::getPropertyNameMapForCharacterProperties(), xLegendProp ); drawing::TextHorizontalAdjust eHorizAdjust( drawing::TextHorizontalAdjust_LEFT ); - aTextValueMap[ C2U("TextAutoGrowHeight") ] = uno::makeAny( sal_True ); - aTextValueMap[ C2U("TextAutoGrowWidth") ] = uno::makeAny( sal_True ); - aTextValueMap[ C2U("TextHorizontalAdjust") ] = uno::makeAny( eHorizAdjust ); - aTextValueMap[ C2U("TextMaximumFrameWidth") ] = uno::makeAny( rReferenceSize.Width ); //needs to be overwritten by actual available space in the legend + aTextValueMap[ "TextAutoGrowHeight" ] = uno::makeAny( sal_True ); + aTextValueMap[ "TextAutoGrowWidth" ] = uno::makeAny( sal_True ); + aTextValueMap[ "TextHorizontalAdjust" ] = uno::makeAny( eHorizAdjust ); + aTextValueMap[ "TextMaximumFrameWidth" ] = uno::makeAny( rReferenceSize.Width ); //needs to be overwritten by actual available space in the legend // recalculate font size awt::Size aPropRefSize; float fFontHeight( 0.0 ); - if( (xLegendProp->getPropertyValue( C2U( "ReferencePageSize" )) >>= aPropRefSize) && + if( (xLegendProp->getPropertyValue( "ReferencePageSize") >>= aPropRefSize) && (aPropRefSize.Height > 0) && - (aTextValueMap[ C2U("CharHeight") ] >>= fFontHeight) ) + (aTextValueMap[ "CharHeight" ] >>= fFontHeight) ) { - aTextValueMap[ C2U("CharHeight") ] = uno::makeAny( + aTextValueMap[ "CharHeight" ] = uno::makeAny( static_cast< float >( ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ))); - if( aTextValueMap[ C2U("CharHeightAsian") ] >>= fFontHeight ) + if( aTextValueMap[ "CharHeightAsian" ] >>= fFontHeight ) { - aTextValueMap[ C2U("CharHeightAsian") ] = uno::makeAny( + aTextValueMap[ "CharHeightAsian" ] = uno::makeAny( static_cast< float >( ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ))); } - if( aTextValueMap[ C2U("CharHeightComplex") ] >>= fFontHeight ) + if( aTextValueMap[ "CharHeightComplex" ] >>= fFontHeight ) { - aTextValueMap[ C2U("CharHeightComplex") ] = uno::makeAny( + aTextValueMap[ "CharHeightComplex" ] = uno::makeAny( static_cast< float >( ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ))); } @@ -166,7 +166,7 @@ awt::Size lcl_createTextShapes( // create label shape Reference< drawing::XShape > xEntry( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.TextShape" )), uno::UNO_QUERY_THROW ); + "com.sun.star.drawing.TextShape"), uno::UNO_QUERY_THROW ); xTarget->add( xEntry ); // set label text @@ -181,7 +181,7 @@ awt::Size lcl_createTextShapes( OUString aLabelString( aLabelSeq[i]->getString()); // workaround for Issue #i67540# if( aLabelString.isEmpty()) - aLabelString = C2U(" "); + aLabelString = " "; if( xRange.is()) xRange->setString( aLabelString ); @@ -300,7 +300,7 @@ awt::Size lcl_placeLegendEntries( const sal_Int32 nSymbolToTextDistance = static_cast< sal_Int32 >( std::max( 100.0, fViewFontSize * 0.22 ) );//minimum 1mm const sal_Int32 nSymbolPlusDistanceWidth = rMaxSymbolExtent.Width + nSymbolToTextDistance; sal_Int32 nMaxTextWidth = rAvailableSpace.Width - (2 * nXPadding) - nSymbolPlusDistanceWidth; - rtl::OUString aPropNameTextMaximumFrameWidth( C2U("TextMaximumFrameWidth") ); + rtl::OUString aPropNameTextMaximumFrameWidth( "TextMaximumFrameWidth" ); uno::Any* pFrameWidthAny = PropertyMapper::getValuePointer( rTextProperties.second, rTextProperties.first, aPropNameTextMaximumFrameWidth); if(pFrameWidthAny) { @@ -769,7 +769,7 @@ bool lcl_shouldSymbolsBePlacedOnTheLeftSide( const Reference< beans::XPropertySe if(xLegendProp.is()) { sal_Int16 nWritingMode=-1; - if( (xLegendProp->getPropertyValue( C2U("WritingMode") ) >>= nWritingMode) ) + if( (xLegendProp->getPropertyValue( "WritingMode" ) >>= nWritingMode) ) { if( nWritingMode == text::WritingMode2::PAGE ) nWritingMode = nDefaultWritingMode; @@ -828,7 +828,7 @@ bool VLegend::isVisible( const Reference< XLegend > & xLegend ) try { Reference< beans::XPropertySet > xLegendProp( xLegend, uno::UNO_QUERY_THROW ); - xLegendProp->getPropertyValue( C2U( "Show" )) >>= bShow; + xLegendProp->getPropertyValue( "Show") >>= bShow; } catch( const uno::Exception & ex ) { @@ -853,7 +853,7 @@ void VLegend::createShapes( { //create shape and add to page m_xShape.set( m_xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.GroupShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.GroupShape"), uno::UNO_QUERY ); m_xTarget->add( m_xShape ); // set name to enable selection @@ -868,7 +868,7 @@ void VLegend::createShapes( { Reference< drawing::XShape > xBorder( m_xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.RectangleShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY ); // for quickly setting properties tPropertyValues aLineFillProperties; @@ -881,11 +881,11 @@ void VLegend::createShapes( if( xLegendProp.is()) { // get Expansion property - xLegendProp->getPropertyValue( C2U( "Expansion" )) >>= eExpansion; + xLegendProp->getPropertyValue( "Expansion") >>= eExpansion; if( eExpansion == ::com::sun::star::chart::ChartLegendExpansion_CUSTOM ) { RelativeSize aRelativeSize; - if ((xLegendProp->getPropertyValue( C2U( "RelativeSize" )) >>= aRelativeSize)) + if ((xLegendProp->getPropertyValue( "RelativeSize") >>= aRelativeSize)) { aLegendSize.Width = static_cast<sal_Int32>(::rtl::math::approxCeil( aRelativeSize.Primary * rPageSize.Width )); aLegendSize.Height = static_cast<sal_Int32>(::rtl::math::approxCeil( aRelativeSize.Secondary * rPageSize.Height )); @@ -906,7 +906,7 @@ void VLegend::createShapes( Reference< beans::XPropertySet >( xBorder, uno::UNO_QUERY )); //because of this name this border will be used for marking the legend - ShapeFactory(m_xShapeFactory).setShapeName( xBorder, C2U("MarkHandles") ); + ShapeFactory(m_xShapeFactory).setShapeName( xBorder, "MarkHandles" ); } // create entries @@ -977,10 +977,10 @@ void VLegend::changePosition( chart2::RelativePosition aRelativePosition; bool bAutoPosition = - ! (xLegendProp->getPropertyValue( C2U( "RelativePosition" )) >>= aRelativePosition); + ! (xLegendProp->getPropertyValue( "RelativePosition") >>= aRelativePosition); LegendPosition ePos = LegendPosition_CUSTOM; - xLegendProp->getPropertyValue( C2U( "AnchorPosition" )) >>= ePos; + xLegendProp->getPropertyValue( "AnchorPosition") >>= ePos; //calculate position if( bAutoPosition ) diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index 24979bb30a59..a22cd9cffeb2 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -71,7 +71,7 @@ void lcl_setPropetiesToShape( ::chart::tAnySequence aPropValues; ::chart::PropertyMapper::getMultiPropertyListsFromValueMap( aPropNames, aPropValues, aValueMap ); - uno::Any* pLineWidthAny = ::chart::PropertyMapper::getValuePointer(aPropValues,aPropNames,C2U("LineWidth")); + uno::Any* pLineWidthAny = ::chart::PropertyMapper::getValuePointer(aPropValues,aPropNames,"LineWidth"); sal_Int32 nLineWidth = 0; if( pLineWidthAny && (*pLineWidthAny>>=nLineWidth) ) { @@ -104,7 +104,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( return xResult; xResult.set( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.GroupShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.GroupShape"), uno::UNO_QUERY ); xSymbolContainer->add( xResult ); Reference< drawing::XShapes > xResultGroup( xResult, uno::UNO_QUERY ); if( ! xResultGroup.is()) @@ -120,7 +120,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( if( eStyle == LegendSymbolStyle_LINE ) { Reference< drawing::XShape > xLine( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.LineShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.LineShape"), uno::UNO_QUERY ); if( xLine.is()) { xResultGroup->add( xLine ); @@ -141,7 +141,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( if( aSymbol.Style == chart2::SymbolStyle_STANDARD ) { // take series color as fill color - xLegendEntryProperties->getPropertyValue( C2U("Color")) >>= aSymbol.FillColor; + xLegendEntryProperties->getPropertyValue( "Color") >>= aSymbol.FillColor; // border of symbols always same as fill color aSymbol.BorderColor = aSymbol.FillColor; @@ -170,7 +170,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( else if( eStyle == LegendSymbolStyle_CIRCLE ) { Reference< drawing::XShape > xShape( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.EllipseShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.EllipseShape"), uno::UNO_QUERY ); if( xShape.is() ) { xResultGroup->add( xShape ); @@ -183,7 +183,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( else // eStyle == LegendSymbolStyle_BOX { Reference< drawing::XShape > xShape( xShapeFactory->createInstance( - C2U( "com.sun.star.drawing.RectangleShape" )), uno::UNO_QUERY ); + "com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY ); if( xShape.is() ) { xResultGroup->add( xShape ); diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index f999388a4fd9..22c4155811d9 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -48,11 +48,11 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert { if( bUseSeriesPropertyNames ) try { - this->Color = xProp->getPropertyValue( C2U( "BorderColor" ) ); - this->LineStyle = xProp->getPropertyValue( C2U( "BorderStyle" ) ); - this->Transparence = xProp->getPropertyValue( C2U( "BorderTransparency" ) ); - this->Width = xProp->getPropertyValue( C2U( "BorderWidth" ) ); - this->DashName = xProp->getPropertyValue( C2U( "BorderDashName" ) ); + this->Color = xProp->getPropertyValue( "BorderColor" ); + this->LineStyle = xProp->getPropertyValue( "BorderStyle" ); + this->Transparence = xProp->getPropertyValue( "BorderTransparency" ); + this->Width = xProp->getPropertyValue( "BorderWidth" ); + this->DashName = xProp->getPropertyValue( "BorderDashName" ); } catch( const uno::Exception& e ) { @@ -60,11 +60,11 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert } else try { - this->Color = xProp->getPropertyValue( C2U( "LineColor" ) ); - this->LineStyle = xProp->getPropertyValue( C2U( "LineStyle" ) ); - this->Transparence = xProp->getPropertyValue( C2U( "LineTransparence" ) ); - this->Width = xProp->getPropertyValue( C2U( "LineWidth" ) ); - this->DashName = xProp->getPropertyValue( C2U( "LineDashName" ) ); + this->Color = xProp->getPropertyValue( "LineColor" ); + this->LineStyle = xProp->getPropertyValue( "LineStyle" ); + this->Transparence = xProp->getPropertyValue( "LineTransparence" ); + this->Width = xProp->getPropertyValue( "LineWidth" ); + this->DashName = xProp->getPropertyValue( "LineDashName" ); } catch( const uno::Exception& e ) { diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index 4fb26a00410d..9fcd762d6fff 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -101,7 +101,7 @@ void VTitle::changePosition( const awt::Point& rPos ) ::basegfx::B2DHomMatrix aM; aM.rotate( -m_fRotationAngleDegree*F_PI/180.0 );//#i78696#->#i80521# aM.translate( m_nXPos, m_nYPos); - xShapeProp->setPropertyValue( C2U( "Transformation" ), uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) ); + xShapeProp->setPropertyValue( "Transformation", uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) ); } catch( const uno::Exception& e ) { @@ -124,8 +124,8 @@ void VTitle::createShapes( //create shape and add to page uno::Reference< drawing::XShape > xShape( - m_xShapeFactory->createInstance( C2U( - "com.sun.star.drawing.TextShape" ) ), uno::UNO_QUERY ); + m_xShapeFactory->createInstance( + "com.sun.star.drawing.TextShape" ), uno::UNO_QUERY ); m_xTarget->add(xShape); m_xShape = xShape; @@ -152,14 +152,14 @@ void VTitle::createShapes( drawing::TextHorizontalAdjust eHorizontalAdjust = drawing::TextHorizontalAdjust_CENTER; drawing::TextVerticalAdjust eVerticalAdjust = drawing::TextVerticalAdjust_CENTER; - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextHorizontalAdjust"), uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextVerticalAdjust"), uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowHeight"), uno::makeAny(sal_True) ) ); // sal_Bool - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowWidth"), uno::makeAny(sal_True) ) ); // sal_Bool + aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust + aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(sal_True) ) ); // sal_Bool + aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(sal_True) ) ); // sal_Bool //set name/classified ObjectID (CID) if( !m_aCID.isEmpty() ) - aValueMap.insert( tPropertyNameValueMap::value_type( C2U("Name"), uno::makeAny( m_aCID ) ) ); //CID rtl::OUString + aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( m_aCID ) ) ); //CID rtl::OUString } //set global title properties @@ -173,7 +173,7 @@ void VTitle::createShapes( sal_Bool bStackCharacters(sal_False); try { - xTitleProperties->getPropertyValue( C2U( "StackCharacters" ) ) >>= bStackCharacters; + xTitleProperties->getPropertyValue( "StackCharacters" ) >>= bStackCharacters; } catch( const uno::Exception& e ) { @@ -200,7 +200,7 @@ void VTitle::createShapes( // adapt font size according to page size awt::Size aOldRefSize; - if( xTitleProperties->getPropertyValue( C2U("ReferencePageSize")) >>= aOldRefSize ) + if( xTitleProperties->getPropertyValue( "ReferencePageSize") >>= aOldRefSize ) { RelativeSizeHelper::adaptFontSizes( xTargetProps, aOldRefSize, rReferenceSize ); } @@ -219,7 +219,7 @@ void VTitle::createShapes( } awt::Size aOldRefSize; bool bHasRefPageSize = - ( xTitleProperties->getPropertyValue( C2U("ReferencePageSize")) >>= aOldRefSize ); + ( xTitleProperties->getPropertyValue( "ReferencePageSize") >>= aOldRefSize ); if( aStringList.getLength()>0 ) { @@ -237,23 +237,23 @@ void VTitle::createShapes( // #i109336# Improve auto positioning in chart float fFontHeight = 0.0; - if ( xShapeProp.is() && ( xShapeProp->getPropertyValue( C2U( "CharHeight" ) ) >>= fFontHeight ) ) + if ( xShapeProp.is() && ( xShapeProp->getPropertyValue( "CharHeight" ) >>= fFontHeight ) ) { fFontHeight *= ( 2540.0f / 72.0f ); // pt -> 1/100 mm float fXFraction = 0.18f; sal_Int32 nXDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * fXFraction ) ); float fYFraction = 0.30f; sal_Int32 nYDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * fYFraction ) ); - xShapeProp->setPropertyValue( C2U( "TextLeftDistance" ), uno::makeAny( nXDistance ) ); - xShapeProp->setPropertyValue( C2U( "TextRightDistance" ), uno::makeAny( nXDistance ) ); - xShapeProp->setPropertyValue( C2U( "TextUpperDistance" ), uno::makeAny( nYDistance ) ); - xShapeProp->setPropertyValue( C2U( "TextLowerDistance" ), uno::makeAny( nYDistance ) ); + xShapeProp->setPropertyValue( "TextLeftDistance", uno::makeAny( nXDistance ) ); + xShapeProp->setPropertyValue( "TextRightDistance", uno::makeAny( nXDistance ) ); + xShapeProp->setPropertyValue( "TextUpperDistance", uno::makeAny( nYDistance ) ); + xShapeProp->setPropertyValue( "TextLowerDistance", uno::makeAny( nYDistance ) ); } try { double fAngleDegree = 0; - xTitleProperties->getPropertyValue( C2U( "TextRotation" ) ) >>= fAngleDegree; + xTitleProperties->getPropertyValue( "TextRotation" ) >>= fAngleDegree; m_fRotationAngleDegree += fAngleDegree; } catch( const uno::Exception& e ) @@ -268,7 +268,7 @@ void VTitle::createShapes( ::basegfx::B2DHomMatrix aM; aM.rotate( -m_fRotationAngleDegree*F_PI/180.0 );//#i78696#->#i80521# aM.translate( m_nXPos, m_nYPos ); - xShapeProp->setPropertyValue( C2U( "Transformation" ), uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) ); + xShapeProp->setPropertyValue( "Transformation", uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) ); } catch( const uno::Exception& e ) { |