Kaydet (Commit) af5059d1 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Some clean up of previous commit

Change-Id: I0ea6d6439f97fcf74162c19671483aaa17b5a6cb
üst 197a79e5
...@@ -1711,7 +1711,7 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertSelect ) ...@@ -1711,7 +1711,7 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertSelect )
Reference< security::XDocumentDigitalSignatures > xSigner( Reference< security::XDocumentDigitalSignatures > xSigner(
security::DocumentDigitalSignatures::createWithVersion( security::DocumentDigitalSignatures::createWithVersion(
comphelper::getProcessComponentContext(), rtl::OUString("1.2") ) ); comphelper::getProcessComponentContext(), "1.2" ) );
maSignCertificate = xSigner->chooseCertificate(); maSignCertificate = xSigner->chooseCertificate();
......
...@@ -214,9 +214,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\ ...@@ -214,9 +214,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\
StringResourceWithLocation \ StringResourceWithLocation \
StringResourceWithStorage \ StringResourceWithStorage \
)) ))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\
DocumentDigitalSignatures \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\
ScannerManager \ ScannerManager \
)) ))
...@@ -244,6 +241,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\ ...@@ -244,6 +241,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\
)) ))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\
CertificateContainer \ CertificateContainer \
DocumentDigitalSignatures \
SerialNumberAdapter \ SerialNumberAdapter \
)) ))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\
......
...@@ -1261,7 +1261,7 @@ uno::Sequence< security::DocumentSignatureInformation > SfxObjectShell::ImplAnal ...@@ -1261,7 +1261,7 @@ uno::Sequence< security::DocumentSignatureInformation > SfxObjectShell::ImplAnal
{ {
if ( !xLocSigner.is() ) if ( !xLocSigner.is() )
{ {
::rtl::OUString aVersion; OUString aVersion;
try try
{ {
uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW );
......
...@@ -1538,7 +1538,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl ...@@ -1538,7 +1538,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
try try
{ {
// get the ODF version of the new medium // get the ODF version of the new medium
::rtl::OUString aVersion; OUString aVersion;
try try
{ {
uno::Reference < beans::XPropertySet > xPropSet( rMedium.GetStorage(), uno::UNO_QUERY_THROW ); uno::Reference < beans::XPropertySet > xPropSet( rMedium.GetStorage(), uno::UNO_QUERY_THROW );
......
...@@ -304,7 +304,7 @@ IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl) ...@@ -304,7 +304,7 @@ IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl)
aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() ); aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() );
uno::Reference< security::XDocumentDigitalSignatures > xD( uno::Reference< security::XDocumentDigitalSignatures > xD(
security::DocumentDigitalSignatures::create(comphelper::getProcessComponentContext() ); security::DocumentDigitalSignatures::createDefault(comphelper::getProcessComponentContext() );
xD->signDocumentContent( xStore, NULL ); xD->signDocumentContent( xStore, NULL );
...@@ -318,7 +318,7 @@ IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl) ...@@ -318,7 +318,7 @@ IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl)
aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() ); aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() );
uno::Reference< security::XDocumentDigitalSignatures > xD( uno::Reference< security::XDocumentDigitalSignatures > xD(
security::DocumentDigitalSignatures::create(comphelper::getProcessComponentContext()) ); security::DocumentDigitalSignatures::createDefault(comphelper::getProcessComponentContext()) );
uno::Sequence< security::DocumentSignatureInformation > aInfos = xD->verifyDocumentContentSignatures( xStore, NULL ); uno::Sequence< security::DocumentSignatureInformation > aInfos = xD->verifyDocumentContentSignatures( xStore, NULL );
int nInfos = aInfos.getLength(); int nInfos = aInfos.getLength();
for ( int n = 0; n < nInfos; n++ ) for ( int n = 0; n < nInfos; n++ )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment