#89533# GetMainURL changed

3 files changed, 19 insertions, 11 deletions

diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 89b17add946c..fac978dd5125 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.64 $
+ *  $Revision: 1.65 $
  *
- *  last change: $Author: oj $ $Date: 2001-07-11 10:10:30 $
+ *  last change: $Author: oj $ $Date: 2001-07-17 07:30:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -195,7 +195,6 @@ ODbAdminDialog::ODbAdminDialog(Window* _pParent, SfxItemSet* _pItems, const Refe
     AddTabPage(PAGE_TABLESUBSCRIPTION, String(ResId(STR_PAGETITLE_TABLESUBSCRIPTION)), OTableSubscriptionPage::Create, NULL);
     AddTabPage(PAGE_QUERYADMINISTRATION, String(ResId(STR_PAGETITLE_QUERIES)), OQueryAdministrationPage::Create, NULL);
     AddTabPage(PAGE_DOCUMENTLINKS, String(ResId(STR_PAGETITLE_DOCUMENTS)), ODocumentLinksPage::Create, NULL);
-
     // no local resources needed anymore
     FreeResource();
 
@@ -1901,6 +1900,9 @@ IMPL_LINK(ODbAdminDialog, OnApplyChanges, PushButton*, EMPTYARG)
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.64  2001/07/11 10:10:30  oj
+ *  #87257# change GetUILanguage
+ *
  *  Revision 1.63  2001/07/06 11:33:29  oj
  *  #89359# now dialog saves password temp
  *
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index a86b0aed7f48..5a29d5388db7 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbfindex.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: fme $ $Date: 2001-06-21 15:07:11 $
+ *  last change: $Author: oj $ $Date: 2001-07-17 07:30:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -376,7 +376,7 @@ void ODbaseIndexDialog::Init()
 
 
     //  String aFileName = aURL.PathToFileName();
-    m_aDSN = aURL.GetMainURL();
+    m_aDSN = aURL.GetMainURL(INetURLObject::NO_DECODE);
     ::ucb::Content aFile;
     sal_Bool bFolder=sal_True;
     try
@@ -599,6 +599,9 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.10  2001/06/21 15:07:11  fme
+ *  Fix #86988#: Redesign of dialogs
+ *
  *  Revision 1.9  2001/06/12 15:42:44  fs
  *  #88079# catch the property exceptions
  *
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 96c3640c5d14..c6eb2cd55b5d 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: generalpage.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: oj $ $Date: 2001-07-16 07:48:40 $
+ *  last change: $Author: oj $ $Date: 2001-07-17 07:35:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -661,7 +661,7 @@ namespace dbaui
         {
             aToBeCreated.push_back(aParser.getName());  // remember the local name for creation
             aParser.removeSegment();                    // cut the local name
-            bParentExists = directoryExists(aParser.GetMainURL());
+            bParentExists = directoryExists(aParser.GetMainURL(INetURLObject::NO_DECODE));
         }
 
         if (!aParser.getSegmentCount())
@@ -672,7 +672,7 @@ namespace dbaui
         {
             // the parent content
             Reference< XCommandEnvironment > xEmptyEnv;
-            ::ucb::Content aParent(aParser.GetMainURL(), xEmptyEnv);
+            ::ucb::Content aParent(aParser.GetMainURL(INetURLObject::NO_DECODE), xEmptyEnv);
 
             const ::rtl::OUString sDirectoryContentType = ::rtl::OUString::createFromAscii("application/vnd.sun.staroffice.fsys-folder");
 
@@ -1108,7 +1108,7 @@ namespace dbaui
         INetURLObject aNormalizer;
         aNormalizer.SetSmartProtocol(INET_PROT_FILE);
         aNormalizer.SetSmartURL(_rPath);
-        String sAdabasConfigDir = aNormalizer.GetMainURL();
+        String sAdabasConfigDir = aNormalizer.GetMainURL(INetURLObject::NO_DECODE);
 
         ::ucb::Content aAdabasConfigDir;
         try
@@ -1177,6 +1177,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.14  2001/07/16 07:48:40  oj
+ *  #89578# removed : after address url
+ *
  *  Revision 1.13  2001/07/12 13:54:20  oj
  *  #89456# check if old type is already ldap
  *