diff options
author | José Guilherme Vanz <guilherme.sft@gmail.com> | 2012-11-30 22:28:09 -0200 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-12-01 15:04:37 +0000 |
commit | 3066167ff05cc78ac21dbb9173264dda3f91550e (patch) | |
tree | 455793526a5800932d373e0f35f76e8a0f7ea5ab /oox | |
parent | Removal ::rtl:: prefixes and macros in IO (diff) | |
download | core-3066167ff05cc78ac21dbb9173264dda3f91550e.tar.gz core-3066167ff05cc78ac21dbb9173264dda3f91550e.zip |
Removal ::rtl:: prefixes and macros in oxx
This commit removes some ::rtl:: prefixes and RTL_CONSTASCII_STRINGPARAM,
RTL_CONSTASCII_USTRINGPARAM macros in oxx.
Change-Id: I1139b10256387bb71e8a425153d46add181538bc
Signed-off-by: José Guilherme Vanz <guilherme.sft@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/1212
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/chart/axiscontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/axisconverter.cxx | 4 | ||||
-rw-r--r-- | oox/source/drawingml/chart/chartconverter.cxx | 10 | ||||
-rw-r--r-- | oox/source/drawingml/chart/chartdrawingfragment.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/chartspaceconverter.cxx | 4 | ||||
-rw-r--r-- | oox/source/drawingml/chart/chartspacefragment.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/converterbase.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/datasourcecontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/datasourceconverter.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/modelbase.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 8 | ||||
-rw-r--r-- | oox/source/drawingml/chart/plotareaconverter.cxx | 6 | ||||
-rw-r--r-- | oox/source/drawingml/chart/seriescontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/seriesconverter.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/titlecontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/titleconverter.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/typegroupconverter.cxx | 2 |
17 files changed, 28 insertions, 28 deletions
diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx index 944d09c79710..1b21d78c0ef8 100644 --- a/oox/source/drawingml/chart/axiscontext.cxx +++ b/oox/source/drawingml/chart/axiscontext.cxx @@ -32,7 +32,7 @@ namespace chart { using ::oox::core::ContextHandlerRef; using ::oox::core::ContextHandler2Helper; -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 0371e531f209..97f64d425e1c 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::uno; -using ::rtl::OUString; +using OUString; // ============================================================================ @@ -360,4 +360,4 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo } // namespace drawingml } // namespace oox -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:n:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx index 3e7469a50819..1f46cb8a8c53 100644 --- a/oox/source/drawingml/chart/chartconverter.cxx +++ b/oox/source/drawingml/chart/chartconverter.cxx @@ -27,7 +27,7 @@ using ::oox::drawingml::chart::DataSequenceModel; using ::com::sun::star::uno::Any; -using ::rtl::OUStringBuffer; +using OUStringBuffer; namespace oox { namespace drawingml { namespace chart { @@ -41,7 +41,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::uno; using ::oox::core::XmlFilterBase; -using ::rtl::OUString; +using OUString; // ============================================================================ @@ -60,7 +60,7 @@ static OUString lclGenerateApiString( const OUString& rString ) return OUStringBuffer().append( sal_Unicode( '"' ) ).append( aRetString ).append( sal_Unicode( '"' ) ).makeStringAndClear(); } -static ::rtl::OUString lclGenerateApiArray( const Matrix< Any >& rMatrix ) +static OUString lclGenerateApiArray( const Matrix< Any >& rMatrix ) { OSL_ENSURE( !rMatrix.empty(), "ChartConverter::lclGenerateApiArray - missing matrix values" ); OUStringBuffer aBuffer; @@ -72,7 +72,7 @@ static ::rtl::OUString lclGenerateApiArray( const Matrix< Any >& rMatrix ) for( Matrix< Any >::const_iterator aBeg = rMatrix.row_begin( nRow ), aIt = aBeg, aEnd = rMatrix.row_end( nRow ); aIt != aEnd; ++aIt ) { double fValue = 0.0; - ::rtl::OUString aString; + OUString aString; if( aIt != aBeg ) aBuffer.append( API_TOKEN_ARRAY_COLSEP ); if( *aIt >>= fValue ) @@ -127,7 +127,7 @@ Reference< XDataSequence > ChartConverter::createDataSequence( const Reference< Reference< XDataSequence > xDataSeq; if( rxDataProvider.is() ) { - ::rtl::OUString aRangeRep; + OUString aRangeRep; if( !rDataSeq.maData.empty() ) { // create a single-row array from constant source data diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx index 0dba782467da..be7e8b3456a7 100644 --- a/oox/source/drawingml/chart/chartdrawingfragment.cxx +++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::uno; using namespace ::oox::core; -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index 058fafec9d45..b06d9ae2b4e5 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -32,7 +32,7 @@ #include "oox/drawingml/chart/plotareaconverter.hxx" #include "oox/drawingml/chart/titleconverter.hxx" -using ::rtl::OUString; +using OUString; using ::com::sun::star::awt::Point; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Exception; @@ -60,7 +60,7 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx index 556580b08a8d..c70f591c1ed1 100644 --- a/oox/source/drawingml/chart/chartspacefragment.cxx +++ b/oox/source/drawingml/chart/chartspacefragment.cxx @@ -33,7 +33,7 @@ namespace chart { using namespace ::oox::core; -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx index 8d2a8e9d8d33..64b2a51d7ff9 100644 --- a/oox/source/drawingml/chart/converterbase.cxx +++ b/oox/source/drawingml/chart/converterbase.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using ::oox::core::XmlFilterBase; -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx index 3e8accbe140f..b5b446a70916 100644 --- a/oox/source/drawingml/chart/datasourcecontext.cxx +++ b/oox/source/drawingml/chart/datasourcecontext.cxx @@ -29,7 +29,7 @@ namespace chart { using ::oox::core::ContextHandler2Helper; using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/datasourceconverter.cxx b/oox/source/drawingml/chart/datasourceconverter.cxx index 7ee5d7a6671b..70f80aeb3d79 100644 --- a/oox/source/drawingml/chart/datasourceconverter.cxx +++ b/oox/source/drawingml/chart/datasourceconverter.cxx @@ -33,7 +33,7 @@ namespace chart { using namespace ::com::sun::star::chart2::data; using namespace ::com::sun::star::uno; -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/modelbase.cxx b/oox/source/drawingml/chart/modelbase.cxx index de031b115543..3bb1020fe56f 100644 --- a/oox/source/drawingml/chart/modelbase.cxx +++ b/oox/source/drawingml/chart/modelbase.cxx @@ -27,7 +27,7 @@ namespace chart { // ============================================================================ -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 7079a9ceb06d..1f64033f7cdb 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -47,9 +47,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using ::oox::core::XmlFilterBase; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringToOString; +using OStringBuffer; +using OUString; +using OUStringToOString; // ============================================================================ @@ -1124,7 +1124,7 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo } else try { - sal_Int32 nIndex = rNumberFormat.maFormatCode.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("general")) ? + sal_Int32 nIndex = rNumberFormat.maFormatCode.equalsIgnoreAsciiCaseAsciiL("general") ? mxData->mxNumTypes->getStandardIndex( mxData->maFromLocale ) : mxData->mxNumFmts->addNewConverted( rNumberFormat.maFormatCode, mxData->maEnUsLocale, mxData->maFromLocale ); if( nIndex >= 0 ) diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index 904c889e8215..c490c8f7c9a8 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::uno; -using ::rtl::OUString; +using OUString; // ============================================================================ @@ -79,7 +79,7 @@ public: bool bSupportsVaryColorsByPoint ); /** Returns the automatic chart title if the axes set contains only one series. */ - inline const ::rtl::OUString& getAutomaticTitle() const { return maAutoTitle; } + inline const OUString& getAutomaticTitle() const { return maAutoTitle; } /** Returns true, if the chart is three-dimensional. */ inline bool is3dChart() const { return mb3dChart; } /** Returns true, if chart type supports wall and floor format in 3D mode. */ @@ -88,7 +88,7 @@ public: inline bool isPieChart() const { return mbPieChart; } private: - ::rtl::OUString maAutoTitle; + OUString maAutoTitle; bool mb3dChart; bool mbWall3dChart; bool mbPieChart; diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index 61a3c792d9d5..9e7b262eeb5c 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -34,7 +34,7 @@ namespace chart { using ::oox::core::ContextHandler2; using ::oox::core::ContextHandler2Helper; using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 3823d3ed8f0c..af853860487f 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2::data; using namespace ::com::sun::star::uno; -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx index 92b33c22f3a2..1f0135e9e24f 100644 --- a/oox/source/drawingml/chart/titlecontext.cxx +++ b/oox/source/drawingml/chart/titlecontext.cxx @@ -32,7 +32,7 @@ namespace chart { using ::oox::core::ContextHandler2Helper; using ::oox::core::ContextHandlerRef; -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index 06013555e5f3..c9d5a7564033 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::chart2::data; using namespace ::com::sun::star::uno; using ::oox::core::XmlFilterBase; -using ::rtl::OUString; +using OUString; // ============================================================================ diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index c676e3596d31..4bdc8592483f 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2::data; using namespace ::com::sun::star::uno; -using ::rtl::OUString; +using OUString; // ============================================================================ |