summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2010-06-03 00:10:45 +0200
committerMikhail Voytenko <mav@openoffice.org>2010-06-03 00:10:45 +0200
commitf165b2dae6e9133481da351586a4d5f14839fa4d (patch)
tree53bdc6b6c9f570746d6461aeb7a19f1b9eac713f /sd
parent5f1cf0c9724c55c054a1012a72be6ae7e047bfec (diff)
tl78: #i110383# password to modify support for binary types only
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx28
1 files changed, 1 insertions, 27 deletions
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index aa41dfc54bb0..ed47e57b2130 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -152,7 +152,7 @@ enum SdDocumentSettingsPropertyHandles
// --> PB 2004-08-23 #i33095#
,HANDLE_LOAD_READONLY, HANDLE_SAVE_VERSION
// <--
- ,HANDLE_SLIDESPERHANDOUT, HANDLE_HANDOUTHORIZONTAL, HANDLE_MODIFYPASSWORDHASH
+ ,HANDLE_SLIDESPERHANDOUT, HANDLE_HANDOUTHORIZONTAL
};
#define MID_PRINTER 1
@@ -216,7 +216,6 @@ enum SdDocumentSettingsPropertyHandles
{ MAP_LEN("LoadReadonly"), HANDLE_LOAD_READONLY, &::getBooleanCppuType(), 0, 0 },
{ MAP_LEN("SaveVersionOnClose"), HANDLE_SAVE_VERSION, &::getBooleanCppuType(), 0, 0 },
// <--
- { MAP_LEN("ModifyPasswordHash"), HANDLE_MODIFYPASSWORDHASH, &getCppuType((sal_Int32*)0), 0, 0 },
{ NULL, 0, 0, NULL, 0, 0 }
};
@@ -864,25 +863,6 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
}
break;
- case HANDLE_MODIFYPASSWORDHASH:
- {
- sal_Int32 nHash = 0;
- if ( ( *pValues >>= nHash ) && nHash >= 0 && nHash <= SAL_MAX_UINT16 )
- {
- bChanged = ( pDocSh->GetModifyPasswordHash() != nHash );
- if ( bChanged )
- {
- if ( !pDocSh->SetModifyPasswordHash( static_cast< sal_uInt16 >( nHash ) ) )
- throw beans::PropertyVetoException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The hash is not allowed to be changed now!" ) ),
- uno::Reference< uno::XInterface >() );
- }
-
- bOk = sal_True;
- }
- }
- break;
-
default:
throw UnknownPropertyException();
}
@@ -1142,12 +1122,6 @@ void DocumentSettings::_getPropertyValues( const PropertyMapEntry** ppEntries, A
}
break;
- case HANDLE_MODIFYPASSWORDHASH:
- {
- *pValue <<= static_cast< sal_Int32 >( pDocSh->GetModifyPasswordHash() );
- }
- break;
-
default:
throw UnknownPropertyException();
}