filter/source/graphicfilter/ieps/ieps.cxx | 2 +- sal/osl/w32/nlsupport.c | 2 +- scp2/source/winexplorerext/registryitem_winexplorerext.scp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 9de95a52405c948a32895aec1da06c9d33b4eee2 Author: Jesús Corrius <jcorr...@gmail.com> Date: Tue Sep 3 21:07:25 2013 +0200 ICE03: WARNING: String overflow (greater than length permitted in column) Change-Id: I3c918da4c093489db122bc5af7401c7c93c1579e diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp index d34223c..a8eda1d 100644 --- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp +++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp @@ -128,14 +128,14 @@ End // Begin registry items for the Column handler -RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396 +RegistryItem gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"; Value = "%PRODUCTNAME Column Handler"; End -RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_x64 +RegistryItem gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_x64 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext_x64; ComponentCondition = "VersionNT64"; @@ -259,14 +259,14 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_x64 Value = "OpenDocument Format Persistent Handler"; End -RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered +RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}"; Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; End -RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered_x64 +RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg_x64 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext_x64; ComponentCondition = "VersionNT64"; commit 6f667f7e5ba1033d4abedf9efca6607b449c2396 Author: Jesús Corrius <jcorr...@gmail.com> Date: Tue Sep 3 20:44:16 2013 +0200 dezimal -> decimal Change-Id: I196026cc7f2f885664e9719557f662a32a7187b8 diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index de06d5d..311bf8c 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -598,7 +598,7 @@ GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Boo { if ( nByte > '9' ) { - nByte &=~0x20; // case none sensitive for hexadezimal values + nByte &=~0x20; // case none sensitive for hexadecimal values nByte -= ( 'A' - 10 ); if ( nByte > 15 ) bIsValid = sal_False; diff --git a/sal/osl/w32/nlsupport.c b/sal/osl/w32/nlsupport.c index 04c63aa..175a8c6 100644 --- a/sal/osl/w32/nlsupport.c +++ b/sal/osl/w32/nlsupport.c @@ -147,7 +147,7 @@ rtl_TextEncoding GetTextEncodingFromLCID( LCID localeId ) WCHAR *pwcEnd; UINT codepage; - /* values returned from GetLocaleInfo are dezimal based */ + /* values returned from GetLocaleInfo are decimal based */ codepage = wcstol( ansiCP, &pwcEnd, 10 ); /* find matching rtl encoding */
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits