[Libreoffice-commits] .: 4 commits - chart2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 8 09:13:13 PDT 2012
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 158 ++---
chart2/source/controller/dialogs/DataBrowser.cxx | 15
chart2/source/controller/dialogs/DataBrowserModel.cxx | 24
chart2/source/controller/dialogs/DialogModel.cxx | 86 +--
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 101 +--
chart2/source/controller/dialogs/RangeSelectionHelper.cxx | 9
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 42 -
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 10
chart2/source/controller/dialogs/res_ErrorBar.cxx | 10
chart2/source/controller/dialogs/res_LegendPosition.cxx | 12
chart2/source/controller/dialogs/res_TextSeparator.cxx | 18
chart2/source/controller/dialogs/res_TextSeparator.hxx | 6
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 4
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx | 10
chart2/source/controller/dialogs/tp_ChartType.cxx | 6
chart2/source/controller/dialogs/tp_DataSource.cxx | 20
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 14
chart2/source/controller/dialogs/tp_RangeChooser.hxx | 2
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 6
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 56 -
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx | 138 ++--
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 80 +-
chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx | 35 -
chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx | 136 ++--
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx | 18
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx | 12
chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 30 -
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 51 -
chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx | 8
chart2/source/controller/main/ChartController.cxx | 282 +++++-----
30 files changed, 693 insertions(+), 706 deletions(-)
New commits:
commit 8f14c8a6115fb7c57203fa089b2383b858723932
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Sat Oct 6 23:58:35 2012 -0300
OUString cleanup in Chart2
Include C2U macro and rtl prefix
Change-Id: If930f77179dbf24d43f10a344b68edcf968f7304
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 59f1efd..1ce4107 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -252,12 +252,12 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
m_aRB_Columns.IsChecked(), bFirstCellAsLabel, bHasCategories ) );
// only if range is valid
- if( m_aLastValidRangeString.equals( m_aED_Range.GetText()))
+ if( m_aLastValidRangeString.equals(m_aED_Range.GetText()))
{
m_rDialogModel.setTemplate( m_xCurrentChartTypeTemplate );
aArguments.realloc( aArguments.getLength() + 1 );
aArguments[aArguments.getLength() - 1] =
- beans::PropertyValue( C2U("CellRangeRepresentation"), -1,
+ beans::PropertyValue( "CellRangeRepresentation" , -1,
uno::makeAny( m_aLastValidRangeString ),
beans::PropertyState_DIRECT_VALUE );
m_rDialogModel.setData( aArguments );
@@ -271,7 +271,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
bool RangeChooserTabPage::isValid()
{
- ::rtl::OUString aRange( m_aED_Range.GetText());
+ OUString aRange( m_aED_Range.GetText());
sal_Bool bFirstCellAsLabel = ( m_aCB_FirstColumnAsLabel.IsChecked() && !m_aRB_Columns.IsChecked() )
|| ( m_aCB_FirstRowAsLabel.IsChecked() && !m_aRB_Rows.IsChecked() );
sal_Bool bHasCategories = ( m_aCB_FirstColumnAsLabel.IsChecked() && m_aRB_Columns.IsChecked() )
@@ -352,9 +352,9 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl)
IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl)
{
- rtl::OUString aRange = m_aED_Range.GetText();
+ OUString aRange = m_aED_Range.GetText();
// using assignment for broken gcc 3.3
- rtl::OUString aTitle = String( SchResId( STR_PAGE_DATA_RANGE ) );
+ OUString aTitle = String( SchResId( STR_PAGE_DATA_RANGE ) );
lcl_enableRangeChoosing( true, m_pParentDialog );
m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this );
@@ -363,11 +363,11 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl)
}
-void RangeChooserTabPage::listeningFinished( const ::rtl::OUString & rNewRange )
+void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
{
//user has selected a new range
- rtl::OUString aRange( rNewRange );
+ OUString aRange( rNewRange );
m_rDialogModel.startControllerLockTimer();
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index bb03ff0..2f0bc8d 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -100,7 +100,7 @@ protected: //member
::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataProvider > m_xDataProvider;
- rtl::OUString m_aLastValidRangeString;
+ OUString m_aLastValidRangeString;
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartTypeTemplate > m_xCurrentChartTypeTemplate;
ChartTypeTemplateProvider* m_pTemplateProvider;
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index dc0de9a..37e7b0a 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -192,8 +192,8 @@ SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const
if( pRet )
{
//ignore some special shapes
- rtl::OUString aShapeName = pRet->GetName();
- if( aShapeName.match(C2U("PlotAreaIncludingAxes")) || aShapeName.match(C2U("PlotAreaExcludingAxes")) )
+ OUString aShapeName = pRet->GetName();
+ if( aShapeName.match("PlotAreaIncludingAxes") || aShapeName.match("PlotAreaExcludingAxes") )
{
pRet->SetMarkProtect( true );
return getHitObject( rPnt );
@@ -300,7 +300,7 @@ SfxItemSet DrawViewWrapper::getPositionAndSizeItemSetFromMarkedObject() const
return aFullSet;
}
-SdrObject* DrawViewWrapper::getNamedSdrObject( const rtl::OUString& rName ) const
+SdrObject* DrawViewWrapper::getNamedSdrObject( const OUString& rName ) const
{
if(rName.isEmpty())
return 0;
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 78fc46e..e066436 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -103,7 +103,7 @@ AxisItemConverter::AxisItemConverter(
xNamedPropertyContainerFactory,
GraphicPropertyItemConverter::LINE_PROPERTIES ));
m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize,
- C2U( "ReferencePageSize" ) ));
+ "ReferencePageSize" ));
m_xAxis.set( Reference< chart2::XAxis >( rPropertySet, uno::UNO_QUERY ) );
OSL_ASSERT( m_xAxis.is());
@@ -348,7 +348,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
case SCHATTR_AXIS_POSITION:
{
::com::sun::star::chart::ChartAxisPosition eAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO );
- GetPropertySet()->getPropertyValue(C2U( "CrossoverPosition" )) >>= eAxisPos;
+ GetPropertySet()->getPropertyValue( "CrossoverPosition" ) >>= eAxisPos;
rOutItemSet.Put( SfxInt32Item( nWhichId, eAxisPos ) );
}
break;
@@ -356,7 +356,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
case SCHATTR_AXIS_POSITION_VALUE:
{
double fValue = 0.0;
- if( GetPropertySet()->getPropertyValue(C2U( "CrossoverValue" )) >>= fValue )
+ if( GetPropertySet()->getPropertyValue( "CrossoverValue" ) >>= fValue )
rOutItemSet.Put( SvxDoubleItem( fValue, nWhichId ) );
}
break;
@@ -381,7 +381,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
case SCHATTR_AXIS_LABEL_POSITION:
{
::com::sun::star::chart::ChartAxisLabelPosition ePos( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS );
- GetPropertySet()->getPropertyValue(C2U( "LabelPosition" )) >>= ePos;
+ GetPropertySet()->getPropertyValue( "LabelPosition" ) >>= ePos;
rOutItemSet.Put( SfxInt32Item( nWhichId, ePos ) );
}
break;
@@ -389,7 +389,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
case SCHATTR_AXIS_MARK_POSITION:
{
::com::sun::star::chart::ChartAxisMarkPosition ePos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS );
- GetPropertySet()->getPropertyValue(C2U( "MarkPosition" )) >>= ePos;
+ GetPropertySet()->getPropertyValue( "MarkPosition" ) >>= ePos;
rOutItemSet.Put( SfxInt32Item( nWhichId, ePos ) );
}
break;
@@ -399,7 +399,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
// convert double to int (times 100)
double fVal = 0;
- if( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fVal )
+ if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fVal )
{
rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast< sal_Int32 >(
::rtl::math::round( fVal * 100.0 ) ) ));
@@ -425,7 +425,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
case SID_ATTR_NUMBERFORMAT_SOURCE:
{
- bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )).hasValue());
+ bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "NumberFormat" ).hasValue());
rOutItemSet.Put( SfxBoolItem( nWhichId, ! bNumberFormatIsSet ));
}
break;
@@ -744,11 +744,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
double fValue = 0.0;
if( aValue >>= fValue )
{
- xCrossingMainAxis->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE ));
- xCrossingMainAxis->setPropertyValue( C2U( "CrossoverValue" ), uno::makeAny( fValue ));
+ xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE ));
+ xCrossingMainAxis->setPropertyValue( "CrossoverValue" , uno::makeAny( fValue ));
}
else
- xCrossingMainAxis->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START ));
+ xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START ));
}
}
}
@@ -764,11 +764,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
::com::sun::star::chart::ChartAxisPosition eOldAxisPos( ::com::sun::star::chart::ChartAxisPosition_ZERO );
- bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "CrossoverPosition" )) >>= eOldAxisPos );
+ bool bPropExisted = ( GetPropertySet()->getPropertyValue( "CrossoverPosition" ) >>= eOldAxisPos );
if( !bPropExisted || ( eOldAxisPos != eAxisPos ))
{
- GetPropertySet()->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( eAxisPos ));
+ GetPropertySet()->setPropertyValue( "CrossoverPosition" , uno::makeAny( eAxisPos ));
bChangedOtherwise = true;
//move the parallel axes to the other side if necessary
@@ -778,7 +778,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
if( xParallelAxis.is() )
{
::com::sun::star::chart::ChartAxisPosition eOtherPos;
- if( xParallelAxis->getPropertyValue( C2U( "CrossoverPosition" ) ) >>= eOtherPos )
+ if( xParallelAxis->getPropertyValue( "CrossoverPosition" ) >>= eOtherPos )
{
if( eOtherPos == eAxisPos )
{
@@ -786,7 +786,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
(eAxisPos==::com::sun::star::chart::ChartAxisPosition_START)
? ::com::sun::star::chart::ChartAxisPosition_END
: ::com::sun::star::chart::ChartAxisPosition_START;
- xParallelAxis->setPropertyValue( C2U( "CrossoverPosition" ), uno::makeAny( eOppositePos ));
+ xParallelAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( eOppositePos ));
}
}
}
@@ -800,11 +800,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
double fValue = static_cast< const SvxDoubleItem & >( rItemSet.Get( nWhichId )).GetValue();
double fOldValue = 0.0;
- bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "CrossoverValue" )) >>= fOldValue );
+ bool bPropExisted = ( GetPropertySet()->getPropertyValue( "CrossoverValue" ) >>= fOldValue );
if( !bPropExisted || ( fOldValue != fValue ))
{
- GetPropertySet()->setPropertyValue( C2U( "CrossoverValue" ), uno::makeAny( fValue ));
+ GetPropertySet()->setPropertyValue( "CrossoverValue" , uno::makeAny( fValue ));
bChangedOtherwise = true;
//keep old and new settings for axis positioning in sync somehow
@@ -836,11 +836,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
::com::sun::star::chart::ChartAxisLabelPosition eOldPos( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS );
- bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "LabelPosition" )) >>= eOldPos );
+ bool bPropExisted = ( GetPropertySet()->getPropertyValue( "LabelPosition" ) >>= eOldPos );
if( !bPropExisted || ( eOldPos != ePos ))
{
- GetPropertySet()->setPropertyValue( C2U( "LabelPosition" ), uno::makeAny( ePos ));
+ GetPropertySet()->setPropertyValue( "LabelPosition" , uno::makeAny( ePos ));
bChangedOtherwise = true;
//move the parallel axes to the other side if necessary
@@ -850,7 +850,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
if( xParallelAxis.is() )
{
::com::sun::star::chart::ChartAxisLabelPosition eOtherPos;
- if( xParallelAxis->getPropertyValue( C2U( "LabelPosition" ) ) >>= eOtherPos )
+ if( xParallelAxis->getPropertyValue( "LabelPosition" ) >>= eOtherPos )
{
if( eOtherPos == ePos )
{
@@ -858,7 +858,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
(ePos==::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START)
? ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END
: ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START;
- xParallelAxis->setPropertyValue( C2U( "LabelPosition" ), uno::makeAny( eOppositePos ));
+ xParallelAxis->setPropertyValue( "LabelPosition" , uno::makeAny( eOppositePos ));
}
}
}
@@ -874,11 +874,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
::com::sun::star::chart::ChartAxisMarkPosition eOldPos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS );
- bool bPropExisted = ( GetPropertySet()->getPropertyValue(C2U( "MarkPosition" )) >>= eOldPos );
+ bool bPropExisted = ( GetPropertySet()->getPropertyValue( "MarkPosition" ) >>= eOldPos );
if( !bPropExisted || ( eOldPos != ePos ))
{
- GetPropertySet()->setPropertyValue( C2U( "MarkPosition" ), uno::makeAny( ePos ));
+ GetPropertySet()->setPropertyValue( "MarkPosition" , uno::makeAny( ePos ));
bChangedOtherwise = true;
}
}
@@ -892,12 +892,12 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
rItemSet.Get( nWhichId )).GetValue()) / 100.0;
double fOldVal = 0.0;
bool bPropExisted =
- ( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fOldVal );
+ ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldVal );
if( ! bPropExisted ||
( bPropExisted && fOldVal != fVal ))
{
- GetPropertySet()->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fVal ));
+ GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fVal ));
bChangedOtherwise = true;
}
}
@@ -918,9 +918,9 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
rItemSet.Get( nWhichId )).GetValue());
aValue = uno::makeAny(nFmt);
- if( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )) != aValue )
+ if( GetPropertySet()->getPropertyValue( "NumberFormat" ) != aValue )
{
- GetPropertySet()->setPropertyValue( C2U( "NumberFormat" ), aValue );
+ GetPropertySet()->setPropertyValue( "NumberFormat" , aValue );
bChangedOtherwise = true;
}
}
@@ -933,7 +933,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
bool bUseSourceFormat =
(static_cast< const SfxBoolItem & >(
rItemSet.Get( nWhichId )).GetValue() );
- bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )).hasValue());
+ bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "NumberFormat").hasValue());
bChangedOtherwise = (bUseSourceFormat == bNumberFormatIsSet);
if( bChangedOtherwise )
@@ -961,7 +961,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
}
}
// else set a void Any
- GetPropertySet()->setPropertyValue( C2U( "NumberFormat" ), aValue );
+ GetPropertySet()->setPropertyValue( "NumberFormat" , aValue );
}
}
break;
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 97881ce..1550998 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -82,7 +82,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter(
const uno::Reference< beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
::std::auto_ptr< awt::Size > pRefSize,
- const ::rtl::OUString & rRefSizePropertyName,
+ const OUString & rRefSizePropertyName,
const uno::Reference< beans::XPropertySet > & rRefSizePropSet ) :
ItemConverter( rPropertySet, rItemPool ),
m_pRefSize( pRefSize ),
@@ -121,23 +121,23 @@ void CharacterPropertyItemConverter::FillSpecialItem(
case EE_CHAR_FONTINFO_CJK:
case EE_CHAR_FONTINFO_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_FONTINFO_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_FONTINFO_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
SvxFontItem aItem( nWhichId );
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontName" ) + aPostfix),
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontName" + aPostfix),
MID_FONT_FAMILY_NAME );
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontFamily" ) + aPostfix),
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontFamily" + aPostfix),
MID_FONT_FAMILY );
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontStyleName" ) + aPostfix),
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontStyleName" + aPostfix),
MID_FONT_STYLE_NAME );
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontCharSet" ) + aPostfix),
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontCharSet" + aPostfix),
MID_FONT_CHAR_SET );
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "CharFontPitch" ) + aPostfix),
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "CharFontPitch" + aPostfix),
MID_FONT_PITCH );
rOutItemSet.Put( aItem );
@@ -149,14 +149,14 @@ void CharacterPropertyItemConverter::FillSpecialItem(
SvxUnderlineItem aItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE);
bool bModified = false;
- uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharUnderline" )));
+ uno::Any aValue( GetPropertySet()->getPropertyValue( "CharUnderline" ));
if( aValue.hasValue())
{
aItem.PutValue( aValue, MID_TL_STYLE );
bModified = true;
}
- aValue = GetPropertySet()->getPropertyValue( C2U( "CharUnderlineHasColor" ));
+ aValue = GetPropertySet()->getPropertyValue( "CharUnderlineHasColor" );
if( aValue.hasValue() &&
( *reinterpret_cast< const sal_Bool * >( aValue.getValue()) != sal_False ))
{
@@ -164,7 +164,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
bModified = true;
}
- aValue = GetPropertySet()->getPropertyValue( C2U( "CharUnderlineColor" ));
+ aValue = GetPropertySet()->getPropertyValue( "CharUnderlineColor" );
if( aValue.hasValue())
{
aItem.PutValue( aValue, MID_TL_COLOR );
@@ -181,14 +181,14 @@ void CharacterPropertyItemConverter::FillSpecialItem(
SvxOverlineItem aItem( UNDERLINE_NONE, EE_CHAR_OVERLINE );
bool bModified = false;
- uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharOverline" ) ) );
+ uno::Any aValue( GetPropertySet()->getPropertyValue( "CharOverline" ) );
if ( aValue.hasValue() )
{
aItem.PutValue( aValue, MID_TL_STYLE );
bModified = true;
}
- aValue = GetPropertySet()->getPropertyValue( C2U( "CharOverlineHasColor" ) );
+ aValue = GetPropertySet()->getPropertyValue( "CharOverlineHasColor" );
if ( aValue.hasValue() &&
( *reinterpret_cast< const sal_Bool* >( aValue.getValue() ) != sal_False ) )
{
@@ -196,7 +196,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
bModified = true;
}
- aValue = GetPropertySet()->getPropertyValue( C2U( "CharOverlineColor" ) );
+ aValue = GetPropertySet()->getPropertyValue( "CharOverlineColor" );
if ( aValue.hasValue() )
{
aItem.PutValue( aValue, MID_TL_COLOR );
@@ -214,15 +214,15 @@ void CharacterPropertyItemConverter::FillSpecialItem(
case EE_CHAR_ITALIC_CJK:
case EE_CHAR_ITALIC_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_ITALIC_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_ITALIC_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
SvxPostureItem aItem( ITALIC_NONE, nWhichId );
- uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharPosture" ) + aPostfix));
+ uno::Any aValue( GetPropertySet()->getPropertyValue( "CharPosture" + aPostfix));
if( aValue.hasValue())
{
aItem.PutValue( aValue, MID_POSTURE );
@@ -235,15 +235,15 @@ void CharacterPropertyItemConverter::FillSpecialItem(
case EE_CHAR_WEIGHT_CJK:
case EE_CHAR_WEIGHT_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_WEIGHT_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_WEIGHT_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
SvxWeightItem aItem( WEIGHT_NORMAL, nWhichId );
- uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharWeight" ) + aPostfix));
+ uno::Any aValue( GetPropertySet()->getPropertyValue( "CharWeight" + aPostfix));
if( aValue.hasValue())
{
aItem.PutValue( aValue, MID_WEIGHT );
@@ -256,17 +256,17 @@ void CharacterPropertyItemConverter::FillSpecialItem(
case EE_CHAR_FONTHEIGHT_CJK:
case EE_CHAR_FONTHEIGHT_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_FONTHEIGHT_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_FONTHEIGHT_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
SvxFontHeightItem aItem( 240, 100, nWhichId );
try
{
- uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharHeight" ) + aPostfix ));
+ uno::Any aValue( GetPropertySet()->getPropertyValue( "CharHeight" + aPostfix ));
float fHeight;
if( aValue >>= fHeight )
{
@@ -298,11 +298,11 @@ void CharacterPropertyItemConverter::FillSpecialItem(
uno::Reference< chart2::XFormattedString > xFormattedString( GetPropertySet(), uno::UNO_QUERY );
if( xFormattedString.is() )
{
- ::rtl::OUString aString = xFormattedString->getString();
+ OUString aString = xFormattedString->getString();
rOutItemSet.Put( SfxStringItem( nWhichId, aString ) );
}
else
- rOutItemSet.Put( SfxStringItem( nWhichId, C2U( "" ) ) );
+ rOutItemSet.Put( SfxStringItem( nWhichId, OUString("") ) );
}
break;
@@ -326,11 +326,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
case EE_CHAR_FONTINFO_CJK:
case EE_CHAR_FONTINFO_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_FONTINFO_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_FONTINFO_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
const SvxFontItem & rItem =
static_cast< const SvxFontItem & >(
@@ -338,41 +338,41 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_FONT_FAMILY_NAME ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontName" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharFontName" + aPostfix ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharFontName" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharFontName" + aPostfix, aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_FONT_FAMILY ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontFamily" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharFontFamily" + aPostfix ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharFontFamily" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharFontFamily" + aPostfix, aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_FONT_STYLE_NAME ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontStyleName" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharFontStyleName" + aPostfix ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharFontStyleName" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharFontStyleName" + aPostfix, aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_FONT_CHAR_SET ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontCharSet" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharFontCharSet" + aPostfix ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharFontCharSet" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharFontCharSet" + aPostfix, aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_FONT_PITCH ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharFontPitch" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharFontPitch" + aPostfix ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharFontPitch" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharFontPitch" + aPostfix, aValue );
bChanged = true;
}
}
@@ -387,27 +387,27 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_TL_STYLE ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderline" ) ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharUnderline" ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharUnderline" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharUnderline" , aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_TL_COLOR ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderlineColor" ) ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharUnderlineColor" ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharUnderlineColor" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharUnderlineColor" , aValue );
bChanged = true;
}
}
if( rItem.QueryValue( aValue, MID_TL_HASCOLOR ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderlineHasColor" ) ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharUnderlineHasColor" ))
{
- GetPropertySet()->setPropertyValue( C2U( "CharUnderlineHasColor" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharUnderlineHasColor" , aValue );
bChanged = true;
}
}
@@ -420,27 +420,27 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if ( rItem.QueryValue( aValue, MID_TL_STYLE ) )
{
- if ( aValue != GetPropertySet()->getPropertyValue( C2U( "CharOverline" ) ) )
+ if ( aValue != GetPropertySet()->getPropertyValue( "CharOverline" ) )
{
- GetPropertySet()->setPropertyValue( C2U( "CharOverline" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharOverline" , aValue );
bChanged = true;
}
}
if ( rItem.QueryValue( aValue, MID_TL_COLOR ) )
{
- if ( aValue != GetPropertySet()->getPropertyValue( C2U( "CharOverlineColor" ) ) )
+ if ( aValue != GetPropertySet()->getPropertyValue( "CharOverlineColor" ) )
{
- GetPropertySet()->setPropertyValue( C2U( "CharOverlineColor" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharOverlineColor" , aValue );
bChanged = true;
}
}
if ( rItem.QueryValue( aValue, MID_TL_HASCOLOR ) )
{
- if ( aValue != GetPropertySet()->getPropertyValue( C2U( "CharOverlineHasColor" ) ) )
+ if ( aValue != GetPropertySet()->getPropertyValue( "CharOverlineHasColor" ) )
{
- GetPropertySet()->setPropertyValue( C2U( "CharOverlineHasColor" ), aValue );
+ GetPropertySet()->setPropertyValue( "CharOverlineHasColor" , aValue );
bChanged = true;
}
}
@@ -451,11 +451,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
case EE_CHAR_ITALIC_CJK:
case EE_CHAR_ITALIC_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_ITALIC_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_ITALIC_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
const SvxPostureItem & rItem =
static_cast< const SvxPostureItem & >(
@@ -463,9 +463,9 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_POSTURE ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharPosture" ) + aPostfix))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharPosture" + aPostfix))
{
- GetPropertySet()->setPropertyValue( C2U( "CharPosture" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharPosture" + aPostfix, aValue );
bChanged = true;
}
}
@@ -476,11 +476,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
case EE_CHAR_WEIGHT_CJK:
case EE_CHAR_WEIGHT_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_WEIGHT_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian" ;
else if( nWhichId == EE_CHAR_WEIGHT_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
const SvxWeightItem & rItem =
static_cast< const SvxWeightItem & >(
@@ -488,9 +488,9 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_WEIGHT ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharWeight" ) + aPostfix))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharWeight" + aPostfix))
{
- GetPropertySet()->setPropertyValue( C2U( "CharWeight" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharWeight" + aPostfix, aValue );
bChanged = true;
}
}
@@ -501,11 +501,11 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
case EE_CHAR_FONTHEIGHT_CJK:
case EE_CHAR_FONTHEIGHT_CTL:
{
- ::rtl::OUString aPostfix;
+ OUString aPostfix;
if( nWhichId == EE_CHAR_FONTHEIGHT_CJK )
- aPostfix = C2U( "Asian" );
+ aPostfix = "Asian";
else if( nWhichId == EE_CHAR_FONTHEIGHT_CTL )
- aPostfix = C2U( "Complex" );
+ aPostfix = "Complex";
const SvxFontHeightItem & rItem =
static_cast< const SvxFontHeightItem & >(
@@ -516,7 +516,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_FONTHEIGHT ) )
{
bool bSetValue = false;
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharHeight" ) + aPostfix ))
+ if( aValue != GetPropertySet()->getPropertyValue( "CharHeight" + aPostfix ))
bSetValue = true;
else
{
@@ -542,7 +542,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
uno::makeAny( *m_pRefSize ));
}
- GetPropertySet()->setPropertyValue( C2U( "CharHeight" ) + aPostfix, aValue );
+ GetPropertySet()->setPropertyValue( "CharHeight" + aPostfix, aValue );
bChanged = true;
}
}
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 325e15a..148743e 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -100,7 +100,7 @@ bool lcl_NumberFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxItemSe
bool bChanged = false;
if( !xPropertySet.is() )
return bChanged;
- rtl::OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? C2U( "NumberFormat" ) : C2U( "PercentageNumberFormat" );
+ OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? OUString( "NumberFormat" ) : OUString( "PercentageNumberFormat" );
sal_uInt16 nSourceWhich = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE;
if( SFX_ITEM_SET != rItemSet.GetItemState( nSourceWhich ) )
@@ -147,7 +147,7 @@ bool lcl_UseSourceFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxIte
bool bChanged = false;
if( !xPropertySet.is() )
return bChanged;
- rtl::OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? C2U( "NumberFormat" ) : C2U( "PercentageNumberFormat" );
+ OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? OUString( "NumberFormat" ) : OUString( "PercentageNumberFormat" );
sal_uInt16 nFormatWhich = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE;
if( SFX_ITEM_SET != rItemSet.GetItemState( nWhichId ) )
@@ -227,8 +227,7 @@ DataPointItemConverter::DataPointItemConverter(
{
m_aConverters.push_back( new GraphicPropertyItemConverter(
rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory, eMapTo ));
- m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize,
- C2U( "ReferencePageSize" )));
+ m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize, "ReferencePageSize"));
if( bDataSeries )
{
m_aConverters.push_back( new StatisticsItemConverter( xChartModel, rPropertySet, rItemPool ));
@@ -315,7 +314,7 @@ bool DataPointItemConverter::ApplySpecialItem(
{
const SfxBoolItem & rItem = static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId ));
- uno::Any aOldValue( GetPropertySet()->getPropertyValue( C2U( "Label" ) ));
+ uno::Any aOldValue( GetPropertySet()->getPropertyValue( "Label" ));
chart2::DataPointLabel aLabel;
if( aOldValue >>= aLabel )
{
@@ -328,15 +327,15 @@ bool DataPointItemConverter::ApplySpecialItem(
{
Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
if( bOldValue != rValue ||
- DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "Label" ), aOldValue ) )
+ DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "Label" , aOldValue ) )
{
- DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "Label" ), uno::makeAny( aLabel ) );
+ DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Label" , uno::makeAny( aLabel ) );
bChanged = true;
}
}
else if( bOldValue != rValue )
{
- GetPropertySet()->setPropertyValue( C2U( "Label" ), uno::makeAny( aLabel ));
+ GetPropertySet()->setPropertyValue( "Label" , uno::makeAny( aLabel ));
bChanged = true;
}
}
@@ -359,24 +358,24 @@ bool DataPointItemConverter::ApplySpecialItem(
case SCHATTR_DATADESCR_SEPARATOR:
{
- rtl::OUString aNewValue = static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue();
- rtl::OUString aOldValue;
+ OUString aNewValue = static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue();
+ OUString aOldValue;
try
{
- GetPropertySet()->getPropertyValue( C2U( "LabelSeparator" ) ) >>= aOldValue;
+ GetPropertySet()->getPropertyValue( "LabelSeparator" ) >>= aOldValue;
if( m_bOverwriteLabelsForAttributedDataPointsAlso )
{
Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
if( !aOldValue.equals(aNewValue) ||
- DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "LabelSeparator" ), uno::makeAny( aOldValue ) ) )
+ DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelSeparator" , uno::makeAny( aOldValue ) ) )
{
- DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "LabelSeparator" ), uno::makeAny( aNewValue ) );
+ DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelSeparator" , uno::makeAny( aNewValue ) );
bChanged = true;
}
}
else if( !aOldValue.equals(aNewValue) )
{
- GetPropertySet()->setPropertyValue( C2U( "LabelSeparator" ), uno::makeAny( aNewValue ));
+ GetPropertySet()->setPropertyValue( "LabelSeparator" , uno::makeAny( aNewValue ));
bChanged = true;
}
}
@@ -394,7 +393,7 @@ bool DataPointItemConverter::ApplySpecialItem(
{
sal_Int32 nNew = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
sal_Int32 nOld =0;
- if( !(GetPropertySet()->getPropertyValue( C2U( "LabelPlacement" ) ) >>= nOld) )
+ if( !(GetPropertySet()->getPropertyValue( "LabelPlacement" ) >>= nOld) )
{
if( m_aAvailableLabelPlacements.getLength() )
nOld = m_aAvailableLabelPlacements[0];
@@ -403,15 +402,15 @@ bool DataPointItemConverter::ApplySpecialItem(
{
Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
if( nOld!=nNew ||
- DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, C2U( "LabelPlacement" ), uno::makeAny( nOld ) ) )
+ DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelPlacement" , uno::makeAny( nOld ) ) )
{
- DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "LabelPlacement" ), uno::makeAny( nNew ) );
+ DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelPlacement" , uno::makeAny( nNew ) );
bChanged = true;
}
}
else if( nOld!=nNew )
{
- GetPropertySet()->setPropertyValue( C2U( "LabelPlacement" ), uno::makeAny( nNew ));
+ GetPropertySet()->setPropertyValue( "LabelPlacement" , uno::makeAny( nNew ));
bChanged = true;
}
}
@@ -429,7 +428,7 @@ bool DataPointItemConverter::ApplySpecialItem(
rItemSet.Get( nWhichId )).GetValue();
chart2::Symbol aSymbol;
- GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol;
+ GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol;
sal_Int32 nOldStyle = lcl_getSymbolStyleForSymbol( aSymbol );
if( nStyle != nOldStyle )
@@ -456,10 +455,9 @@ bool DataPointItemConverter::ApplySpecialItem(
}
if( bDeleteSymbol )
- GetPropertySet()->setPropertyValue( C2U( "Symbol" ), uno::Any());
+ GetPropertySet()->setPropertyValue( "Symbol" , uno::Any());
else
- GetPropertySet()->setPropertyValue( C2U( "Symbol" ),
- uno::makeAny( aSymbol ));
+ GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol ));
bChanged = true;
}
}
@@ -471,14 +469,14 @@ bool DataPointItemConverter::ApplySpecialItem(
rItemSet.Get( nWhichId )).GetSize();
chart2::Symbol aSymbol;
- GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol;
+ GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol;
if( aSize.getWidth() != aSymbol.Size.Width ||
aSize.getHeight() != aSymbol.Size.Height )
{
aSymbol.Size.Width = aSize.getWidth();
aSymbol.Size.Height = aSize.getHeight();
- GetPropertySet()->setPropertyValue( C2U( "Symbol" ), uno::makeAny( aSymbol ));
+ GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol ));
bChanged = true;
}
}
@@ -497,11 +495,11 @@ bool DataPointItemConverter::ApplySpecialItem(
{
aXGraphicAny <<= xGraphic;
chart2::Symbol aSymbol;
- GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol;
+ GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol;
if( aSymbol.Graphic != xGraphic )
{
aSymbol.Graphic = xGraphic;
- GetPropertySet()->setPropertyValue( C2U( "Symbol" ), uno::makeAny( aSymbol ));
+ GetPropertySet()->setPropertyValue( "Symbol" , uno::makeAny( aSymbol ));
bChanged = true;
}
}
@@ -516,12 +514,12 @@ bool DataPointItemConverter::ApplySpecialItem(
rItemSet.Get( nWhichId )).GetValue()) / 100.0;
double fOldValue = 0.0;
bool bPropExisted =
- ( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fOldValue );
+ ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldValue );
if( ! bPropExisted ||
( bPropExisted && fOldValue != fValue ))
{
- GetPropertySet()->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fValue ));
+ GetPropertySet()->setPropertyValue( "TextRotation" , uno::makeAny( fValue ));
bChanged = true;
}
}
@@ -543,7 +541,7 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_DATADESCR_SHOW_SYMBOL:
{
chart2::DataPointLabel aLabel;
- if( GetPropertySet()->getPropertyValue( C2U( "Label" )) >>= aLabel )
+ if( GetPropertySet()->getPropertyValue( "Label" ) >>= aLabel )
{
sal_Bool bValue = (SCHATTR_DATADESCR_SHOW_NUMBER==nWhichId) ? aLabel.ShowNumber : (
(SCHATTR_DATADESCR_SHOW_PERCENTAGE==nWhichId) ? aLabel.ShowNumberInPercent : (
@@ -554,7 +552,7 @@ void DataPointItemConverter::FillSpecialItem(
if( m_bOverwriteLabelsForAttributedDataPointsAlso )
{
if( DataSeriesHelper::hasAttributedDataPointDifferentValue(
- Reference< chart2::XDataSeries >( GetPropertySet(), uno::UNO_QUERY), C2U( "Label" ), uno::makeAny(aLabel) ) )
+ Reference< chart2::XDataSeries >( GetPropertySet(), uno::UNO_QUERY), "Label" , uno::makeAny(aLabel) ) )
{
rOutItemSet.InvalidateItem(nWhichId);
}
@@ -566,7 +564,7 @@ void DataPointItemConverter::FillSpecialItem(
case SID_ATTR_NUMBERFORMAT_VALUE:
{
sal_Int32 nKey = 0;
- if( !(GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )) >>= nKey) )
+ if( !(GetPropertySet()->getPropertyValue( "NumberFormat" ) >>= nKey) )
nKey = m_nNumberFormat;
rOutItemSet.Put( SfxUInt32Item( nWhichId, nKey ));
}
@@ -575,7 +573,7 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_PERCENT_NUMBERFORMAT_VALUE:
{
sal_Int32 nKey = 0;
- if( !(GetPropertySet()->getPropertyValue( C2U( "PercentageNumberFormat" )) >>= nKey) )
+ if( !(GetPropertySet()->getPropertyValue( "PercentageNumberFormat" ) >>= nKey) )
nKey = m_nPercentNumberFormat;
rOutItemSet.Put( SfxUInt32Item( nWhichId, nKey ));
}
@@ -583,23 +581,23 @@ void DataPointItemConverter::FillSpecialItem(
case SID_ATTR_NUMBERFORMAT_SOURCE:
{
- bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )).hasValue());
+ bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "NumberFormat" ).hasValue());
rOutItemSet.Put( SfxBoolItem( nWhichId, ! bNumberFormatIsSet ));
}
break;
case SCHATTR_PERCENT_NUMBERFORMAT_SOURCE:
{
- bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( C2U( "PercentageNumberFormat" )).hasValue());
+ bool bNumberFormatIsSet = ( GetPropertySet()->getPropertyValue( "PercentageNumberFormat" ).hasValue());
rOutItemSet.Put( SfxBoolItem( nWhichId, ! bNumberFormatIsSet ));
}
break;
case SCHATTR_DATADESCR_SEPARATOR:
{
- rtl::OUString aValue;
+ OUString aValue;
try
{
- GetPropertySet()->getPropertyValue( C2U( "LabelSeparator" ) ) >>= aValue;
+ GetPropertySet()->getPropertyValue( "LabelSeparator" ) >>= aValue;
rOutItemSet.Put( SfxStringItem( nWhichId, aValue ));
}
catch( const uno::Exception& e )
@@ -614,7 +612,7 @@ void DataPointItemConverter::FillSpecialItem(
try
{
sal_Int32 nPlacement=0;
- if( GetPropertySet()->getPropertyValue( C2U( "LabelPlacement" ) ) >>= nPlacement )
+ if( GetPropertySet()->getPropertyValue( "LabelPlacement" ) >>= nPlacement )
rOutItemSet.Put( SfxInt32Item( nWhichId, nPlacement ));
else if( m_aAvailableLabelPlacements.getLength() )
rOutItemSet.Put( SfxInt32Item( nWhichId, m_aAvailableLabelPlacements[0] ));
@@ -641,7 +639,7 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_STYLE_SYMBOL:
{
chart2::Symbol aSymbol;
- if( GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol )
+ if( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol )
rOutItemSet.Put( SfxInt32Item( nWhichId, lcl_getSymbolStyleForSymbol( aSymbol ) ));
}
break;
@@ -649,7 +647,7 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_SYMBOL_SIZE:
{
chart2::Symbol aSymbol;
- if( GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol )
+ if( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol )
rOutItemSet.Put(
SvxSizeItem( nWhichId, Size( aSymbol.Size.Width, aSymbol.Size.Height ) ));
}
@@ -658,7 +656,7 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_SYMBOL_BRUSH:
{
chart2::Symbol aSymbol;
- if(( GetPropertySet()->getPropertyValue( C2U( "Symbol" )) >>= aSymbol )
+ if(( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol )
&& aSymbol.Graphic.is() )
{
rOutItemSet.Put( SvxBrushItem( Graphic( aSymbol.Graphic ), GPOS_MM, SCHATTR_SYMBOL_BRUSH ));
@@ -670,7 +668,7 @@ void DataPointItemConverter::FillSpecialItem(
{
double fValue = 0;
- if( GetPropertySet()->getPropertyValue( C2U( "TextRotation" )) >>= fValue )
+ if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fValue )
{
rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast< sal_Int32 >(
::rtl::math::round( fValue * 100.0 ) ) ));
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index bba5733..1848f25 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -56,8 +56,8 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar
try
{
- xErrorBarProp->getPropertyValue( C2U( "PositiveError" )) >>= rOutPosError;
- xErrorBarProp->getPropertyValue( C2U( "NegativeError" )) >>= rOutNegError;
+ xErrorBarProp->getPropertyValue( "PositiveError" ) >>= rOutPosError;
+ xErrorBarProp->getPropertyValue( "NegativeError" ) >>= rOutNegError;
}
catch( const uno::Exception & ex )
{
@@ -74,8 +74,8 @@ void lcl_getErrorIndicatorValues(
try
{
- xErrorBarProp->getPropertyValue( C2U( "ShowPositiveError" )) >>= rOutShowPosError;
- xErrorBarProp->getPropertyValue( C2U( "ShowNegativeError" )) >>= rOutShowNegError;
+ xErrorBarProp->getPropertyValue( "ShowPositiveError" ) >>= rOutShowPosError;
+ xErrorBarProp->getPropertyValue( "ShowNegativeError" ) >>= rOutShowNegError;
}
catch( const uno::Exception & ex )
{
@@ -184,8 +184,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
nStyle = ::com::sun::star::chart::ErrorBarStyle::FROM_DATA; break;
}
- xErrorBarProp->setPropertyValue( C2U( "ErrorBarStyle" ),
- uno::makeAny( nStyle ));
+ xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::makeAny( nStyle ));
bChanged = true;
}
}
@@ -194,7 +193,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
case SCHATTR_STAT_PERCENT:
case SCHATTR_STAT_BIGERROR:
{
- OSL_FAIL( "Deprectaed item" );
+ OSL_FAIL( "Deprecated item" );
uno::Reference< beans::XPropertySet > xErrorBarProp( GetPropertySet());
double fValue =
@@ -206,10 +205,8 @@ bool ErrorBarItemConverter::ApplySpecialItem(
if( ! ( ::rtl::math::approxEqual( fPos, fValue ) &&
::rtl::math::approxEqual( fNeg, fValue )))
{
- xErrorBarProp->setPropertyValue( C2U( "PositiveError" ),
- uno::makeAny( fValue ));
- xErrorBarProp->setPropertyValue( C2U( "NegativeError" ),
- uno::makeAny( fValue ));
+ xErrorBarProp->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
+ xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
bChanged = true;
}
}
@@ -225,7 +222,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
if( ! ::rtl::math::approxEqual( fPos, fValue ))
{
- GetPropertySet()->setPropertyValue( C2U( "PositiveError" ), uno::makeAny( fValue ));
+ GetPropertySet()->setPropertyValue( "PositiveError" , uno::makeAny( fValue ));
bChanged = true;
}
}
@@ -243,7 +240,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
if( ! ::rtl::math::approxEqual( fNeg, fValue ))
{
- xErrorBarProp->setPropertyValue( C2U( "NegativeError" ), uno::makeAny( fValue ));
+ xErrorBarProp->setPropertyValue( "NegativeError" , uno::makeAny( fValue ));
bChanged = true;
}
}
@@ -266,8 +263,8 @@ bool ErrorBarItemConverter::ApplySpecialItem(
if( ( bShowPos != bNewIndPos ||
bShowNeg != bNewIndNeg ))
{
- xErrorBarProp->setPropertyValue( C2U( "ShowPositiveError" ), uno::makeAny( bNewIndPos ));
- xErrorBarProp->setPropertyValue( C2U( "ShowNegativeError" ), uno::makeAny( bNewIndNeg ));
+ xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::makeAny( bNewIndPos ));
+ xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::makeAny( bNewIndNeg ));
bChanged = true;
}
}
@@ -288,7 +285,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
xDataProvider.set( xChartDoc->getDataProvider());
if( xErrorBarSource.is() && xDataProvider.is())
{
- ::rtl::OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue());
+ OUString aNewRange( static_cast< const SfxStringItem & >( rItemSet.Get( nWhichId )).GetValue());
bool bApplyNewRange = false;
bool bIsPositiveValue( nWhichId == SCHATTR_STAT_RANGE_POS );
@@ -307,7 +304,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
if( xIntDataProvider.is())
{
xIntDataProvider->appendSequence();
- aNewRange = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("last"));
+ aNewRange = "last";
bApplyNewRange = true;
}
}
@@ -319,7 +316,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
StatisticsHelper::getErrorDataSequenceFromDataSource(
xErrorBarSource, bIsPositiveValue, bYError ));
bApplyNewRange =
- ! ( xSeq.is() && aNewRange.equals( xSeq->getSourceRangeRepresentation()));
+ ! ( xSeq.is() && (aNewRange == xSeq->getSourceRangeRepresentation()));
}
if( bApplyNewRange )
@@ -345,7 +342,7 @@ void ErrorBarItemConverter::FillSpecialItem(
uno::Reference< beans::XPropertySet > xErrorBarProp( GetPropertySet());
sal_Int32 nStyle = 0;
- if( xErrorBarProp->getPropertyValue( C2U( "ErrorBarStyle" )) >>= nStyle )
+ if( xErrorBarProp->getPropertyValue( "ErrorBarStyle" ) >>= nStyle )
{
switch( nStyle )
{
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 99c4234..e87f6d4 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -128,13 +128,13 @@ bool lcl_supportsLineProperties( ::chart::wrapper::GraphicPropertyItemConverter:
bool lcl_SetContentForNamedProperty(
const uno::Reference< lang::XMultiServiceFactory > & xFactory,
- const ::rtl::OUString & rTableName,
+ const OUString & rTableName,
NameOrIndex & rItem, sal_uInt8 nMemberId )
{
bool bResult = false;
if( xFactory.is())
{
- ::rtl::OUString aPropertyValue( rItem.GetName());
+ OUString aPropertyValue( rItem.GetName());
uno::Reference< container::XNameAccess > xNameAcc(
xFactory->createInstance( rTableName ),
uno::UNO_QUERY );
@@ -250,7 +250,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_FILLBMP_STRETCH:
{
drawing::BitmapMode aMode = drawing::BitmapMode_REPEAT;
- if( GetPropertySet()->getPropertyValue( C2U("FillBitmapMode")) >>= aMode )
+ if( GetPropertySet()->getPropertyValue( "FillBitmapMode" ) >>= aMode )
{
rOutItemSet.Put( XFillBmpTileItem( aMode == drawing::BitmapMode_REPEAT ));
rOutItemSet.Put( XFillBmpStretchItem( aMode == drawing::BitmapMode_STRETCH ));
@@ -263,10 +263,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
{
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "TransparencyGradientName" )
- : C2U( "FillTransparenceGradientName" );
+ ? OUString( "TransparencyGradientName" )
+ : OUString( "FillTransparenceGradientName" );
uno::Any aValue( GetPropertySet()->getPropertyValue( aPropName ));
if( aValue.hasValue())
@@ -275,11 +275,11 @@ void GraphicPropertyItemConverter::FillSpecialItem(
aItem.PutValue( aValue, MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.TransparencyGradientTable"),
+ m_xNamedPropertyTableFactory, "com.sun.star.drawing.TransparencyGradientTable" ,
aItem, MID_FILLGRADIENT );
// this is important to enable the item
- ::rtl::OUString aName;
+ OUString aName;
if( (aValue >>= aName) &&
!aName.isEmpty())
{
@@ -298,10 +298,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_GRADIENTSTEPCOUNT:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "GradientStepCount" )
- : C2U( "FillGradientStepCount" );
+ ? OUString( "GradientStepCount" )
+ : OUString( "FillGradientStepCount" );
uno::Any aValue( GetPropertySet()->getPropertyValue( aPropName ) );
if( hasLongOrShortValue(aValue) )
@@ -315,16 +315,16 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_LINEDASH:
if( lcl_supportsLineProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "BorderDashName" )
- : C2U( "LineDashName" );
+ ? OUString( "BorderDashName" )
+ : OUString( "LineDashName" );
XLineDashItem aItem;
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.DashTable"),
+ m_xNamedPropertyTableFactory, "com.sun.star.drawing.DashTable" ,
aItem, MID_LINEDASH );
// translate model name to UI-name for predefined entries, so
@@ -339,16 +339,16 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_FILLGRADIENT:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "GradientName" )
- : C2U( "FillGradientName" );
+ ? OUString( "GradientName" )
+ : OUString( "FillGradientName" );
XFillGradientItem aItem;
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.GradientTable"),
+ m_xNamedPropertyTableFactory, "com.sun.star.drawing.GradientTable" ,
aItem, MID_FILLGRADIENT );
// translate model name to UI-name for predefined entries, so
@@ -363,16 +363,16 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_FILLHATCH:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "HatchName" )
- : C2U( "FillHatchName" );
+ ? OUString( "HatchName" )
+ : OUString( "FillHatchName" );
XFillHatchItem aItem;
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.HatchTable"),
+ m_xNamedPropertyTableFactory, "com.sun.star.drawing.HatchTable" ,
aItem, MID_FILLHATCH );
// translate model name to UI-name for predefined entries, so
@@ -388,10 +388,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
XFillBitmapItem aItem;
- aItem.PutValue( GetPropertySet()->getPropertyValue( C2U( "FillBitmapName" ) ), MID_NAME );
+ aItem.PutValue( GetPropertySet()->getPropertyValue( "FillBitmapName" ), MID_NAME );
lcl_SetContentForNamedProperty(
- m_xNamedPropertyTableFactory, C2U("com.sun.star.drawing.BitmapTable"),
+ m_xNamedPropertyTableFactory, "com.sun.star.drawing.BitmapTable" ,
aItem, MID_GRAFURL );
// translate model name to UI-name for predefined entries, so
@@ -408,12 +408,12 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_LINETRANSPARENCE:
if( lcl_supportsLineProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "BorderTransparency" )
+ ? OUString( "BorderTransparency" )
: (m_eGraphicObjectType == LINE_DATA_POINT)
- ? C2U( "Transparency" )
- : C2U( "LineTransparence" );
+ ? OUString( "Transparency" )
+ : OUString( "LineTransparence" );
XLineTransparenceItem aItem;
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ) );
@@ -427,10 +427,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
case XATTR_FILLTRANSPARENCE:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "Transparency" )
- : C2U( "FillTransparence" );
+ ? OUString( "Transparency" )
+ : OUString( "FillTransparence" );
XFillTransparenceItem aItem;
aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ) );
@@ -454,7 +454,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
case XATTR_FILLBMP_STRETCH:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- const ::rtl::OUString aModePropName = C2U("FillBitmapMode");
+ const OUString aModePropName("FillBitmapMode");
bool bStretched = static_cast< const XFillBmpStretchItem & >(
rItemSet.Get( XATTR_FILLBMP_STRETCH )).GetValue();
drawing::BitmapMode aMode =
@@ -472,7 +472,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
case XATTR_FILLBMP_TILE:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- const ::rtl::OUString aModePropName = C2U("FillBitmapMode");
+ const OUString aModePropName("FillBitmapMode");
bool bTiled = static_cast< const XFillBmpTileItem & >(
rItemSet.Get( XATTR_FILLBMP_TILE )).GetValue();
drawing::BitmapMode aMode =
@@ -492,10 +492,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
{
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "TransparencyGradientName" )
- : C2U( "FillTransparenceGradientName" );
+ ? OUString( "TransparencyGradientName" )
+ : OUString( "FillTransparenceGradientName" );
const XFillFloatTransparenceItem & rItem =
static_cast< const XFillFloatTransparenceItem & >(
@@ -508,7 +508,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
rItem.QueryValue( aGradient, MID_FILLGRADIENT );
// add TransparencyGradient to list if it does not already exist
- ::rtl::OUString aPreferredName;
+ OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addTransparencyGradientUniqueNameToTable(
aGradient, m_xNamedPropertyTableFactory, aPreferredName );
@@ -521,7 +521,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
}
else
{
- ::rtl::OUString aName;
+ OUString aName;
if( ( GetPropertySet()->getPropertyValue( aPropName ) >>= aName )
&& !aName.isEmpty() )
{
@@ -543,10 +543,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
{
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "GradientStepCount" )
- : C2U( "FillGradientStepCount" );
+ ? OUString( "GradientStepCount" )
+ : OUString( "FillGradientStepCount" );
sal_Int16 nStepCount = ( static_cast< const XGradientStepCountItem & >(
rItemSet.Get( nWhichId ))).GetValue();
@@ -566,10 +566,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
if( lcl_supportsLineProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "BorderDashName" )
- : C2U( "LineDashName" );
+ ? OUString( "BorderDashName" )
+ : OUString( "LineDashName" );
const XLineDashItem & rItem =
static_cast< const XLineDashItem & >(
@@ -582,7 +582,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
// add LineDash to list
uno::Any aLineDash;
rItem.QueryValue( aLineDash, MID_LINEDASH );
- ::rtl::OUString aPreferredName;
+ OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addLineDashUniqueNameToTable(
aLineDash, m_xNamedPropertyTableFactory, aPreferredName );
@@ -599,10 +599,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
{
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "GradientName" )
- : C2U( "FillGradientName" );
+ ? OUString( "GradientName" )
+ : OUString( "FillGradientName" );
const XFillGradientItem & rItem =
static_cast< const XFillGradientItem & >(
@@ -615,7 +615,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
// add Gradient to list
uno::Any aGradient;
rItem.QueryValue( aGradient, MID_FILLGRADIENT );
- ::rtl::OUString aPreferredName;
+ OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addGradientUniqueNameToTable(
aGradient, m_xNamedPropertyTableFactory, aPreferredName );
@@ -632,10 +632,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
{
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "HatchName" )
- : C2U( "FillHatchName" );
+ ? OUString( "HatchName" )
+ : OUString( "FillHatchName" );
const XFillHatchItem & rItem =
static_cast< const XFillHatchItem & >(
@@ -648,7 +648,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
// add Hatch to list
uno::Any aHatch;
rItem.QueryValue( aHatch, MID_FILLHATCH );
- ::rtl::OUString aPreferredName;
+ OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addHatchUniqueNameToTable(
aHatch, m_xNamedPropertyTableFactory, aPreferredName );
@@ -671,17 +671,17 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
if( rItem.QueryValue( aValue, MID_NAME ))
{
- if( aValue != GetPropertySet()->getPropertyValue( C2U( "FillBitmapName" )))
+ if( aValue != GetPropertySet()->getPropertyValue( "FillBitmapName" ))
{
// add Bitmap to list
uno::Any aBitmap;
rItem.QueryValue( aBitmap, MID_GRAFURL );
- ::rtl::OUString aPreferredName;
+ OUString aPreferredName;
aValue >>= aPreferredName;
aValue <<= PropertyHelper::addBitmapUniqueNameToTable(
aBitmap, m_xNamedPropertyTableFactory, aPreferredName );
- GetPropertySet()->setPropertyValue( C2U( "FillBitmapName" ), aValue );
+ GetPropertySet()->setPropertyValue( "FillBitmapName" , aValue );
bChanged = true;
}
}
@@ -694,12 +694,12 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
case XATTR_LINETRANSPARENCE:
if( lcl_supportsLineProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "BorderTransparency" )
+ ? OUString( "BorderTransparency" )
: (m_eGraphicObjectType == LINE_DATA_POINT)
- ? C2U( "Transparency" )
- : C2U( "LineTransparence" );
+ ? OUString( "Transparency" )
+ : OUString( "LineTransparence" );
const XLineTransparenceItem & rItem =
static_cast< const XLineTransparenceItem & >(
@@ -733,10 +733,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
case XATTR_FILLTRANSPARENCE:
if( lcl_supportsFillProperties( m_eGraphicObjectType ))
{
- ::rtl::OUString aPropName =
+ OUString aPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "Transparency" )
- : C2U( "FillTransparence" );
+ ? OUString( "Transparency" )
+ : OUString( "FillTransparence" );
const XFillTransparenceItem & rItem =
static_cast< const XFillTransparenceItem & >(
@@ -756,12 +756,12 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
GetPropertySet()->setPropertyValue( aPropName, aValue );
// if linear or no transparence is set, delete the gradient
- ::rtl::OUString aTransGradPropName =
+ OUString aTransGradPropName =
(m_eGraphicObjectType == FILLED_DATA_POINT)
- ? C2U( "TransparencyGradientName" )
- : C2U( "FillTransparenceGradientName" );
+ ? OUString( "TransparencyGradientName" )
+ : OUString( "FillTransparenceGradientName" );
GetPropertySet()->setPropertyValue(
- aTransGradPropName, uno::makeAny( ::rtl::OUString() ));
+ aTransGradPropName, uno::makeAny( OUString() ));
bChanged = true;
}
commit 33bea955ca93e218ae19961e1fd9800b8a0590d4
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Sat Oct 6 23:04:07 2012 -0300
OUString cleanup in Chart2
Include C2U macro and rtl prefix
Change-Id: I01c3224bc21a7f8a03a8562191fbc161032f2a1d
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index ba61320..377c7dd 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -191,7 +191,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing(
{
try
{
- xProps->getPropertyValue( C2U( "DisableDataTableDialog" ) ) >>= m_bDisableDataTableDialog;
+ xProps->getPropertyValue( "DisableDataTableDialog" ) >>= m_bDisableDataTableDialog;
}
catch( const uno::Exception& e )
{
@@ -455,7 +455,7 @@ IMPL_LINK( ErrorBarResources, ChooseRange, RangeSelectionButton *, pButton )
return 0;
OSL_ASSERT( m_pCurrentRangeChoosingField == 0 );
- ::rtl::OUString aUIString;
+ OUString aUIString;
if( pButton == &m_aIbRangePositive )
{
m_pCurrentRangeChoosingField = &m_aEdRangePositive;
@@ -697,14 +697,14 @@ void ErrorBarResources::FillValueSets()
}
void ErrorBarResources::listeningFinished(
- const ::rtl::OUString & rNewRange )
+ const OUString & rNewRange )
{
OSL_ASSERT( m_apRangeSelectionHelper.get());
if( ! m_apRangeSelectionHelper.get())
return;
// rNewRange becomes invalid after removing the listener
- ::rtl::OUString aRange( rNewRange );
+ OUString aRange( rNewRange );
// stop listening
m_apRangeSelectionHelper->stopRangeListening();
@@ -740,7 +740,7 @@ void ErrorBarResources::disposingRangeSelection()
bool ErrorBarResources::isRangeFieldContentValid( Edit & rEdit )
{
- ::rtl::OUString aRange( rEdit.GetText());
+ OUString aRange( rEdit.GetText());
bool bIsValid = ( aRange.isEmpty() ) ||
( m_apRangeSelectionHelper.get() &&
m_apRangeSelectionHelper->verifyCellRange( aRange ));
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index c08bdd7..0760a8b 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -95,13 +95,13 @@ void LegendPositionResources::writeToResources( const uno::Reference< frame::XMo
{
//show
sal_Bool bShowLegend = sal_False;
- xProp->getPropertyValue( C2U("Show") ) >>= bShowLegend;
+ xProp->getPropertyValue( "Show" ) >>= bShowLegend;
m_aCbxShow.Check( bShowLegend );
PositionEnableHdl(0);
//position
chart2::LegendPosition ePos;
- xProp->getPropertyValue( C2U( "AnchorPosition" )) >>= ePos;
+ xProp->getPropertyValue( "AnchorPosition" ) >>= ePos;
switch( ePos )
{
case chart2::LegendPosition_LINE_START:
@@ -139,7 +139,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen
if( xProp.is() )
{
//show
- xProp->setPropertyValue( C2U("Show"), uno::makeAny( bShowLegend ));
+ xProp->setPropertyValue( "Show" , uno::makeAny( bShowLegend ));
//position
chart2::LegendPosition eNewPos;
@@ -162,9 +162,9 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen
eExp = ::com::sun::star::chart::ChartLegendExpansion_WIDE;
}
- xProp->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( eNewPos ));
- xProp->setPropertyValue( C2U( "Expansion" ), uno::makeAny( eExp ));
- xProp->setPropertyValue( C2U( "RelativePosition" ), uno::Any());
+ xProp->setPropertyValue( "AnchorPosition" , uno::makeAny( eNewPos ));
+ xProp->setPropertyValue( "Expansion" , uno::makeAny( eExp ));
+ xProp->setPropertyValue( "RelativePosition" , uno::Any());
}
}
catch( const uno::Exception & ex )
diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx
index 5ebc89b..9b7fc8c 100644
--- a/chart2/source/controller/dialogs/res_TextSeparator.cxx
+++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx
@@ -43,10 +43,10 @@ TextSeparatorResources::TextSeparatorResources( Window* pWindow )
m_aLB_Separator.SetDropDownLineCount(m_aLB_Separator.GetEntryCount());
m_aLB_Separator.SetSizePixel( m_aLB_Separator.CalcMinimumSize() );
- m_aEntryMap[ C2U( " " ) ] = 0;
- m_aEntryMap[ C2U( ", " ) ] = 1;
- m_aEntryMap[ C2U( "; " ) ] = 2;
- m_aEntryMap[ C2U( "\n" ) ] = 3;
+ m_aEntryMap[ " " ] = 0;
+ m_aEntryMap[ ", " ] = 1;
+ m_aEntryMap[ "; " ] = 2;
+ m_aEntryMap[ "\n" ] = 3;
m_aLB_Separator.SetAccessibleName(m_aFT_Separator.GetText());
m_aLB_Separator.SetAccessibleRelationLabeledBy(&m_aFT_Separator);
@@ -113,9 +113,9 @@ Size TextSeparatorResources::GetCurrentListBoxSize() const
return m_aLB_Separator.GetSizePixel();
}
-void TextSeparatorResources::SetValue( const rtl::OUString& rSeparator )
+void TextSeparatorResources::SetValue( const OUString& rSeparator )
{
- ::std::map< ::rtl::OUString, sal_uInt16 >::iterator aIter( m_aEntryMap.find(rSeparator) );
+ ::std::map< OUString , sal_uInt16 >::iterator aIter( m_aEntryMap.find(rSeparator) );
if( aIter == m_aEntryMap.end() )
m_aLB_Separator.SelectEntryPos( m_nDefaultPos );
else
@@ -127,17 +127,17 @@ void TextSeparatorResources::SetDefault()
m_aLB_Separator.SelectEntryPos( m_nDefaultPos );
}
-rtl::OUString TextSeparatorResources::GetValue() const
+ OUString TextSeparatorResources::GetValue() const
{
sal_uInt16 nPos = m_aLB_Separator.GetSelectEntryPos();
- ::std::map< ::rtl::OUString, sal_uInt16 >::const_iterator aIter( m_aEntryMap.begin() );
+ ::std::map< OUString , sal_uInt16 >::const_iterator aIter( m_aEntryMap.begin() );
while( aIter != m_aEntryMap.end() )
{
if(aIter->second==nPos )
return aIter->first;
++aIter;
}
- return C2U( " " );
+ return OUString( " " );
}
//.............................................................................
diff --git a/chart2/source/controller/dialogs/res_TextSeparator.hxx b/chart2/source/controller/dialogs/res_TextSeparator.hxx
index 9d6121c..9f89dcc 100644
--- a/chart2/source/controller/dialogs/res_TextSeparator.hxx
+++ b/chart2/source/controller/dialogs/res_TextSeparator.hxx
@@ -47,15 +47,15 @@ public:
Point GetCurrentListBoxPosition() const;
Size GetCurrentListBoxSize() const;
- ::rtl::OUString GetValue() const;
- void SetValue( const ::rtl::OUString& rSeparator );
+ OUString GetValue() const;
+ void SetValue( const OUString& rSeparator );
void SetDefault();
private:
FixedText m_aFT_Separator;
ListBox m_aLB_Separator;
- ::std::map< ::rtl::OUString, sal_uInt16 > m_aEntryMap;
+ ::std::map< OUString, sal_uInt16 > m_aEntryMap;
const sal_uInt16 m_nDefaultPos;
};
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 0e05e50..4c3fd3c 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -55,7 +55,7 @@ lcl_ModelProperties lcl_getPropertiesFromModel( uno::Reference< frame::XModel >
{
uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( xModel ) );
uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY_THROW );
- xDiaProp->getPropertyValue( C2U("D3DSceneShadeMode")) >>= aProps.m_aShadeMode;
+ xDiaProp->getPropertyValue( "D3DSceneShadeMode" ) >>= aProps.m_aShadeMode;
::chart::ThreeDHelper::getRoundedEdgesAndObjectLines( xDiagram, aProps.m_nRoundedEdges, aProps.m_nObjectLines );
aProps.m_eScheme = ::chart::ThreeDHelper::detectScheme( xDiagram );
}
@@ -72,7 +72,7 @@ void lcl_setShadeModeAtModel( uno::Reference< frame::XModel > & xModel, drawing:
{
uno::Reference< beans::XPropertySet > xDiaProp(
::chart::ChartModelHelper::findDiagram( xModel ), uno::UNO_QUERY_THROW );
- xDiaProp->setPropertyValue( C2U("D3DSceneShadeMode"), uno::makeAny( aShadeMode ));
+ xDiaProp->setPropertyValue( "D3DSceneShadeMode" , uno::makeAny( aShadeMode ));
}
catch( const uno::Exception & ex )
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index bcd4c1b..0fe8ac8 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -122,12 +122,12 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow
m_aMFZRotation.SetModifyHdl( aAngleEditedLink );
drawing::ProjectionMode aProjectionMode = drawing::ProjectionMode_PERSPECTIVE;
- m_xSceneProperties->getPropertyValue( C2U("D3DScenePerspective")) >>= aProjectionMode;
+ m_xSceneProperties->getPropertyValue( "D3DScenePerspective" ) >>= aProjectionMode;
m_aCbxPerspective.Check( aProjectionMode == drawing::ProjectionMode_PERSPECTIVE );
m_aCbxPerspective.SetToggleHdl( LINK( this, ThreeD_SceneGeometry_TabPage, PerspectiveToggled ));
sal_Int32 nPerspectivePercentage = 20;
- m_xSceneProperties->getPropertyValue( C2U("Perspective")) >>= nPerspectivePercentage;
+ m_xSceneProperties->getPropertyValue( "Perspective" ) >>= nPerspectivePercentage;
m_aMFPerspective.SetValue( nPerspectivePercentage );
m_aMFPerspective.EnableUpdateData( nTimeout );
@@ -143,7 +143,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow
if( ChartTypeHelper::isSupportingRightAngledAxes(
DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) )
{
- m_xSceneProperties->getPropertyValue( C2U("RightAngledAxes")) >>= bRightAngledAxes;
+ m_xSceneProperties->getPropertyValue( "RightAngledAxes" ) >>= bRightAngledAxes;
m_aCbxRightAngledAxes.SetToggleHdl( LINK( this, ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled ));
m_aCbxRightAngledAxes.Check( bRightAngledAxes );
}
@@ -216,8 +216,8 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel()
try
{
- m_xSceneProperties->setPropertyValue( C2U("D3DScenePerspective"), uno::makeAny( aMode ));
- m_xSceneProperties->setPropertyValue( C2U("Perspective"), uno::makeAny( (sal_Int32)m_aMFPerspective.GetValue() ));
+ m_xSceneProperties->setPropertyValue( "D3DScenePerspective" , uno::makeAny( aMode ));
+ m_xSceneProperties->setPropertyValue( "Perspective" , uno::makeAny( (sal_Int32)m_aMFPerspective.GetValue() ));
}
catch( const uno::Exception & ex )
{
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 6884e67..7ab0e54 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -59,7 +59,7 @@ namespace
try
{
uno::Reference< beans::XPropertySet > xDiaProp( xChartDoc->getFirstDiagram(), uno::UNO_QUERY_THROW );
- xDiaProp->getPropertyValue( C2U( "SortByXValues" ) ) >>= bRet;
+ xDiaProp->getPropertyValue( "SortByXValues" ) >>= bRet;
}
catch( const uno::Exception & ex )
{
@@ -840,7 +840,7 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent
{
try
{
- xProps->getPropertyValue( C2U( "DisableComplexChartTypes" ) ) >>= bDisableComplexChartTypes;
+ xProps->getPropertyValue( "DisableComplexChartTypes" ) >>= bDisableComplexChartTypes;
}
catch( const uno::Exception& e )
{
@@ -1089,7 +1089,7 @@ void ChartTypeTabPage::initializePage()
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) );
DiagramHelper::tTemplateWithServiceName aTemplate =
DiagramHelper::getTemplateForDiagram( xDiagram, xTemplateManager );
- ::rtl::OUString aServiceName( aTemplate.second );
+ OUString aServiceName( aTemplate.second );
bool bFound = false;
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index e0fb150..080ad76 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -58,7 +58,7 @@ using ::rtl::OUStringBuffer;
namespace
{
-const OUString lcl_aLabelRole( RTL_CONSTASCII_USTRINGPARAM( "label" ));
+const OUString lcl_aLabelRole( "label" );
String lcl_GetRoleLBEntry(
const OUString & rRole, const OUString & rRange )
@@ -124,7 +124,7 @@ OUString lcl_GetSelectedRolesRange( const SvTabListBox & rRoleListBox )
OUString lcl_GetSequenceNameForLabel( ::chart::SeriesEntry * pEntry )
{
- OUString aResult( RTL_CONSTASCII_USTRINGPARAM("values-y"));
+ OUString aResult( "values-y" );
if( pEntry &&
pEntry->m_xChartType.is())
{
@@ -477,7 +477,7 @@ void DataSourceTabPage::fillSeriesListBox()
OUString aResString( String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES_WITH_INDEX )));
// replace index of unnamed series
- const OUString aReplacementStr( RTL_CONSTASCII_USTRINGPARAM( "%NUMBER" ));
+ const OUString aReplacementStr( "%NUMBER" );
sal_Int32 nIndex = aResString.indexOf( aReplacementStr );
if( nIndex != -1 )
aLabel = String( aResString.replaceAt(
@@ -609,7 +609,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl)
OUString aSelectedRange = lcl_GetSelectedRolesRange( m_aLB_ROLE );
// replace role in fixed text label
- const OUString aReplacementStr( RTL_CONSTASCII_USTRINGPARAM( "%VALUETYPE" ));
+ const OUString aReplacementStr( "%VALUETYPE" );
sal_Int32 nIndex = m_aFixedTextRange.indexOf( aReplacementStr );
if( nIndex != -1 )
{
@@ -644,7 +644,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl)
OUString aUIStr( aStr );
// replace role
- OUString aReplacement( RTL_CONSTASCII_USTRINGPARAM( "%VALUETYPE" ));
+ OUString aReplacement( "%VALUETYPE" );
sal_Int32 nIndex = aUIStr.indexOf( aReplacement );
if( nIndex != -1 )
{
@@ -652,7 +652,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl)
lcl_GetSelectedRole( m_aLB_ROLE, true ));
}
// replace series name
- aReplacement = C2U( "%SERIESNAME" );
+ aReplacement = "%SERIESNAME";
nIndex = aUIStr.indexOf( aReplacement );
if( nIndex != -1 )
{
@@ -936,7 +936,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
OUString aSelectedRole = lcl_GetSelectedRole( m_aLB_ROLE );
OUString aRange( m_aEDT_RANGE.GetText());
OUString aSequenceRole( aSelectedRole );
- bool bIsLabel = aSequenceRole.equals( lcl_aLabelRole );
+ bool bIsLabel = (aSequenceRole == lcl_aLabelRole );
OUString aSequenceNameForLabel( lcl_GetSequenceNameForLabel( pSeriesEntry ));
if( bIsLabel )
@@ -982,7 +982,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
// "$Sheet1.$A$1"
aRange = xNewSeq->getSourceRangeRepresentation();
Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW );
- xProp->setPropertyValue( C2U("Role"), uno::makeAny( lcl_aLabelRole ));
+ xProp->setPropertyValue( "Role" , uno::makeAny( lcl_aLabelRole ));
xLabeledSeq->setLabel( xNewSeq );
}
}
@@ -1014,10 +1014,10 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
aRange = xNewSeq->getSourceRangeRepresentation();
Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW );
- xProp->setPropertyValue( C2U("Role"), uno::makeAny( aSelectedRole ));
+ xProp->setPropertyValue( "Role" , uno::makeAny( aSelectedRole ));
if( !xLabeledSeq.is())
{
- if( aSelectedRole.equals( aSequenceNameForLabel ))
+ if( aSelectedRole == aSequenceNameForLabel )
xLabeledSeq.set( lcl_findLSequenceWithOnlyLabel( xSource ));
if( ! xLabeledSeq.is())
{
commit d812cee7cb3ac7069d4cfbabc567312a325f6f69
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Sat Oct 6 22:23:08 2012 -0300
OUString cleanup in Chart2
Include C2U macro removal and rtl prefix
Change-Id: I3de75446e53618862e50c69382a7ddaf0d482fa7
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index ceb5a15..a03796f 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -129,7 +129,7 @@ Image ChartTypeDialogController::getImage()
{
return Image();
}
-bool ChartTypeDialogController::isSubType( const rtl::OUString& rServiceName )
+bool ChartTypeDialogController::isSubType( const OUString& rServiceName )
{
const tTemplateServiceChartTypeParameterMap& rTemplateMap = this->getTemplateMap();
tTemplateServiceChartTypeParameterMap::const_iterator aIt( rTemplateMap.find( rServiceName ));
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list