summaryrefslogtreecommitdiff
path: root/framework/source/classes
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /framework/source/classes
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'framework/source/classes')
-rw-r--r--framework/source/classes/droptargetlistener.cxx2
-rw-r--r--framework/source/classes/framecontainer.cxx4
-rw-r--r--framework/source/classes/fwktabwindow.cxx14
-rw-r--r--framework/source/classes/taskcreator.cxx14
4 files changed, 17 insertions, 17 deletions
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index 74c31dc93fbe..66e272b18bef 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -198,7 +198,7 @@ sal_Bool DropTargetListener::implts_IsDropFormatSupported( SotFormatStringId nFo
void DropTargetListener::implts_OpenFile( const String& rFilePath )
{
- rtl::OUString aFileURL;
+ OUString aFileURL;
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFilePath, aFileURL ) )
aFileURL = rFilePath;
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index 78a9c1783d54..9ca00ea7ae44 100644
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -287,7 +287,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::getActive() const
@threadsafe yes
*****************************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens( const ::rtl::OUString& sName ) const
+css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens( const OUString& sName ) const
{
/* SAFE { */
ReadGuard aReadLock( m_aLock );
@@ -325,7 +325,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens(
@threadsafe yes
*****************************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnDirectChildrens( const ::rtl::OUString& sName ) const
+css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnDirectChildrens( const OUString& sName ) const
{
/* SAFE { */
ReadGuard aReadLock( m_aLock );
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index a9b2aaa6d6ab..5ca707a083b0 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -70,7 +70,7 @@ void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
// class FwkTabPage ------------------------------------------------
FwkTabPage::FwkTabPage(
- Window* pParent, const rtl::OUString& rPageURL,
+ Window* pParent, const OUString& rPageURL,
const css::uno::Reference< css::awt::XContainerWindowEventHandler >& rEventHdl,
const css::uno::Reference< css::awt::XContainerWindowProvider >& rProvider ) :
@@ -104,7 +104,7 @@ void FwkTabPage::CreateDialog()
uno::Reference< awt::XWindowPeer > xParent( VCLUnoHelper::GetInterface( this ), uno::UNO_QUERY );
m_xPage = uno::Reference < awt::XWindow >(
m_xWinProvider->createContainerWindow(
- m_sPageURL, rtl::OUString(), xParent, xHandler ), uno::UNO_QUERY );
+ m_sPageURL, OUString(), xParent, xHandler ), uno::UNO_QUERY );
uno::Reference< awt::XControl > xPageControl( m_xPage, uno::UNO_QUERY );
if ( xPageControl.is() )
@@ -118,7 +118,7 @@ void FwkTabPage::CreateDialog()
}
}
- CallMethod( rtl::OUString(INITIALIZE_METHOD) );
+ CallMethod( OUString(INITIALIZE_METHOD) );
}
catch ( const lang::IllegalArgumentException& )
{
@@ -132,14 +132,14 @@ void FwkTabPage::CreateDialog()
// -----------------------------------------------------------------------
-sal_Bool FwkTabPage::CallMethod( const rtl::OUString& rMethod )
+sal_Bool FwkTabPage::CallMethod( const OUString& rMethod )
{
sal_Bool bRet = sal_False;
if ( m_xEventHdl.is() )
{
try
{
- bRet = m_xEventHdl->callHandlerMethod( m_xPage, uno::makeAny( rMethod ), rtl::OUString(EXTERNAL_EVENT) );
+ bRet = m_xEventHdl->callHandlerMethod( m_xPage, uno::makeAny( rMethod ), OUString(EXTERNAL_EVENT) );
}
catch ( const uno::Exception& )
{
@@ -317,7 +317,7 @@ void FwkTabWindow::RemoveEventListener( const Link& rEventListener )
FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< beans::NamedValue >& rProperties )
{
- ::rtl::OUString sTitle, sToolTip, sPageURL;
+ OUString sTitle, sToolTip, sPageURL;
uno::Reference< css::awt::XContainerWindowEventHandler > xEventHdl;
uno::Reference< graphic::XGraphic > xImage;
bool bDisabled = false;
@@ -326,7 +326,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
for ( i = 0; i < nLen; ++i )
{
beans::NamedValue aValue = rProperties[i];
- ::rtl::OUString sName = aValue.Name;
+ OUString sName = aValue.Name;
if ( sName == "Title" )
aValue.Value >>= sTitle;
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 1d1c8a5a169d..dbbc8d3899f5 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -58,7 +58,7 @@ TaskCreator::~TaskCreator()
/*-****************************************************************************************************//**
TODO document me
*//*-*****************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::OUString& sName ,
+css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUString& sName ,
sal_Bool bVisible )
{
/* SAFE { */
@@ -68,7 +68,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::
/* } SAFE */
css::uno::Reference< css::lang::XSingleServiceFactory > xCreator;
- ::rtl::OUString sCreator = IMPLEMENTATIONNAME_FWK_TASKCREATOR;
+ OUString sCreator = IMPLEMENTATIONNAME_FWK_TASKCREATOR;
try
{
@@ -102,23 +102,23 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::
css::uno::Sequence< css::uno::Any > lArgs(5);
css::beans::NamedValue aArg ;
- aArg.Name = rtl::OUString(ARGUMENT_PARENTFRAME);
+ aArg.Name = OUString(ARGUMENT_PARENTFRAME);
aArg.Value <<= css::uno::Reference< css::frame::XFrame >( css::frame::Desktop::create( comphelper::getComponentContext(xSMGR) ), css::uno::UNO_QUERY_THROW);
lArgs[0] <<= aArg;
- aArg.Name = rtl::OUString(ARGUMENT_CREATETOPWINDOW);
+ aArg.Name = OUString(ARGUMENT_CREATETOPWINDOW);
aArg.Value <<= sal_True;
lArgs[1] <<= aArg;
- aArg.Name = rtl::OUString(ARGUMENT_MAKEVISIBLE);
+ aArg.Name = OUString(ARGUMENT_MAKEVISIBLE);
aArg.Value <<= bVisible;
lArgs[2] <<= aArg;
- aArg.Name = rtl::OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE);
+ aArg.Name = OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE);
aArg.Value <<= sal_True;
lArgs[3] <<= aArg;
- aArg.Name = rtl::OUString(ARGUMENT_FRAMENAME);
+ aArg.Name = OUString(ARGUMENT_FRAMENAME);
aArg.Value <<= sName;
lArgs[4] <<= aArg;