Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx

1 files changed, 124 insertions, 0 deletions

diff --git a/idlc/source/makefile.mk b/idlc/source/makefile.mk
new file mode 100644
index 000000000000..0f4232feadfe
--- /dev/null
+++ b/idlc/source/makefile.mk
@@ -0,0 +1,124 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=idlc
+TARGET=idlc
+TARGETTYPE=CUI
+LIBTARGET=NO
+
+ENABLE_EXCEPTIONS=TRUE
+INCPRE=$(MISC)
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Files --------------------------------------------------------
+
+CXXFILES=   \
+            wrap_scanner.cxx \
+            wrap_parser.cxx	\
+            idlcmain.cxx	\
+            idlc.cxx	\
+            idlccompile.cxx	\
+            idlcproduce.cxx	\
+            errorhandler.cxx	\
+            options.cxx	\
+            fehelper.cxx	\
+            astdeclaration.cxx \
+            astscope.cxx \
+            aststack.cxx \
+            astdump.cxx \
+            astinterface.cxx \
+            aststruct.cxx \
+            aststructinstance.cxx \
+            astoperation.cxx \
+            astconstant.cxx \
+            astenum.cxx \
+            astarray.cxx \
+            astunion.cxx \
+            astexpression.cxx \
+            astservice.cxx
+
+YACCTARGET=$(MISC)$/parser.cxx
+YACCFILES=parser.y
+
+OBJFILES=   \
+            $(OBJ)$/wrap_scanner.obj	\
+            $(OBJ)$/wrap_parser.obj	\
+            $(OBJ)$/idlcmain.obj	\
+            $(OBJ)$/idlc.obj	\
+            $(OBJ)$/idlccompile.obj	\
+            $(OBJ)$/idlcproduce.obj	\
+            $(OBJ)$/errorhandler.obj	\
+            $(OBJ)$/options.obj	\
+            $(OBJ)$/fehelper.obj	\
+            $(OBJ)$/astdeclaration.obj	\
+            $(OBJ)$/astscope.obj	\
+            $(OBJ)$/aststack.obj	\
+            $(OBJ)$/astdump.obj	\
+            $(OBJ)$/astinterface.obj	\
+            $(OBJ)$/aststruct.obj	\
+            $(OBJ)$/aststructinstance.obj \
+            $(OBJ)$/astoperation.obj	\
+            $(OBJ)$/astconstant.obj	\
+            $(OBJ)$/astenum.obj	\
+            $(OBJ)$/astarray.obj	\
+            $(OBJ)$/astunion.obj	\
+            $(OBJ)$/astexpression.obj \
+            $(OBJ)$/astservice.obj
+
+APP1TARGET= $(TARGET)
+APP1OBJS=   $(OBJFILES)
+
+APP1RPATH=SDK
+
+APP1STDLIBS = \
+    $(REGLIB) \
+    $(SALLIB) \
+    $(SALHELPERLIB)
+
+# --- Targets ------------------------------------------------------
+
+.IF "$(debug)" == ""
+YACCFLAGS+=-l
+.ELSE
+YACCFLAGS+=-v
+.ENDIF
+    
+.INCLUDE :  target.mk
+
+$(MISC)$/stripped_scanner.ll : scanner.ll
+    tr -d "\015" < scanner.ll > $(MISC)$/stripped_scanner.ll
+
+$(MISC)$/scanner.cxx:	$(MISC)$/stripped_scanner.ll
+    flex -o$(MISC)$/scanner.cxx $(MISC)$/stripped_scanner.ll
+
+$(OBJ)$/wrap_parser.obj: $(MISC)$/parser.cxx
+$(OBJ)$/wrap_scanner.obj: $(MISC)$/scanner.cxx