diff options
| -rw-r--r-- | filter/source/pdf/impdialog.cxx | 2 | ||||
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/workben/signaturetest.cxx | 4 |
5 files changed, 6 insertions, 8 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 7ef26b1d3e55..3662826525af 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1711,7 +1711,7 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertSelect ) Reference< security::XDocumentDigitalSignatures > xSigner( security::DocumentDigitalSignatures::createWithVersion( - comphelper::getProcessComponentContext(), rtl::OUString("1.2") ) ); + comphelper::getProcessComponentContext(), "1.2" ) ); maSignCertificate = xSigner->chooseCertificate(); diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 0abad1a6b5de..0a9714528a0f 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -214,9 +214,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\ StringResourceWithLocation \ 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,\ 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,\ CertificateContainer \ + DocumentDigitalSignatures \ SerialNumberAdapter \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\ diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 5046eca0c865..443294aafafd 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1261,7 +1261,7 @@ uno::Sequence< security::DocumentSignatureInformation > SfxObjectShell::ImplAnal { if ( !xLocSigner.is() ) { - ::rtl::OUString aVersion; + OUString aVersion; try { uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 0534f9c4547f..e3ffae4bca9f 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1538,7 +1538,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl try { // get the ODF version of the new medium - ::rtl::OUString aVersion; + OUString aVersion; try { uno::Reference < beans::XPropertySet > xPropSet( rMedium.GetStorage(), uno::UNO_QUERY_THROW ); diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index e5e3ac52ff31..f0c45fd95b1d 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -304,7 +304,7 @@ IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl) aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() ); uno::Reference< security::XDocumentDigitalSignatures > xD( - security::DocumentDigitalSignatures::create(comphelper::getProcessComponentContext() ); + security::DocumentDigitalSignatures::createDefault(comphelper::getProcessComponentContext() ); xD->signDocumentContent( xStore, NULL ); @@ -318,7 +318,7 @@ IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl) aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() ); uno::Reference< security::XDocumentDigitalSignatures > xD( - security::DocumentDigitalSignatures::create(comphelper::getProcessComponentContext()) ); + security::DocumentDigitalSignatures::createDefault(comphelper::getProcessComponentContext()) ); uno::Sequence< security::DocumentSignatureInformation > aInfos = xD->verifyDocumentContentSignatures( xStore, NULL ); int nInfos = aInfos.getLength(); for ( int n = 0; n < nInfos; n++ ) |