User: hr      
Date: 2007-08-03 10:23:28+0000
Modified:
   dba/dbaccess/source/ui/misc/linkeddocuments.cxx

Log:
 INTEGRATION: CWS rpt23fix02 (1.22.16); FILE MERGED
 2007/08/01 08:16:20 oj 1.22.16.3: #i78940#
 2007/07/24 09:49:43 oj 1.22.16.2: #i79794# correct class id for report 
definition
 2007/07/23 11:12:29 lla 1.22.16.1: #i79879# open old reports, if extension not 
present fix

File Changes:

Directory: /dba/dbaccess/source/ui/misc/
========================================

File [changed]: linkeddocuments.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/linkeddocuments.cxx?r1=1.22&r2=1.23
Delta lines:  +8 -4
-------------------
--- linkeddocuments.cxx 2007-07-06 08:37:12+0000        1.22
+++ linkeddocuments.cxx 2007-08-03 10:23:25+0000        1.23
@@ -144,6 +144,8 @@
 
 #include <connectivity/dbtools.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <com/sun/star/io/WrongFormatException.hpp>
+#include "ExtensionNotPresent.hxx"
 
 //......................................................................
 namespace dbaui
@@ -357,10 +359,7 @@
                                aClassId = 
lcl_GetSequenceClassID(SO3_SIMPRESS_CLASSID);
                                break;
                        case ID_REPORT_NEW_TEXT:
-                               {
-                                       ::comphelper::MimeConfigurationHelper 
aConfigHelper(m_xORB);
-                                       aClassId = 
aConfigHelper.GetSequenceClassIDFromObjectName((::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Report"))));
-                               }
+                               aClassId = 
comphelper::MimeConfigurationHelper::GetSequenceClassID(SO3_RPT_CLASSID_90);
                                break;
 
                        case SID_DB_FORM_NEW_PILOT:
@@ -432,6 +431,11 @@
                        }
                        return xRet;
                }
+               //catch (com::sun::star::io::WrongFormatException e)
+               //{ 
+               //      OExtensionNotPresentDialog aDlg(m_pDialogParent, 
m_xORB);
+  //          aDlg.Execute();
+               //}
                catch(Exception& e) 
                {
             com::sun::star::sdbc::SQLException aSQLException;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to