merge commit

4 files changed, 14 insertions, 24 deletions

diff --git a/forms/qa/makefile.mk b/forms/qa/makefile.mk
index 822f67e1bb46..b34529e2fbcf 100644
--- a/forms/qa/makefile.mk
+++ b/forms/qa/makefile.mk
@@ -73,15 +73,18 @@ ALL: 	ALLDEP
 
 .INCLUDE :  target.mk
 
+test:
+    echo $(SOLARBINDIR)
+
 .IF "$(BUILD_QADEVOOO)" == "YES"
 show_targets:
-    +@java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
+    +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
 
 run:
-    +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce
+    +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce
 
 run_%:
-    +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//)
+    +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//)
 
 .ELSE
 run: show_targets
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 20900f3ec3e0..92883f70a950 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -539,18 +539,21 @@ Model::XModel_t Model::newModel( const Reference<com::sun::star::frame::XModel>&
                                  const OUString& sName )
     throw( RuntimeException )
 {
-    Model* pModel = NULL;
+    Model::XModel_t xModel;
     Reference<XNameContainer> xModels = lcl_getModels( xCmp );
     if( xModels.is()
         && ! xModels->hasByName( sName ) )
     {
-        pModel = new Model();
+        Model* pModel = new Model();
+        xModel.set( pModel );
+
         pModel->setID( sName );
         pModel->newInstance( OUString(), OUString(), sal_False );
-        xModels->insertByName( sName, makeAny( Reference<XModel>( pModel ) ) );
+        pModel->initialize();
+        xModels->insertByName( sName, makeAny( xModel ) );
     }
 
-    return pModel;
+    return xModel;
 }
 
 void Model::renameModel( const Reference<com::sun::star::frame::XModel>& xCmp,
diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx
index 1c4bf3f6d14f..a4dfbe3b08e6 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -293,7 +293,7 @@ void xforms_nowFunction(xmlXPathParserContextPtr ctxt, int /*nargs*/)
     */
     DateTime aDateTime;
     ::rtl::OString aDateTimeString = makeDateTimeString(aDateTime);
-    xmlChar *pString = (xmlChar*)rtl_allocateMemory(aDateTimeString.getLength()+1);
+    xmlChar *pString = static_cast<xmlChar*>(xmlMalloc(aDateTimeString.getLength()+1));
     strncpy((char*)pString, (char*)aDateTimeString.getStr(), aDateTimeString.getLength());
     pString[aDateTimeString.getLength()] = 0;
     xmlXPathReturnString(ctxt, pString);
diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk
index 17f594ba7c4f..1c454b1383db 100644
--- a/forms/util/makefile.mk
+++ b/forms/util/makefile.mk
@@ -96,22 +96,6 @@ RES1FILELIST=\
 RESLIB1NAME=$(TARGET)
 RESLIB1SRSFILES=$(RES1FILELIST)
 
-.IF "$(GUI)"=="UNX"
-
-# [ed] 6/19/02 Only add in libraries for X11 OS X builds
-
-.IF "$(OS)"=="MACOSX"
-.IF "$(GUIBASE)"=="unx"
-SHL1STDLIBS +=\
-        -lX11 -lXt -lXmu
-.ENDIF
-.ELSE
-SHL1STDLIBS +=\
-    -lX11
-.ENDIF # OS == MACOSX
-
-.ENDIF
-
 .IF "$(GUI)"=="OS2"
 SHL1STDLIBS += pthread.lib libz.lib
 .ENDIF