ooo-build r11549 - in trunk: . patches/src680

[jannieuw svn gnome org]

Author: jannieuw
Date: Mon Feb 11 13:58:26 2008
New Revision: 11549
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11549&view=rev

Log:
2008-02-11  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/src680/layout-dialogs-transex3.diff: Update from GIT:
	Actually build tralay when --enable-layout.  Build fix for tralay,
	drop sal and vcl dependencies.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/layout-dialogs-transex3.diff

Modified: trunk/patches/src680/layout-dialogs-transex3.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-transex3.diff	(original)
+++ trunk/patches/src680/layout-dialogs-transex3.diff	Mon Feb 11 13:58:26 2008
@@ -284,17 +284,17 @@
 +layout	janneke\vc\ooo-m3\build\current\transex3\layout\zoom.xml	0	layout	BTN_USER				0	en-US	Variable				20080206 16:06:07
 diff --git a/transex3/layout/makefile.mk b/transex3/layout/makefile.mk
 new file mode 100644
-index 0000000..b55d195
+index 0000000..7b7c4ac
 --- /dev/null
 +++ transex3/layout/makefile.mk
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,60 @@
 +PRJ=..
 +
 +INCPRE=$(MISC)
 +
 +PRJNAME=transex3
 +TARGET=tralay
-+TARGETTYPE=GUI
++TARGETTYPE=CUI
 +LIBTARGET=no
 +
 +# --- Settings -----------------------------------------------------
@@ -315,7 +315,7 @@
 +
 +APP1TARGET=$(TARGET)
 +
-+.IF "$(ENABLE_LAYOUT)" == "XTRUE"
++.IF "$(ENABLE_LAYOUT)" == "TRUE"
 +
 +OBJFILES =\
 +	$(OBJ)/export2.obj\
@@ -325,13 +325,12 @@
 +	$(OBJ)/tralay.obj\
 +	$(OBJ)/xmlparse.obj
 +
++APP1OBJS = $(OBJFILES)
++
 +APP1STDLIBS =\
-+	$(SALLIB)\
 +	$(EXPATASCII3RDLIB)\
 +	$(TOOLSLIB)\
-+	$(VOSLIB)\
-+	$(VCLLIB)\
-+	$(XMLSCRIPTLIB)
++	$(VOSLIB)
 +
 +# --- Targets ------------------------------------------------------
 +
@@ -351,11 +350,10 @@
 +
 diff --git a/transex3/layout/tralay.cxx b/transex3/layout/tralay.cxx
 new file mode 100644
-index 0000000..fb3d2bc
+index 0000000..d44daf1
 --- /dev/null
 +++ transex3/layout/tralay.cxx
-@@ -0,0 +1,312 @@
-+#include <vcl/svapp.hxx>
+@@ -0,0 +1,344 @@
 +#include <com/sun/star/xml/sax/SAXException.hpp>
 +
 +#include "export.hxx"
@@ -373,6 +371,33 @@
 +using namespace ::com::sun::star;
 +using namespace ::com::sun::star::uno;
 +
++#include <sal/main.h>
++#include <vos/process.hxx>
++
++// vcl/svapp compatibility without vcl dependence
++class Application
++{
++public:
++    USHORT GetCommandLineParamCount();
++    XubString GetCommandLineParam( USHORT nParam );
++    virtual void Main() = 0;
++};
++
++// Urg: Cut & Paste from svapp.cxx: we don't want to depend on vcl
++USHORT Application::GetCommandLineParamCount()
++{
++    vos::OStartupInfo aStartInfo;
++    return (USHORT)aStartInfo.getCommandArgCount();
++}
++
++XubString Application::GetCommandLineParam( USHORT nParam )
++{
++    vos::OStartupInfo aStartInfo;
++    rtl::OUString aParam;
++    aStartInfo.getCommandArg( nParam, aParam );
++    return XubString( aParam );
++}
++
 +class TranslateLayout : public Application
 +{
 +    ByteString mGid1;
@@ -666,7 +691,13 @@
 +{
 +}
 +
-+TranslateLayout translatelayout;
++SAL_IMPLEMENT_MAIN()
++{
++    TranslateLayout t;
++    t.Main();
++    return 0;
++}
++
 diff --git a/transex3/layout/zoom.xml b/transex3/layout/zoom.xml
 new file mode 100644
 index 0000000..4cd67b7
@@ -811,7 +842,7 @@
  
  	if( xmlfile == NULL)
 diff --git a/transex3/source/xmlparse.cxx b/transex3/source/xmlparse.cxx
-index d257399..e7b181d 100644
+index d257399..c505b43 100644
 --- transex3/source/xmlparse.cxx
 +++ transex3/source/xmlparse.cxx
 @@ -230,6 +230,14 @@ void XMLParentNode::RemoveAndDeleteAllChilds(){
@@ -848,13 +879,12 @@
  
  	return Execute( &aMemStream );
  }
-@@ -1295,6 +1304,9 @@ XMLFile *SimpleXMLParser::Execute( SvMemoryStream *pStream )
+@@ -1295,6 +1304,8 @@ XMLFile *SimpleXMLParser::Execute( SvMemoryStream *pStream )
    			case XML_ERROR_EXTERNAL_ENTITY_HANDLING: aErrorInformation.sMessage += String::CreateFromAscii( "External entity handling" ); break;
    			case XML_ERROR_NOT_STANDALONE: aErrorInformation.sMessage += String::CreateFromAscii( "Not standalone" ); break;
              case XML_ERROR_NONE: break;
 +            default:
 +                break;
-+
  		}
  		delete pXMLFile;
  		pXMLFile = NULL;