[Libreoffice-commits] .: automation/source

[Caolán McNamara]

 automation/source/server/cmdbasestream.cxx |    8 ++++----
 automation/source/server/sta_list.cxx      |    7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 18254f78635847446604183ec73ca526ff9f7d12
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 23 00:48:52 2011 +0100

    use OString::equalsL

diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index b5a48e0..4d8dfe8 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 69a0212..163c8e3 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)