#87149# new helpids

12 files changed, 362 insertions, 37 deletions

diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 26d79fe40d52..a580e7529c23 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbaccess_helpid.hrc,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: oj $ $Date: 2001-05-14 11:57:17 $
+ *  last change: $Author: oj $ $Date: 2001-05-23 14:15:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -263,6 +263,8 @@
 #define HID_DSADMIN_TABLE_TOOLBOX                   (HID_DBACCESS_START + 171)
 #define HID_DSADMIN_QUERY_TOOLBOX                   (HID_DBACCESS_START + 172)
 #define HID_DSADMIN_BOOKMARK_TOOLBOX                (HID_DBACCESS_START + 173)
+#define HID_DSADMIN_PAGE_ADDRESSBOOK                (HID_DBACCESS_START + 174)
+#define HID_DSADMIN_LB_ADDRESSBOOK                  (HID_DBACCESS_START + 175)
 
 // don't forget to update the file util/hidother.src
 #endif // _DBA_DBACCESS_HELPID_HRC_
@@ -270,6 +272,9 @@
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.30  2001/05/14 11:57:17  oj
+ *  #86744# new helpids for views
+ *
  *  Revision 1.29  2001/05/10 12:09:02  fs
  *  #86223# new help ids (not surprising ...)
  *
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index ae2444fa307e..5b52aece8caa 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.cxx,v $
  *
- *  $Revision: 1.50 $
+ *  $Revision: 1.51 $
  *
- *  last change: $Author: fs $ $Date: 2001-05-15 15:07:06 $
+ *  last change: $Author: oj $ $Date: 2001-05-23 14:16:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1253,6 +1253,10 @@ IMPL_LINK(ODbAdminDialog, OnTypeSelected, OGeneralPage*, _pTabPage)
             AddTabPage(PAGE_ODBC, String(ResId(STR_PAGETITLE_ODBC)), OOdbcDetailsPage::Create, 0, sal_False, 1);
             m_aCurrentDetailPages.push(PAGE_ODBC);
             break;
+        case DST_ADDRESSBOOK:
+            AddTabPage(PAGE_ADDRESSBOOK, String(ResId(STR_PAGETITLE_ADDRESSBOOK)), OAddressBookDetailsPage::Create, 0, sal_False, 1);
+            m_aCurrentDetailPages.push(PAGE_ADDRESSBOOK);
+            break;
         case DST_ADABAS:
             AddTabPage(TAB_PAG_ADABAS_SETTINGS, String(ResId(STR_PAGETITLE_ADABAS_STATISTIC)), OAdabasAdminSettings::Create, 0, sal_False, 1);
             AddTabPage(PAGE_ADABAS, String(ResId(STR_PAGETITLE_ADABAS)), OAdabasDetailsPage::Create, 0, sal_False, 1);
@@ -1679,11 +1683,12 @@ const sal_Int32* ODbAdminDialog::getRelevantItems(const SfxItemSet& _rSet) const
                 pRelevantItems = pAdabasItems;
             }
             break;
