Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2475
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/2475/1
Replace rtl::O(U)String with O(U)String
Other changes include:
in bridges/test/testcomp.cxx duplicate 'using namespace ::test' removed,
'using namespace ::rtl' replaced with 'using ::rtl::OUString' and
'using ::rtl::OUStringToOString'
Change-Id: I67a5952afd305adeb07f728c9074620ecba8e9fc
---
M bridges/test/testcomp.cxx
M canvas/source/simplecanvas/simplecanvasimpl.cxx
M canvas/source/tools/cachedprimitivebase.cxx
M canvas/source/tools/parametricpolypolygon.cxx
M canvas/source/tools/propertysethelper.cxx
M canvas/source/vcl/canvas.cxx
M canvas/source/vcl/canvasbitmap.cxx
M canvas/source/vcl/canvascustomsprite.cxx
M canvas/source/vcl/canvasfont.cxx
M canvas/source/vcl/spritecanvashelper.cxx
M canvas/source/vcl/spritehelper.cxx
M canvas/source/vcl/textlayout.cxx
M canvas/workben/canvasdemo.cxx
M chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
M chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
M chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
M chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
M chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
M chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
M chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
M chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
M chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
M chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
M chart2/source/controller/dialogs/RangeSelectionListener.cxx
M chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
M chart2/source/controller/dialogs/tp_DataSource.cxx
M chart2/source/controller/main/ChartController_Insert.cxx
M chart2/source/controller/main/ChartController_Properties.cxx
28 files changed, 182 insertions(+), 188 deletions(-)
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 588546e..053772b 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -39,19 +39,19 @@
#include <cppuhelper/weak.hxx>
using namespace ::test;
-using namespace ::rtl;
-using namespace ::test;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::bridge;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::test::performance;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
#include "testcomp.h"
void parseCommandLine( char *argv[] ,
- ::rtl::OUString *pConnection , ::rtl::OUString *pProtocol ,
+ OUString *pConnection , OUString *pProtocol ,
sal_Bool *pbLatency , sal_Bool *pbReverse)
{
sal_Int32 nArgIndex = 1;
@@ -92,7 +92,7 @@
}
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
- OInstanceProvider::getInstance( const ::rtl::OUString& sObjectName )
+ OInstanceProvider::getInstance( const OUString& sObjectName )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException)
{
@@ -176,7 +176,7 @@
{}
virtual OUString SAL_CALL getString_attr() throw(::com::sun::star::uno::RuntimeException)
{ return _aDummyString; }
- virtual void SAL_CALL setString_attr( const ::rtl::OUString& /* _attributestring */)
throw(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL setString_attr( const OUString& /* _attributestring */)
throw(::com::sun::star::uno::RuntimeException)
{}
virtual Reference< XInterface > SAL_CALL getInterface_attr()
throw(::com::sun::star::uno::RuntimeException)
{ return Reference< XInterface >(); }
@@ -214,7 +214,7 @@
{}
virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException)
{ return _aDummyString; }
- virtual void SAL_CALL setString( const ::rtl::OUString& /* _string */)
throw(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL setString( const OUString& /* _string */)
throw(::com::sun::star::uno::RuntimeException)
{}
virtual Reference< XInterface > SAL_CALL getInterface()
throw(::com::sun::star::uno::RuntimeException)
{ return Reference< XInterface >(); }
@@ -293,7 +293,7 @@
return OWeakObject::queryInterface( aType );
}
-void OCallMe::call( const ::rtl::OUString& s, sal_Int32 nToDo )
+void OCallMe::call( const OUString& s, sal_Int32 nToDo )
throw( RuntimeException, ::test::TestBridgeException)
{
if( nToDo < 0 )
@@ -318,7 +318,7 @@
// do nothings
}
-void OCallMe::callOneway( const ::rtl::OUString& /* s */, sal_Int32 nToDo )
+void OCallMe::callOneway( const OUString& /* s */, sal_Int32 nToDo )
throw(RuntimeException)
{
OUString sDummy;
@@ -343,11 +343,11 @@
return types;
}
-::rtl::OUString OCallMe::getsAttribute() throw(RuntimeException)
+OUString OCallMe::getsAttribute() throw(RuntimeException)
{
return m_sAttribute;
}
-void OCallMe::setsAttribute( const ::rtl::OUString& _sattribute )
+void OCallMe::setsAttribute( const OUString& _sattribute )
throw(RuntimeException)
{
m_sAttribute = _sattribute;
@@ -469,7 +469,7 @@
// public:
// virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-// getInstance( const ::rtl::OUString& sObjectName )
+// getInstance( const OUString& sObjectName )
// throw( ::com::sun::star::container::NoSuchElementException,
// ::com::sun::star::uno::RuntimeException);
// };
@@ -749,8 +749,8 @@
-Reference <XInterface > createComponent( const ::rtl::OUString &sService ,
- const ::rtl::OUString &sDllName,
+Reference <XInterface > createComponent( const OUString &sService ,
+ const OUString &sDllName,
const Reference < XMultiServiceFactory > &rSMgr )
{
Reference< XInterface > rInterface;
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx
b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index eaadad5..f04b811 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -176,13 +176,13 @@
private:
// Ifc XServiceName
- virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException)
+ virtual OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException)
{
return OUString( SERVICE_NAME );
}
// Ifc XSimpleCanvas
- virtual void SAL_CALL selectFont( const ::rtl::OUString& sFontName,
+ virtual void SAL_CALL selectFont( const OUString& sFontName,
double size,
::sal_Bool bold,
::sal_Bool italic ) throw
(uno::RuntimeException)
diff --git a/canvas/source/tools/cachedprimitivebase.cxx
b/canvas/source/tools/cachedprimitivebase.cxx
index 69e92f1..63a62b5 100644
--- a/canvas/source/tools/cachedprimitivebase.cxx
+++ b/canvas/source/tools/cachedprimitivebase.cxx
@@ -26,7 +26,6 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/tools/canvastools.hxx>
-
using namespace ::com::sun::star;
#define IMPLEMENTATION_NAME "canvas::CachedPrimitiveBase"
@@ -87,7 +86,7 @@
return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
+ sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) throw
(uno::RuntimeException)
{
return ServiceName == SERVICE_NAME;
}
diff --git a/canvas/source/tools/parametricpolypolygon.cxx
b/canvas/source/tools/parametricpolypolygon.cxx
index afce14a..11ca7ed 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -35,7 +35,6 @@
#include <canvas/parametricpolypolygon.hxx>
-
using namespace ::com::sun::star;
namespace canvas
@@ -52,7 +51,7 @@
ParametricPolyPolygon* ParametricPolyPolygon::create(
const uno::Reference< rendering::XGraphicDevice >& rDevice,
- const ::rtl::OUString& rServiceName,
+ const OUString& rServiceName,
const uno::Sequence< uno::Any >& rArgs )
{
uno::Sequence< uno::Sequence< double > > colorSequence(2);
@@ -208,7 +207,7 @@
return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
+ sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) throw
(uno::RuntimeException)
{
return ServiceName == SERVICE_NAME;
}
diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx
index eabbe89..2cdee08 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.cxx
@@ -85,7 +85,7 @@
initProperties( aMerged );
}
- bool PropertySetHelper::isPropertyName( const ::rtl::OUString& aPropertyName ) const
+ bool PropertySetHelper::isPropertyName( const OUString& aPropertyName ) const
{
if( !mpMap.get() )
return false;
@@ -101,7 +101,7 @@
return uno::Reference< beans::XPropertySetInfo >();
}
- void PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPropertyName,
+ void PropertySetHelper::setPropertyValue( const OUString& aPropertyName,
const uno::Any& aValue )
{
Callbacks aCallbacks;
@@ -118,7 +118,7 @@
aCallbacks.setter(aValue);
}
- uno::Any PropertySetHelper::getPropertyValue( const ::rtl::OUString& aPropertyName ) const
+ uno::Any PropertySetHelper::getPropertyValue( const OUString& aPropertyName ) const
{
Callbacks aCallbacks;
if( !mpMap.get() ||
@@ -136,7 +136,7 @@
return uno::Any();
}
- void PropertySetHelper::addPropertyChangeListener( const ::rtl::OUString&
aPropertyName,
+ void PropertySetHelper::addPropertyChangeListener( const OUString&
aPropertyName,
const uno::Reference<
beans::XPropertyChangeListener >& /*xListener*/ )
{
// check validity of property, but otherwise ignore the
@@ -145,13 +145,13 @@
throwUnknown( aPropertyName );
}
- void PropertySetHelper::removePropertyChangeListener( const ::rtl::OUString&
/*aPropertyName*/,
+ void PropertySetHelper::removePropertyChangeListener( const OUString&
/*aPropertyName*/,
const uno::Reference<
beans::XPropertyChangeListener >& /*xListener*/ )
{
// ignore request, no listener added in the first place
}
- void PropertySetHelper::addVetoableChangeListener( const ::rtl::OUString&
aPropertyName,
+ void PropertySetHelper::addVetoableChangeListener( const OUString&
aPropertyName,
const uno::Reference<
beans::XVetoableChangeListener >& /*xListener*/ )
{
// check validity of property, but otherwise ignore the
@@ -160,7 +160,7 @@
throwUnknown( aPropertyName );
}
- void PropertySetHelper::removeVetoableChangeListener( const ::rtl::OUString&
/*aPropertyName*/,
+ void PropertySetHelper::removeVetoableChangeListener( const OUString&
/*aPropertyName*/,
const uno::Reference<
beans::XVetoableChangeListener >& /*xListener*/ )
{
// ignore request, no listener added in the first place
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index 4b59cef..5a44e40 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -40,7 +40,6 @@
#include "canvas.hxx"
#include "windowoutdevholder.hxx"
-
using namespace ::com::sun::star;
namespace vclcanvas
@@ -101,7 +100,7 @@
OutputDevice* pOutDev = reinterpret_cast<OutputDevice*>(nPtr);
if( !pOutDev )
throw lang::NoSupportException(
- ::rtl::OUString( "Passed OutDev invalid!" ),
+ OUString( "Passed OutDev invalid!" ),
NULL);
OutDevProviderSharedPtr pOutdevProvider( new OutDevHolder(*pOutDev) );
@@ -131,9 +130,9 @@
CanvasBaseT::disposeThis();
}
- ::rtl::OUString SAL_CALL Canvas::getServiceName( ) throw
(::com::sun::star::uno::RuntimeException)
+ OUString SAL_CALL Canvas::getServiceName( ) throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString( CANVAS_SERVICE_NAME );
+ return OUString( CANVAS_SERVICE_NAME );
}
bool Canvas::repaint( const GraphicObjectSharedPtr& rGrf,
diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx
index b941eb1..a469e44 100644
--- a/canvas/source/vcl/canvasbitmap.cxx
+++ b/canvas/source/vcl/canvasbitmap.cxx
@@ -79,7 +79,7 @@
return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL CanvasBitmap::supportsService( const ::rtl::OUString& ServiceName ) throw
(uno::RuntimeException)
+ sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw
(uno::RuntimeException)
{
return ServiceName == SERVICE_NAME;
}
diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx
index a452212..9dead83 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.cxx
@@ -42,7 +42,6 @@
#include "canvascustomsprite.hxx"
-
using namespace ::com::sun::star;
@@ -126,7 +125,7 @@
return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const ::rtl::OUString& ServiceName )
throw( uno::RuntimeException )
+ sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw(
uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
}
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index 8f422f7..c314e5d 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -158,7 +158,7 @@
return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL CanvasFont::supportsService( const ::rtl::OUString& ServiceName ) throw(
uno::RuntimeException )
+ sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw(
uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
}
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index dc66395..d9a77f2 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -36,7 +36,6 @@
#include "spritecanvashelper.hxx"
#include "canvascustomsprite.hxx"
-
using namespace ::com::sun::star;
#define FPS_BOUNDS Rectangle(0,0,130,90)
@@ -158,7 +157,7 @@
}
void renderInfoText( OutputDevice& rOutDev,
- const ::rtl::OUString& rStr,
+ const OUString& rStr,
const Point& rPos )
{
Font aVCLFont;
@@ -641,8 +640,8 @@
sal_Int32 nCount(0);
mpRedrawManager->forEachSprite( makeAdder(nCount,sal_Int32(1)) );
- ::rtl::OUString text(
- ::rtl::OUString::valueOf(
+ OUString text(
+ OUString::valueOf(
// disambiguate overload...
static_cast<sal_Int64>(nCount) ) );
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 534e0cb..5411158 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -396,7 +396,7 @@
rTargetSurface.SetTextColor( COL_RED );
rTargetSurface.SetFont( aVCLFont );
- ::rtl::OUString text( ::rtl::math::doubleToUString( getPriority(),
+ OUString text( ::rtl::math::doubleToUString( getPriority(),
rtl_math_StringFormat_F,
2,'.',NULL,' ') );
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 72ede12..d8a0b14 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -37,7 +37,6 @@
#include <boost/scoped_array.hpp>
-
using namespace ::com::sun::star;
namespace vclcanvas
@@ -471,7 +470,7 @@
return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL TextLayout::supportsService( const ::rtl::OUString& ServiceName ) throw(
uno::RuntimeException )
+ sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw(
uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
}
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index a1e142d..fe55c57 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -56,7 +56,6 @@
#include <stdio.h>
#include <unistd.h>
-
// never import whole leaf namespaces, since this will result in
// absolutely weird effects during (Koenig) name lookup
using namespace ::com::sun::star;
@@ -79,7 +78,7 @@
public:
TestWindow() : Dialog( (Window *) NULL )
{
- SetText( rtl::OUString( "Canvas test" ) );
+ SetText( OUString( "Canvas test" ) );
SetSizePixel( Size( 600, 450 ) );
EnablePaint( true );
Show();
@@ -139,8 +138,8 @@
lang::Locale aLocale;
rendering::FontInfo aFontInfo;
- aFontInfo.FamilyName = ::rtl::OUString( "Swiss" );
- aFontInfo.StyleName = ::rtl::OUString( "SansSerif" );
+ aFontInfo.FamilyName = OUString( "Swiss" );
+ aFontInfo.StyleName = OUString( "SansSerif" );
geometry::Matrix2D aFontMatrix( 1, 0,
0, 1 );
rendering::FontRequest aFontRequest( aFontInfo, 12.0, 0.0, aLocale );
@@ -164,10 +163,10 @@
maViewState, maRenderState );
}
- void drawStringAt( ::rtl::OString aString, double x, double y )
+ void drawStringAt( OString aString, double x, double y )
{
rendering::StringContext aText;
- aText.Text = ::rtl::OStringToOUString( aString, RTL_TEXTENCODING_UTF8 );
+ aText.Text = OStringToOUString( aString, RTL_TEXTENCODING_UTF8 );
aText.StartPosition = 0;
aText.Length = aString.getLength();
rendering::RenderState aRenderState( maRenderState );
@@ -290,7 +289,7 @@
//mxCanvas->drawPolyPolygon( xPP, maViewState, aRenderState );
}
- void drawTitle( rtl::OString aTitle )
+ void drawTitle( OString aTitle )
{
// FIXME: text anchoring to be done
double nStringWidth = aTitle.getLength() * 8.0;
@@ -301,7 +300,7 @@
{
rendering::RenderState maOldRenderState = maRenderState; // push
- drawTitle( ::rtl::OString( "Rectangles" ) );
+ drawTitle( OString( "Rectangles" ) );
drawRect( Rectangle( 20, 30, 70, 60 ), maColorRed, 8 );
// color mediumseagreen, stipple fill, outline black
@@ -317,7 +316,7 @@
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width(), 0.0 );
- drawTitle( ::rtl::OString( "Ellipses" ) );
+ drawTitle( OString( "Ellipses" ) );
const basegfx::B2DPoint aCenter( maBox.Width()*.5,
maBox.Height()*.5 );
@@ -348,11 +347,11 @@
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width() * 2.0, 0.0 );
- drawTitle( ::rtl::OString( "Text" ) );
+ drawTitle( OString( "Text" ) );
translate( 0.0,
maBox.Height() * .5 );
- drawTitle( ::rtl::OString( "This is lame" ) );
+ drawTitle( OString( "This is lame" ) );
maRenderState = maOldRenderState; // pop
}
@@ -362,7 +361,7 @@
rendering::RenderState maOldRenderState = maRenderState; // push
translate( 0.0, maBox.Height() );
- drawTitle( ::rtl::OString( "Images" ) );
+ drawTitle( OString( "Images" ) );
uno::Reference< rendering::XBitmap > xBitmap(mxCanvas, uno::UNO_QUERY);
@@ -395,7 +394,7 @@
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width(), maBox.Height() );
- drawTitle( ::rtl::OString( "Lines" ) );
+ drawTitle( OString( "Lines" ) );
drawPolishDiamond( 70.0, 80.0 );
drawHilbert( 140.0, 140.0 );
@@ -408,7 +407,7 @@
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width() * 2.0, maBox.Height() );
- drawTitle( ::rtl::OString( "Curves" ) );
+ drawTitle( OString( "Curves" ) );
translate( maBox.Width() * .5, maBox.Height() * .5 );
@@ -457,7 +456,7 @@
rendering::RenderState maOldRenderState = maRenderState; // push
translate( 0.0, maBox.Height() * 2.0 );
- drawTitle( ::rtl::OString( "Arcs" ) );
+ drawTitle( OString( "Arcs" ) );
//begin hacks
@@ -536,7 +535,7 @@
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width() * 1.0, maBox.Height() * 2.0 );
- drawTitle( ::rtl::OString( "Polgyons" ) );
+ drawTitle( OString( "Polgyons" ) );
int sides= 3;
for (int i= 1; i <= 4; i++)
@@ -553,7 +552,7 @@
rendering::RenderState maOldRenderState = maRenderState; // push
translate( maBox.Width() * 2.0, maBox.Height() * 2.0 );
- drawTitle( ::rtl::OString( "Widgets" ) );
+ drawTitle( OString( "Widgets" ) );
maRenderState = maOldRenderState; // pop
}
@@ -620,7 +619,7 @@
catch (const uno::Exception &e)
{
fprintf( stderr, "Exception '%s' thrown\n" ,
- ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
@@ -641,7 +640,7 @@
for( USHORT i = 0; i < GetCommandLineParamCount(); i++ )
{
- ::rtl::OUString aParam = GetCommandLineParam( i );
+ OUString aParam = GetCommandLineParam( i );
if( aParam == "--help" || aParam == "-h" )
bHelp = true;
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 1679932..72730ff 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -102,8 +102,8 @@
SERVICE_NAME_IMPORT_GRAPHIC_RESOLVER
};
-typedef ::std::map< ::rtl::OUString, enum eServiceType > tServiceNameMap;
-typedef ::comphelper::MakeMap< ::rtl::OUString, enum eServiceType > tMakeServiceNameMap;
+typedef ::std::map< OUString, enum eServiceType > tServiceNameMap;
+typedef ::comphelper::MakeMap< OUString, enum eServiceType > tMakeServiceNameMap;
tServiceNameMap & lcl_getStaticServiceNameMap()
{
@@ -197,7 +197,7 @@
rOutProperties.push_back(
Property( "BaseDiagram",
PROP_DOCUMENT_BASEDIAGRAM,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
@@ -312,7 +312,7 @@
m_aOuterValue = rOuterValue;
bool bNewValue = bLabelsInFirstRow;
- ::rtl::OUString aRangeString;
+ OUString aRangeString;
bool bUseColumns = true;
bool bFirstCellAsLabel = true;
bool bHasCategories = true;
@@ -338,7 +338,7 @@
Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference<
beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
- ::rtl::OUString aRangeString;
+ OUString aRangeString;
bool bUseColumns = true;
bool bFirstCellAsLabel = true;
bool bHasCategories = true;
@@ -413,7 +413,7 @@
m_aOuterValue = rOuterValue;
bool bNewValue = bLabelsInFirstRow;
- ::rtl::OUString aRangeString;
+ OUString aRangeString;
bool bUseColumns = true;
bool bFirstCellAsLabel = true;
bool bHasCategories = true;
@@ -439,7 +439,7 @@
Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Reference<
beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
- ::rtl::OUString aRangeString;
+ OUString aRangeString;
bool bUseColumns = true;
bool bFirstCellAsLabel = true;
bool bHasCategories = true;
@@ -858,7 +858,7 @@
// ____ XModel ____
sal_Bool SAL_CALL ChartDocumentWrapper::attachResource(
- const ::rtl::OUString& URL,
+ const OUString& URL,
const Sequence< beans::PropertyValue >& Arguments )
throw (uno::RuntimeException)
{
@@ -868,13 +868,13 @@
return sal_False;
}
-::rtl::OUString SAL_CALL ChartDocumentWrapper::getURL()
+OUString SAL_CALL ChartDocumentWrapper::getURL()
throw (uno::RuntimeException)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
return xModel->getURL();
- return ::rtl::OUString();
+ return OUString();
}
Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs()
@@ -1039,7 +1039,7 @@
}
}
-void ChartDocumentWrapper::setBaseDiagram( const rtl::OUString& rBaseDiagram )
+void ChartDocumentWrapper::setBaseDiagram( const OUString& rBaseDiagram )
{
ControllerLockGuard aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
m_aBaseDiagram = rBaseDiagram;
@@ -1049,7 +1049,7 @@
this->setDiagram( xDiagram );
}
-rtl::OUString ChartDocumentWrapper::getBaseDiagram() const
+OUString ChartDocumentWrapper::getBaseDiagram() const
{
return m_aBaseDiagram;
}
@@ -1162,7 +1162,7 @@
// ____ XMultiServiceFactory ____
uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
- const ::rtl::OUString& aServiceSpecifier )
+ const OUString& aServiceSpecifier )
throw (uno::Exception,
uno::RuntimeException)
{
@@ -1437,7 +1437,7 @@
}
uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceWithArguments(
- const ::rtl::OUString& ServiceSpecifier,
+ const OUString& ServiceSpecifier,
const uno::Sequence< uno::Any >& Arguments )
throw (uno::Exception,
uno::RuntimeException)
@@ -1448,11 +1448,11 @@
return createInstance( ServiceSpecifier );
}
-uno::Sequence< ::rtl::OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceNames()
+uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceNames()
throw (uno::RuntimeException)
{
tServiceNameMap & rMap = lcl_getStaticServiceNameMap();
- uno::Sequence< ::rtl::OUString > aResult( rMap.size());
+ uno::Sequence< OUString > aResult( rMap.size());
::std::transform( rMap.begin(), rMap.end(),
aResult.getArray(),
@@ -1555,9 +1555,9 @@
// ================================================================================
-uno::Sequence< ::rtl::OUString > ChartDocumentWrapper::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ChartDocumentWrapper::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 4 );
+ uno::Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart.ChartDocument";
aServices[ 1 ] = CHART_CHARTAPIWRAPPER_SERVICE_NAME;
aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 97d49ee..d701353 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -459,7 +459,7 @@
Reference< chart2::XChartType > xChartType( ::chart::DiagramHelper::getChartTypeByIndex(
xDiagram, 0 ) );
if( xChartType.is() )
{
- rtl::OUString aChartType( xChartType->getChartType() );
+ OUString aChartType( xChartType->getChartType() );
if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) )
bRet = true;
}
@@ -497,11 +497,11 @@
// "Area" "StackedArea" "PercentStackedArea" "ThreeDArea"
// "StackedThreeDArea" "PercentStackedThreeDArea"
if( aName.indexOf( "Area" ) != -1 )
- return rtl::OUString("com.sun.star.chart.AreaDiagram");
+ return OUString("com.sun.star.chart.AreaDiagram");
// "Pie" "PieAllExploded" "ThreeDPie" "ThreeDPieAllExploded"
if( aName.indexOf( "Pie" ) != -1 )
- return rtl::OUString("com.sun.star.chart.PieDiagram");
+ return OUString("com.sun.star.chart.PieDiagram");
// "Column" "StackedColumn" "PercentStackedColumn" "ThreeDColumnDeep"
// "ThreeDColumnFlat" "StackedThreeDColumnFlat"
@@ -510,33 +510,33 @@
// "StackedThreeDBarFlat" "PercentStackedThreeDBarFlat" "ColumnWithLine"
// "StackedColumnWithLine"
if( aName.indexOf( "Column" ) != -1 || aName.indexOf( "Bar" ) != -1 )
- return rtl::OUString( "com.sun.star.chart.BarDiagram" );
+ return OUString( "com.sun.star.chart.BarDiagram" );
// "Donut" "DonutAllExploded" "ThreeDDonut" "ThreeDDonutAllExploded"
if( aName.indexOf( "Donut" ) != -1 )
- return rtl::OUString( "com.sun.star.chart.DonutDiagram" );
+ return OUString( "com.sun.star.chart.DonutDiagram" );
// "ScatterLineSymbol" "ScatterLine" "ScatterSymbol" "ThreeDScatter"
if( aName.indexOf( "Scatter" ) != -1 )
- return rtl::OUString( "com.sun.star.chart.XYDiagram" );
+ return OUString( "com.sun.star.chart.XYDiagram" );
// "FilledNet" "StackedFilledNet" "PercentStackedFilledNet"
if( aName.indexOf( "FilledNet" ) != -1 )
- return rtl::OUString( "com.sun.star.chart.FilledNetDiagram" );
+ return OUString( "com.sun.star.chart.FilledNetDiagram" );
// "Net" "NetSymbol" "NetLine" "StackedNet" "StackedNetSymbol"
// "StackedNetLine" "PercentStackedNet" "PercentStackedNetSymbol"
// "PercentStackedNetLine"
if( aName.indexOf( "Net" ) != -1 )
- return rtl::OUString( "com.sun.star.chart.NetDiagram" );
+ return OUString( "com.sun.star.chart.NetDiagram" );
// "StockLowHighClose" "StockOpenLowHighClose" "StockVolumeLowHighClose"
// "StockVolumeOpenLowHighClose"
if( aName.indexOf( "Stock" ) != -1 )
- return rtl::OUString( "com.sun.star.chart.StockDiagram" );
+ return OUString( "com.sun.star.chart.StockDiagram" );
if( aName.indexOf( "Bubble" ) != -1 )
- return rtl::OUString( "com.sun.star.chart.BubbleDiagram" );
+ return OUString( "com.sun.star.chart.BubbleDiagram" );
// Note: this must be checked after Bar, Net and Scatter
@@ -545,7 +545,7 @@
// "PercentStackedLineSymbol" "ThreeDLine" "StackedThreeDLine"
// "PercentStackedThreeDLine" "ThreeDLineDeep"
if( aName.indexOf( "Line" ) != -1 || aName.indexOf( "Symbol" ) != -1 )
- return rtl::OUString( "com.sun.star.chart.LineDiagram" );
+ return OUString( "com.sun.star.chart.LineDiagram" );
OSL_FAIL( "unknown template" );
}
@@ -553,7 +553,7 @@
return OUString();
}
-typedef ::comphelper::MakeMap< ::rtl::OUString, ::rtl::OUString > tMakeStringStringMap;
+typedef ::comphelper::MakeMap< OUString, OUString > tMakeStringStringMap;
const tMakeStringStringMap& lcl_getChartTypeNameMap()
{
@@ -769,7 +769,7 @@
OUString SAL_CALL DiagramWrapper::getShapeType()
throw (uno::RuntimeException)
{
- return rtl::OUString( "com.sun.star.chart.Diagram" );
+ return OUString( "com.sun.star.chart.Diagram" );
}
// ____ XDiagramPositioning ____
@@ -1221,7 +1221,7 @@
bool bNewUseColumns = eChartDataRowSource ==
::com::sun::star::chart::ChartDataRowSource_COLUMNS;
- ::rtl::OUString aRangeString;
+ OUString aRangeString;
bool bUseColumns = true;
bool bFirstCellAsLabel = true;
bool bHasCategories = true;
@@ -1243,7 +1243,7 @@
Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPropertySet >&
/*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
- ::rtl::OUString aRangeString;
+ OUString aRangeString;
bool bUseColumns = true;
bool bFirstCellAsLabel = true;
bool bHasCategories = true;
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index eec61f2..96ccd65 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -50,6 +50,7 @@
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
+using ::rtl::OUString;
//-----------------------------------------------------------------------------
@@ -213,7 +214,7 @@
namespace
{
-static const ::rtl::OUString lcl_aServiceName("com.sun.star.comp.chart.Legend");
+static const OUString lcl_aServiceName("com.sun.star.comp.chart.Legend");
enum
{
@@ -337,10 +338,10 @@
}
// ____ XShapeDescriptor (base of XShape) ____
-::rtl::OUString SAL_CALL LegendWrapper::getShapeType()
+OUString SAL_CALL LegendWrapper::getShapeType()
throw (uno::RuntimeException)
{
- return rtl::OUString( "com.sun.star.chart.ChartLegend" );
+ return OUString( "com.sun.star.chart.ChartLegend" );
}
// ____ XComponent ____
@@ -431,9 +432,9 @@
// ================================================================================
-Sequence< ::rtl::OUString > LegendWrapper::getSupportedServiceNames_Static()
+Sequence< OUString > LegendWrapper::getSupportedServiceNames_Static()
{
- Sequence< ::rtl::OUString > aServices( 4 );
+ Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart.ChartLegend";
aServices[ 1 ] = "com.sun.star.drawing.Shape";
aServices[ 2 ] = "com.sun.star.xml.UserDefinedAttributesSupplier";
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index fd25e33..9c3d4a2 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -95,7 +95,7 @@
{
Sequence< Reference< chart2::XFormattedString > > aStrings( xTitle->getText());
- ::rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
for( sal_Int32 i = 0; i < aStrings.getLength(); ++i )
{
aBuf.append( aStrings[ i ]->getString());
@@ -107,7 +107,7 @@
Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPropertyState >&
/*xInnerPropertyState*/ ) const
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
- return uno::makeAny( rtl::OUString() );//default title is a empty String
+ return uno::makeAny( OUString() );//default title is a empty String
}
//-----------------------------------------------------------------------------
@@ -148,7 +148,7 @@
rOutProperties.push_back(
Property( "String",
PROP_TITLE_STRING,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
@@ -261,7 +261,7 @@
OUString SAL_CALL TitleWrapper::getShapeType()
throw (uno::RuntimeException)
{
- return rtl::OUString( "com.sun.star.chart.ChartTitle" );
+ return OUString( "com.sun.star.chart.ChartTitle" );
}
// ____ XComponent ____
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 937cb83..d80169a 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -174,7 +174,7 @@
{
return *StaticUpDownBarWrapperInfo::get();
}
-void SAL_CALL UpDownBarWrapper::setPropertyValue( const ::rtl::OUString& rPropertyName, const
uno::Any& rValue )
+void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any&
rValue )
throw (beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
Reference< beans::XPropertySet > xPropSet(0);
@@ -196,7 +196,7 @@
if(xPropSet.is())
xPropSet->setPropertyValue( rPropertyName, rValue );
}
-uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const ::rtl::OUString& rPropertyName )
+uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyName )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
Any aRet;
@@ -222,22 +222,22 @@
return aRet;
}
-void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const ::rtl::OUString&
/*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
+void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
-void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const ::rtl::OUString&
/*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
+void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
-void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const ::rtl::OUString&
/*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
+void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const
uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
-void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const ::rtl::OUString&
/*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
+void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
OSL_FAIL("not implemented");
@@ -245,13 +245,13 @@
//XMultiPropertySet
//getPropertySetInfo() already declared in XPropertySet
-void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< ::rtl::OUString >&
rNameSeq, const uno::Sequence< uno::Any >& rValueSeq )
+void SAL_CALL UpDownBarWrapper::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] );
@@ -263,7 +263,7 @@
}
//todo: store unknown properties elsewhere
}
-uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const uno::Sequence<
::rtl::OUString >& rNameSeq )
+uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const uno::Sequence<
OUString >& rNameSeq )
throw (uno::RuntimeException)
{
Sequence< Any > aRetSeq;
@@ -272,13 +272,13 @@
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 UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< ::rtl::OUString
& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
+void SAL_CALL UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< OUString >& /*
aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
OSL_FAIL("not implemented");
@@ -288,14 +288,14 @@
{
OSL_FAIL("not implemented");
}
-void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< ::rtl::OUString >&
/* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
+void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< OUString >& /*
aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
//XPropertyState
-beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const ::rtl::OUString&
rPropertyName )
+beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString& rPropertyName )
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
uno::Any aDefault( this->getPropertyDefault( rPropertyName ) );
@@ -306,7 +306,7 @@
return beans::PropertyState_DIRECT_VALUE;
}
-uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStates( const
uno::Sequence< ::rtl::OUString >& rNameSeq )
+uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStates( const
uno::Sequence< OUString >& rNameSeq )
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
Sequence< beans::PropertyState > aRetSeq;
@@ -315,19 +315,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 UpDownBarWrapper::setPropertyToDefault( const ::rtl::OUString& rPropertyName )
+void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const OUString& rPropertyName )
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) );
}
-uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const ::rtl::OUString& rPropertyName )
+uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropertyName )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get();
@@ -345,20 +345,20 @@
const Sequence< beans::Property >& rPropSeq = *StaticUpDownBarWrapperPropertyArray::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 UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< ::rtl::OUString >&
rNameSeq )
+void SAL_CALL UpDownBarWrapper::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 UpDownBarWrapper::getPropertyDefaults( const uno::Sequence<
::rtl::OUString >& rNameSeq )
+uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const uno::Sequence<
OUString >& rNameSeq )
throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
Sequence< Any > aRetSeq;
@@ -367,7 +367,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 );
}
}
@@ -380,10 +380,10 @@
Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 4 );
- aServices[ 0 ] = ::rtl::OUString("com.sun.star.chart.ChartArea");
- aServices[ 1 ] = ::rtl::OUString("com.sun.star.drawing.LineProperties");
- aServices[ 2 ] = ::rtl::OUString("com.sun.star.drawing.FillProperties");
- aServices[ 3 ] = ::rtl::OUString("com.sun.star.xml.UserDefinedAttributesSupplier");
+ aServices[ 0 ] = OUString("com.sun.star.chart.ChartArea");
+ aServices[ 1 ] = OUString("com.sun.star.drawing.LineProperties");
+ aServices[ 2 ] = OUString("com.sun.star.drawing.FillProperties");
+ aServices[ 3 ] = OUString("com.sun.star.xml.UserDefinedAttributesSupplier");
return aServices;
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index 9b5b7f2..67c8f31 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -41,11 +41,11 @@
//-----------------------------------------------------------------------------
WrappedBarPositionProperty_Base::WrappedBarPositionProperty_Base(
- const ::rtl::OUString& rOuterName
- , const ::rtl::OUString& rInnerSequencePropertyName
+ const OUString& rOuterName
+ , const OUString& rInnerSequencePropertyName
, sal_Int32 nDefaultValue
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
- : WrappedDefaultProperty( rOuterName, rtl::OUString(), uno::makeAny( nDefaultValue ) )
+ : WrappedDefaultProperty( rOuterName, OUString(), uno::makeAny( nDefaultValue ) )
, m_nDimensionIndex(0)
, m_nAxisIndex(0)
, m_spChart2ModelContact( spChart2ModelContact )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
index f06c278..327cc7c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
@@ -33,11 +33,11 @@
{
WrappedSeriesAreaOrLineProperty::WrappedSeriesAreaOrLineProperty(
- const rtl::OUString& rOuterName
- , const rtl::OUString& rInnerAreaTypeName
- , const rtl::OUString& rInnerLineTypeName
+ const OUString& rOuterName
+ , const OUString& rInnerAreaTypeName
+ , const OUString& rInnerLineTypeName
, DataSeriesPointWrapper* pDataSeriesPointWrapper )
- : WrappedProperty( rOuterName, rtl::OUString() )
+ : WrappedProperty( rOuterName, OUString() )
, m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
, m_aInnerAreaTypeName( rInnerAreaTypeName )
, m_aInnerLineTypeName( rInnerLineTypeName )
@@ -48,7 +48,7 @@
}
//virtual
-::rtl::OUString WrappedSeriesAreaOrLineProperty::getInnerName() const
+OUString WrappedSeriesAreaOrLineProperty::getInnerName() const
{
if( m_pDataSeriesPointWrapper && !m_pDataSeriesPointWrapper->isSupportingAreaProperties() )
return m_aInnerLineTypeName;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index d68bdc5..53dff54 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -45,7 +45,7 @@
class WrappedSplineProperty : public WrappedProperty
{
public:
- explicit WrappedSplineProperty( const ::rtl::OUString& rOuterName, const ::rtl::OUString&
rInnerName
+ explicit WrappedSplineProperty( const OUString& rOuterName, const OUString& rInnerName
, const ::com::sun::star::uno::Any& rDefaulValue
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
: WrappedProperty(rOuterName,OUString())
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 0e57ea4..88dc00d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -134,7 +134,7 @@
}
void lcl_ConvertRangeFromXML(
- ::rtl::OUString & rInOutRange,
+ OUString & rInOutRange,
::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
if( !rInOutRange.isEmpty())
@@ -143,14 +143,14 @@
lcl_getDataProviderFromContact( spChart2ModelContact ), uno::UNO_QUERY );
if( xConverter.is())
{
- ::rtl::OUString aResult = xConverter->convertRangeFromXML( rInOutRange );
+ OUString aResult = xConverter->convertRangeFromXML( rInOutRange );
rInOutRange = aResult;
}
}
}
void lcl_ConvertRangeToXML(
- ::rtl::OUString & rInOutRange,
+ OUString & rInOutRange,
::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
if( !rInOutRange.isEmpty())
@@ -159,7 +159,7 @@
lcl_getDataProviderFromContact( spChart2ModelContact ), uno::UNO_QUERY );
if( xConverter.is())
{
- ::rtl::OUString aResult = xConverter->convertRangeToXML( rInOutRange );
+ OUString aResult = xConverter->convertRangeToXML( rInOutRange );
rInOutRange = aResult;
}
}
@@ -904,10 +904,10 @@
, tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< Reference< beans::XPropertySet > >(
(ePropertySetType == PROPERTY_SET_TYPE_REGRESSION)
- ? rtl::OUString("DataRegressionProperties")
+ ? OUString("DataRegressionProperties")
: (ePropertySetType == PROPERTY_SET_TYPE_ERROR_BAR)
- ? rtl::OUString("DataErrorProperties")
- : rtl::OUString("DataMeanValueProperties")
+ ? OUString("DataErrorProperties")
+ : OUString("DataMeanValueProperties")
, uno::Any(), spChart2ModelContact, ePropertyType )
, m_eType( ePropertySetType )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 7757d16..76a461a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -45,7 +45,7 @@
class WrappedStockProperty : public WrappedProperty
{
public:
- explicit WrappedStockProperty( const ::rtl::OUString& rOuterName
+ explicit WrappedStockProperty( const OUString& rOuterName
, const ::com::sun::star::uno::Any& rDefaulValue
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedStockProperty();
@@ -56,7 +56,7 @@
::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const
rtl::OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const =
0;
+ virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const
OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const = 0;
protected:
::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -64,10 +64,10 @@
::com::sun::star::uno::Any m_aDefaultValue;
};
-WrappedStockProperty::WrappedStockProperty( const ::rtl::OUString& rOuterName
+WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName
, const ::com::sun::star::uno::Any& rDefaulValue
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
- : WrappedProperty(rOuterName,rtl::OUString())
+ : WrappedProperty(rOuterName,OUString())
, m_spChart2ModelContact(spChart2ModelContact)
, m_aOuterValue()
, m_aDefaultValue(rDefaulValue)
@@ -131,7 +131,7 @@
::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const
rtl::OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const;
+ uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const
OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const;
};
WrappedVolumeProperty::WrappedVolumeProperty( ::boost::shared_ptr< Chart2ModelContact >
spChart2ModelContact )
@@ -169,7 +169,7 @@
return m_aOuterValue;
}
-uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTemplate( sal_Bool
bNewValue, const rtl::OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >&
xFactory ) const
+uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTemplate( sal_Bool
bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >&
xFactory ) const
{
uno::Reference< chart2::XChartTypeTemplate > xTemplate(0);
@@ -204,7 +204,7 @@
::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const
rtl::OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const;
+ uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const
OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const;
};
WrappedUpDownProperty::WrappedUpDownProperty( ::boost::shared_ptr< Chart2ModelContact >
spChart2ModelContact )
: WrappedStockProperty( "UpDown", uno::makeAny(sal_False) , spChart2ModelContact )
@@ -239,7 +239,7 @@
}
return m_aOuterValue;
}
-uno::Reference< chart2::XChartTypeTemplate > WrappedUpDownProperty::getNewTemplate( sal_Bool
bNewValue, const rtl::OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >&
xFactory ) const
+uno::Reference< chart2::XChartTypeTemplate > WrappedUpDownProperty::getNewTemplate( sal_Bool
bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >&
xFactory ) const
{
uno::Reference< chart2::XChartTypeTemplate > xTemplate(0);
if( bNewValue ) //add open series
diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx
b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
index ff88b75..032f0b5 100644
--- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
@@ -31,7 +31,7 @@
RangeSelectionListener::RangeSelectionListener(
RangeSelectionListenerParent & rParent,
- const ::rtl::OUString & rInitialRange,
+ const OUString & rInitialRange,
const Reference< frame::XModel >& xModelToLockController ) :
m_rParent( rParent ),
m_aRange( rInitialRange ),
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 509af56..a218633 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -53,13 +53,13 @@
//-------------------------------------------------------------------------
// lang::XServiceInfo
//-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException)
+OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//-------------------------------------------------------------------------
-::rtl::OUString ChartTypeUnoDlg::getImplementationName_Static() throw(uno::RuntimeException)
+OUString ChartTypeUnoDlg::getImplementationName_Static() throw(uno::RuntimeException)
{
return CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME;
}
@@ -72,9 +72,9 @@
//-------------------------------------------------------------------------
-uno::Sequence< rtl::OUString > ChartTypeUnoDlg::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ChartTypeUnoDlg::getSupportedServiceNames_Static()
{
- uno::Sequence< rtl::OUString > aSNS( 1 );
+ uno::Sequence< OUString > aSNS( 1 );
aSNS.getArray()[ 0 ] = CHART_TYPE_DIALOG_SERVICE_NAME;
return aSNS;
}
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index af14ac4..a13c677 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -336,8 +336,8 @@
// set button text
sal_Unicode cBlackUpPointingTriangle( 0x25b2 );
sal_Unicode cBlackDownPointingTriangle( 0x25bc );
- m_aBTN_UP.SetText( rtl::OUString( cBlackUpPointingTriangle ));
- m_aBTN_DOWN.SetText( rtl::OUString( cBlackDownPointingTriangle ));
+ m_aBTN_UP.SetText( OUString( cBlackUpPointingTriangle ));
+ m_aBTN_DOWN.SetText( OUString( cBlackDownPointingTriangle ));
// init controls
m_aLB_ROLE.SetTabs( lcl_pRoleListBoxTabs, MAP_APPFONT );
@@ -482,7 +482,7 @@
if( nIndex != -1 )
aLabel = String( aResString.replaceAt(
nIndex, aReplacementStr.getLength(),
- rtl::OUString::valueOf(nUnnamedSeriesIndex)));
+ OUString::valueOf(nUnnamedSeriesIndex)));
}
if( aLabel.Len() == 0 )
aLabel = String( ::chart::SchResId( STR_DATA_UNNAMED_SERIES ));
@@ -834,7 +834,7 @@
}
void DataSourceTabPage::listeningFinished(
- const ::rtl::OUString & rNewRange )
+ const OUString & rNewRange )
{
// rNewRange becomes invalid after removing the listener
OUString aRange( rNewRange );
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx
b/chart2/source/controller/main/ChartController_Insert.cxx
index cd42430..8c7c733 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -496,7 +496,7 @@
aItemConverter.FillItemSet( aItemSet );
ObjectPropertiesDialogParameter aDialogParameter = ObjectPropertiesDialogParameter(
ObjectIdentifier::createClassifiedIdentifierWithParent(
- objType, ::rtl::OUString(), m_aSelection.getSelectedCID()));
+ objType, OUString(), m_aSelection.getSelectedCID()));
aDialogParameter.init( getModel() );
ViewElementListProvider aViewElementListProvider( m_pDrawModelWrapper.get());
SolarMutexGuard aGuard;
@@ -543,7 +543,7 @@
bYError ? ErrorBarResources::ERROR_BAR_Y : ErrorBarResources::ERROR_BAR_X);
aDlg.SetAxisMinorStepWidthForErrorBarDecimals(
- InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals( getModel(),
m_xChartView, rtl::OUString() ) );
+ InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals( getModel(),
m_xChartView, OUString() ) );
if( aDlg.Execute() == RET_OK )
{
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx
b/chart2/source/controller/main/ChartController_Properties.cxx
index d78a5d7..145e7e3 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -76,7 +76,7 @@
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::comphelper::ItemConverter* createItemConverter(
- const ::rtl::OUString & aObjectCID
+ const OUString & aObjectCID
, const uno::Reference< frame::XModel > & xChartModel
, const uno::Reference< uno::XComponentContext > & xContext
, SdrModel & rDrawModel
@@ -96,7 +96,7 @@
return NULL;
}
- rtl::OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID );
+ OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID );
bool bAffectsMultipleObjects = aParticleID == "ALLELEMENTS";
//-------------------------------------------------------------
if( !bAffectsMultipleObjects )
@@ -317,7 +317,7 @@
}
SAL_WNODEPRECATED_DECLARATIONS_POP
-rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand, const
uno::Reference< frame::XModel > & xChartModel )
+OUString lcl_getTitleCIDForCommand( const OString& rDispatchCommand, const uno::Reference<
frame::XModel > & xChartModel )
{
if( rDispatchCommand.equals("AllTitles"))
return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_TITLE, "ALLELEMENTS" );
@@ -340,7 +340,7 @@
return ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel );
}
-rtl::OUString lcl_getAxisCIDForCommand( const ::rtl::OString& rDispatchCommand, const
uno::Reference< frame::XModel >& xChartModel )
+OUString lcl_getAxisCIDForCommand( const OString& rDispatchCommand, const uno::Reference<
frame::XModel >& xChartModel )
{
if( rDispatchCommand.equals("DiagramAxisAll"))
return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_AXIS, "ALLELEMENTS" );
@@ -373,7 +373,7 @@
return ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, xChartModel );
}
-rtl::OUString lcl_getGridCIDForCommand( const ::rtl::OString& rDispatchCommand, const
uno::Reference< frame::XModel >& xChartModel )
+OUString lcl_getGridCIDForCommand( const OString& rDispatchCommand, const uno::Reference<
frame::XModel >& xChartModel )
{
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
@@ -414,22 +414,22 @@
uno::Reference< XAxis > xAxis( AxisHelper::getAxis( nDimensionIndex, bMainAxis, xDiagram ) );
sal_Int32 nSubGridIndex= bMainGrid ? (-1) : 0;
- rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel,
nSubGridIndex ) );
+ OUString aCID( ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel,
nSubGridIndex ) );
return aCID;
}
-rtl::OUString lcl_getErrorCIDForCommand( const ObjectType eDispatchType, const ObjectType
&eSelectedType, const ::rtl::OUString &rSelectedCID)
+OUString lcl_getErrorCIDForCommand( const ObjectType eDispatchType, const ObjectType
&eSelectedType, const OUString &rSelectedCID)
{
if( eSelectedType == eDispatchType )
return rSelectedCID;
- return ObjectIdentifier::createClassifiedIdentifierWithParent( eDispatchType,
::rtl::OUString(), rSelectedCID );
+ return ObjectIdentifier::createClassifiedIdentifierWithParent( eDispatchType, OUString(),
rSelectedCID );
}
-rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand, const
uno::Reference< XChartDocument > & xChartDocument, const rtl::OUString& rSelectedCID )
+OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno::Reference<
XChartDocument > & xChartDocument, const OUString& rSelectedCID )
{
ObjectType eObjectType = OBJECTTYPE_UNKNOWN;
- rtl::OUString aParticleID;
+ OUString aParticleID;
uno::Reference< frame::XModel > xChartModel( xChartDocument, uno::UNO_QUERY );
const ObjectType eSelectedType = ObjectIdentifier::getObjectType( rSelectedCID );
@@ -523,7 +523,7 @@
return rSelectedCID;
else
return ObjectIdentifier::createClassifiedIdentifierWithParent(
- OBJECTTYPE_DATA_LABELS, ::rtl::OUString(), rSelectedCID );
+ OBJECTTYPE_DATA_LABELS, OUString(), rSelectedCID );
}
//-------------------------------------------------------------------------
//data labels
@@ -540,7 +540,7 @@
OUString aChildParticle( ObjectIdentifier::getStringForType(
OBJECTTYPE_DATA_LABELS ) + "=" );
OUString aLabelsCID = ObjectIdentifier::createClassifiedIdentifierForParticles(
aSeriesParticle, aChildParticle );
OUString aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent(
- OBJECTTYPE_DATA_LABEL, ::rtl::OUString(), aLabelsCID );
+ OBJECTTYPE_DATA_LABEL, OUString(), aLabelsCID );
return ObjectIdentifier::createPointCID( aLabelCID_Stub, nPointIndex );
}
@@ -645,7 +645,7 @@
if( eSelectedType == OBJECTTYPE_DATA_STOCK_LOSS )
return rSelectedCID;
else
- return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_LOSS,
rtl::OUString());
+ return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_LOSS,
OUString());
}
//-------------------------------------------------------------------------
// stock gain
@@ -654,7 +654,7 @@
if( eSelectedType == OBJECTTYPE_DATA_STOCK_GAIN )
return rSelectedCID;
else
- return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_GAIN,
rtl::OUString() );
+ return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_GAIN,
OUString() );
}
return ObjectIdentifier::createClassifiedIdentifier(
@@ -664,11 +664,11 @@
}
// anonymous namespace
-void SAL_CALL ChartController::executeDispatch_FormatObject(const ::rtl::OUString&
rDispatchCommand)
+void SAL_CALL ChartController::executeDispatch_FormatObject(const OUString& rDispatchCommand)
{
uno::Reference< XChartDocument > xChartDocument( getModel(), uno::UNO_QUERY );
- rtl::OString aCommand( rtl::OUStringToOString( rDispatchCommand, RTL_TEXTENCODING_ASCII_US ) );
- rtl::OUString rObjectCID = lcl_getObjectCIDForCommand( aCommand, xChartDocument,
m_aSelection.getSelectedCID() );
+ OString aCommand( OUStringToOString( rDispatchCommand, RTL_TEXTENCODING_ASCII_US ) );
+ OUString rObjectCID = lcl_getObjectCIDForCommand( aCommand, xChartDocument,
m_aSelection.getSelectedCID() );
executeDlg_ObjectProperties( rObjectCID );
}
@@ -680,9 +680,9 @@
namespace
{
-rtl::OUString lcl_getFormatCIDforSelectedCID( const ::rtl::OUString& rSelectedCID )
+OUString lcl_getFormatCIDforSelectedCID( const OUString& rSelectedCID )
{
- ::rtl::OUString aFormatCID(rSelectedCID);
+ OUString aFormatCID(rSelectedCID);
//get type of selected object
ObjectType eObjectType = ObjectIdentifier::getObjectType( aFormatCID );
@@ -690,22 +690,22 @@
// some legend entries are handled as if they were data series
if( OBJECTTYPE_LEGEND_ENTRY==eObjectType )
{
- rtl::OUString aParentParticle( ObjectIdentifier::getFullParentParticle( rSelectedCID ) );
+ OUString aParentParticle( ObjectIdentifier::getFullParentParticle( rSelectedCID ) );
aFormatCID = ObjectIdentifier::createClassifiedIdentifierForParticle( aParentParticle );
}
// treat diagram as wall
if( OBJECTTYPE_DIAGRAM==eObjectType )
- aFormatCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL,
rtl::OUString() );
+ aFormatCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL,
OUString() );
return aFormatCID;
}
}//end anonymous namespace
-void SAL_CALL ChartController::executeDlg_ObjectProperties( const ::rtl::OUString&
rSelectedObjectCID )
+void SAL_CALL ChartController::executeDlg_ObjectProperties( const OUString& rSelectedObjectCID )
{
- rtl::OUString aObjectCID = lcl_getFormatCIDforSelectedCID( rSelectedObjectCID );
+ OUString aObjectCID = lcl_getFormatCIDforSelectedCID( rSelectedObjectCID );
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::FORMAT,
@@ -717,7 +717,7 @@
aUndoGuard.commit();
}
-bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl::OUString&
rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso )
+bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUString& rObjectCID,
bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso )
{
//return true if the properties were changed successfully
bool bRet = false;
--
To view, visit https://gerrit.libreoffice.org/2475
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67a5952afd305adeb07f728c9074620ecba8e9fc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ádám Király <kiraly.adam.csaba@gmail.com>
Context
- [PATCH] Replace rtl::O(U)String with O(U)String · 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.