mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#i12215# XScriptSecurity::checkPermissions now returns void if permission

Browse Source 
is granted.
Removed IllegalArgumentException from specification of
XScriptInfoAccess::getScriptLogicalNames
This commit is contained in:
Duncan Foster
2003-03-12 14:54:18 +00:00
parent 683487f6af
commit c09e0ef0d6
7 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripting/source/storage/ScriptSecurityManager.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: ScriptSecurityManager.cxx,v $
*
* $Revision: 1.18 $
* $Revision: 1.19 $
*
* last change: $Author: jmrice $ $Date: 2003-03-07 11:02:42 $
* last change: $Author: dfoster $ $Date: 2003-03-12 15:54:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -379,7 +379,7 @@ throw ( RuntimeException )
* we can't see a good reason not to return a bool, rather than throw
* an exception if the request is not granted (as is the case in Java).
*/
sal_Bool ScriptSecurityManager::checkPermission( const OUString & scriptStorageURL,
void ScriptSecurityManager::checkPermission( const OUString & scriptStorageURL,
const OUString & permissionRequest )
throw ( RuntimeException, lang::IllegalArgumentException, security::AccessControlException )
{
@@ -396,7 +396,7 @@ sal_Bool ScriptSecurityManager::checkPermission( const OUString & scriptStorageU
{
if ( ph_it->second.execPermission )
{
return true;
return;
}
else
{

6
scripting/source/storage/ScriptSecurityManager.hxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: ScriptSecurityManager.hxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: jmrice $ $Date: 2003-03-07 11:02:42 $
* last change: $Author: dfoster $ $Date: 2003-03-12 15:54:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -101,7 +101,7 @@ public:
* checks to see if the requested permission can be granted
* checks to see whether the requested ScriptPeremission is allowed.
*/
sal_Bool checkPermission( const rtl::OUString & scriptStorageURL,
void checkPermission( const rtl::OUString & scriptStorageURL,
const rtl::OUString & permissionRequest )
throw ( css::uno::RuntimeException, css::lang::IllegalArgumentException,
css::security::AccessControlException );

7
scripting/source/storage/ScriptStorage.cxx
View File

@@ -2,8 +2,8 @@
*
* $RCSfile: ScriptStorage.cxx,v $
*
* $Revision: 1.18 $
* last change: $Author: npower $ $Date: 2003-03-04 13:26:27 $
* $Revision: 1.19 $
* last change: $Author: dfoster $ $Date: 2003-03-12 15:54:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -556,8 +556,7 @@ ScriptStorage::writeMetadataHeader(
//*************************************************************************
Sequence< ::rtl::OUString >
ScriptStorage::getScriptLogicalNames()
throw ( lang::IllegalArgumentException,
RuntimeException )
throw ( RuntimeException )
{
Sequence< ::rtl::OUString > results;
ScriptInfo_hash::iterator h_it = mh_implementations.begin();

6
scripting/source/storage/ScriptStorage.hxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: ScriptStorage.hxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: npower $ $Date: 2003-02-12 16:21:43 $
* last change: $Author: dfoster $ $Date: 2003-03-12 15:54:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -149,7 +149,7 @@ public:
*/
virtual css::uno::Sequence< ::rtl::OUString >
SAL_CALL getScriptLogicalNames()
throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException );
throw ( css::uno::RuntimeException );
//=========================================================================
/**

10
scripting/source/storage/ScriptStorageManager.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: ScriptStorageManager.cxx,v $
*
* $Revision: 1.24 $
* $Revision: 1.25 $
*
* last change: $Author: dfoster $ $Date: 2003-03-04 18:34:54 $
* last change: $Author: dfoster $ $Date: 2003-03-12 15:54:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -416,15 +416,14 @@ throw( RuntimeException )
}
//*************************************************************************
sal_Bool SAL_CALL
void SAL_CALL
ScriptStorageManager::checkPermission( const OUString &
scriptStorageURI, const OUString & permissionRequest )
throw ( RuntimeException, lang::IllegalArgumentException, css::security::AccessControlException )
{
sal_Bool result;
try
{
result = m_securityMgr.checkPermission( scriptStorageURI, permissionRequest );
m_securityMgr.checkPermission( scriptStorageURI, permissionRequest );
}
catch ( css::security::AccessControlException & e )
{
@@ -444,7 +443,6 @@ throw ( RuntimeException, lang::IllegalArgumentException, css::security::AccessC
OUSTR( "ScriptStorageManager::checkPermission: RuntimeException: " ).concat(
e.Message ), Reference< XInterface >() );
}
return result;
}
//*************************************************************************

6
scripting/source/storage/ScriptStorageManager.hxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: ScriptStorageManager.hxx,v $
*
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* last change: $Author: dfoster $ $Date: 2003-03-04 12:33:32 $
* last change: $Author: dfoster $ $Date: 2003-03-12 15:54:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -214,7 +214,7 @@ public:
if there is no matching script name
*/
virtual sal_Bool SAL_CALL ScriptStorageManager::checkPermission(
virtual void SAL_CALL ScriptStorageManager::checkPermission(
const rtl::OUString & scriptStorageURI,
const rtl::OUString & permissionRequest )
throw ( css::uno::RuntimeException, css::lang::IllegalArgumentException,