-        case DST_JDBC:  pRelevantItems = OJdbcDetailsPage::getDetailIds(); break;
-        case DST_ADO:   pRelevantItems = OAdoDetailsPage::getDetailIds(); break;
-        case DST_ODBC:  pRelevantItems = OOdbcDetailsPage::getDetailIds(); break;
-        case DST_DBASE: pRelevantItems = ODbaseDetailsPage::getDetailIds(); break;
-        case DST_TEXT:  pRelevantItems = OTextDetailsPage::getDetailIds(); break;
+        case DST_JDBC:          pRelevantItems = OJdbcDetailsPage::getDetailIds(); break;
+        case DST_ADO:           pRelevantItems = OAdoDetailsPage::getDetailIds(); break;
+        case DST_ODBC:          pRelevantItems = OOdbcDetailsPage::getDetailIds(); break;
+        case DST_ADDRESSBOOK:   pRelevantItems = OAddressBookDetailsPage::getDetailIds(); break;
+        case DST_DBASE:         pRelevantItems = ODbaseDetailsPage::getDetailIds(); break;
+        case DST_TEXT:          pRelevantItems = OTextDetailsPage::getDetailIds(); break;
         case DST_CALC:
             {
                 // spreadsheet currently has no options page
@@ -2576,6 +2581,9 @@ IMPL_LINK(ODatasourceSelector, OnButtonPressed, Button*, EMPTYARG)
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.50  2001/05/15 15:07:06  fs
+ *  #86991# save the current (modified) settings when inserting a new data source
+ *
  *  Revision 1.49  2001/05/15 11:25:35  fs
  *  #86996# use the connection pool instead of the driver manager
  *
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc
index d42e61bef0d5..ccdb20af564c 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.hrc,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: fs $ $Date: 2001-05-10 13:37:24 $
+ *  last change: $Author: oj $ $Date: 2001-05-23 14:16:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,11 +82,13 @@
 #define FT_SPECIAL_MESSAGE      15
 #define FT_LOGINTIMEOUT         16
 #define FT_FILTER_EXPLANATION   17
+#define FT_ADDRESSBOOK          18
 
 #define LB_DATATYPE             1
 #define LB_DATASOURCES          2
 #define LB_CHARSET              3
 #define LB_TIMEOUT_UNIT         4
+#define LB_ADDRESSBOOK          5
 
 #define ET_CONNECTURL           1
 #define ET_DATASOURCENAME       2
@@ -154,6 +156,7 @@
 #define STR_PAGETITLE_QUERIES               18
 #define STR_PAGETITLE_ADABAS_STATISTIC      19
 #define STR_PAGETITLE_DOCUMENTS             20
+#define STR_PAGETITLE_ADDRESSBOOK           21
 
 //========================================================================
 // menu item ids
@@ -166,6 +169,9 @@
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.15  2001/05/10 13:37:24  fs
+ *  #86223# some new ids
+ *
  *  Revision 1.14  2001/04/26 11:40:21  fs
  *  file is alive, again - added support for data source associated bookmarks
  *
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index fb818462fdbc..2f5d3a8515fe 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.src,v $
  *
- *  $Revision: 1.47 $
+ *  $Revision: 1.48 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-18 05:13:53 $
+ *  last change: $Author: oj $ $Date: 2001-05-23 14:16:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -281,6 +281,11 @@ TabDialog DLG_DATABASE_ADMINISTRATION
         Text [ language_user1 ] = " ";
         Text[ catalan ] = "ODBC";
     };
+    String STR_PAGETITLE_ADDRESSBOOK
+    {
+        Text = "Adressbuch" ;
+        Text [ english ] = "addressbook" ;
+    };
     String STR_PAGETITLE_ADABAS
     {
         Text = "Adabas D" ;
@@ -1453,7 +1458,120 @@ TabPage PAGE_ODBC
         Text[ catalan ] = "Use catalog on filebased databases";
     };
 };
