[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - dbaccess/source sw/source

[pasqualm]

 dbaccess/source/ui/dlg/ConnectionHelper.cxx |    4 ++--
 sw/source/ui/dbui/dbui.src                  |    4 ++--
 sw/source/uibase/dbui/dbmgr.cxx             |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ebcea9815b634ce19c0180ac4f6d9236f69b1a32
Author: pasqualm <pasqual.milvaques at gmail.com>
Date:   Sun Mar 6 20:44:01 2016 +0100

    tdf#97978: add support for opening mde and accde files in base
    
    This patch modifies the base 'open existing database' wizard so accde and mde files
    can be chosen as targets for access and access 2007 databases. Both file types are
    the runtime-only equivalents to accdb and mdb files so base can use them in the
    same way as does with the former
    
    Change-Id: I5b6002089a2d3c19498ff6e05bae3facc5a4e2d0
    Reviewed-on: https://gerrit.libreoffice.org/22957
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/23178
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index e1eec6b..5744db9 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -230,7 +230,7 @@ namespace dbaui
             break;
             case  ::dbaccess::DST_MSACCESS:
             {
-                const OUString sExt("*.mdb");
+                const OUString sExt("*.mdb;*.mde");
                 OUString sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME));
                 ::sfx2::FileDialogHelper aFileDlg(
                     ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
@@ -242,7 +242,7 @@ namespace dbaui
             break;
             case  ::dbaccess::DST_MSACCESS_2007:
             {
-                const OUString sAccdb("*.accdb");
+                const OUString sAccdb("*.accdb;*.accde");
                 OUString sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME));
                 ::sfx2::FileDialogHelper aFileDlg(
                     ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index 0124bc7..3962a25 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -78,11 +78,11 @@ String STR_FILTER_CSV
 };
 String STR_FILTER_MDB
 {
-    Text [ en-US ] = "Microsoft Access (*.mdb)" ;
+    Text [ en-US ] = "Microsoft Access (*.mdb;*.mde)" ;
 };
 String STR_FILTER_ACCDB
 {
-    Text [ en-US ] = "Microsoft Access 2007 (*.accdb)" ;
+    Text [ en-US ] = "Microsoft Access 2007 (*.accdb,*.accde)" ;
 };
 
 String      ST_SAVESTART
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 3932b11..f86a5ee 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2506,8 +2506,8 @@ OUString SwDBManager::LoadAndRegisterDataSource(SwDocShell* pDocShell)
     xFltMgr->appendFilter( sFilterTXT, "*.txt" );
     xFltMgr->appendFilter( sFilterCSV, "*.csv" );
 #ifdef WNT
-    xFltMgr->appendFilter( sFilterMDB, "*.mdb" );
-    xFltMgr->appendFilter( sFilterACCDB, "*.accdb" );
+    xFltMgr->appendFilter( sFilterMDB, "*.mdb;*.mde" );
+    xFltMgr->appendFilter( sFilterACCDB, "*.accdb;*.accde" );
 #endif
 
     xFltMgr->setCurrentFilter( sFilterAll ) ;
@@ -2570,14 +2570,14 @@ SwDBManager::DBConnURITypes SwDBManager::GetDBunoURI(const OUString &rURI, uno::
         type = DBCONN_FLAT;
     }
 #ifdef WNT
-    else if(sExt.equalsIgnoreAsciiCase("mdb"))
+    else if (sExt.equalsIgnoreAsciiCase("mdb") || sExt.equalsIgnoreAsciiCase("mde"))
     {
         OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=");
         sDBURL += aURL.PathToFileName();
         aURLAny <<= sDBURL;
         type = DBCONN_MSJET;
     }
-    else if(sExt.equalsIgnoreAsciiCase("accdb"))
+    else if (sExt.equalsIgnoreAsciiCase("accdb") || sExt.equalsIgnoreAsciiCase("accde"))
     {
         OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=");
         sDBURL += aURL.PathToFileName();