autorecovery: commit resolved merge (after rebase to m71)

odk/examples/DevelopersGuide/UCB/ResourceCreator.java

@@ -43,7 +43,6 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.ucb.ContentInfo;
 import com.sun.star.ucb.InsertCommandArgument;
 import com.sun.star.ucb.XContent;
-import com.sun.star.ucb.XContentCreator;
 import com.sun.star.io.XInputStream;
 
 
@@ -154,18 +153,17 @@ public class ResourceCreator {
         boolean result = false;
         if ( stream != null && name != null && !name.equals( "" )) {
 
-            // Obtain content creator interface.
-            XContentCreator creator = ( XContentCreator )UnoRuntime.queryInterface(
-                    XContentCreator.class, m_content );
-
-            // Note: The data for info may have been obtained using
-            //       XContentCreator::queryCreatableContentsInfo().
+            // Note: The data for info may have been obtained from
+            //       property CreatableContentsInfo.
             ContentInfo info = new ContentInfo();
             info.Type = "application/vnd.sun.staroffice.fsys-file";
             info.Attributes = 0;
 
-            // Create new, empty content.
-            XContent newContent = creator.createNewContent( info );
+            // Create new, empty content (execute command "createNewContent").
+            XContent newContent = ( XContent )UnoRuntime.queryInterface(
+                XContent.class,
+                m_helper.executeCommand( m_content, "createNewContent", info ) );
+
             if ( newContent != null ) {
 
                 /////////////////////////////////////////////////////////////////////
@@ -181,7 +179,7 @@ public class ResourceCreator {
                 props[ 0 ] = prop;
 
                 // Execute command "setPropertyValues".
-                m_helper.executeCommand( newContent, "setPropertyValues",props );
+                m_helper.executeCommand( newContent, "setPropertyValues", props );
 
                 /////////////////////////////////////////////////////////////////////
                 // Write the new file to disk...