+//.........................................................................
+TabPage PAGE_ADDRESSBOOK
+{
+    SVLook = TRUE ;
+    Pos = MAP_APPFONT ( 0 , 0 ) ;
+    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Hide = TRUE;
+    HelpId = HID_DSADMIN_PAGE_ADDRESSBOOK;
+
+    FixedText FT_USERNAME
+    {
+        Pos = MAP_APPFONT ( 6 , 7 ) ;
+        Size = MAP_APPFONT ( 80 , 10 ) ;
+        Text = "~Benutzername" ;
+        Text [ english ] = "~Username" ;
+        Text [ NORWEGIAN ] = "~Username" ;
+        Text [ DANISH ] = "Brugernavn" ;
+        Text [ english_US ] = "~User name" ;
+        Text [ SPANISH ] = "N~ombre del usuario" ;
+        Text [ FINNISH ] = "~K�ytt�j�tunnus" ;
+        Text [ FRENCH ] = "Nom d'~utilisateur" ;
+        Text [ ITALIAN ] = "Nome ~utente" ;
+        Text [ DUTCH ] = "Naam ~gebruiker" ;
+        Text [ SWEDISH ] = "~Anv�ndarnamn" ;
+        Text [ PORTUGUESE ] = "Nome do ~utilizador" ;
+        Text [ portuguese_brazilian ] = "~Benutzername" ;
+        Text [ chinese_simplified ] = "ʹ����(~U)";
+        Text [ russian ] = "��� ������������";
+        Text [ polish ] = "Nazwa u�ytkownika";
+        Text [ japanese ] = "հ�ް��(~U)";
+        Text [ chinese_traditional ] = "�ϥΪ�(~U)";
+        Text [ arabic ] = "��� ��������";
+        Text [ greek ] = "����� ������";
+        Text [ korean ] = "����� �̸�(~U)";
+        Text [ turkish ] = "Kullan�c� ad�";
+        Text [ language_user1 ] = " ";
+        Text[ catalan ] = "N~ombre del usuario";
+    };
+    Edit ET_USERNAME
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 90 , 6 ) ;
+        Size = MAP_APPFONT ( 105 , 12 ) ;
+        TabStop = TRUE ;
+        HelpId = HID_DSADMIN_USER_ODBC;
+    };
+    CheckBox CB_PASSWORD_REQUIRED
+    {
+        Pos = MAP_APPFONT ( 90 , 21 ) ;
+        Size = MAP_APPFONT ( 105 , 10 ) ;
+        Text = "Passwort erforderlich";
+        Text [ english ] = "Password required";
+        Text [ english_us ] = "Password required";
+        HelpId = HID_DSADMIN_PWDREC_ODBC;
+        Text [ portuguese ] = "Necess�rio senha";
+        Text [ russian ] = "��������� ������";
+        Text [ greek ] = "���������� ������� ���������";
+        Text [ dutch ] = "Wachtwoord verlangd";
+        Text [ french ] = "Mot de passe requis";
+        Text [ spanish ] = "Se necesita una contrase�a";
+        Text [ italian ] = "Password necessaria";
+        Text [ danish ] = "Adgangskode p�kr�vet";
+        Text [ swedish ] = "L�senord kr�vs";
+        Text [ polish ] = "Podaj has�o";
+        Text [ portuguese_brazilian ] = "Password required";
+        Text [ japanese ] = "�߽ܰ�ނ��K�v";
+        Text [ korean ] = "�н����尡 �ʿ��մϴ�";
+        Text [ chinese_simplified ] = "������������";
+        Text [ chinese_traditional ] = "������J�K�X";
+        Text [ turkish ] = "Password required";
+        Text [ arabic ] = "����� ���� ��";
+        Text[ finnish ] = "Salasana pakollinen";
+        Text[ catalan ] = "Se necesita una contrase�a";
+    };
+    FixedLine FL_SEPARATOR1
+    {
+        Pos = MAP_APPFONT ( 4 , 34 ) ;
+        Size = MAP_APPFONT ( 252 , 1 ) ;
+    };
+    FixedText FT_ADDRESSBOOK
+    {
+        Pos = MAP_APPFONT ( 6 , 40 ) ;
+        Size = MAP_APPFONT ( 80 , 10 ) ;
+        Text = "~Adressbuch" ;
+        Text [ english ] = "~Address book" ;
+    };
+    ListBox LB_ADDRESSBOOK
+    {
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+        CurPos = 0 ;
+        HelpId = HID_DSADMIN_LB_ADDRESSBOOK;
 
+        Pos = MAP_APPFONT ( 91 , 39 ) ;
+        Size = MAP_APPFONT ( 105 , 60 ) ;
+
+        StringList =
+        {
+            "System Adressbuch" ;
+            "LDAP" ;
+#if defined(WNT) || defined(WIN32)
+            "Outlook" ;
+#endif
+        };
+        StringList [ english ] =
+        {
+            "System address book" ;
+            "LDAP" ;
+#if defined(WNT) || defined(WIN32)
+            "Outlook" ;
+#endif
+        };
+    };
+};
 //.........................................................................
 TabPage PAGE_TEXT
 {
@@ -2874,6 +2992,9 @@ QueryBox QUERY_NEED_TO_SAVE_FILTER
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.47  2001/05/18 05:13:53  kz
+ *  Merge SRC632: 18.05.01 - 07:13:45 (NoBranch)
+ *
  *  Revision 1.46  2001/05/14 13:22:58  fs
  *  no : at end of label texts
  *
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index e08cf2996770..d48fcd9fabb5 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: detailpages.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-27 08:07:31 $
+ *  last change: $Author: oj $ $Date: 2001-05-23 14:16:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -745,6 +745,103 @@ namespace dbaui
     }
 
     //========================================================================
