diff options
Diffstat (limited to 'connectivity/source/resource')
| -rw-r--r-- | connectivity/source/resource/conn_shared_res.src | 16 | ||||
| -rwxr-xr-x[-rw-r--r--] | connectivity/source/resource/makefile.mk | 3 | ||||
| -rw-r--r-- | connectivity/source/resource/sharedresources.cxx | 8 |
3 files changed, 14 insertions, 13 deletions
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src index 87f69a4aabd0..1c1d703e6679 100644 --- a/connectivity/source/resource/conn_shared_res.src +++ b/connectivity/source/resource/conn_shared_res.src @@ -131,7 +131,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 @@ -146,12 +146,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 @@ -171,7 +171,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 @@ -383,7 +383,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 { @@ -611,7 +611,7 @@ String STR_COMMAND_NOT_FOUND }; String STR_DATABASE_NEEDS_CONVERTING { - Text [ en-US ] = "The current database need to be converted. Please insert control user and password."; + Text [ en-US ] = "The current database need to be converted. Please insert control user and password."; }; String STR_USER_NO_DELETE { @@ -628,11 +628,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 { diff --git a/connectivity/source/resource/makefile.mk b/connectivity/source/resource/makefile.mk index 3ccb8ffd164b..b4944187dc2a 100644..100755 --- a/connectivity/source/resource/makefile.mk +++ b/connectivity/source/resource/makefile.mk @@ -42,12 +42,11 @@ ENABLE_EXCEPTIONS=TRUE ENVCFLAGS+=/FR$(SLO)$/ .ENDIF -CDEFS+=-DCONN_SHARED_RESOURCE_FILE=$(TARGET) - .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/dbtools.pmk .INCLUDE : $(PRJ)$/version.mk +CDEFS+=-DCONN_SHARED_RESOURCE_FILE=$(TARGET) # --- Files ------------------------------------- diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx index 1c27207223c0..482e3d0f20a5 100644 --- a/connectivity/source/resource/sharedresources.cxx +++ b/connectivity/source/resource/sharedresources.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -156,17 +157,17 @@ namespace connectivity size_t lcl_substitute( ::rtl::OUString& _inout_rString, const sal_Char* _pAsciiPattern, const ::rtl::OUString& _rReplace ) { - size_t nOccurences = 0; + size_t nOccurrences = 0; ::rtl::OUString sPattern( ::rtl::OUString::createFromAscii( _pAsciiPattern ) ); sal_Int32 nIndex = 0; while ( ( nIndex = _inout_rString.indexOf( sPattern ) ) > -1 ) { - ++nOccurences; + ++nOccurrences; _inout_rString = _inout_rString.replaceAt( nIndex, sPattern.getLength(), _rReplace ); } - return nOccurences; + return nOccurrences; } } @@ -240,3 +241,4 @@ namespace connectivity } // namespace connectivity //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |