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

Some clean up of previous commit

Browse Source 
Change-Id: I0ea6d6439f97fcf74162c19671483aaa17b5a6cb
This commit is contained in:
Stephan Bergmann
2012-09-04 17:23:18 +02:00
parent 197a79e571
commit af5059d19a
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
filter/source/pdf/impdialog.cxx
View File

@@ -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();

4
offapi/UnoApi_offapi.mk
View File

@@ -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,\
)) ))
$(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,\

2
sfx2/source/doc/objserv.cxx
View File

@@ -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 );

2
sfx2/source/doc/objstor.cxx
View File

@@ -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 );

4
xmlsecurity/workben/signaturetest.cxx
View File

@@ -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)
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++ )