+    //= OAddressBookDetailsPage
+    //========================================================================
+    OAddressBookDetailsPage::OAddressBookDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+        :OCommonBehaviourTabPage(pParent, PAGE_ADDRESSBOOK, _rCoreAttrs, CBTP_USE_UIDPWD)
+        ,m_aSeparator1      (this, ResId(FL_SEPARATOR1))
+        ,m_aFixedText       (this, ResId(FT_ADDRESSBOOK))
+        ,m_aAddressBookList (this, ResId(LB_ADDRESSBOOK))
+    {
+        FreeResource();
+    }
+
+    // -----------------------------------------------------------------------
+    SfxTabPage* OAddressBookDetailsPage::Create( Window* pParent, const SfxItemSet& _rAttrSet )
+    {
+        return ( new OAddressBookDetailsPage( pParent, _rAttrSet ) );
+    }
+
+    // -----------------------------------------------------------------------
+    sal_Int32* OAddressBookDetailsPage::getDetailIds()
+    {
+        static sal_Int32* pRelevantIds = NULL;
+        if (!pRelevantIds)
+        {
+            static sal_Int32 nRelevantIds[] =
+            {
+                0
+            };
+            pRelevantIds = nRelevantIds;
+        }
+        return pRelevantIds;
+    }
+    // -----------------------------------------------------------------------
+    sal_Bool OAddressBookDetailsPage::FillItemSet( SfxItemSet& _rSet )
+    {
+        sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet) || m_aAddressBookList.GetSelectEntryPos() != m_aAddressBookList.GetSavedValue();
+        String sAddressBook;
+        switch(m_aAddressBookList.GetSelectEntryPos())
+        {
+            case 0:
+                sAddressBook.AssignAscii("DEFAULT");
+                break;
+            case 1:
+                sAddressBook.AssignAscii("LDAP");
+                break;
+            case 2:
+                sAddressBook.AssignAscii("OUTLOOK");
+                break;
+            default:
+                OSL_ENSURE(0,"Wrong Addressbook type!");
+        }
+
+        SFX_ITEMSET_GET(_rSet, pConnectUrl, SfxStringItem, DSID_CONNECTURL, sal_True);
+        SFX_ITEMSET_GET(_rSet, pTypesItem, DbuTypeCollectionItem, DSID_TYPECOLLECTION, sal_True);
+        ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL;
+        if (pTypeCollection && pConnectUrl && pConnectUrl->GetValue().Len())
+        {
+            String sType = pTypeCollection->getDatasourcePrefix(DST_ADDRESSBOOK);
+            sType += sAddressBook;
+            _rSet.Put(SfxStringItem(DSID_CONNECTURL, sType));
+        }
+        return bChangedSomething;
+    }
+    // -----------------------------------------------------------------------
+    void OAddressBookDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
+    {
+        OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
+
+        // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
+        sal_Bool bValid, bReadonly;
+        getFlags(_rSet, bValid, bReadonly);
+
+        String sAddressBook;
+
+        SFX_ITEMSET_GET(_rSet, pConnectUrl, SfxStringItem, DSID_CONNECTURL, sal_True);
+        SFX_ITEMSET_GET(_rSet, pTypesItem, DbuTypeCollectionItem, DSID_TYPECOLLECTION, sal_True);
+        ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL;
+        if (pTypeCollection && pConnectUrl && pConnectUrl->GetValue().Len())
+            sAddressBook = pTypeCollection->cutPrefix(pConnectUrl->GetValue());
+
+
+        USHORT nPos = 0;
+        if(!sAddressBook.CompareToAscii("DEFAULT"))
+            nPos = 0;
+        else if(!sAddressBook.CompareToAscii("LDAP"))
+            nPos = 1;
+        else if(!sAddressBook.CompareToAscii("OUTLOOK"))
+            nPos = 2;
+
+        m_aAddressBookList.SelectEntryPos(nPos);
+        if (_bSaveValue)
+            m_aAddressBookList.SaveValue();
+
+        if (bReadonly)
+            m_aAddressBookList.Disable();
+    }
+
+    //========================================================================
     //= OTextDetailsPage
     //========================================================================
     //------------------------------------------------------------------------
