[Libreoffice-commits] .: stoc/source

[Caolán McNamara]

 stoc/source/security/file_policy.cxx |   36 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit d6392679b897f6b76cbeef7eac1aa88b78f0523d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 16 15:41:23 2011 +0000

    equalsAsciiL faster than equals

diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 78f02d3..33e4039 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -434,16 +434,16 @@ PolicyReader::~PolicyReader()
     }
 }
 
-static OUString s_grant = OUSTR("grant");
-static OUString s_user = OUSTR("user");
-static OUString s_permission = OUSTR("permission");
-static OUString s_openBrace = OUSTR("{");
-static OUString s_closingBrace = OUSTR("}");
+#define s_grant "grant"
+#define s_user "user"
+#define s_permission "permission"
+#define s_openBrace "{"
+#define s_closingBrace "}"
 
-static OUString s_filePermission = OUSTR("com.sun.star.io.FilePermission");
-static OUString s_socketPermission = OUSTR("com.sun.star.connection.SocketPermission");
-static OUString s_runtimePermission = OUSTR("com.sun.star.security.RuntimePermission");
-static OUString s_allPermission = OUSTR("com.sun.star.security.AllPermission");
+#define s_filePermission "com.sun.star.io.FilePermission"
+#define s_socketPermission "com.sun.star.connection.SocketPermission"
+#define s_runtimePermission "com.sun.star.security.RuntimePermission"
+#define s_allPermission "com.sun.star.security.AllPermission"
 
 //__________________________________________________________________________________________________
 void FilePolicy::refresh()
@@ -469,46 +469,46 @@ void FilePolicy::refresh()
     OUString token( reader.getToken() );
     while (token.getLength())
     {
-        if (! token.equals( s_grant ))
+        if (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_grant)))
             reader.error( OUSTR("expected >grant< token!") );
         OUString userId;
         token = reader.assureToken();
-        if (token.equals( s_user )) // next token is user-id
+        if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_user))) // next token is user-id
         {
             userId = reader.assureQuotedToken();
             token = reader.assureToken();
         }
-        if (! token.equals( s_openBrace ))
+        if (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_openBrace)))
             reader.error( OUSTR("expected opening brace >{<!") );
         token = reader.assureToken();
         // permissions list
-        while (! token.equals( s_closingBrace ))
+        while (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_closingBrace)))
         {
-            if (! token.equals( s_permission ))
+            if (!token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_permission)))
                 reader.error( OUSTR("expected >permission< or closing brace >}<!") );
             
             token = reader.assureToken(); // permission type
             Any perm;
-            if (token.equals( s_filePermission )) // FilePermission
+            if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_filePermission))) // FilePermission
             {
                 OUString url( reader.assureQuotedToken() );
                 reader.assureToken( ',' );
                 OUString actions( reader.assureQuotedToken() );
                 perm <<= io::FilePermission( url, actions );
             }            
-            else if (token.equals( s_socketPermission )) // SocketPermission
+            else if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_socketPermission))) // SocketPermission
             {
                 OUString host( reader.assureQuotedToken() );
                 reader.assureToken( ',' );
                 OUString actions( reader.assureQuotedToken() );
                 perm <<= connection::SocketPermission( host, actions );
             }
-            else if (token.equals( s_runtimePermission )) // RuntimePermission
+            else if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_runtimePermission))) // RuntimePermission
             {
                 OUString name( reader.assureQuotedToken() );
                 perm <<= security::RuntimePermission( name );
             }
-            else if (token.equals( s_allPermission )) // AllPermission
+            else if (token.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_allPermission))) // AllPermission
             {
                 perm <<= security::AllPermission();
             }