handle getParameters being called before execute()

Change-Id: If81e745ee15df3848c6577a9e979672523718daf

dbaccess/source/core/api/RowSet.cxx

@@ -1624,10 +1624,17 @@ void ORowSet::setStatementResultSetType( const Reference< XPropertySet >& _rxSta
     _rxStatement->setPropertyValue( PROPERTY_RESULTSETCONCURRENCY, makeAny( nResultSetConcurrency ) );
 }
 
-void ORowSet::impl_makeNewStatement_throw()
+void ORowSet::impl_ensureStatement_throw()
 {
     OUString sCommandToExecute;
-    impl_initComposer_throw( sCommandToExecute );
+    if(m_bCommandFacetsDirty)
+    {
+        impl_initComposer_throw( sCommandToExecute );
+    }
+    else
+    {
+        sCommandToExecute = m_bUseEscapeProcessing ? m_xComposer->getQueryWithSubstitution() : m_aActiveCommand;
+    }
 
     try
     {
@@ -1672,8 +1679,7 @@ void ORowSet::impl_makeNewStatement_throw()
 
 Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
 {
-    if(m_bCommandFacetsDirty)
-        impl_makeNewStatement_throw();
+    impl_ensureStatement_throw();
 
     m_aParameterValueForCache.get().resize(1);
     Reference< XParameters > xParam( m_xStatement, UNO_QUERY_THROW );

dbaccess/source/core/api/RowSet.hxx

@@ -197,7 +197,7 @@ namespace dbaccess
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
                         impl_prepareAndExecute_throw();
-        void            impl_makeNewStatement_throw();
+        void            impl_ensureStatement_throw();
 
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >  calcConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxHandler) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
         // free clones and ParseTree. Plus, if _bComplete is <TRUE/>, *all* other associated resources