@@ -1052,6 +1149,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.4  2001/04/27 08:07:31  fs
+ *  #86370# disallow UTF-8 for dBase and text data sources
+ *
  *  Revision 1.3  2001/04/20 13:38:06  oj
  *  #85736# new checkbox for odbc
  *
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 800b8e9ea7d6..00942f36b9a1 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: detailpages.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-27 08:07:01 $
+ *  last change: $Author: oj $ $Date: 2001-05-23 14:16:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -235,6 +235,28 @@ namespace dbaui
     };
 
     //========================================================================
+    //= OOdbcDetailsPage
+    //========================================================================
+    class OAddressBookDetailsPage : public OCommonBehaviourTabPage
+    {
+    public:
+        static  SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
+        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+
+        /// get the SfxPoolItem ids used by this tab page
+        static sal_Int32* getDetailIds();
+
+    private:
+        FixedLine           m_aSeparator1;
+        FixedText           m_aFixedText;
+        ListBox             m_aAddressBookList;
+
+        OAddressBookDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
+
+        virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+    };
+
+    //========================================================================
     //= OTextDetailsPage
     //========================================================================
     class OTextDetailsPage : public OCommonBehaviourTabPage
@@ -284,6 +306,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.4  2001/04/27 08:07:01  fs
+ *  #86370# +adjustUTF8
+ *
  *  Revision 1.3  2001/04/20 13:38:06  oj
  *  #85736# new checkbox for odbc
  *
diff --git a/dbaccess/source/ui/dlg/makefile.mk b/dbaccess/source/ui/dlg/makefile.mk
index b61632ba39af..9b267f03d25e 100644
--- a/dbaccess/source/ui/dlg/makefile.mk
+++ b/dbaccess/source/ui/dlg/makefile.mk
@@ -2,9 +2,9 @@
  #
  #  $RCSfile: makefile.mk,v $
  #
- #  $Revision: 1.15 $
+ #  $Revision: 1.16 $
  #
- #  last change: $Author: fs $ $Date: 2001-04-26 11:40:21 $
+ #  last change: $Author: oj $ $Date: 2001-05-23 14:16:42 $
  #
  #  The Contents of this file are made available subject to the terms of
  #  either of the following licenses
@@ -64,8 +64,6 @@ PRJINC=$(PRJ)$/source
 PRJNAME=dbaccess
 TARGET=uidlg
 
-ENABLE_EXCEPTIONS=TRUE
-
 # --- Settings ----------------------------------
 
 .INCLUDE : settings.mk
@@ -123,6 +121,25 @@ SLOFILES=	\
         $(SLO)$/sqlmessage.obj	\
         $(SLO)$/dbfindex.obj
 
+EXCEPTIONSFILES=	\
+        $(SLO)$/missingdocdlg.obj	\
+        $(SLO)$/doclinkdialog.obj	\
+        $(SLO)$/AdabasStat.obj	\
+        $(SLO)$/AdabasPage.obj	\
+        $(SLO)$/indexfieldscontrol.obj	\
+        $(SLO)$/indexdialog.obj	\
+        $(SLO)$/RelationDlg.obj	\
+        $(SLO)$/adtabdlg.obj	\
+        $(SLO)$/dlgsave.obj		\
+        $(SLO)$/queryorder.obj	\
+        $(SLO)$/queryfilter.obj	\
+        $(SLO)$/paramdialog.obj	\
+        $(SLO)$/dbadmin.obj		\
+        $(SLO)$/commonpages.obj	\
+        $(SLO)$/detailpages.obj	\
+        $(SLO)$/sqlmessage.obj	\
+        $(SLO)$/dbfindex.obj
+
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
@@ -131,6 +148,9 @@ SLOFILES=	\
  #########################################################################
  # history:
  #	$Log: not supported by cvs2svn $
+ #	Revision 1.15  2001/04/26 11:40:21  fs
+ #	file is alive, again - added support for data source associated bookmarks
+ #	
  #	Revision 1.14  2001/03/27 08:05:56  oj
  #	impl new page for adabas
  #	
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 03ab8f5d13cf..c65ffd0ec374 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbu_resource.hrc,v $
  *
