MWS_SRX644: migrate branch mws_srx644 -> HEAD

3 files changed, 28 insertions, 39 deletions

diff --git a/extensions/util/hidother.src b/extensions/util/hidother.src
index 624f2945667b..668eace985fc 100644
--- a/extensions/util/hidother.src
+++ b/extensions/util/hidother.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hidother.src,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: os $ $Date: 2002-05-08 08:53:41 $
+ *  last change: $Author: hr $ $Date: 2003-03-25 16:04:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -138,5 +138,24 @@ hidspecial HID_DBIWIZARD                        { HelpId = HID_DBIWIZARD; }
 hidspecial UID_DBIWIZARD_HELP                   { HelpId = UID_DBIWIZARD_HELP; }
 hidspecial HID_DBIWIZARD_FILESELECTION          { HelpId = HID_DBIWIZARD_FILESELECTION; }
 
-hidspecial HID_BIB_DELETE_RECORD               { HelpId = HID_BIB_DELETE_RECORD; }
-hidspecial HID_BIB_INSERT_RECORD               { HelpId = HID_BIB_INSERT_RECORD; }
+hidspecial HID_BIB_DELETE_RECORD                { HelpId = HID_BIB_DELETE_RECORD; }
+hidspecial HID_BIB_INSERT_RECORD                { HelpId = HID_BIB_INSERT_RECORD; }
+
+hidspecial HID_PROP_TITLE                       { HelpId = HID_PROP_TITLE; }
+hidspecial HID_PROP_STEP                        { HelpId = HID_PROP_STEP; }
+hidspecial HID_PROP_VALUE                       { HelpId = HID_PROP_VALUE; }
+hidspecial HID_PROP_PROGRESSVALUE               { HelpId = HID_PROP_PROGRESSVALUE; }
+hidspecial HID_PROP_PROGRESSVALUE_MIN           { HelpId = HID_PROP_PROGRESSVALUE_MIN; }
+hidspecial HID_PROP_PROGRESSVALUE_MAX           { HelpId = HID_PROP_PROGRESSVALUE_MAX; }
+hidspecial HID_PROP_SCROLLVALUE                 { HelpId = HID_PROP_SCROLLVALUE; }
+hidspecial HID_PROP_SCROLLVALUE_MAX             { HelpId = HID_PROP_SCROLLVALUE_MAX; }
+hidspecial HID_PROP_LINEINCREMENT               { HelpId = HID_PROP_LINEINCREMENT; }
+hidspecial HID_PROP_BLOCKINCREMENT              { HelpId = HID_PROP_BLOCKINCREMENT; }
+hidspecial HID_PROP_VISIBLESIZE                 { HelpId = HID_PROP_VISIBLESIZE; }
+hidspecial HID_PROP_ORIENTATION                 { HelpId = HID_PROP_ORIENTATION; }
+hidspecial HID_PROP_POSITIONX                   { HelpId = HID_PROP_POSITIONX; }
+hidspecial HID_PROP_POSITIONY                   { HelpId = HID_PROP_POSITIONY; }
+hidspecial HID_PROP_PUSHBUTTONTYPE              { HelpId = HID_PROP_PUSHBUTTONTYPE; }
+hidspecial HID_PROP_STATE                       { HelpId = HID_PROP_STATE; }
+hidspecial HID_PROP_SCALEIMAGE                  { HelpId = HID_PROP_SCALEIMAGE; }
+
diff --git a/extensions/util/makefile.mk b/extensions/util/makefile.mk
index 0b74cdb52137..ddf714a303c4 100644
--- a/extensions/util/makefile.mk
+++ b/extensions/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: gh $ $Date: 2002-11-07 15:14:09 $
+#   last change: $Author: hr $ $Date: 2003-03-25 16:04:55 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,6 +64,7 @@ PRJ=..
 PRJNAME=extensions
 TARGET=ext
 GEN_HID=TRUE
+GEN_HID_OTHER=TRUE
 
 # --- Settings ----------------------------------
 
@@ -71,18 +72,3 @@ GEN_HID=TRUE
 
 .INCLUDE : target.mk
 
-.IF "$(GUI)$(CPU)"=="WNTI"
-.IF "$(BUILD_SOSL)"==""
-ALLTAR : $(SRS)$/hidother.hid
-
-$(MISC)$/$(PRJNAME).hid : $(SRS)$/hidother.hid
-
-$(SRS)$/hidother.hid: hidother.src
-    @+-mhids hidother.src $(SRS) $(PRJNAME) dummy $(INCLUDE)
-
-$(MISC)$/$(PRJNAME).hid : buildmealways
-buildmealways:
-    @+echo >& $(NULLDEV)
-.ENDIF
-.ENDIF
-
diff --git a/extensions/util/makefile.pmk b/extensions/util/makefile.pmk
index 530e406a6656..c433e164beec 100644
--- a/extensions/util/makefile.pmk
+++ b/extensions/util/makefile.pmk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.pmk,v $
 #
-#   $Revision: 1.1.1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: hr $ $Date: 2000-09-18 16:16:56 $
+#   last change: $Author: hr $ $Date: 2003-03-25 16:04:55 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,22 +64,6 @@ PROJECTPCH=extensionspch
 PROJECTPCHSOURCE=$(PRJ)$/util$/extensionspch
 PDBTARGET=extensions
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
-
-.IF "$(GUI)" != "MAC"
-CFLAGS+=-I..$/..$/idl
-.ELSE
-CFLAGS+=-I ..$/..$/idl
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-PATH_SEPERATOR=":"
-.ELSE
-PATH_SEPERATOR=";"
-.ENDIF
-
-JARFILES = uno.jar