[Libreoffice-commits] .: oox/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Dec 1 07:04:57 PST 2012
oox/source/drawingml/chart/axiscontext.cxx | 2 +-
oox/source/drawingml/chart/axisconverter.cxx | 4 ++--
oox/source/drawingml/chart/chartconverter.cxx | 10 +++++-----
oox/source/drawingml/chart/chartdrawingfragment.cxx | 2 +-
oox/source/drawingml/chart/chartspaceconverter.cxx | 4 ++--
oox/source/drawingml/chart/chartspacefragment.cxx | 2 +-
oox/source/drawingml/chart/converterbase.cxx | 2 +-
oox/source/drawingml/chart/datasourcecontext.cxx | 2 +-
oox/source/drawingml/chart/datasourceconverter.cxx | 2 +-
oox/source/drawingml/chart/modelbase.cxx | 2 +-
oox/source/drawingml/chart/objectformatter.cxx | 8 ++++----
oox/source/drawingml/chart/plotareaconverter.cxx | 6 +++---
oox/source/drawingml/chart/seriescontext.cxx | 2 +-
oox/source/drawingml/chart/seriesconverter.cxx | 2 +-
oox/source/drawingml/chart/titlecontext.cxx | 2 +-
oox/source/drawingml/chart/titleconverter.cxx | 2 +-
oox/source/drawingml/chart/typegroupconverter.cxx | 2 +-
17 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 3066167ff05cc78ac21dbb9173264dda3f91550e
Author: José Guilherme Vanz <guilherme.sft at gmail.com>
Date: Fri Nov 30 22:28:09 2012 -0200
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 at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/1212
Reviewed-by: Olivier Hallot <olivier.hallot at alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot at alta.org.br>
diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx
index 944d09c..1b21d78 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 0371e53..97f64d4 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 3e7469a..1f46cb8 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 0dba782..be7e8b3 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 058fafe..b06d9ae 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 556580b..c70f591 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 8d2a8e9..64b2a51 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 3e8accb..b5b446a 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 7ee5d7a..70f80ae 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 de031b1..3bb1020 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 7079a9c..1f64033 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 904c889..c490c8f 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 61a3c79..9e7b262 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 3823d3e..af85386 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 92b33c2..1f0135e 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 0601355..c9d5a75 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 c676e35..4bdc859 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;
// ============================================================================
More information about the Libreoffice-commits
mailing list