- *  $Revision: 1.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: fs $ $Date: 2001-05-16 15:33:27 $
+ *  last change: $Author: oj $ $Date: 2001-05-23 14:16:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,6 +124,7 @@
 #define TAB_WIZ_COPYTABLE               RID_PAGE_START + 12
 #define TAB_PAG_ADABAS_SETTINGS         RID_PAGE_START + 13
 #define PAGE_DOCUMENTLINKS              RID_PAGE_START + 14
+#define PAGE_ADDRESSBOOK                RID_PAGE_START + 15
 
 //========================================================================
 // error boxes
@@ -431,6 +432,9 @@
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.45  2001/05/16 15:33:27  fs
+ *  #87065# +QUERY_VIEW_DESIGN_SAVEMODIFIED
+ *
  *  Revision 1.44  2001/05/14 11:59:28  oj
  *  #86744# some changes for entries and views
  *
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index 0d0cdc7505c1..941502a0aeac 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbumiscres.src,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-16 15:28:52 $
+ *  last change: $Author: oj $ $Date: 2001-05-23 14:16:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,13 +82,13 @@ Resource RSC_DATASOURCE_TYPES
 {
     String STR_CONNTYPES
     {
-        Text = "sdbc:adabas:;jdbc:;sdbc:odbc:;sdbc:dbase:;sdbc:ado:;sdbc:flat:;sdbc:calc:" ;
+        Text = "sdbc:adabas:;jdbc:;sdbc:odbc:;sdbc:dbase:;sdbc:ado:;sdbc:flat:;sdbc:calc:;sdbc:mozab:" ;
     };
     String STR_CONNUINAMES
     {
-        Text = "Adabas;JDBC;ODBC;dBase;ADO;Text;Tabellendokument" ;
-        Text [ english ] = "Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet" ;
-        Text [ english_us ] = "Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet" ;
+        Text = "Adabas;JDBC;ODBC;dBase;ADO;Text;Tabellendokument;Adressbuch" ;
+        Text [ english ] = "Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet;Addressbook" ;
+        Text [ english_us ] = "Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet;Addressbook" ;
         Text[ portuguese ] = "Adabas;JDBC;ODBC;dBase;ADO;Texto;Folha de c�lculo";
         Text[ russian ] = "Adabas;JDBC;ODBC;dBase;ADO;�����;�������� ����������� �������";
         Text[ greek ] = "Adabas;JDBC;ODBC;dBase;ADO;�������;������� ������";
@@ -305,6 +305,9 @@ String STR_BUTTON_TEXT_ALL
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.22  2001/05/16 15:28:52  kz
+ *  Merge SRC632: 16.05.01 - 17:28:14 (NoBranch)
+ *
  *  Revision 1.21  2001/05/12 06:34:09  kz
  *  Merge SRC631: 12.05.01 - 08:34:37 (NoBranch)
  *
diff --git a/dbaccess/source/ui/misc/dsntypes.cxx b/dbaccess/source/ui/misc/dsntypes.cxx
index 353cdf1cc349..f001d07b76a0 100644
--- a/dbaccess/source/ui/misc/dsntypes.cxx
+++ b/dbaccess/source/ui/misc/dsntypes.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsntypes.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: nn $ $Date: 2001-01-29 16:02:05 $
+ *  last change: $Author: oj $ $Date: 2001-05-23 14:16:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,6 +161,7 @@ sal_Bool ODsnTypeCollection::hasAuthentication(DATASOURCE_TYPE _eType)
         case DST_JDBC:
         case DST_ODBC:
         case DST_ADO:
+        case DST_ADDRESSBOOK:
             return sal_True;
             break;
         case DST_DBASE:
@@ -205,6 +206,8 @@ DATASOURCE_TYPE ODsnTypeCollection::implDetermineType(const String& _rDsn)
         return DST_TEXT;
     if (_rDsn.EqualsIgnoreCaseAscii("sdbc:calc:", 0, nSeparator))
         return DST_CALC;
+    if (_rDsn.EqualsIgnoreCaseAscii("sdbc:mozab:", 0, nSeparator))
+        return DST_ADDRESSBOOK;
 
     // find third :
     nSeparator = _rDsn.Search((sal_Unicode)':', nSeparator + 1);
@@ -380,6 +383,9 @@ SfxPoolItem* DbuTypeCollectionItem::Clone(SfxItemPool* _pPool) const
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.6  2001/01/29 16:02:05  nn
+ *  added DST_CALC
+ *
  *  Revision 1.5  2001/01/04 11:20:23  fs
  *  #81485# +DST_ADO
  *
diff --git a/dbaccess/source/ui/querydesign/makefile.mk b/dbaccess/source/ui/querydesign/makefile.mk
index 9bf81e1f5591..b636da054be1 100644
--- a/dbaccess/source/ui/querydesign/makefile.mk
+++ b/dbaccess/source/ui/querydesign/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: oj $ $Date: 2001-02-28 10:18:26 $
+#   last change: $Author: oj $ $Date: 2001-05-23 14:16:41 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -65,8 +65,6 @@ PRJINC=$(PRJ)$/source
 PRJNAME=dbaccess
 TARGET=querydesign
 
-ENABLE_EXCEPTIONS=TRUE
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
@@ -106,6 +104,30 @@ SLOFILES =\
             $(SLO)$/querycontroller.obj			\
             $(SLO)$/queryview.obj
 
+EXCEPTIONSFILES =\
+            $(SLO)$/JoinDesignView.obj			\
+            $(SLO)$/JoinController.obj			\
+            $(SLO)$/QueryDesignView.obj			\
+            $(SLO)$/TableFieldData.obj			\
+            $(SLO)$/SelectionBrowseBox.obj		\
+            $(SLO)$/querydlg.obj				\
+            $(SLO)$/QueryTabWinUndoAct.obj		\
+            $(SLO)$/QueryMoveTabWinUndoAct.obj	\
+            $(SLO)$/QueryTabConnUndoAction.obj	\
+            $(SLO)$/TableFieldDescription.obj	\
+            $(SLO)$/JoinTableView.obj			\
+            $(SLO)$/QueryViewSwitch.obj			\
+            $(SLO)$/QueryTableView.obj			\
+            $(SLO)$/TableWindowData.obj			\
+            $(SLO)$/QTableWindow.obj			\
+            $(SLO)$/TableWindow.obj				\
+            $(SLO)$/JoinExchange.obj			\
+            $(SLO)$/TableWindowListBox.obj		\
+            $(SLO)$/TableWindowTitle.obj		\
+            $(SLO)$/QueryTextView.obj			\
+            $(SLO)$/querycontroller.obj			\
+            $(SLO)$/queryview.obj
+
 SRCFILES =  query.src		\
             querydlg.src	\
 
diff --git a/dbaccess/util/hidother.src b/dbaccess/util/hidother.src
index 2bab604abbdc..96a912d002f0 100644
--- a/dbaccess/util/hidother.src
+++ b/dbaccess/util/hidother.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hidother.src,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: oj $ $Date: 2001-05-14 11:57:35 $
+ *  last change: $Author: oj $ $Date: 2001-05-23 14:15:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -248,10 +248,15 @@ hidspecial HID_DSBROWSER_BOOKMARK_SELECTED              { HelpId = HID_DSBROWSER
 hidspecial HID_DSADMIN_TABLE_TOOLBOX                    { HelpId = HID_DSADMIN_TABLE_TOOLBOX ; };
 hidspecial HID_DSADMIN_QUERY_TOOLBOX                    { HelpId = HID_DSADMIN_QUERY_TOOLBOX ; };
 hidspecial HID_DSADMIN_BOOKMARK_TOOLBOX                 { HelpId = HID_DSADMIN_BOOKMARK_TOOLBOX ; };
+hidspecial HID_DSADMIN_PAGE_ADDRESSBOOK                 { HelpId = HID_DSADMIN_PAGE_ADDRESSBOOK ; };
+hidspecial HID_DSADMIN_LB_ADDRESSBOOK                   { HelpId = HID_DSADMIN_LB_ADDRESSBOOK ; };
 
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.25  2001/05/14 11:57:35  oj
+ *  #86744# new helpids for views
+ *
  *  Revision 1.24  2001/05/10 12:09:25  fs
  *  #86223# new help ids (not surprising ...)
  *