summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/app
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/generic/app')
-rw-r--r--vcl/unx/generic/app/i18n_cb.cxx6
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_im.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx2
-rw-r--r--vcl/unx/generic/app/keysymnames.cxx8
-rw-r--r--vcl/unx/generic/app/saldata.cxx14
-rw-r--r--vcl/unx/generic/app/saldisp.cxx19
-rw-r--r--vcl/unx/generic/app/sm.cxx24
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx26
9 files changed, 51 insertions, 52 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 7ff60cb3ed83..d29b43dd74d8 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -384,7 +384,7 @@ PreeditDrawCallback(XIC ic, XPointer client_data,
pPreeditData->aInputEv.mpTextAttr = Preedit_FeedbackToSAL(
pPreeditData->aText.pCharStyle, pPreeditData->aText.nLength, pPreeditData->aInputFlags);
pPreeditData->aInputEv.mnCursorPos = call_data->caret;
- pPreeditData->aInputEv.maText = rtl::OUString(pPreeditData->aText.pUnicodeBuffer,
+ pPreeditData->aInputEv.maText = OUString(pPreeditData->aText.pUnicodeBuffer,
pPreeditData->aText.nLength);
pPreeditData->aInputEv.mnCursorFlags = 0; // default: make cursor visible
pPreeditData->aInputEv.mnDeltaStart = 0; // call_data->chg_first;
@@ -546,7 +546,7 @@ StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data)
else
{
fprintf( stderr, "XIMStatusDataType %s not supported\n",
- call_data->type == XIMBitmapType ? "XIMBitmapType" : rtl::OString::valueOf(static_cast<sal_Int32>(call_data->type)).getStr() );
+ call_data->type == XIMBitmapType ? "XIMBitmapType" : OString::valueOf(static_cast<sal_Int32>(call_data->type)).getStr() );
}
#endif
return;
@@ -556,7 +556,7 @@ void
SwitchIMCallback (XIC, XPointer, XPointer call_data)
{
XIMSwitchIMNotifyCallbackStruct* pCallData = (XIMSwitchIMNotifyCallbackStruct*)call_data;
- ::vcl::I18NStatus::get().changeIM( rtl::OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) );
+ ::vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) );
}
// ----------------------------------------------------------------------------------
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index dd8abd8cc16b..54a0ae670258 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -568,7 +568,7 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
aTextEvent.mnTime = 0;
aTextEvent.mpTextAttr = 0;
aTextEvent.mnCursorPos = nLength;
- aTextEvent.maText = rtl::OUString(pText, nLength);
+ aTextEvent.maText = OUString(pText, nLength);
aTextEvent.mnCursorFlags = 0;
aTextEvent.mnDeltaStart = 0;
aTextEvent.mbOnlyCursor = False;
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 430aea2f43d7..0ba5fc14b54e 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -167,7 +167,7 @@ SetSystemLocale( const char* p_inlocale )
#ifdef SOLARIS
static void
-SetSystemEnvironment( const rtl::OUString& rLocale )
+SetSystemEnvironment( const OUString& rLocale )
{
OUString LC_ALL_Var("LC_ALL");
osl_setEnvironment(LC_ALL_Var.pData, rLocale.pData);
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 53fa8c270ef2..5d7e7f20ea4b 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -597,7 +597,7 @@ void I18NStatus::setStatusText( const String& rText )
else
pBuffer[i] = pCopy[i];
}
- rtl::OUString aText( pBuffer );
+ OUString aText( pBuffer );
m_pStatusWindow->setText( aText );
m_pStatusWindow->setPosition( m_pParent );
diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx
index b733c734e719..6356c61b3ba5 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -461,7 +461,7 @@ namespace vcl_sal {
};
// translate keycodes, used within the displayed menu shortcuts
- rtl::OUString getKeysymReplacementName( rtl::OUString pLang, KeySym nSymbol )
+ OUString getKeysymReplacementName( OUString pLang, KeySym nSymbol )
{
for( unsigned int n = 0; n < SAL_N_ELEMENTS(aKeyboards); n++ )
{
@@ -471,7 +471,7 @@ namespace vcl_sal {
for( int m = aKeyboards[n].nReplacements ; m ; )
{
if( nSymbol == pRepl[--m].aSymbol )
- return rtl::OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 );
+ return OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 );
}
}
}
@@ -481,10 +481,10 @@ namespace vcl_sal {
for( int m = SAL_N_ELEMENTS(aImplReplacements_English); m ; )
{
if( nSymbol == pRepl[--m].aSymbol )
- return rtl::OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 );
+ return OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 );
}
- return rtl::OUString();
+ return OUString();
}
}
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index c7f5351dc137..6202b34c077f 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -405,15 +405,15 @@ void SalXLib::Init()
// is there a -display command line parameter?
sal_uInt32 nParams = osl_getCommandArgCount();
- rtl::OUString aParam;
- rtl::OString aDisplay;
+ OUString aParam;
+ OString aDisplay;
for (sal_uInt16 i=0; i<nParams; i++)
{
osl_getCommandArg(i, &aParam.pData);
if ( aParam == "-display" )
{
osl_getCommandArg(i+1, &aParam.pData);
- aDisplay = rtl::OUStringToOString(
+ aDisplay = OUStringToOString(
aParam, osl_getThreadTextEncoding());
if ((pDisp = XOpenDisplay(aDisplay.getStr()))!=NULL)
@@ -436,17 +436,17 @@ void SalXLib::Init()
// Open $DISPLAY or default...
char *pDisplay = getenv("DISPLAY");
if (pDisplay != NULL)
- aDisplay = rtl::OString(pDisplay);
+ aDisplay = OString(pDisplay);
pDisp = XOpenDisplay(pDisplay);
}
if ( !pDisp )
{
- rtl::OUString aProgramFileURL;
+ OUString aProgramFileURL;
osl_getExecutableFile( &aProgramFileURL.pData );
- rtl::OUString aProgramSystemPath;
+ OUString aProgramSystemPath;
osl_getSystemPathFromFileURL (aProgramFileURL.pData, &aProgramSystemPath.pData);
- rtl::OString aProgramName = rtl::OUStringToOString(
+ OString aProgramName = OUStringToOString(
aProgramSystemPath,
osl_getThreadTextEncoding() );
std::fprintf( stderr, "%s X11 error: Can't open display: %s\n",
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index fdc0c6814dc6..6867f4da1730 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -78,7 +78,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
using namespace vcl_sal;
-using ::rtl::OUString;
#define SALCOLOR_WHITE MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF )
#define SALCOLOR_BLACK MAKE_SALCOLOR( 0x00, 0x00, 0x00 )
@@ -494,7 +493,7 @@ SalDisplay::initScreen( SalX11Screen nXScreen ) const
1
);
- rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
+ OString aExec(OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
const char* argv[2];
argv[0] = "/bin/sh";
argv[1] = aExec.getStr();
@@ -587,7 +586,7 @@ void SalDisplay::Init()
const char* pValStr = XGetDefault( pDisp_, "Xft", "dpi" );
if( pValStr != NULL )
{
- const rtl::OString aValStr( pValStr );
+ const OString aValStr( pValStr );
const long nDPI = (long) aValStr.toDouble();
// guard against insane resolution
if( (nDPI >= 50) && (nDPI <= 500) )
@@ -723,10 +722,10 @@ sal_uInt16 SalDisplay::GetIndicatorState() const
return nState;
}
-rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
+OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
{
- rtl::OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage();
- rtl::OUString aRet;
+ OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage();
+ OUString aRet;
// return an empty string for keysyms that are not bound to
// any key code
@@ -734,7 +733,7 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
if( aKeyCode != 0 && aKeyCode != NoSymbol )
{
if( !nKeySym )
- aRet = rtl::OUString( "???" );
+ aRet = OUString( "???" );
else
{
aRet = ::vcl_sal::getKeysymReplacementName( aLang, nKeySym );
@@ -743,9 +742,9 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
const char *pString = XKeysymToString( nKeySym );
int n = strlen( pString );
if( n > 2 && pString[n-2] == '_' )
- aRet = rtl::OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 );
+ aRet = OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 );
else
- aRet = rtl::OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 );
+ aRet = OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 );
}
}
}
@@ -789,7 +788,7 @@ void SalDisplay::ModifierMapping()
XFreeModifiermap( pXModMap );
}
-rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
+OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
{
String aStrMap;
String aCustomKeyName;
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 7cb72e8d5bf0..cfa587ec7f57 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -138,7 +138,7 @@ SalSession * SessionManagerClient::m_pSession = NULL;
boost::scoped_ptr< ICEConnectionObserver >
SessionManagerClient::m_pICEConnectionObserver;
SmcConn SessionManagerClient::m_pSmcConnection = NULL;
-rtl::OString SessionManagerClient::m_aClientID;
+OString SessionManagerClient::m_aClientID;
bool SessionManagerClient::m_bDocSaveDone = false; // HACK
extern "C" {
@@ -164,7 +164,7 @@ static void BuildSmPropertyList()
{
if( ! pSmProps )
{
- rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
+ OString aExec(OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
nSmProps = 5;
pSmProps = new SmProp[ nSmProps ];
@@ -198,8 +198,8 @@ static void BuildSmPropertyList()
pSmProps[ 2 ].vals[2].length = aRestartOptionNoLogo.getLength()+1;
pSmProps[ 2 ].vals[2].value = strdup(aRestartOptionNoLogo.getStr());
- rtl::OUString aUserName;
- rtl::OString aUser;
+ OUString aUserName;
+ OString aUser;
oslSecurity aSec = osl_getCurrentSecurity();
if( aSec )
{
@@ -431,7 +431,7 @@ void SessionManagerClient::open(SalSession * pSession)
aCallbacks.save_complete.client_data = NULL;
aCallbacks.shutdown_cancelled.callback = ShutdownCanceledProc;
aCallbacks.shutdown_cancelled.client_data = NULL;
- rtl::OString aPrevId(getPreviousSessionID());
+ OString aPrevId(getPreviousSessionID());
char* pClientID = NULL;
char aErrBuf[1024];
m_pSmcConnection = SmcOpenConnection( NULL,
@@ -476,7 +476,7 @@ void SessionManagerClient::open(SalSession * pSession)
}
}
-rtl::OString SessionManagerClient::getSessionID()
+OString SessionManagerClient::getSessionID()
{
return m_aClientID;
}
@@ -522,9 +522,9 @@ void SessionManagerClient::interactionDone( bool bCancelShutdown )
}
-rtl::OUString SessionManagerClient::getExecName()
+OUString SessionManagerClient::getExecName()
{
- rtl::OUString aExec, aSysExec;
+ OUString aExec, aSysExec;
osl_getExecutableFile( &aExec.pData );
osl_getSystemPathFromFileURL( aExec.pData, &aSysExec.pData );
@@ -534,18 +534,18 @@ rtl::OUString SessionManagerClient::getExecName()
}
-rtl::OString SessionManagerClient::getPreviousSessionID()
+OString SessionManagerClient::getPreviousSessionID()
{
- rtl::OString aPrevId;
+ OString aPrevId;
sal_uInt32 n = rtl_getAppCommandArgCount();
for (sal_uInt32 i = 0; i != n; ++i)
{
- ::rtl::OUString aArg;
+ OUString aArg;
rtl_getAppCommandArg( i, &aArg.pData );
if(aArg.match("--session="))
{
- aPrevId = rtl::OUStringToOString(
+ aPrevId = OUStringToOString(
aArg.copy(RTL_CONSTASCII_LENGTH("--session=")),
osl_getThreadTextEncoding());
break;
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index b2de7a048333..c5fa4bc0540c 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -211,7 +211,7 @@ WMAdaptor* WMAdaptor::createWMAdaptor( SalDisplay* pSalDisplay )
#if OSL_DEBUG_LEVEL > 1
fprintf(stderr, "Window Manager's name is \"%s\"\n",
- rtl::OUStringToOString(pAdaptor->getWindowManagerName(),
+ OUStringToOString(pAdaptor->getWindowManagerName(),
RTL_TEXTENCODING_UTF8).getStr());
#endif
return pAdaptor;
@@ -843,7 +843,7 @@ bool WMAdaptor::getNetWmName()
&& nItems != 0
)
{
- rtl::OUString aMetaVersion( (sal_Char*)pProperty, nItems, RTL_TEXTENCODING_UTF8 );
+ OUString aMetaVersion( (sal_Char*)pProperty, nItems, RTL_TEXTENCODING_UTF8 );
nVersionMajor = aMetaVersion.getToken(0, '.').toInt32();
nVersionMinor = aMetaVersion.getToken(1, '.').toInt32();
}
@@ -888,8 +888,8 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const
pWMA->m_bWMshouldSwitchWorkspace = true;
vcl::SettingsConfigItem* pItem = vcl::SettingsConfigItem::get();
- rtl::OUString aSetting( pItem->getValue( rtl::OUString( "WM" ),
- rtl::OUString( "ShouldSwitchWorkspace" ) ) );
+ OUString aSetting( pItem->getValue( OUString( "WM" ),
+ OUString( "ShouldSwitchWorkspace" ) ) );
if( aSetting.isEmpty() )
{
if( m_aWMName.EqualsAscii( "awesome" ) )
@@ -981,27 +981,27 @@ void GnomeWMAdaptor::initAtoms()
void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
{
- rtl::OString aTitle(rtl::OUStringToOString(rWMName,
+ OString aTitle(OUStringToOString(rWMName,
osl_getThreadTextEncoding()));
/* FIXME-BCP47: what slumbering dogs may we wake up here? */
- ::rtl::OString aWMLocale;
+ OString aWMLocale;
rtl_Locale* pLocale = NULL;
osl_getProcessLocale( &pLocale );
if( pLocale )
{
- ::rtl::OUString aLocaleString( pLocale->Language );
- ::rtl::OUString aCountry( pLocale->Country );
- ::rtl::OUString aVariant( pLocale->Variant );
+ OUString aLocaleString( pLocale->Language );
+ OUString aCountry( pLocale->Country );
+ OUString aVariant( pLocale->Variant );
if( !aCountry.isEmpty() )
{
- aLocaleString += ::rtl::OUString("_");
+ aLocaleString += OUString("_");
aLocaleString += aCountry;
}
if( !aVariant.isEmpty() )
aLocaleString += aVariant;
- aWMLocale = ::rtl::OUStringToOString( aLocaleString, RTL_TEXTENCODING_ISO_8859_1 );
+ aWMLocale = OUStringToOString( aLocaleString, RTL_TEXTENCODING_ISO_8859_1 );
}
else
{
@@ -1101,7 +1101,7 @@ void NetWMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
{
WMAdaptor::setWMName( pFrame, rWMName );
- rtl::OString aTitle(rtl::OUStringToOString(rWMName, RTL_TEXTENCODING_UTF8));
+ OString aTitle(OUStringToOString(rWMName, RTL_TEXTENCODING_UTF8));
const SystemEnvData* pEnv = pFrame->GetSystemData();
if( m_aWMAtoms[ NET_WM_NAME ] )
XChangeProperty( m_pDisplay,
@@ -2386,7 +2386,7 @@ void WMAdaptor::setPID( X11SalFrame* i_pFrame ) const
*/
void WMAdaptor::setClientMachine( X11SalFrame* i_pFrame ) const
{
- rtl::OString aWmClient( rtl::OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) );
+ OString aWmClient( OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) );
XTextProperty aClientProp = { (unsigned char*)aWmClient.getStr(), XA_STRING, 8, sal::static_int_cast<unsigned long>( aWmClient.getLength() ) };
XSetWMClientMachine( m_pDisplay, i_pFrame->GetShellWindow(), &aClientProp );
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 06:49:20 +0000