From 6e6d81e9cfc593d865e409ad22b2307f87a37859 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 29 May 2012 17:23:51 +0100 Subject: targetted SAL_N_ELEMENTS reversion. Change-Id: I30be93ccaeb1f9fd17cbe9e3ed3165e094810b2e --- ucb/source/ucp/gvfs/gvfs_content.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ucb/source/ucp/gvfs/gvfs_content.cxx') diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx index cb1bb50dea5e..7b0605a1cd33 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.cxx +++ b/ucb/source/ucp/gvfs/gvfs_content.cxx @@ -1352,7 +1352,7 @@ uno::Sequence< beans::Property > Content::getProperties( beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) }; - const int nProps = SAL_N_ELEMENTS(aGenericProperties); + const int nProps = sizeof (aGenericProperties) / sizeof (aGenericProperties[0]); return uno::Sequence< beans::Property > ( aGenericProperties, nProps ); @@ -1396,7 +1396,8 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( -1, getCppuType( static_cast( 0 ) ) ) }; - const int nProps = SAL_N_ELEMENTS( aCommandInfoTable ); + const int nProps + = sizeof( aCommandInfoTable ) / sizeof( aCommandInfoTable[ 0 ] ); return uno::Sequence< ucb::CommandInfo >( aCommandInfoTable, isFolder( xEnv ) ? nProps : nProps - 2 ); } -- cgit