updated for OpenOffice 605

basic/source/app/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1.1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: hr $ $Date: 2000-09-18 16:12:09 $
+#   last change: $Author: john.marmion $ $Date: 2000-09-26 14:05:51 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -73,7 +73,7 @@ TARGET=app
 
 # --- Allgemein ------------------------------------------------------------
 
-.INCLUDE :  $(UPD)minor.mk
+.INCLUDE :  minor.mk
 RSCUPDVER=$(RSCREVISION)SV$(UPD)$(UPDMINOR)
 
 

svx/source/form/fmshimp.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmshimp.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: kz $ $Date: 2000-09-26 11:42:52 $
+ *  last change: $Author: john.marmion $ $Date: 2000-09-26 14:14:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -143,6 +143,10 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #endif
 
+#ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HPP_
+#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#endif
+
 #ifndef _COM_SUN_STAR_AWT_XTEXTCOMPONENT_HPP_
 #include <com/sun/star/awt/XTextComponent.hpp>
 #endif

xmloff/source/text/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: mib $ $Date: 2000-09-26 08:10:55 $
+#   last change: $Author: john.marmion $ $Date: 2000-09-26 14:12:15 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -91,7 +91,6 @@ CXXFILES = \
         txtstyle.cxx \
         txtstyli.cxx \
         txtvfldi.cxx \
-        txtflde.cxx \
         txtftne.cxx \
         XMLTextNumRuleInfo.cxx \
         XMLTextColumnsExport.cxx \
@@ -99,12 +98,10 @@ CXXFILES = \
         XMLTextFrameHyperlinkContext.cxx \
         XMLTextListAutoStylePool.cxx \
         XMLTextListBlockContext.cxx \
-        XMLTextPropertySetContext.cxx \
         XMLFootnoteImportContext.cxx \
         XMLFootnoteConfigurationImportContext.cxx \
         XMLTextMarkImportContext.cxx \
         XMLTextColumnsContext.cxx \
-        XMLTextColumnsExport.cxx \
         XMLTextListItemContext.cxx \
         XMLTextPropertySetContext.cxx
 
@@ -123,7 +120,6 @@ SLOFILES =	\
         $(SLO)$/txtstyle.obj \
         $(SLO)$/txtstyli.obj \
         $(SLO)$/txtvfldi.obj \
-        $(SLO)$/txtflde.obj \
         $(SLO)$/txtftne.obj \
         $(SLO)$/XMLTextColumnsContext.obj \
         $(SLO)$/XMLTextColumnsExport.obj \
@@ -134,8 +130,6 @@ SLOFILES =	\
         $(SLO)$/XMLFootnoteImportContext.obj \
         $(SLO)$/XMLFootnoteConfigurationImportContext.obj \
         $(SLO)$/XMLTextMarkImportContext.obj \
-        $(SLO)$/XMLTextPropertySetContext.obj \
-        $(SLO)$/XMLTextColumnsExport.obj \
         $(SLO)$/XMLTextListItemContext.obj \
         $(SLO)$/XMLTextNumRuleInfo.obj \
         $(SLO)$/XMLTextPropertySetContext.obj

xmloff/util/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: obo $ $Date: 2000-09-21 09:38:42 $
+#   last change: $Author: john.marmion $ $Date: 2000-09-26 14:10:12 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -106,7 +106,6 @@ SHL1STDLIBS= \
         $(SVLLIB)		\
         $(SALLIB)		\
         $(UNOTOOLSLIB)	\
-#		$(GOODIESLIB) \
         $(ONELIB)