[Libreoffice-commits] core.git: 2 commits - forms/source xmlsecurity/source

[Stephan Bergmann]

 forms/source/component/ImageControl.cxx                    |   12 ++++++------
 forms/source/runtime/formoperations.cxx                    |    8 ++++----
 forms/source/xforms/submission.cxx                         |   10 +++++-----
 xmlsecurity/source/component/documentdigitalsignatures.cxx |    4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 715d4d803a8649b4aa46ff7ef89786a1de435604
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Apr 17 15:09:39 2016 +0200

    Avoid reserved identifiers
    
    Change-Id: Icc658a3adce2e93c3cc4e8a88689f462b1c7c8a1

diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index c6cf462..cc3be59 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -734,15 +734,15 @@ css::uno::Sequence<OUString>  OImageControlControl::getSupportedServiceNames() t
 }
 
 
-void SAL_CALL OImageControlControl::addModifyListener( const Reference< XModifyListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OImageControlControl::addModifyListener( const Reference< XModifyListener >& Listener ) throw (RuntimeException, std::exception)
 {
-    m_aModifyListeners.addInterface( _Listener );
+    m_aModifyListeners.addInterface( Listener );
 }
 
 
-void SAL_CALL OImageControlControl::removeModifyListener( const Reference< XModifyListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OImageControlControl::removeModifyListener( const Reference< XModifyListener >& Listener ) throw (RuntimeException, std::exception)
 {
-    m_aModifyListeners.removeInterface( _Listener );
+    m_aModifyListeners.removeInterface( Listener );
 }
 
 
@@ -755,9 +755,9 @@ void SAL_CALL OImageControlControl::disposing()
 }
 
 
-void SAL_CALL OImageControlControl::disposing( const EventObject& _Event ) throw(RuntimeException, std::exception)
+void SAL_CALL OImageControlControl::disposing( const EventObject& Event ) throw(RuntimeException, std::exception)
 {
-    OBoundControl::disposing( _Event );
+    OBoundControl::disposing( Event );
 }
 
 
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 96e7a1f..fa3d428 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -168,9 +168,9 @@ namespace frm
         return getImplementationName_Static();
     }
 
-    sal_Bool SAL_CALL FormOperations::supportsService( const OUString& _ServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL FormOperations::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
     {
-        return cppu::supportsService(this, _ServiceName);
+        return cppu::supportsService(this, ServiceName);
     }
 
     Sequence< OUString > SAL_CALL FormOperations::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
@@ -428,9 +428,9 @@ namespace frm
         }
 
         template < typename TYPE >
-        TYPE lcl_safeGetPropertyValue_throw( const Reference< XPropertySet >& _rxProperties, const OUString& _rPropertyName, TYPE _Default )
+        TYPE lcl_safeGetPropertyValue_throw( const Reference< XPropertySet >& _rxProperties, const OUString& _rPropertyName, TYPE Default )
         {
-            TYPE value( _Default );
+            TYPE value( Default );
             OSL_PRECOND( _rxProperties.is(), "FormOperations::<foo>: no cursor (already disposed?)!" );
             if ( _rxProperties.is() )
                 OSL_VERIFY( _rxProperties->getPropertyValue( _rPropertyName ) >>= value );
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index ec9360c..1f71fa2 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -514,7 +514,7 @@ void SAL_CALL Submission::removeSubmissionVetoListener( const Reference< XSubmis
     throw NoSupportException();
 }
 
-static bool _isIgnorable(const Reference< XNode >& aNode)
+static bool isIgnorable(const Reference< XNode >& aNode)
 {
     // ignore whitespace-only textnodes
     if (aNode->getNodeType() == NodeType_TEXT_NODE)
@@ -527,7 +527,7 @@ static bool _isIgnorable(const Reference< XNode >& aNode)
 }
 
 // recursively copy relevant nodes from A to B
-static void _cloneNodes(Model& aModel, const Reference< XNode >& dstParent, const Reference< XNode >& source, bool bRemoveWSNodes)
+static void cloneNodes(Model& aModel, const Reference< XNode >& dstParent, const Reference< XNode >& source, bool bRemoveWSNodes)
 {
     if (!source.is()) return;
 
@@ -539,13 +539,13 @@ static void _cloneNodes(Model& aModel, const Reference< XNode >& dstParent, cons
     {
         //  is this node relevant?
         MIP mip = aModel.queryMIP(cur);
-        if(mip.isRelevant() && !(bRemoveWSNodes && _isIgnorable(cur)))
+        if(mip.isRelevant() && !(bRemoveWSNodes && isIgnorable(cur)))
         {
             imported = dstDoc->importNode(cur, false);
             imported = dstParent->appendChild(imported);
             // append source children to new imported parent
             for( cur = cur->getFirstChild(); cur.is(); cur = cur->getNextSibling() )
-                _cloneNodes(aModel, imported, cur, bRemoveWSNodes);
+                cloneNodes(aModel, imported, cur, bRemoveWSNodes);
         }
     }
 }
@@ -582,7 +582,7 @@ Reference< XDocumentFragment > Submission::createSubmissionDocument(const Refere
             if (aListItem->getNodeType()==NodeType_DOCUMENT_NODE)
                 aListItem.set( (Reference< XDocument >(aListItem, UNO_QUERY))->getDocumentElement(), UNO_QUERY);
             // copy relevant nodes from instance into fragment
-            _cloneNodes(*getModelImpl(), aFragment, aListItem, bRemoveWSNodes);
+            cloneNodes(*getModelImpl(), aFragment, aListItem, bRemoveWSNodes);
         }
     }
     return aFragment;
commit 0ac89e300f936a7f731ece3d286849e67cf44a40
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Apr 17 15:05:06 2016 +0200

    Avoid reserved identifier
    
    Change-Id: I2577b4986f1b033253b368c570507e757893f98c

diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 5ccacf6..f510f9c 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -398,7 +398,7 @@ void DocumentDigitalSignatures::manageTrustedSources(  ) throw (RuntimeException
 }
 
 void DocumentDigitalSignatures::showCertificate(
-    const Reference< css::security::XCertificate >& _Certificate ) throw (RuntimeException, std::exception)
+    const Reference< css::security::XCertificate >& Certificate ) throw (RuntimeException, std::exception)
 {
     XMLSignatureHelper aSignatureHelper( mxCtx );
 
@@ -408,7 +408,7 @@ void DocumentDigitalSignatures::showCertificate(
 
     if ( bInit )
     {
-        ScopedVclPtrInstance< CertificateViewer > aViewer( nullptr, aSignatureHelper.GetSecurityEnvironment(), _Certificate, false );
+        ScopedVclPtrInstance< CertificateViewer > aViewer( nullptr, aSignatureHelper.GetSecurityEnvironment(), Certificate, false );
         aViewer->Execute();
     }