summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sidebar/ContextChangeBroadcaster.hxx10
-rw-r--r--sfx2/source/appl/shutdowniconaqua.mm42
-rw-r--r--sfx2/source/control/emojiview.cxx6
-rw-r--r--sfx2/source/control/shell.cxx2
-rw-r--r--sfx2/source/sidebar/Context.cxx4
-rw-r--r--sfx2/source/sidebar/ContextChangeBroadcaster.cxx7
-rw-r--r--sfx2/source/sidebar/ContextList.cxx2
-rw-r--r--sfx2/source/sidebar/ControllerFactory.cxx1
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx14
-rw-r--r--sfx2/source/sidebar/SidebarPanelBase.cxx6
-rw-r--r--sfx2/source/sidebar/Theme.cxx20
-rw-r--r--sfx2/source/sidebar/Tools.cxx16
12 files changed, 63 insertions, 67 deletions
diff --git a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
index 457729720bdc..bf4d6d41847b 100644
--- a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
+++ b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
@@ -34,7 +34,7 @@ public:
ContextChangeBroadcaster();
~ContextChangeBroadcaster();
- void Initialize (const ::rtl::OUString& rsContextName);
+ void Initialize (const OUString& rsContextName);
void Activate (const css::uno::Reference<css::frame::XFrame>& rxFrame);
void Deactivate (const css::uno::Reference<css::frame::XFrame>& rxFrame);
@@ -48,14 +48,14 @@ public:
bool SetBroadcasterEnabled (const bool bIsEnabled);
private:
- rtl::OUString msContextName;
+ OUString msContextName;
bool mbIsBroadcasterEnabled;
void BroadcastContextChange (
const css::uno::Reference<css::frame::XFrame>& rxFrame,
- const ::rtl::OUString& rsModuleName,
- const ::rtl::OUString& rsContextName);
- static ::rtl::OUString GetModuleName (
+ const OUString& rsModuleName,
+ const OUString& rsContextName);
+ static OUString GetModuleName (
const css::uno::Reference<css::frame::XFrame>& rxFrame);
};
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 582b403ebecb..189910f59864 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -116,17 +116,17 @@ static QSMenuExecute* pExecute = nil;
static std::set< OUString > aShortcuts;
-static NSString* getAutoreleasedString( const rtl::OUString& rStr )
+static NSString* getAutoreleasedString( const OUString& rStr )
{
return [[[NSString alloc] initWithCharacters: reinterpret_cast<unichar const *>(rStr.getStr()) length: rStr.getLength()] autorelease];
}
struct RecentMenuEntry
{
- rtl::OUString aURL;
- rtl::OUString aFilter;
- rtl::OUString aTitle;
- rtl::OUString aPassword;
+ OUString aURL;
+ OUString aFilter;
+ OUString aTitle;
+ OUString aPassword;
};
class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStringWidth >
@@ -135,7 +135,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
RecentFilesStringLength() {}
// XStringWidth
- sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString ) override
+ sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) override
{
return aString.getLength();
}
@@ -208,15 +208,15 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
// insert new recent items
for ( std::vector<RecentMenuEntry>::size_type i = 0; i < m_pRecentFilesItems->size(); i++ )
{
- rtl::OUString aMenuTitle;
+ OUString aMenuTitle;
INetURLObject aURL( (*m_pRecentFilesItems)[i].aURL );
if ( aURL.GetProtocol() == INetProtocol::File )
{
// Do handle file URL differently => convert it to a system
// path and abbreviate it with a special function:
- ::rtl::OUString aSystemPath( aURL.getFSysPath( FSysStyle::Detect ) );
- ::rtl::OUString aCompactedSystemPath;
+ OUString aSystemPath( aURL.getFSysPath( FSysStyle::Detect ) );
+ OUString aCompactedSystemPath;
oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, nullptr );
if ( !nError )
@@ -258,11 +258,11 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
aArgsList[1].Name = "AsTemplate";
aArgsList[1].Value <<= false;
- ::rtl::OUString aFilter( rRecentFile.aFilter );
+ OUString aFilter( rRecentFile.aFilter );
sal_Int32 nPos = aFilter.indexOf( '|' );
if ( nPos >= 0 )
{
- rtl::OUString aFilterOptions;
+ OUString aFilterOptions;
if ( nPos < ( aFilter.getLength() - 1 ) )
aFilterOptions = aFilter.copy( nPos+1 );
@@ -284,13 +284,13 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
static RecentMenuDelegate* pRecentDelegate = nil;
-static rtl::OUString getShortCut( const rtl::OUString& i_rTitle )
+static OUString getShortCut( const OUString& i_rTitle )
{
// create shortcut
- rtl::OUString aKeyEquiv;
+ OUString aKeyEquiv;
for( sal_Int32 nIndex = 0; nIndex < i_rTitle.getLength(); nIndex++ )
{
- rtl::OUString aShortcut( i_rTitle.copy( nIndex, 1 ).toAsciiLowerCase() );
+ OUString aShortcut( i_rTitle.copy( nIndex, 1 ).toAsciiLowerCase() );
if( aShortcuts.find( aShortcut ) == aShortcuts.end() )
{
aShortcuts.insert( aShortcut );
@@ -302,7 +302,7 @@ static rtl::OUString getShortCut( const rtl::OUString& i_rTitle )
return aKeyEquiv;
}
-static void appendMenuItem( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const rtl::OUString& i_rTitle, int i_nTag, const rtl::OUString& i_rKeyEquiv )
+static void appendMenuItem( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUString& i_rTitle, int i_nTag, const OUString& i_rKeyEquiv )
{
if( ! i_rTitle.getLength() )
return;
@@ -406,14 +406,14 @@ void aqua_init_systray()
// collect the URLs of the entries in the File/New menu
SvtModuleOptions aModuleOptions;
- std::set< rtl::OUString > aFileNewAppsAvailable;
+ std::set< OUString > aFileNewAppsAvailable;
SvtDynamicMenuOptions aOpt;
css::uno::Sequence < css::uno::Sequence < css::beans::PropertyValue > > aNewMenu = aOpt.GetMenu( EDynamicMenuType::NewMenu );
for ( auto const & newMenuProp : aNewMenu )
{
comphelper::SequenceAsHashMap aEntryItems( newMenuProp );
- rtl::OUString sURL( aEntryItems.getUnpackedValueOrDefault( "URL", rtl::OUString() ) );
+ OUString sURL( aEntryItems.getUnpackedValueOrDefault( "URL", OUString() ) );
if ( sURL.getLength() )
aFileNewAppsAvailable.insert( sURL );
}
@@ -452,14 +452,14 @@ void aqua_init_systray()
// the complete application is not even installed
continue;
- rtl::OUString sURL( ::rtl::OUString::createFromAscii( aMenuItems[i].pAsciiURLDescription ) );
+ OUString sURL( OUString::createFromAscii( aMenuItems[i].pAsciiURLDescription ) );
if ( aFileNewAppsAvailable.find( sURL ) == aFileNewAppsAvailable.end() )
// the application is installed, but the entry has been configured to *not* appear in the File/New
// menu => also let not appear it in the quickstarter
continue;
- rtl::OUString aKeyEquiv( getShortCut( ShutdownIcon::GetUrlDescription( sURL ) ) );
+ OUString aKeyEquiv( getShortCut( ShutdownIcon::GetUrlDescription( sURL ) ) );
appendMenuItem( pMenu, pDockMenu, ShutdownIcon::GetUrlDescription( sURL ), aMenuItems[i].nMenuTag, aKeyEquiv );
}
@@ -469,8 +469,8 @@ void aqua_init_systray()
// add recent menu
appendRecentMenu( pMenu, pDockMenu, SfxResId(STR_QUICKSTART_RECENTDOC) );
- rtl::OUString aTitle( SfxResId(STR_QUICKSTART_FROMTEMPLATE) );
- rtl::OUString aKeyEquiv( getShortCut( aTitle ) );
+ OUString aTitle( SfxResId(STR_QUICKSTART_FROMTEMPLATE) );
+ OUString aKeyEquiv( getShortCut( aTitle ) );
appendMenuItem( pMenu, pDockMenu, aTitle, MI_TEMPLATE, aKeyEquiv );
aTitle = SfxResId(STR_QUICKSTART_FILEOPEN);
aKeyEquiv = getShortCut( aTitle );
diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx
index f0003cc1ebad..79bb1b0a000f 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -133,15 +133,15 @@ void EmojiView::Populate()
// get values of parameters in AppendItem() function
if(emojiParam == "unicode")
{
- sTitle = rtl::OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
+ sTitle = OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
}
else if(emojiParam == "category")
{
- sCategory = rtl::OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
+ sCategory = OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
}
else if(emojiParam == "name")
{
- sName = rtl::OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
+ sName = OStringToOUString(OString( prop.string_value().get(), prop.string_value().size() ), RTL_TEXTENCODING_UTF8);
}
else if(emojiParam == "duplicate")
{
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index c7a7731ba5c7..a5f942cbb935 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -694,7 +694,7 @@ void SfxShell::ApplyItemSet( sal_uInt16, const SfxItemSet& )
{
}
-void SfxShell::SetContextName (const ::rtl::OUString& rsContextName)
+void SfxShell::SetContextName (const OUString& rsContextName)
{
pImpl->maContextChangeBroadcaster.Initialize(rsContextName);
}
diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx
index b263f3e0bfcf..2452dd63aeb0 100644
--- a/sfx2/source/sidebar/Context.cxx
+++ b/sfx2/source/sidebar/Context.cxx
@@ -36,8 +36,8 @@ Context::Context()
}
Context::Context (
- const ::rtl::OUString& rsApplication,
- const ::rtl::OUString& rsContext)
+ const OUString& rsApplication,
+ const OUString& rsContext)
: msApplication(rsApplication),
msContext(rsContext)
{
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index bdbf62defb36..716cb84fcfc4 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -24,7 +24,6 @@
#include <osl/diagnose.h>
#include <comphelper/processfactory.hxx>
-using ::rtl::OUString;
using namespace css;
using namespace css::uno;
@@ -40,7 +39,7 @@ ContextChangeBroadcaster::~ContextChangeBroadcaster()
{
}
-void ContextChangeBroadcaster::Initialize (const ::rtl::OUString& rsContextName)
+void ContextChangeBroadcaster::Initialize (const OUString& rsContextName)
{
msContextName = rsContextName;
}
@@ -71,8 +70,8 @@ bool ContextChangeBroadcaster::SetBroadcasterEnabled (const bool bIsEnabled)
void ContextChangeBroadcaster::BroadcastContextChange (
const css::uno::Reference<css::frame::XFrame>& rxFrame,
- const ::rtl::OUString& rsModuleName,
- const ::rtl::OUString& rsContextName)
+ const OUString& rsModuleName,
+ const OUString& rsContextName)
{
if ( ! mbIsBroadcasterEnabled)
return;
diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx
index 12a21ca43de9..d6148191431d 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -19,8 +19,6 @@
#include <sfx2/sidebar/ContextList.hxx>
#include <sfx2/sidebar/Context.hxx>
-using ::rtl::OUString;
-
namespace sfx2 { namespace sidebar {
ContextList::ContextList()
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx
index ce1910784fd7..e96d4cff6b2d 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -33,7 +33,6 @@
using namespace css;
using namespace css::uno;
-using ::rtl::OUString;
namespace sfx2 { namespace sidebar {
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 198f136922c4..f39ed4e7d945 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -94,7 +94,7 @@ SidebarController::SidebarController (
mpTabBar(VclPtr<TabBar>::Create(
mpParentWindow,
rxFrame,
- [this](const ::rtl::OUString& rsDeckId) { return this->OpenThenToggleDeck(rsDeckId); },
+ [this](const OUString& rsDeckId) { return this->OpenThenToggleDeck(rsDeckId); },
[this](const tools::Rectangle& rButtonBox,const ::std::vector<TabBar::DeckMenuData>& rMenuData) { return this->ShowPopupMenu(rButtonBox,rMenuData); },
this)),
mxFrame(rxFrame),
@@ -581,7 +581,7 @@ void SidebarController::SwitchToDefaultDeck()
}
void SidebarController::SwitchToDeck (
- const ::rtl::OUString& rsDeckId)
+ const OUString& rsDeckId)
{
if ( msCurrentDeckId != rsDeckId
|| ! mbIsDeckOpen
@@ -594,11 +594,11 @@ void SidebarController::SwitchToDeck (
}
}
-void SidebarController::CreateDeck(const ::rtl::OUString& rDeckId) {
+void SidebarController::CreateDeck(const OUString& rDeckId) {
CreateDeck(rDeckId, maCurrentContext);
}
-void SidebarController::CreateDeck(const ::rtl::OUString& rDeckId, const Context& rContext, bool bForceCreate)
+void SidebarController::CreateDeck(const OUString& rDeckId, const Context& rContext, bool bForceCreate)
{
std::shared_ptr<DeckDescriptor> xDeckDescriptor = mpResourceManager->GetDeckDescriptor(rDeckId);
@@ -620,7 +620,7 @@ void SidebarController::CreateDeck(const ::rtl::OUString& rDeckId, const Context
}
}
-void SidebarController::CreatePanels(const ::rtl::OUString& rDeckId, const Context& rContext)
+void SidebarController::CreatePanels(const OUString& rDeckId, const Context& rContext)
{
std::shared_ptr<DeckDescriptor> xDeckDescriptor = mpResourceManager->GetDeckDescriptor(rDeckId);
@@ -854,7 +854,7 @@ VclPtr<Panel> SidebarController::CreatePanel (
Reference<ui::XUIElement> SidebarController::CreateUIElement (
const Reference<awt::XWindowPeer>& rxWindow,
- const ::rtl::OUString& rsImplementationURL,
+ const OUString& rsImplementationURL,
const bool bWantsCanvas,
const Context& rContext)
{
@@ -1348,7 +1348,7 @@ ResourceManager::DeckContextDescriptorContainer SidebarController::GetMatchingDe
return aDecks;
}
-ResourceManager::PanelContextDescriptorContainer SidebarController::GetMatchingPanels(const ::rtl::OUString& rDeckId)
+ResourceManager::PanelContextDescriptorContainer SidebarController::GetMatchingPanels(const OUString& rDeckId)
{
ResourceManager::PanelContextDescriptorContainer aPanels;
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 7d0687462122..0906dc962d57 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -34,7 +34,7 @@ using namespace css::uno;
namespace sfx2 { namespace sidebar {
Reference<ui::XUIElement> SidebarPanelBase::Create (
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
vcl::Window* pWindow,
const css::ui::LayoutSize& rLayoutSize)
@@ -49,7 +49,7 @@ Reference<ui::XUIElement> SidebarPanelBase::Create (
}
SidebarPanelBase::SidebarPanelBase (
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
vcl::Window* pWindow,
const css::ui::LayoutSize& rLayoutSize)
@@ -118,7 +118,7 @@ css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame()
return mxFrame;
}
-::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL()
+OUString SAL_CALL SidebarPanelBase::getResourceURL()
{
return msResourceURL;
}
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index e793c4c77e00..a6587a493a50 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -384,7 +384,7 @@ Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo()
}
void SAL_CALL Theme::setPropertyValue (
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Any& rValue)
{
PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
@@ -427,7 +427,7 @@ void SAL_CALL Theme::setPropertyValue (
}
Any SAL_CALL Theme::getPropertyValue (
- const ::rtl::OUString& rsPropertyName)
+ const OUString& rsPropertyName)
{
PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
if (iId == maPropertyNameToIdMap.end())
@@ -443,7 +443,7 @@ Any SAL_CALL Theme::getPropertyValue (
}
void SAL_CALL Theme::addPropertyChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
{
ThemeItem eItem (AnyItem_);
@@ -465,7 +465,7 @@ void SAL_CALL Theme::addPropertyChangeListener(
}
void SAL_CALL Theme::removePropertyChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
{
ThemeItem eItem (AnyItem_);
@@ -497,7 +497,7 @@ void SAL_CALL Theme::removePropertyChangeListener(
}
void SAL_CALL Theme::addVetoableChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
{
ThemeItem eItem (AnyItem_);
@@ -519,7 +519,7 @@ void SAL_CALL Theme::addVetoableChangeListener(
}
void SAL_CALL Theme::removeVetoableChangeListener(
- const ::rtl::OUString& rsPropertyName,
+ const OUString& rsPropertyName,
const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
{
ThemeItem eItem (AnyItem_);
@@ -574,7 +574,7 @@ css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties()
aProperties.size());
}
-beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsPropertyName)
+beans::Property SAL_CALL Theme::getPropertyByName (const OUString& rsPropertyName)
{
PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
if (iId == maPropertyNameToIdMap.end())
@@ -593,7 +593,7 @@ beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsProp
0);
}
-sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyName)
+sal_Bool SAL_CALL Theme::hasPropertyByName (const OUString& rsPropertyName)
{
PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
if (iId == maPropertyNameToIdMap.end())
@@ -846,7 +846,7 @@ css::uno::Type const & Theme::GetCppuType (const PropertyType eType)
switch(eType)
{
case PT_Image:
- return cppu::UnoType<rtl::OUString>::get();
+ return cppu::UnoType<OUString>::get();
case PT_Color:
return cppu::UnoType<sal_uInt32>::get();
@@ -989,7 +989,7 @@ void Theme::ProcessNewValue (
{
case PT_Image:
{
- ::rtl::OUString sURL;
+ OUString sURL;
if (rValue >>= sURL)
{
maImages[nIndex] = Tools::GetImage(sURL, nullptr);
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index a21b7414c61a..0f0f596f936d 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -37,8 +37,8 @@ using namespace css::uno;
namespace sfx2 { namespace sidebar {
Image Tools::GetImage (
- const ::rtl::OUString& rsImageURL,
- const ::rtl::OUString& rsHighContrastImageURL,
+ const OUString& rsImageURL,
+ const OUString& rsHighContrastImageURL,
const Reference<frame::XFrame>& rxFrame)
{
if (Theme::IsHighContrastMode())
@@ -48,7 +48,7 @@ Image Tools::GetImage (
}
Image Tools::GetImage (
- const ::rtl::OUString& rsURL,
+ const OUString& rsURL,
const Reference<frame::XFrame>& rxFrame)
{
if (rsURL.getLength() > 0)
@@ -98,7 +98,7 @@ Gradient Tools::AwtToVclGradient (const css::awt::Gradient& rAwtGradient)
return aVclGradient;
}
-util::URL Tools::GetURL (const ::rtl::OUString& rsCommand)
+util::URL Tools::GetURL (const OUString& rsCommand)
{
util::URL aURL;
aURL.Complete = rsCommand;
@@ -115,15 +115,15 @@ Reference<frame::XDispatch> Tools::GetDispatch (
const util::URL& rURL)
{
Reference<frame::XDispatchProvider> xProvider (rxFrame, UNO_QUERY_THROW);
- Reference<frame::XDispatch> xDispatch (xProvider->queryDispatch(rURL, ::rtl::OUString(), 0));
+ Reference<frame::XDispatch> xDispatch (xProvider->queryDispatch(rURL, OUString(), 0));
return xDispatch;
}
-::rtl::OUString Tools::GetModuleName (
+OUString Tools::GetModuleName (
const css::uno::Reference<css::frame::XController>& rxController)
{
if (!rxController.is())
- return ::rtl::OUString();
+ return OUString();
try
{
@@ -135,7 +135,7 @@ Reference<frame::XDispatch> Tools::GetDispatch (
{
// Ignored.
}
- return ::rtl::OUString();
+ return OUString();
}
} } // end of namespace sfx2::sidebar