Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1550
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/1550/1
Remove some RTL_* and some rtl:: prefixes in chart2
Change-Id: I47889319530d8f03bd7c78e937de55cf380d2d41
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
---
M chart2/source/controller/accessibility/AccStatisticsObject.cxx
M chart2/source/controller/accessibility/AccessibleBase.cxx
M chart2/source/controller/accessibility/AccessibleChartElement.cxx
M chart2/source/controller/accessibility/AccessibleChartShape.cxx
M chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
M chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
M chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
M chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
M chart2/source/controller/chartapiwrapper/GridWrapper.cxx
M chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
M chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
M chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
M chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
M chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
14 files changed, 101 insertions(+), 135 deletions(-)
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.cxx
b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
index b5623de..0d4a1e3 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
@@ -22,8 +22,6 @@
#include <vcl/svapp.hxx>
#include <svx/svditer.hxx>
-using ::rtl::OUString;
-
namespace chart
{
@@ -47,7 +45,7 @@
OUString SAL_CALL AccStatisticsObject::getImplementationName()
throw (::com::sun::star::uno::RuntimeException)
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "StatisticsObject" ));
+ return OUString( "StatisticsObject" );
}
} // namespace chart
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 85907b0..8671673 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -58,8 +58,6 @@
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::UNO_QUERY;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using ::com::sun::star::uno::Reference;
using ::osl::MutexGuard;
using ::osl::ClearableMutexGuard;
@@ -131,9 +129,8 @@
BroadcastAccEvent( AccessibleEventId::VISIBLE_DATA_CHANGED, aEmpty, aEmpty );
#if OSL_DEBUG_LEVEL > 1
OSL_TRACE(
- ::rtl::OUStringToOString(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Visible data event sent by: " )) +
+ OUStringToOString(
+ OUString( "Visible data event sent by: " ) +
getAccessibleName(),
RTL_TEXTENCODING_ASCII_US ).getStr() );
#endif
@@ -150,9 +147,8 @@
BroadcastAccEvent( AccessibleEventId::STATE_CHANGED, aSelected, aEmpty, true );
#if OSL_DEBUG_LEVEL > 1
OSL_TRACE(
- ::rtl::OUStringToOString(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Selection acquired by: " )) +
+ OUStringToOString(
+ OUString( "Selection acquired by: " ) +
getAccessibleName(),
RTL_TEXTENCODING_ASCII_US ).getStr() );
#endif
@@ -169,9 +165,8 @@
BroadcastAccEvent( AccessibleEventId::STATE_CHANGED, aEmpty, aSelected, true );
#if OSL_DEBUG_LEVEL > 1
OSL_TRACE(
- ::rtl::OUStringToOString(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Selection lost by: " )) +
+ OUStringToOString(
+ OUString( "Selection lost by: " ) +
getAccessibleName(),
RTL_TEXTENCODING_ASCII_US ).getStr() );
#endif
@@ -910,7 +905,7 @@
OUString SAL_CALL AccessibleBase::getImplementationName()
throw (RuntimeException)
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "AccessibleBase" ));
+ return OUString( "AccessibleBase" );
}
sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName )
@@ -922,10 +917,10 @@
uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames()
throw (RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aSeq( 2 );
- ::rtl::OUString* pStr = aSeq.getArray();
- pStr[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.accessibility.Accessible" ));
- pStr[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.accessibility.AccessibleContext" ));
+ uno::Sequence< OUString > aSeq( 2 );
+ OUString* pStr = aSeq.getArray();
+ pStr[ 0 ] = "com.sun.star.accessibility.Accessible";
+ pStr[ 1 ] = "com.sun.star.accessibility.AccessibleContext";
return aSeq;
}
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 034e850..f1a4d0c 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -39,8 +39,6 @@
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::UNO_QUERY;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::osl::MutexGuard;
@@ -158,7 +156,7 @@
OUString SAL_CALL AccessibleChartElement::getImplementationName()
throw (RuntimeException)
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "AccessibleChartElement" ));
+ return OUString( "AccessibleChartElement" );
}
// ________ AccessibleChartElement::XAccessibleContext (overloaded) ________
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index 59f3e11..0d3fd83 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -85,10 +85,10 @@
}
// ________ XServiceInfo ________
-::rtl::OUString AccessibleChartShape::getImplementationName()
+OUString AccessibleChartShape::getImplementationName()
throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AccessibleChartShape" ) );
+ return OUString( "AccessibleChartShape" );
}
// ________ XAccessibleContext ________
@@ -125,10 +125,10 @@
return nRole;
}
-::rtl::OUString AccessibleChartShape::getAccessibleDescription()
+OUString AccessibleChartShape::getAccessibleDescription()
throw (::com::sun::star::uno::RuntimeException)
{
- ::rtl::OUString aDescription;
+ OUString aDescription;
if ( m_pAccShape )
{
aDescription = m_pAccShape->getAccessibleDescription();
@@ -136,10 +136,10 @@
return aDescription;
}
-::rtl::OUString AccessibleChartShape::getAccessibleName()
+OUString AccessibleChartShape::getAccessibleName()
throw (::com::sun::star::uno::RuntimeException)
{
- ::rtl::OUString aName;
+ OUString aName;
if ( m_pAccShape )
{
aName = m_pAccShape->getAccessibleName();
@@ -254,10 +254,10 @@
return xFont;
}
-::rtl::OUString AccessibleChartShape::getTitledBorderText()
+OUString AccessibleChartShape::getTitledBorderText()
throw (uno::RuntimeException)
{
- ::rtl::OUString aText;
+ OUString aText;
if ( m_pAccShape )
{
aText = m_pAccShape->getTitledBorderText();
@@ -265,10 +265,10 @@
return aText;
}
-::rtl::OUString AccessibleChartShape::getToolTipText()
+OUString AccessibleChartShape::getToolTipText()
throw (::com::sun::star::uno::RuntimeException)
{
- ::rtl::OUString aText;
+ OUString aText;
if ( m_pAccShape )
{
aText = m_pAccShape->getToolTipText();
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 8fee82b..cab6a30 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -39,13 +39,9 @@
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.Area" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.Area" );
struct StaticAreaWrapperPropertyArray_Initializer
{
@@ -121,10 +117,10 @@
}
// ____ XShapeDescriptor (base of XShape) ____
-::rtl::OUString SAL_CALL AreaWrapper::getShapeType()
+OUString SAL_CALL AreaWrapper::getShapeType()
throw (uno::RuntimeException)
{
- return rtl::OUString( "com.sun.star.chart.ChartArea" );
+ return OUString( "com.sun.star.chart.ChartArea" );
}
// ____ XComponent ____
@@ -180,9 +176,9 @@
// ================================================================================
-Sequence< ::rtl::OUString > AreaWrapper::getSupportedServiceNames_Static()
+Sequence< OUString > AreaWrapper::getSupportedServiceNames_Static()
{
- Sequence< ::rtl::OUString > aServices( 4 );
+ Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
aServices[ 1 ] = "com.sun.star.beans.PropertySet";
aServices[ 2 ] = "com.sun.star.drawing.FillProperties";
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index c5e416c..0ca9408 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -59,12 +59,10 @@
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.Axis" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.Axis" );
enum
{
@@ -501,7 +499,7 @@
OUString SAL_CALL AxisWrapper::getShapeType()
throw (uno::RuntimeException)
{
- return rtl::OUString("com.sun.star.chart.ChartAxis");
+ return OUString("com.sun.star.chart.ChartAxis");
}
// ____ XNumberFormatsSupplier ____
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 83ceca4..6560eae 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -52,7 +52,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::osl::MutexGuard;
using ::com::sun::star::chart2::XAnyDescriptionAccess;
using ::com::sun::star::chart::XComplexDescriptionAccess;
@@ -62,8 +61,7 @@
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.ChartData" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.ChartData" );
uno::Sequence< uno::Sequence< double > > lcl_getNANInsteadDBL_MIN( const uno::Sequence<
uno::Sequence< double > >& rData )
{
@@ -528,12 +526,12 @@
}
// ____ XComplexDescriptionAccess (write) ____
-void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence<
::rtl::OUString > >& rRowDescriptions ) throw (uno::RuntimeException)
+void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >&
rRowDescriptions ) throw (uno::RuntimeException)
{
lcl_ComplexRowDescriptionsOperator aOperator( rRowDescriptions,
m_spChart2ModelContact->getChart2Document() );
applyData( aOperator );
}
-void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence<
::rtl::OUString > >& rColumnDescriptions ) throw (uno::RuntimeException)
+void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString >
& rColumnDescriptions ) throw (uno::RuntimeException)
{
lcl_ComplexColumnDescriptionsOperator aOperator( rColumnDescriptions,
m_spChart2ModelContact->getChart2Document() );
applyData( aOperator );
@@ -694,7 +692,7 @@
}
//detect arguments for the new data source
- ::rtl::OUString aRangeString;
+ OUString aRangeString;
bool bUseColumns = true;
bool bFirstCellAsLabel = true;
bool bHasCategories = true;
@@ -749,9 +747,9 @@
// --------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > ChartDataWrapper::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ChartDataWrapper::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.chart.ChartDataArray";
aServices[ 1 ] = "com.sun.star.chart.ChartData";
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 4242c2e..c605de0 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -63,8 +63,7 @@
namespace
{
-static const ::rtl::OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.DataSeries" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.DataSeries" );
enum
{
@@ -110,7 +109,7 @@
rOutProperties.push_back(
Property( "LabelSeparator",
PROP_SERIES_DATAPOINT_LABEL_SEPARATOR,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -236,7 +235,7 @@
WrappedAttachedAxisProperty::WrappedAttachedAxisProperty(
::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
- : WrappedProperty("Axis",rtl::OUString())
+ : WrappedProperty("Axis",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
{
}
@@ -622,7 +621,7 @@
// WrappedPropertySet
//XPropertyState
-beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const ::rtl::OUString&
rPropertyName )
+beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OUString&
rPropertyName )
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE );
@@ -652,7 +651,7 @@
return aState;
}
-void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const ::rtl::OUString& rPropertyName )
+void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPropertyName )
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
if( m_eType == DATA_SERIES )
@@ -663,7 +662,7 @@
setPropertyValue( rPropertyName, getPropertyDefault( rPropertyName ) );
}
}
-Any SAL_CALL DataSeriesPointWrapper::getPropertyDefault( const ::rtl::OUString& rPropertyName )
+Any SAL_CALL DataSeriesPointWrapper::getPropertyDefault( const OUString& rPropertyName )
throw (beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
@@ -765,7 +764,7 @@
return aWrappedProperties;
}
-void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const ::rtl::OUString& rPropertyName,
const Any& rValue )
+void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropertyName, const Any&
rValue )
throw (beans::UnknownPropertyException,
beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
{
if(rPropertyName == "Lines")
@@ -826,7 +825,7 @@
WrappedPropertySet::setPropertyValue( rPropertyName, rValue );
}
-Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const rtl::OUString& rPropertyName )
+Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rPropertyName )
throw ( beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
if( m_eType == DATA_POINT )
@@ -857,9 +856,9 @@
// ================================================================================
-uno::Sequence< ::rtl::OUString > DataSeriesPointWrapper::getSupportedServiceNames_Static()
+uno::Sequence< OUString > DataSeriesPointWrapper::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 7 );
+ uno::Sequence< OUString > aServices( 7 );
aServices[ 0 ] = "com.sun.star.chart.ChartDataRowProperties";
aServices[ 1 ] = "com.sun.star.chart.ChartDataPointProperties";
aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 07e8a95..4180e87 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -42,12 +42,10 @@
using ::osl::MutexGuard;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.Grid" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.Grid" );
struct StaticGridWrapperPropertyArray_Initializer
{
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 19a06c2..ac10861 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -39,12 +39,10 @@
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.ChartLine" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.ChartLine" );
struct StaticMinMaxLineWrapperDefaults_Initializer
{
@@ -173,7 +171,7 @@
return *StaticMinMaxLineWrapperInfo::get();
}
-void SAL_CALL MinMaxLineWrapper::setPropertyValue( const ::rtl::OUString& rPropertyName, const
uno::Any& rValue )
+void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any&
rValue )
throw (beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
Reference< beans::XPropertySet > xPropSet(0);
@@ -210,7 +208,7 @@
}
}
}
-uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const ::rtl::OUString& rPropertyName )
+uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rPropertyName )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
Any aRet;
@@ -252,22 +250,22 @@
return aRet;
}
-void SAL_CALL MinMaxLineWrapper::addPropertyChangeListener( const ::rtl::OUString&
/*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
+void SAL_CALL MinMaxLineWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
-void SAL_CALL MinMaxLineWrapper::removePropertyChangeListener( const ::rtl::OUString&
/*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
+void SAL_CALL MinMaxLineWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
-void SAL_CALL MinMaxLineWrapper::addVetoableChangeListener( const ::rtl::OUString&
/*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
+void SAL_CALL MinMaxLineWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
-void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const ::rtl::OUString&
/*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
+void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
OSL_FAIL("not implemented");
@@ -275,13 +273,13 @@
//XMultiPropertySet
//getPropertySetInfo() already declared in XPropertySet
-void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< ::rtl::OUString >&
rNameSeq, const uno::Sequence< uno::Any >& rValueSeq )
+void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq,
const uno::Sequence< uno::Any >& rValueSeq )
throw (beans::PropertyVetoException, lang::IllegalArgumentException,
lang::WrappedTargetException, uno::RuntimeException)
{
sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
for(sal_Int32 nN=0; nN<nMinCount; nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
try
{
this->setPropertyValue( aPropertyName, rValueSeq[nN] );
@@ -293,7 +291,7 @@
}
//todo: store unknown properties elsewhere
}
-uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const uno::Sequence<
::rtl::OUString >& rNameSeq )
+uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const uno::Sequence<
OUString >& rNameSeq )
throw (uno::RuntimeException)
{
Sequence< Any > aRetSeq;
@@ -302,14 +300,14 @@
aRetSeq.realloc( rNameSeq.getLength() );
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
aRetSeq[nN] = this->getPropertyValue( aPropertyName );
}
}
return aRetSeq;
}
void SAL_CALL MinMaxLineWrapper::addPropertiesChangeListener(
- const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */,
+ const uno::Sequence< OUString >& /* aPropertyNames */,
const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
@@ -322,7 +320,7 @@
OSL_FAIL("not implemented");
}
void SAL_CALL MinMaxLineWrapper::firePropertiesChangeEvent(
- const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */,
+ const uno::Sequence< OUString >& /* aPropertyNames */,
const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
@@ -330,7 +328,7 @@
}
//XPropertyState
-beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const ::rtl::OUString&
rPropertyName )
+beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUString& rPropertyName )
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) )
@@ -344,7 +342,7 @@
return beans::PropertyState_DIRECT_VALUE;
}
-uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertyStates( const
uno::Sequence< ::rtl::OUString >& rNameSeq )
+uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertyStates( const
uno::Sequence< OUString >& rNameSeq )
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
Sequence< beans::PropertyState > aRetSeq;
@@ -353,19 +351,19 @@
aRetSeq.realloc( rNameSeq.getLength() );
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
aRetSeq[nN] = this->getPropertyState( aPropertyName );
}
}
return aRetSeq;
}
-void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const ::rtl::OUString& rPropertyName )
+void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const OUString& rPropertyName )
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) );
}
-uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const ::rtl::OUString& rPropertyName )
+uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rPropertyName )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
const tPropertyValueMap& rStaticDefaults = *StaticMinMaxLineWrapperDefaults::get();
@@ -383,20 +381,20 @@
const Sequence< beans::Property >& rPropSeq = *StaticMinMaxLineWrapperPropertyArray::get();
for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rPropSeq[nN].Name );
+ OUString aPropertyName( rPropSeq[nN].Name );
this->setPropertyToDefault( aPropertyName );
}
}
-void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< ::rtl::OUString >&
rNameSeq )
+void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq
)
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
this->setPropertyToDefault( aPropertyName );
}
}
-uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const uno::Sequence<
::rtl::OUString >& rNameSeq )
+uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const uno::Sequence<
OUString >& rNameSeq )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
Sequence< Any > aRetSeq;
@@ -405,7 +403,7 @@
aRetSeq.realloc( rNameSeq.getLength() );
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
aRetSeq[nN] = this->getPropertyDefault( aPropertyName );
}
}
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 8c4b53a..f0ed456 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -42,12 +42,10 @@
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
-static const OUString lcl_aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.WallOrFloor" ));
+static const OUString lcl_aServiceName( "com.sun.star.comp.chart.WallOrFloor" );
struct StaticWallFloorWrapperPropertyArray_Initializer
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 25a7bf9..c9bdcb8 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -49,8 +49,6 @@
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
-
namespace com { namespace sun { namespace star { namespace awt {
@@ -205,7 +203,7 @@
rOutProperties.push_back(
Property( "SymbolBitmapURL",
PROP_CHART_SYMBOL_BITMAP_URL,
- ::getCppuType( reinterpret_cast< ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -349,10 +347,9 @@
&& aSymbol.Graphic.is())
{
GraphicObject aGrObj( Graphic( aSymbol.Graphic ));
- aRet = OUString(RTL_CONSTASCII_USTRINGPARAM(
- UNO_NAME_GRAPHOBJ_URLPREFIX));
- aRet += OStringToOUString(aGrObj.GetUniqueID(),
- RTL_TEXTENCODING_ASCII_US);
+ aRet = UNO_NAME_GRAPHOBJ_URLPREFIX +
+ OStringToOUString(aGrObj.GetUniqueID(),
+ RTL_TEXTENCODING_ASCII_US);
}
return aRet;
}
@@ -367,12 +364,11 @@
chart2::Symbol aSymbol;
if( xSeriesPropertySet->getPropertyValue("Symbol") >>= aSymbol )
{
- bool bMatchesPrefix =
- aNewGraphicURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( UNO_NAME_GRAPHOBJ_URLPREFIX ));
+ bool bMatchesPrefix = aNewGraphicURL.match( UNO_NAME_GRAPHOBJ_URLPREFIX );
if( bMatchesPrefix )
{
GraphicObject aGrObj = GraphicObject(
- rtl::OUStringToOString(aNewGraphicURL.copy(
RTL_CONSTASCII_LENGTH(UNO_NAME_GRAPHOBJ_URLPREFIX) ), RTL_TEXTENCODING_ASCII_US));
+ OUStringToOString(aNewGraphicURL.copy(
RTL_CONSTASCII_LENGTH(UNO_NAME_GRAPHOBJ_URLPREFIX) ), RTL_TEXTENCODING_ASCII_US));
aSymbol.Graphic.set( aGrObj.GetGraphic().GetXGraphic());
xSeriesPropertySet->setPropertyValue( "Symbol", uno::makeAny( aSymbol ) );
}
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 67ff9fa..ed19ec5 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -256,11 +256,11 @@
beans::PropertyValue aProperty;
if(*pArguments >>= aProperty)
{
- if( aProperty.Name.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "ParentWindow" ) ) == 0
)
+ if( aProperty.Name.compareTo( "ParentWindow" ) == 0 )
{
aProperty.Value >>= m_xParentWindow;
}
- else if( aProperty.Name.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "ChartModel" ) )
== 0 )
+ else if( aProperty.Name.compareTo( "ChartModel" ) == 0 )
{
aProperty.Value >>= m_xChartModel;
}
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 6096442..4671811 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -55,13 +55,13 @@
SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) );
String aTipHelpStr( SchResId(STR_TIP_LIGHTSOURCE_X) );
- rtl::OUString aTipHelp( aTipHelpStr );
- const rtl::OUString aReplacementStr( RTL_CONSTASCII_USTRINGPARAM( "%LIGHTNUMBER" ));
+ OUString aTipHelp( aTipHelpStr );
+ const OUString aReplacementStr( "%LIGHTNUMBER" );
sal_Int32 nIndex = aTipHelp.indexOf( aReplacementStr );
if( nIndex != -1 )
{
aTipHelp = aTipHelp.replaceAt(nIndex, aReplacementStr.getLength(),
- rtl::OUString::valueOf( nLightNumber ) );
+ OUString::valueOf( nLightNumber ) );
}
this->SetQuickHelpText( String( aTipHelp ) );
}
@@ -179,10 +179,10 @@
::chart::LightSource aResult;
if( 0 <= nIndex && nIndex < 8 )
{
- ::rtl::OUString aColorPropertyPrefix(
RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightColor"));
- ::rtl::OUString aDirectionPropertyPrefix(
RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightDirection"));
- ::rtl::OUString aEnabledPropertyPrefix(
RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightOn"));
- ::rtl::OUString aIndex( ::rtl::OUString::valueOf( nIndex + 1 ));
+ OUString aColorPropertyPrefix("D3DSceneLightColor");
+ OUString aDirectionPropertyPrefix("D3DSceneLightDirection");
+ OUString aEnabledPropertyPrefix("D3DSceneLightOn");
+ OUString aIndex( OUString::valueOf( nIndex + 1 ));
try
{
@@ -193,9 +193,8 @@
catch( const uno::Exception & ex )
{
(void)(ex); // no warning in non-debug builds
- OSL_FAIL( ::rtl::OUStringToOString(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception
caught. Message: " )) +
- ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
+ OSL_FAIL( OUStringToOString(OUString( "Property Exception caught. Message: " ) +
+ ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
}
return aResult;
@@ -208,10 +207,10 @@
{
if( 0 <= nIndex && nIndex < 8 )
{
- ::rtl::OUString aColorPropertyPrefix(
RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightColor"));
- ::rtl::OUString aDirectionPropertyPrefix(
RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightDirection"));
- ::rtl::OUString aEnabledPropertyPrefix(
RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightOn"));
- ::rtl::OUString aIndex( ::rtl::OUString::valueOf( nIndex + 1 ));
+ OUString aColorPropertyPrefix("D3DSceneLightColor");
+ OUString aDirectionPropertyPrefix("D3DSceneLightDirection");
+ OUString aEnabledPropertyPrefix("D3DSceneLightOn");
+ OUString aIndex( OUString::valueOf( nIndex + 1 ));
try
{
@@ -225,9 +224,8 @@
catch( const uno::Exception & ex )
{
(void)(ex); // no warning in non-debug builds
- OSL_FAIL( ::rtl::OUStringToOString(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception
caught. Message: " )) +
- ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
+ OSL_FAIL( OUStringToOString(OUString("Property Exception caught. Message: " ) +
+ ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
}
}
@@ -238,15 +236,13 @@
sal_Int32 nResult = 0x000000;
try
{
- xSceneProperties->getPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneAmbientColor"))) >>= nResult;
+ xSceneProperties->getPropertyValue(OUString("D3DSceneAmbientColor")) >>= nResult;
}
catch( const uno::Exception & ex )
{
(void)(ex); // no warning in non-debug builds
- OSL_FAIL( ::rtl::OUStringToOString(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception
caught. Message: " )) +
- ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
+ OSL_FAIL( OUStringToOString(OUString("Property Exception caught. Message: " ) +
+ ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
return Color( nResult );
}
@@ -257,16 +253,14 @@
{
try
{
- xSceneProperties->setPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneAmbientColor")),
- uno::makeAny( rColor.GetColor()));
+ xSceneProperties->setPropertyValue(OUString("D3DSceneAmbientColor"),
+ uno::makeAny( rColor.GetColor()));
}
catch( const uno::Exception & ex )
{
(void)(ex); // no warning in non-debug builds
- OSL_FAIL( ::rtl::OUStringToOString(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception
caught. Message: " )) +
- ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
+ OSL_FAIL( OUStringToOString(OUString( "Property Exception caught. Message: " ) +
+ ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
}
}
--
To view, visit https://gerrit.libreoffice.org/1550
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47889319530d8f03bd7c78e937de55cf380d2d41
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org@gmail.com>
Context
- [PATCH] Remove some RTL_* and some rtl:: prefixes in chart2 · Marcos Souza (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.