[PATCH] Remove rtl:: namespace, fix minor spelling error in comment
Chris Sherlock (via Code Review)
gerrit at gerrit.libreoffice.org
Thu Mar 14 05:24:00 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2726
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/2726/1
Remove rtl:: namespace, fix minor spelling error in comment
Change-Id: Icd04bfa61209277c57afe313d679b253aa241b7d
---
M vcl/inc/salframe.hxx
M vcl/inc/salinst.hxx
M vcl/inc/salsys.hxx
M vcl/unx/gtk/app/gtkdata.cxx
M vcl/win/source/window/salframe.cxx
5 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 63096e0..2ae11216 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -143,9 +143,9 @@
// When Event is called, SalInstance::Yield() must be returned
virtual sal_Bool PostEvent( void* pData ) = 0;
- virtual void SetTitle( const rtl::OUString& rTitle ) = 0;
+ virtual void SetTitle( const OUString& rTitle ) = 0;
virtual void SetIcon( sal_uInt16 nIcon ) = 0;
- virtual void SetRepresentedURL( const rtl::OUString& );
+ virtual void SetRepresentedURL( const OUString& );
virtual void SetMenu( SalMenu *pSalMenu ) = 0;
virtual void DrawMenuBar() = 0;
@@ -192,7 +192,7 @@
virtual void SetInputContext( SalInputContext* pContext ) = 0;
virtual void EndExtTextInput( sal_uInt16 nFlags ) = 0;
- virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ) = 0;
+ virtual OUString GetKeyName( sal_uInt16 nKeyCode ) = 0;
// returns in 'rKeyCode' the single keycode that translates to the given unicode when using a keyboard layout of language 'aLangType'
// returns sal_False if no mapping exists or function not supported
@@ -236,7 +236,7 @@
// move the frame to a new screen
virtual void SetScreenNumber( unsigned int nScreen ) = 0;
- virtual void SetApplicationID( const rtl::OUString &rApplicationID) = 0;
+ virtual void SetApplicationID( const OUString &rApplicationID) = 0;
// shaped system windows
// set clip region to none (-> rectangular windows, normal state)
@@ -257,7 +257,7 @@
Window* GetWindow() const { return m_pWindow; }
// Call the callback set; this sometimes necessary for implementation classes
- // that should not now more than necessary about the SalFrame implementation
+ // that should not know more than necessary about the SalFrame implementation
// (e.g. input methods, printer update handlers).
long CallCallback( sal_uInt16 nEvent, const void* pEvent ) const
{ return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 2c41bc8..19b5ec6 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -105,7 +105,7 @@
virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) = 0;
virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) = 0;
virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) = 0;
- virtual rtl::OUString GetDefaultPrinter() = 0;
+ virtual OUString GetDefaultPrinter() = 0;
// SalTimer
virtual SalTimer* CreateSalTimer() = 0;
@@ -160,7 +160,7 @@
CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments );
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource();
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget();
- virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType) = 0;
+ virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType) = 0;
virtual bool hasNativeFileSelection() const { return false; }
@@ -187,9 +187,9 @@
// - SalInstance-Functions -
// -------------------------
-void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore );
+void SalAbort( const OUString& rErrorText, bool bDumpCore );
-VCL_PLUGIN_PUBLIC const ::rtl::OUString& SalGetDesktopEnvironment();
+VCL_PLUGIN_PUBLIC const OUString& SalGetDesktopEnvironment();
// -----------
// - SalData -
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 5a5580d..308c65e 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -22,11 +22,7 @@
#include <tools/gen.hxx>
#include <vcl/dllapi.h>
-
-namespace rtl
-{
- class OUString;
-}
+#include <rtl/ustring.hxx>
/* Button combinations for ShowNativeMessageBox
*/
@@ -103,7 +99,7 @@
@returns the name of the screen
*/
- virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen ) = 0;
+ virtual OUString GetDisplayScreenName( unsigned int nScreen ) = 0;
/* Shows a native message box with the specified title, message and button
combination.
@@ -132,11 +128,12 @@
See button identifier above. If the function fails the
return value is 0.
*/
- virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
+ virtual int ShowNativeMessageBox( const OUString& rTitle,
+ const OUString& rMessage,
int nButtonCombination,
int nDefaultButton,
bool bUseResources ) = 0;
+
};
SalSystem* ImplGetSalSystem();
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index e4a35a7..36b0ec8 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -646,7 +646,7 @@
{
pCmdLineAry[i+1] = g_strdup( "--display" );
osl_getCommandArg(i+1, &aParam.pData );
- aDisplay = rtl::OUStringToOString( aParam, aEnc );
+ aDisplay = OUStringToOString( aParam, aEnc );
}
else
pCmdLineAry[i+1] = g_strdup( aBParam.getStr() );
@@ -660,7 +660,7 @@
OUString aAppName = Application::GetAppName();
if( !aAppName.isEmpty() )
{
- OString aPrgName = rtl::OUStringToOString(aAppName, aEnc);
+ OString aPrgName = OUStringToOString(aAppName, aEnc);
g_set_prgname(aPrgName.getStr());
}
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index a824564..1dc3285 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5608,7 +5608,7 @@
if ( WM_USER_SYSTEM_WINDOW_ACTIVATED == nMsg )
{
- ImplHideSplash();
+ pSVData->mpSalSystem.HideSplash();
return 0;
}
@@ -5793,7 +5793,7 @@
{
pSVData->maAppData.mnModalMode++;
- ImplHideSplash();
+ pSVData->mpSalSystem.HideSplash();
if( pWin )
{
pWin->EnableInput( FALSE, TRUE, TRUE, NULL );
--
To view, visit https://gerrit.libreoffice.org/2726
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd04bfa61209277c57afe313d679b253aa241b7d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock <chris.sherlock79 at gmail.com>
More information about the LibreOffice
mailing list