INTEGRATION: CWS bserver29 (1.2.2); FILE MERGED

2007/06/15 13:51:39 kz 1.2.2.1: #140478# waringfree unix

6 files changed, 15 insertions, 30 deletions

diff --git a/soldep/inc/soldep/XmlBuildList.hxx b/soldep/inc/soldep/XmlBuildList.hxx
index 0b3a5507c5f7..165718423d0b 100644
--- a/soldep/inc/soldep/XmlBuildList.hxx
+++ b/soldep/inc/soldep/XmlBuildList.hxx
@@ -11,22 +11,6 @@
 
 #include <sal/types.h>
 
-enum DepTypes
-{
-    mdsimple,
-    mdalways,
-    mdforce
-};
-
-#define DEP_MD_SIMPLE   1;
-#define DEP_MD_ALWAYS   2;
-#define DEP_MD_FORCE    4;
-
-static const char * DEP_MD_SIMPLE_STR = "md-simple";
-static const char * DEP_MD_ALWAYS_STR = "md-always";
-static const char * DEP_MD_FORCE_STR  = "md-force";
-static const char * XML_ALL  =  "all";
-
 class FullByteStringListWrapper;
 
 struct STRUCT_SV;
diff --git a/soldep/inc/soldep/depper.hxx b/soldep/inc/soldep/depper.hxx
index 2975a87f5f12..8c3088a6712e 100644
--- a/soldep/inc/soldep/depper.hxx
+++ b/soldep/inc/soldep/depper.hxx
@@ -11,8 +11,8 @@
 #*                      Beschreibung des Moduls
 #*
 #*    Ersterstellung    XX  TT.MM.JJ
-#*    Letzte Aenderung  $Author: vg $ $Date: 2007-04-11 21:37:48 $
-#*    $Revision: 1.2 $
+#*    Letzte Aenderung  $Author: obo $ $Date: 2007-07-18 07:33:11 $
+#*    $Revision: 1.3 $
 #*
 #*    $Logfile:$
 #*
@@ -35,10 +35,9 @@
 #include <soldep/hashobj.hxx>
 #include <soldep/soldlg.hxx>
 #include <soldep/prj.hxx>
-#include <soldep/XmlBuildList.hxx>
 #include <soldep/sdtresid.hxx>
 
-DECLARE_HASHTABLE_OWNER(SolIdMapper,ByteString,MyHashObject*);
+DECLARE_HASHTABLE_OWNER(SolIdMapper,ByteString,MyHashObject*)
 
 // just for conversion - convert char* to String
 class ProgressBar;
@@ -126,7 +125,6 @@ class Depper : public SolDevDll, public Window
     FixedText*      pMainText;
     SolAutoarrangeDlg maArrangeDlg;
 
-    ULONG               AddObject( ByteString& rBodyText, Point& rPos, Size& rSize );
 
 protected:
     Prj*            mpPrj;
diff --git a/soldep/inc/soldep/hashtbl.hxx b/soldep/inc/soldep/hashtbl.hxx
index 5745baa8e7ee..92f9158005cd 100644
--- a/soldep/inc/soldep/hashtbl.hxx
+++ b/soldep/inc/soldep/hashtbl.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: hashtbl.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 21:38:40 $
+ *  last change: $Author: obo $ $Date: 2007-07-18 07:33:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -145,6 +145,7 @@ public:
         ObjType  Find (KeyType const& Key) const                        \
         { return (ObjType) HashTable::Find(ByteString(Key)); }              \
                                                                         \
+        using HashTable::Insert;                                        \
         BOOL Insert (KeyType const& Key, ObjType Object)                \
         { return HashTable::Insert(ByteString(Key), (void*) Object); }      \
                                                                         \
diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx
index 58f56a709c45..608a68b22945 100644
--- a/soldep/inc/soldep/objwin.hxx
+++ b/soldep/inc/soldep/objwin.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: objwin.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 21:38:50 $
+ *  last change: $Author: obo $ $Date: 2007-07-18 07:33:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -132,6 +132,7 @@ public:
 
         void SetViewMask( ULONG nMask );
         ULONG GetViewMask() { return mnViewMask; }
+        using Window::IsVisible;
         BOOL IsVisible() { return mbVisible; }
 
         DECL_LINK( PopupSelected, PopupMenu * );
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index 164d1ab1301d..57062efeaab6 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: prj.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 21:38:59 $
+ *  last change: $Author: obo $ $Date: 2007-07-18 07:33:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -41,7 +41,6 @@
 #ifndef _LISTMACR_HXX
 #include <bootstrp/listmacr.hxx>
 #endif
-#include <soldep/XmlBuildList.hxx>
 #include <vos/mutex.hxx>
 #include <tools/string.hxx>
 
@@ -64,6 +63,7 @@
 
 class SByteStringList;
 class GenericInformationList;
+class XmlBuildList;
 
 /*
 // Pfade auf Konfigurationsdateien des Build-Servers
diff --git a/soldep/inc/soldep/soldep.hxx b/soldep/inc/soldep/soldep.hxx
index 2f6f7bdab540..8eb7a823c553 100644
--- a/soldep/inc/soldep/soldep.hxx
+++ b/soldep/inc/soldep/soldep.hxx
@@ -10,8 +10,8 @@
 #*                      Beschreibung des Moduls
 #*
 #*    Ersterstellung    XX  TT.MM.JJ
-#*    Letzte Aenderung  $Author: vg $ $Date: 2007-04-11 21:39:34 $
-#*    $Revision: 1.2 $
+#*    Letzte Aenderung  $Author: obo $ $Date: 2007-07-18 07:34:07 $
+#*    $Revision: 1.3 $
 #*
 #*    $Logfile:$
 #*
@@ -87,6 +87,7 @@ public:
     void                Init();
     void                Init( ByteString &rVersion, GenericInformationList *pVersionList = NULL );
     BOOL                InitPrj( ByteString& rListName );
+//        using Depper::AddObject;
     virtual ULONG       AddObject( ByteString& rBodyText, BOOL Interact=TRUE );
             ULONG       AddPrjObject( ByteString& rBodyText, BOOL Interact=TRUE );
     virtual ObjectWin*  RemoveObject( USHORT nId, BOOL bDelete = TRUE );