diff options
| -rw-r--r-- | vcl/inc/salframe.hxx | 10 | ||||
| -rw-r--r-- | vcl/inc/salinst.hxx | 8 | ||||
| -rw-r--r-- | vcl/inc/salsys.hxx | 13 | ||||
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 4 |
4 files changed, 16 insertions, 19 deletions
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 63096e0e2a40..2ae1121675a7 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -143,9 +143,9 @@ public: // 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 @@ public: 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 @@ public: // 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 @@ public: 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 2c41bc87b333..19b5ec605c8f 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -105,7 +105,7 @@ public: 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 @@ public: 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 @@ void DestroySalInstance( SalInstance* pInst ); // - 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 5a5580d47690..308c65e927f4 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 @@ public: @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 @@ public: 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 e4a35a7f679e..36b0ec8cd019 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -646,7 +646,7 @@ void GtkData::Init() { 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 @@ void GtkData::Init() OUString aAppName = Application::GetAppName(); if( !aAppName.isEmpty() ) { - OString aPrgName = rtl::OUStringToOString(aAppName, aEnc); + OString aPrgName = OUStringToOString(aAppName, aEnc); g_set_prgname(aPrgName.getStr()); } |