diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-23 00:48:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-23 00:48:52 +0100 |
| commit | 52c355bc93e1a94f4f3f3904a2f29d9d331ffeaf (patch) | |
| tree | 96ccc056ac201edb38acf3f6031aafa3c2ff4991 /automation | |
| parent | b84b7276ffc70998ca8f2c46d2805165f33f5ed7 (diff) | |
use OString::equalsL
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/source/server/cmdbasestream.cxx | 8 | ||||
| -rw-r--r-- | automation/source/server/sta_list.cxx | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index e7e576f4d4bd..f7e170465f8b 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.cxx @@ -70,7 +70,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 { Write(comm_UINT16(SIReturn)); Write(nRet); - if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + if (pUId->equalsL(RTL_CONSTASCII_STRINGPARAM("UID_ACTIVE"))) Write(comm_UINT32(0)); else Write(pUId); @@ -82,7 +82,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_String { Write(comm_UINT16(SIReturn)); Write(nRet); - if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + if (pUId->equalsL(RTL_CONSTASCII_STRINGPARAM("UID_ACTIVE"))) Write(comm_UINT32(0)); else Write(pUId); @@ -94,7 +94,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_BOOL b { Write(comm_UINT16(SIReturn)); Write(nRet); - if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + if (pUId->equalsL(RTL_CONSTASCII_STRINGPARAM("UID_ACTIVE"))) Write(comm_UINT32(0)); else Write(pUId); @@ -106,7 +106,7 @@ void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 { Write(comm_UINT16(SIReturn)); Write(nRet); - if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) ) + if (pUId->equalsL(RTL_CONSTASCII_STRINGPARAM("UID_ACTIVE"))) Write(comm_UINT32(0)); else Write(pUId); diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index d7f2a75277a2..3ff44fa4d409 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -124,11 +124,10 @@ TTSettings* GetTTSettings() return pTTSettings; } - - - // FIXME: HELPID -#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "TT_Win_is_closing_HID" ) && pWin->GetUniqueId().equals( "TT_Win_is_closing_UID" )) +#define IS_WINP_CLOSING(pWin) \ + (pWin->GetHelpId().equalsL(RTL_CONSTASCII_STRINGPARAM("TT_Win_is_closing_HID")) && \ + pWin->GetUniqueId().equalsL(RTL_CONSTASCII_STRINGPARAM("TT_Win_is_closing_UID"))) StatementList::StatementList() : nRetryCount(MAX_RETRIES) |