diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 08:05:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 08:05:58 +0000 |
| commit | 4ca5c503bc36f0300bb3f3ec1577ed41df098ab2 (patch) | |
| tree | 0e6a4a4fddafd0cafd18601f5345e371c7fe1f99 /stoc/source | |
| parent | c490a9f0684dd5cc7efd897afbf70e2f73444f72 (diff) | |
CWS-TOOLING: integrate CWS jsc311
Diffstat (limited to 'stoc/source')
| -rw-r--r-- | stoc/source/security/permissions.cxx | 9 | ||||
| -rw-r--r-- | stoc/source/security/permissions.h | 7 |
2 files changed, 6 insertions, 10 deletions
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index 5e08c190d079..2d8a655dade6 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: permissions.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.16.1 $ * * This file is part of OpenOffice.org. * @@ -544,6 +544,7 @@ PermissionCollection::PermissionCollection( } } } +#ifdef __DIAGNOSE //__________________________________________________________________________________________________ Sequence< OUString > PermissionCollection::toStrings() const SAL_THROW( () ) { @@ -556,6 +557,7 @@ Sequence< OUString > PermissionCollection::toStrings() const SAL_THROW( () ) return Sequence< OUString >( strings.empty() ? 0 : &strings[ 0 ], strings.size() ); } +#endif //__________________________________________________________________________________________________ inline static bool __implies( ::rtl::Reference< Permission > const & head, Permission const & demanded ) SAL_THROW( () ) @@ -567,11 +569,6 @@ inline static bool __implies( } return false; } -//__________________________________________________________________________________________________ -bool PermissionCollection::implies( Permission const & perm ) const SAL_THROW( () ) -{ - return __implies( m_head, perm ); -} #ifdef __DIAGNOSE //-------------------------------------------------------------------------------------------------- diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h index c7d4ab5d4c79..c86f882b9e07 100644 --- a/stoc/source/security/permissions.h +++ b/stoc/source/security/permissions.h @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: permissions.h,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.16.1 $ * * This file is part of OpenOffice.org. * @@ -93,10 +93,9 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > const & permissions, PermissionCollection const & addition = PermissionCollection() ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); - +#ifdef __DIAGNOSE ::com::sun::star::uno::Sequence< ::rtl::OUString > toStrings() const SAL_THROW( () ); - - bool implies( Permission const & ) const SAL_THROW( () ); +#endif void checkPermission( ::com::sun::star::uno::Any const & perm ) const SAL_THROW( (::com::sun::star::uno::RuntimeException) ); }; |