diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-05-29 17:23:51 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-05-29 18:03:34 +0100 |
| commit | 6e6d81e9cfc593d865e409ad22b2307f87a37859 (patch) | |
| tree | 4d578e5be2dfd3a403576d7c638f83f041d56911 /shell/source | |
| parent | b7c6716b4bc0742af4206035495d161e7eb49424 (diff) | |
targetted SAL_N_ELEMENTS reversion.
Change-Id: I30be93ccaeb1f9fd17cbe9e3ed3165e094810b2e
Diffstat (limited to 'shell/source')
5 files changed, 6 insertions, 5 deletions
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index 8b1782414d49..544f40dcbd4e 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -812,7 +812,8 @@ ConfigurationValue const ConfigurationValues[] = #endif // ENABLE_LOCKDOWN }; -std::size_t const nConfigurationValues = SAL_N_ELEMENTS(ConfigurationValues); +std::size_t const nConfigurationValues = + sizeof ConfigurationValues / sizeof ConfigurationValues[0]; css::beans::Optional< css::uno::Any > getValue(ConfigurationValue const & data) { diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index bce143baf016..b37d19adc460 100644 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -54,7 +54,7 @@ namespace /* private */ {{PSGUID_SUMMARYINFORMATION, PIDSI_PAGECOUNT},VT_BSTR, LVCFMT_LEFT, 30, SHCOLSTATE_TYPE_STR, L"Pagecount", L"Pagecount"} }; - size_t ColumnInfoTableSize = SAL_N_ELEMENTS(ColumnInfoTable); + size_t ColumnInfoTableSize = sizeof(ColumnInfoTable)/sizeof(ColumnInfoTable[0]); } //---------------------------- diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index 3d7e60b4abfc..c9ea9b33f799 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -70,7 +70,7 @@ PROPERTYMAP g_rgPROPERTYMAP[] = { PKEY_Comment, L"LibreOffice", L"Comments" }, }; -size_t gPropertyMapTableSize = SAL_N_ELEMENTS(g_rgPROPERTYMAP); +size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]); //---------------------------- diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx index e097018f660f..60d0e7f92145 100644 --- a/shell/source/win32/shlxthandler/util/fileextensions.cxx +++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx @@ -66,7 +66,7 @@ FileExtensionEntry OOFileExtensionTable[] = { }; -size_t OOFileExtensionTableSize = SAL_N_ELEMENTS(OOFileExtensionTable); +size_t OOFileExtensionTableSize = sizeof(OOFileExtensionTable)/sizeof(OOFileExtensionTable[0]); //--------------------------------- /** Return the extension of a file diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index c7f623dbd541..867dc54638c6 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -200,7 +200,7 @@ const char* KnownParameter[] = "--mapi-logon-ui" }; -const size_t nKnownParameter = (SAL_N_ELEMENTS(KnownParameter)); +const size_t nKnownParameter = (sizeof(KnownParameter)/sizeof(KnownParameter[0])); /** @internal */ bool isKnownParameter(const char* aParameterName) |