[PATCH] Remove commented code in odk/examples

[Christina Roßmanith (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3138

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/3138/1

Remove commented code in odk/examples

Change-Id: I8b28729d3cc632426efac02028f0d0e332243012
---
M odk/examples/cpp/counter/counter.cxx
M odk/examples/java/Inspector/SourceCodeGenerator.java
2 files changed, 1 insertion(+), 45 deletions(-)



diff --git a/odk/examples/cpp/counter/counter.cxx b/odk/examples/cpp/counter/counter.cxx
index 572d9c1..6f65f5c 100644
--- a/odk/examples/cpp/counter/counter.cxx
+++ b/odk/examples/cpp/counter/counter.cxx
@@ -164,42 +164,6 @@
 //#### EXPORTED ###########################################################
 //#########################################################################
 
-
-/**
- * This function creates an implementation section in the registry and another subkey
- *
- * for each supported service.
- * @param pServiceManager   the service manager
- * @param pRegistryKey      the registry key
- */
-// extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKey)
-// {
-//  sal_Bool result = sal_False;
-
-//  if (pRegistryKey)
-//  {
-//      try
-//      {
-//          Reference< XRegistryKey > xNewKey(
-//              reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-//                  OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME "/UNO/SERVICES") ) ) );
-
-//          const Sequence< OUString > & rSNL =
-//              MyCounterImpl::getSupportedServiceNames_Static();
-//          const OUString * pArray = rSNL.getConstArray();
-//          for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
-//              xNewKey->createKey( pArray[nPos] );
-
-//          return sal_True;
-//      }
-//      catch (InvalidRegistryException &)
-//      {
-//          // we should not ignore exceptions
-//      }
-//  }
-//  return result;
-// }
-
 /**
  * This function is called to get service factories for an implementation.
  *
diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java
index ac7bdfa..f8de8c2 100644
--- a/odk/examples/java/Inspector/SourceCodeGenerator.java
+++ b/odk/examples/java/Inspector/SourceCodeGenerator.java
@@ -92,7 +92,6 @@
                         if (oUnoMethodNode.isInvoked()){
                             UnoObjectDefinition oUnoReturnObjectDefinition = getUnoObjectDefinition(_xTreepathProvider, oUnoMethodNode, i);
                             if (!isVariableDeclared(oUnoReturnObjectDefinition, this.generateVariableNameFromMethod(oUnoMethodNode.getXIdlMethod()))){
-//                                sStatementCode += "\n";
                                 sStatementCode += "\n" + getMethodStatementSourceCode(oUnoMethodNode, sVariableName, oUnoReturnObjectDefinition);
                             }
                             sVariableName = oUnoReturnObjectDefinition.getVariableName();
@@ -103,7 +102,6 @@
                         Any oReturnObject = com.sun.star.uno.Any.complete(oUnoPropertyNode.getUnoReturnObject());
                         UnoObjectDefinition oUnoReturnObjectDefinition = new UnoObjectDefinition(oReturnObject);
                         if (!isVariableDeclared(oUnoReturnObjectDefinition, oUnoPropertyNode.getProperty().Name)){
-//                            sStatementCode += "\n";
                             sStatementCode += "\n" + getPropertyStatementSourceCode(oUnoPropertyNode, sVariableName, oUnoReturnObjectDefinition);
                         }
                         sVariableName = oUnoReturnObjectDefinition.getVariableName();
@@ -858,7 +856,6 @@
     public class JavaCodeGenerator implements XLanguageSourceCodeGenerator{
         String sStatementsCode = "";
         boolean bAddAnyConverter = false;
-//        boolean bAddTypeImport = false;
         boolean bIsPropertyUnoObjectDefined = false;
 
         public JavaCodeGenerator(){
@@ -1549,12 +1546,7 @@
 
 
         public String getConvertedSourceCodeValueOfObject(String _sReturnVariableName, String _sObjectDescription, TypeClass _aTypeClass, String _sTypeName){
-//            if (m_oIntrospector.isPrimitive(_aTypeClass)){
-                return _sObjectDescription + " >>= " + _sReturnVariableName;
-//            }
-//            else{
-//                return _sReturnVariableName + " = " + _sObjectDescription;
-//            }
+            return _sObjectDescription + " >>= " + _sReturnVariableName;
         }
 
 

-- 
To view, visit https://gerrit.libreoffice.org/3138
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b28729d3cc632426efac02028f0d0e332243012
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith <ChrRossmanith at web.de>