summaryrefslogtreecommitdiff
path: root/framework/source/fwe
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/fwe')
-rw-r--r--framework/source/fwe/classes/framelistanalyzer.cxx4
-rw-r--r--framework/source/fwe/classes/sfxhelperfunctions.cxx10
-rw-r--r--framework/source/fwe/dispatch/interaction.cxx26
-rw-r--r--framework/source/fwe/helper/actiontriggerhelper.cxx1
-rw-r--r--framework/source/fwe/helper/configimporter.cxx4
-rw-r--r--framework/source/fwe/helper/imageproducer.cxx2
-rw-r--r--framework/source/fwe/helper/propertysetcontainer.cxx1
-rw-r--r--framework/source/fwe/xml/menuconfiguration.cxx2
8 files changed, 24 insertions, 26 deletions
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index f5b6a05fec25..c291e42bc81c 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -125,7 +125,7 @@ void FrameListAnalyzer::impl_analyze()
{
css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
css::uno::Reference< css::frame::XModuleManager2 > xModuleMgr = css::frame::ModuleManager::create(xContext);
- ::rtl::OUString sModule = xModuleMgr->identify(m_xReferenceFrame);
+ OUString sModule = xModuleMgr->identify(m_xReferenceFrame);
m_bReferenceIsBacking = sModule.equals("com.sun.star.frame.StartModule");
}
catch(const css::frame::UnknownModuleException&)
@@ -200,7 +200,7 @@ void FrameListAnalyzer::impl_analyze()
{
css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
css::uno::Reference< css::frame::XModuleManager2 > xModuleMgr = css::frame::ModuleManager::create(xContext);
- ::rtl::OUString sModule = xModuleMgr->identify(xFrame);
+ OUString sModule = xModuleMgr->identify(xFrame);
if (sModule.equals("com.sun.star.frame.StartModule"))
{
m_xBackingComponent = xFrame;
diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index 73f2c3ec3b7d..9ba7fabf5a1e 100644
--- a/framework/source/fwe/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -45,7 +45,7 @@ pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_se
return pOldSetToolBoxControllerCreator;
}
-svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL )
+svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL )
{
pfunc_setToolBoxControllerCreator pFactory = NULL;
{
@@ -67,7 +67,7 @@ pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfun
return pOldSetStatusBarControllerCreator;
}
-svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL )
+svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const OUString& aCommandURL )
{
pfunc_setStatusBarControllerCreator pFactory = NULL;
{
@@ -111,7 +111,7 @@ pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingW
return pOldFunc;
}
-void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL )
+void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rResourceURL )
{
pfunc_createDockingWindow pFactory = NULL;
{
@@ -132,7 +132,7 @@ pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDocking
return pOldFunc;
}
-bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL )
+bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rResourceURL )
{
pfunc_isDockingWindowVisible pCall = NULL;
{
@@ -154,7 +154,7 @@ pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i
return pOldFunc;
}
-void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL )
+void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL )
{
pfunc_activateToolPanel pActivator = NULL;
{
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index 2464439faafb..408464f6c43b 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -53,12 +53,12 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st
// uno interface
public:
- virtual void SAL_CALL setFilter( const ::rtl::OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setFilter( const OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException );
// member
private:
- ::rtl::OUString m_sFilter;
+ OUString m_sFilter;
}; // class ContinuationFilterSelect
@@ -67,14 +67,14 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st
// initialize continuation with right start values
//---------------------------------------------------------------------------------------------------------
ContinuationFilterSelect::ContinuationFilterSelect()
- : m_sFilter( ::rtl::OUString() )
+ : m_sFilter( OUString() )
{
}
//---------------------------------------------------------------------------------------------------------
// handler should use it after selection to set user specified filter for transport
//---------------------------------------------------------------------------------------------------------
-void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilter ) throw( css::uno::RuntimeException )
+void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException )
{
m_sFilter = sFilter;
}
@@ -82,7 +82,7 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilte
//---------------------------------------------------------------------------------------------------------
// read access to transported filter
//---------------------------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException )
+OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException )
{
return m_sFilter;
}
@@ -90,9 +90,9 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilte
class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
{
public:
- RequestFilterSelect_Impl( const ::rtl::OUString& sURL );
+ RequestFilterSelect_Impl( const OUString& sURL );
sal_Bool isAbort () const;
- ::rtl::OUString getFilter() const;
+ OUString getFilter() const;
public:
virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
@@ -109,9 +109,9 @@ private:
// initialize instance with all necessary informations
// We use it without any further checks on our member then ...!
//---------------------------------------------------------------------------------------------------------
-RequestFilterSelect_Impl::RequestFilterSelect_Impl( const ::rtl::OUString& sURL )
+RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL )
{
- ::rtl::OUString temp;
+ OUString temp;
css::uno::Reference< css::uno::XInterface > temp2;
css::document::NoSuchFilterRequest aFilterRequest( temp ,
temp2 ,
@@ -139,7 +139,7 @@ sal_Bool RequestFilterSelect_Impl::isAbort() const
// return user selected filter
// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
//---------------------------------------------------------------------------------------------------------
-::rtl::OUString RequestFilterSelect_Impl::getFilter() const
+OUString RequestFilterSelect_Impl::getFilter() const
{
return m_pFilter->getFilter();
}
@@ -165,7 +165,7 @@ css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >
}
-RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
+RequestFilterSelect::RequestFilterSelect( const OUString& sURL )
{
pImp = new RequestFilterSelect_Impl( sURL );
pImp->acquire();
@@ -190,7 +190,7 @@ sal_Bool RequestFilterSelect::isAbort() const
// return user selected filter
// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
//---------------------------------------------------------------------------------------------------------
-::rtl::OUString RequestFilterSelect::getFilter() const
+OUString RequestFilterSelect::getFilter() const
{
return pImp->getFilter();
}
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index cb57da289c85..08f01d366d55 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -40,7 +40,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
-using ::rtl::OUString;
namespace framework
{
diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx
index 57a98f5134a8..d51650755916 100644
--- a/framework/source/fwe/helper/configimporter.cxx
+++ b/framework/source/fwe/helper/configimporter.cxx
@@ -44,11 +44,11 @@ sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars(
{
for ( sal_uInt16 i = 1; i <= 4; i++ )
{
- rtl::OUStringBuffer aCustomTbxName( 20 );
+ OUStringBuffer aCustomTbxName( 20 );
aCustomTbxName.appendAscii( USERDEFTOOLBOX );
aCustomTbxName[14] = aCustomTbxName[14] + i;
- rtl::OUString aTbxStreamName( aCustomTbxName.makeStringAndClear() );
+ OUString aTbxStreamName( aCustomTbxName.makeStringAndClear() );
uno::Reference< io::XStream > xStream = rToolbarStorage->openStreamElement( aTbxStreamName, embed::ElementModes::READ );
if ( xStream.is() )
{
diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx
index bdc5319ecdb9..4cff53f8ca1a 100644
--- a/framework/source/fwe/helper/imageproducer.cxx
+++ b/framework/source/fwe/helper/imageproducer.cxx
@@ -36,7 +36,7 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc )
Image SAL_CALL GetImageFromURL(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- const ::rtl::OUString& aURL,
+ const OUString& aURL,
bool bBig
)
{
diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index 70d9d28bda66..a93c14f4af2f 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -24,7 +24,6 @@
#define WRONG_TYPE_EXCEPTION "Only XPropertSet allowed!"
-using ::rtl::OUString;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index 0402a9546a90..0f0e894eb69d 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -105,7 +105,7 @@ throw ( WrappedTargetException )
PopupMenu* MenuConfiguration::CreateBookmarkMenu(
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- const ::rtl::OUString& aURL )
+ const OUString& aURL )
throw ( ::com::sun::star::lang::WrappedTargetException )
{
if ( aURL == BOOKMARK_NEWMENU )
generated by cgit (git 2.34.1) at 2024-07-23 09:54:43 +0000