[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source xmlsecurity/source

[Tomaž Vajngerl (via logerrit)]

 sfx2/source/appl/appopen.cxx                          |   14 +++++++-------
 xmlsecurity/source/helper/documentsignaturehelper.cxx |    6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit f4146c70daf41420f7ac75dfe2b57195f3594282
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon Dec 31 10:09:03 2018 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Sep 22 10:09:10 2019 +0200

    Remove some useless whitespaces
    
    Change-Id: Iebf7add3dd937afb6dad07a10ecbe768c0a79d36
    Reviewed-on: https://gerrit.libreoffice.org/65764
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    (cherry picked from commit a8d51dc85627514ce7f983eb4e0514ef00f84b1e)
    Reviewed-on: https://gerrit.libreoffice.org/79298
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    Tested-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index c54b3e58580b..3c52e0f1cb9a 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -664,9 +664,9 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             // intercept all incoming interactions and provide useful 
information
             // later if the following transaction was finished.
 
-            ::sfx2::PreventDuplicateInteraction*                 pHandler      
 = new 
::sfx2::PreventDuplicateInteraction(::comphelper::getProcessComponentContext());
-            css::uno::Reference< css::task::XInteractionHandler >     xHandler 
      (static_cast< css::task::XInteractionHandler* >(pHandler), 
css::uno::UNO_QUERY);
-            css::uno::Reference< css::task::XInteractionHandler >     
xWrappedHandler;
+            sfx2::PreventDuplicateInteraction* pHandler = new 
sfx2::PreventDuplicateInteraction(comphelper::getProcessComponentContext());
+            uno::Reference<task::XInteractionHandler> xHandler(static_cast< 
css::task::XInteractionHandler* >(pHandler), css::uno::UNO_QUERY);
+            uno::Reference<task::XInteractionHandler> xWrappedHandler;
 
             // wrap existing handler or create new UUI handler
             const SfxUnoAnyItem* pInteractionItem = 
rReq.GetArg<SfxUnoAnyItem>(SID_INTERACTIONHANDLER);
@@ -682,7 +682,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             rReq.AppendItem( 
SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::makeAny(xHandler)) );
 
             // define rules for this handler
-            css::uno::Type                                            
aInteraction = ::cppu::UnoType<css::task::ErrorCodeRequest>::get();
+            css::uno::Type aInteraction = 
::cppu::UnoType<css::task::ErrorCodeRequest>::get();
             ::sfx2::PreventDuplicateInteraction::InteractionInfo 
aRule(aInteraction);
             pHandler->addInteractionRule(aRule);
 
@@ -804,9 +804,9 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     // Mark without URL cannot be handled by hyperlink code
     if ( bHyperlinkUsed && !aFileName.isEmpty() && aFileName[0] != '#' )
     {
-        Reference< css::document::XTypeDetection > xTypeDetection( 
::comphelper::getProcessServiceFactory()->createInstance(
-                                                                       
"com.sun.star.document.TypeDetection"),
-                                                                   UNO_QUERY );
+        uno::Reference<document::XTypeDetection> xTypeDetection(
+            
comphelper::getProcessServiceFactory()->createInstance("com.sun.star.document.TypeDetection"),
 UNO_QUERY);
+
         if ( xTypeDetection.is() )
         {
             URL             aURL;
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx 
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index dc00cc18e626..1dda0be4d7f5 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -490,17 +490,17 @@ bool 
DocumentSignatureHelper::equalsReferenceUriManifestPath(
 
 OUString 
DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName()
 {
-    return OUString(  "documentsignatures.xml"  );
+    return OUString("documentsignatures.xml");
 }
 
 OUString 
DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName()
 {
-    return OUString(  "macrosignatures.xml"  );
+    return OUString("macrosignatures.xml");
 }
 
 OUString DocumentSignatureHelper::GetPackageSignatureDefaultStreamName()
 {
-    return OUString(  "packagesignatures.xml"  );
+    return OUString("packagesignatures.xml");
 }
 
 void DocumentSignatureHelper::writeDigestMethod(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits