Kaydet (Commit) 32cc00e9 authored tarafından Caolán McNamara's avatar Caolán McNamara

ditch old string

üst 30a53d4e
...@@ -372,7 +372,7 @@ protected: ...@@ -372,7 +372,7 @@ protected:
KeySym nShiftKeySym_; // first shift modifier KeySym nShiftKeySym_; // first shift modifier
KeySym nCtrlKeySym_; // first control modifier KeySym nCtrlKeySym_; // first control modifier
KeySym nMod1KeySym_; // first mod1 modifier KeySym nMod1KeySym_; // first mod1 modifier
ByteString m_aKeyboardName; rtl::OString m_aKeyboardName;
vcl_sal::WMAdaptor* m_pWMAdaptor; vcl_sal::WMAdaptor* m_pWMAdaptor;
DtIntegrator* m_pDtIntegrator; DtIntegrator* m_pDtIntegrator;
......
...@@ -583,7 +583,7 @@ static const keyboard_layout type6_layout[] = ...@@ -583,7 +583,7 @@ static const keyboard_layout type6_layout[] =
const char* SalDisplay::GetKeyboardName( bool bRefresh ) const char* SalDisplay::GetKeyboardName( bool bRefresh )
{ {
if( bRefresh || ! m_aKeyboardName.Len() ) if (bRefresh || m_aKeyboardName.isEmpty())
{ {
#if defined(SOLARIS) #if defined(SOLARIS)
if( IsLocal() ) if( IsLocal() )
...@@ -665,10 +665,10 @@ const char* SalDisplay::GetKeyboardName( bool bRefresh ) ...@@ -665,10 +665,10 @@ const char* SalDisplay::GetKeyboardName( bool bRefresh )
} }
} }
#endif #endif
if( ! m_aKeyboardName.Len() ) if (m_aKeyboardName.isEmpty())
m_aKeyboardName = "<unknown keyboard>"; m_aKeyboardName = "<unknown keyboard>";
} }
return m_aKeyboardName.GetBuffer(); return m_aKeyboardName.getStr();
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment