Modified: openoffice/branches/ia2/main/connectivity/source/commontools/ConnectionWrapper.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/connectivity/source/commontools/ConnectionWrapper.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff ============================================================================== --- openoffice/branches/ia2/main/connectivity/source/commontools/ConnectionWrapper.cxx (original) +++ openoffice/branches/ia2/main/connectivity/source/commontools/ConnectionWrapper.cxx Mon Nov 4 05:32:01 2013 @@ -196,7 +196,10 @@ namespace {} bool operator() (const ::com::sun::star::beans::PropertyValue& lhs, const ::com::sun::star::beans::PropertyValue& rhs) const { - return !!(lhs.Name.equalsIgnoreAsciiCase( rhs.Name )); + const rtl_uString* l = lhs.Name.pData; + const rtl_uString* r = rhs.Name.pData; + const int c = rtl_ustr_compareIgnoreAsciiCase_WithLength( l->buffer, l->length, r->buffer, r->length ); + return (c < 0); } };
Modified: openoffice/branches/ia2/main/connectivity/source/resource/conn_shared_res.src URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/connectivity/source/resource/conn_shared_res.src?rev=1538508&r1=1538507&r2=1538508&view=diff ============================================================================== --- openoffice/branches/ia2/main/connectivity/source/resource/conn_shared_res.src (original) +++ openoffice/branches/ia2/main/connectivity/source/resource/conn_shared_res.src Mon Nov 4 05:32:01 2013 @@ -123,7 +123,7 @@ String STR_STMT_TYPE_NOT_SUPPORTED String STR_UNSPECIFIED_ERROR { - Text [ en-US ] = "An unknown error occured."; + Text [ en-US ] = "An unknown error occurred."; }; String STR_COULD_NOT_CREATE_ADDRESSBOOK @@ -138,12 +138,12 @@ String STR_COULD_NOT_LOAD_LIB String STR_ERROR_REFRESH_ROW { - Text [ en-US ] = "An error occured while refreshing the current row."; + Text [ en-US ] = "An error occurred while refreshing the current row."; }; String STR_ERROR_GET_ROW { - Text [ en-US ] = "An error occured while getting the current row."; + Text [ en-US ] = "An error occurred while getting the current row."; }; String STR_CAN_NOT_CANCEL_ROW_UPDATE @@ -163,7 +163,7 @@ String STR_QUERY_INVALID_IS_NULL_COLUMN String STR_ILLEGAL_MOVEMENT { - Text [ en-US ] = "Illegal cursor movement occured."; + Text [ en-US ] = "Illegal cursor movement occurred."; }; String STR_COMMIT_ROW @@ -375,7 +375,7 @@ String STR_NO_CONNECTION // dbase String STR_COULD_NOT_DELETE_INDEX { - Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occured."; + Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occurred."; }; String STR_ONL_ONE_COLUMN_PER_INDEX { @@ -620,11 +620,11 @@ String STR_INVALID_FILE_URL }; String STR_NO_TABLE_CONTAINER { - Text [ en-US ] = "An error occured while obtaining the connection's table container."; + Text [ en-US ] = "An error occurred while obtaining the connection's table container."; }; String STR_NO_TABLE_EDITOR_DIALOG { - Text [ en-US ] = "An error occured while creating the table editor dialog."; + Text [ en-US ] = "An error occurred while creating the table editor dialog."; }; String STR_NO_TABLENAME { Modified: openoffice/branches/ia2/main/cppuhelper/source/findsofficepath.c URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cppuhelper/source/findsofficepath.c?rev=1538508&r1=1538507&r2=1538508&view=diff ============================================================================== --- openoffice/branches/ia2/main/cppuhelper/source/findsofficepath.c (original) +++ openoffice/branches/ia2/main/cppuhelper/source/findsofficepath.c Mon Nov 4 05:32:01 2013 @@ -129,21 +129,7 @@ static char* platformSpecific() */ static char* platformSpecific() { - const int SEPARATOR = '/'; - const char* PATHSEPARATOR = ":"; - const char* PATHVARNAME = "PATH"; - const char* APPENDIX = "/soffice"; - char* path = NULL; - char* env = NULL; - char* str = NULL; - char* dir = NULL; - char* file = NULL; - char* resolved = NULL; - char* sep = NULL; - - char buffer[PATH_MAX]; - int pos; #ifdef MACOSX /* On MacOS we have no soffice link under /usr/bin but the default office location is known @@ -159,6 +145,21 @@ static char* platformSpecific() } return path; #else + const int SEPARATOR = '/'; + const char* PATHSEPARATOR = ":"; + const char* PATHVARNAME = "PATH"; + const char* APPENDIX = "/soffice"; + + char* env = NULL; + char* str = NULL; + char* dir = NULL; + char* file = NULL; + char* resolved = NULL; + char* sep = NULL; + + char buffer[PATH_MAX]; + int pos; + /* get the value of the PATH environment variable */ env = getenv( PATHVARNAME ); str = (char*) malloc( strlen( env ) + 1 );
