[Libreoffice-commits] .: avmedia/source basctl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 27 05:54:14 PDT 2012
avmedia/source/gstreamer/gstframegrabber.cxx | 4 +--
basctl/source/inc/accessibledialogwindow.hxx | 14 ++++++-------
basctl/source/inc/basidesh.hxx | 28 +++++++++++++--------------
basctl/source/inc/dlged.hxx | 4 +--
4 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 1a42e2458bda63e7c11b5298bee34eebbaedd022
Author: Ricardo Montania <ricardo at linuxafundo.com.br>
Date: Wed Sep 26 21:24:26 2012 -0300
::rtl::OUString cleanup in basctl
Change-Id: Icb6f04d6ad22f1652abbb399beb08645daf8b9c9
Reviewed-on: https://gerrit.libreoffice.org/705
Reviewed-by: Noel Power <noel.power at suse.com>
Tested-by: Noel Power <noel.power at suse.com>
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index d9a4ed1..ed998dd 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -51,7 +51,7 @@ void FrameGrabber::disposePipeline()
}
}
-FrameGrabber::FrameGrabber( const rtl::OUString &rURL ) :
+FrameGrabber::FrameGrabber( const OUString &rURL ) :
FrameGrabber_BASE()
{
gchar *pPipelineStr;
@@ -97,7 +97,7 @@ FrameGrabber::~FrameGrabber()
disposePipeline();
}
-FrameGrabber* FrameGrabber::create( const rtl::OUString &rURL )
+FrameGrabber* FrameGrabber::create( const OUString &rURL )
{
return new FrameGrabber( rURL );
}
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index c8885ea..884cb64 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 743b8b3..be34a78 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<LocalizationMgr> 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<LocalizationMgr> 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 4a67773..8c7b302 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();
More information about the Libreoffice-commits
mailing list