From 1a42e2458bda63e7c11b5298bee34eebbaedd022 Mon Sep 17 00:00:00 2001 From: Ricardo Montania Date: Wed, 26 Sep 2012 21:24:26 -0300 Subject: ::rtl::OUString cleanup in basctl Change-Id: Icb6f04d6ad22f1652abbb399beb08645daf8b9c9 Reviewed-on: https://gerrit.libreoffice.org/705 Reviewed-by: Noel Power Tested-by: Noel Power --- basctl/source/inc/accessibledialogwindow.hxx | 14 +++++++------- basctl/source/inc/basidesh.hxx | 28 ++++++++++++++-------------- basctl/source/inc/dlged.hxx | 4 ++-- 3 files changed, 23 insertions(+), 23 deletions(-) (limited to 'basctl') diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index c8885eae09ed..884cb64f9ff7 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -122,9 +122,9 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); @@ -135,8 +135,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -149,8 +149,8 @@ public: // XAccessibleExtendedComponent virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 743b8b3f6fe0..be34a788a866 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -54,7 +54,7 @@ class TabBar; class BaseWindow; class LocalizationMgr; -bool RemoveDialog( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName ); +bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName ); class Shell : public SfxViewShell, @@ -67,13 +67,13 @@ public: private: friend class JavaDebuggingListenerImpl; friend class LocalizationMgr; - friend bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName ); // defined in baside3.cxx + friend bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); // defined in baside3.cxx WindowTable aWindowTable; sal_uInt16 nCurKey; BaseWindow* pCurWin; ScriptDocument m_aCurDocument; - rtl::OUString m_aCurLibName; + OUString m_aCurLibName; boost::shared_ptr m_pCurLocalizationMgr; ScrollBar aHScrollBar; @@ -100,14 +100,14 @@ private: void InitTabBar(); void InitScrollBars(); void CheckWindows(); - void RemoveWindows( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, bool bDestroy ); + void RemoveWindows( const ScriptDocument& rDocument, const OUString& rLibName, bool bDestroy ); void UpdateWindows(); void InvalidateBasicIDESlots(); void StoreAllWindowData( bool bPersistent = true ); void SetMDITitle(); void EnableScrollbars( bool bEnable ); - void SetCurLib( const ScriptDocument& rDocument, ::rtl::OUString aLibName, bool bUpdateWindows = true , bool bCheck = true ); - void SetCurLibForLocalization( const ScriptDocument& rDocument, ::rtl::OUString aLibName ); + void SetCurLib( const ScriptDocument& rDocument, OUString aLibName, bool bUpdateWindows = true , bool bCheck = true ); + void SetCurLibForLocalization( const ScriptDocument& rDocument, OUString aLibName ); void ImplStartListening( StarBASIC* pBasic ); @@ -128,8 +128,8 @@ private: void ManageToolbars(); void ArrangeTabBar(); - ModulWindow* CreateBasWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName ); - DialogWindow* CreateDlgWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName ); + ModulWindow* CreateBasWin( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName ); + DialogWindow* CreateDlgWin( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName ); ModulWindow* ShowActiveModuleWindow( StarBASIC* pBasic ); @@ -163,7 +163,7 @@ public: BaseWindow* GetCurWindow() const { return pCurWin; } ScriptDocument const& GetCurDocument() const { return m_aCurDocument; } - rtl::OUString const& GetCurLibName() const { return m_aCurLibName; } + OUString const& GetCurLibName() const { return m_aCurLibName; } boost::shared_ptr GetCurLocalizationMgr() const { return m_pCurLocalizationMgr; } ScrollBar& GetHScrollBar() { return aHScrollBar; } @@ -196,9 +196,9 @@ public: long CallBasicErrorHdl( StarBASIC* pBasic ); long CallBasicBreakHdl( StarBASIC* pBasic ); - BaseWindow* FindWindow( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName = ::rtl::OUString(), const ::rtl::OUString& rName = ::rtl::OUString(), ItemType nType = TYPE_UNKNOWN, bool bFindSuspended = false ); - DialogWindow* FindDlgWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rName, bool bCreateIfNotExist = false, bool bFindSuspended = false ); - ModulWindow* FindBasWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName, bool bCreateIfNotExist = false, bool bFindSuspended = false ); + BaseWindow* FindWindow( const ScriptDocument& rDocument, const OUString& rLibName = OUString(), const OUString& rName = OUString(), ItemType nType = TYPE_UNKNOWN, bool bFindSuspended = false ); + DialogWindow* FindDlgWin( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rName, bool bCreateIfNotExist = false, bool bFindSuspended = false ); + ModulWindow* FindBasWin( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName, bool bCreateIfNotExist = false, bool bFindSuspended = false ); BaseWindow* FindApplicationWindow(); bool NextPage( bool bPrev = false ); @@ -209,8 +209,8 @@ public: // (defined in moduldlg.cxx) static void CopyDialogResources( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >& io_xISP, - const ScriptDocument& rSourceDoc, const ::rtl::OUString& rSourceLibName, const ScriptDocument& rDestDoc, - const ::rtl::OUString& rDestLibName, const ::rtl::OUString& rDlgName ); + const ScriptDocument& rSourceDoc, const OUString& rSourceLibName, const ScriptDocument& rDestDoc, + const OUString& rDestLibName, const OUString& rDlgName ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetCurrentDocument() const; diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 4a677737a605..8c7b302170e7 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -104,7 +104,7 @@ private: DECL_LINK(PaintTimeout, void *); DECL_LINK(MarkTimeout, void *); - void Print( Printer* pPrinter, const ::rtl::OUString& rTitle ); + void Print( Printer* pPrinter, const OUString& rTitle ); private: ScrollBar* pHScroll; @@ -205,7 +205,7 @@ public: void UpdatePropertyBrowserDelayed(); sal_Int32 countPages( Printer* pPrinter ); - void printPage( sal_Int32 nPage, Printer* pPrinter, const ::rtl::OUString& ); + void printPage( sal_Int32 nPage, Printer* pPrinter, const OUString& ); bool AdjustPageSize(); -- cgit