From dfa844f08a6a7101f9f6bc89bc1414e5c9e0b61a Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Thu, 2 Aug 2007 13:25:50 +0000
Subject: [PATCH] INTEGRATION: CWS rpt23fix01 (1.42.2); FILE MERGED 2007/07/31
19:20:04 oj 1.42.2.3: reverse issue #i78940# 2007/07/31 19:01:40 oj 1.42.2.2:
reverse issue #i78940# 2007/07/11 11:34:01 oj 1.42.2.1: #i78940# ask for ext
when not present
---
dbaccess/source/ui/app/AppController.cxx | 28 ++++++++++++------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 5c2dcc5ebd89..aac31d4d5b79 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: AppController.cxx,v $
*
- * $Revision: 1.42 $
+ * $Revision: 1.43 $
*
- * last change: $Author: rt $ $Date: 2007-07-06 07:57:53 $
+ * last change: $Author: hr $ $Date: 2007-08-02 14:25:50 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1689,20 +1689,20 @@ Reference< XComponent > OApplicationController::openElement(const ::rtl::OUStrin
Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(s_sReportDesign);
if ( !xEnumDrivers.is() || !xEnumDrivers->hasMoreElements() )
{
- OExtensionNotPresentDialog aDlg(getView(), getORB());
- aDlg.Execute();
- // // is there no report designer available?
- // static const ::rtl::OUString sStatus = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000"));
- // String sMsg = String( ModuleRes( RID_STR_ERROR_NO_REPORT_INSTALLED ) );
- // // sMsg.SearchAndReplace('#',e.Message);
- // SQLExceptionInfo aInfo;
- //
- // SQLException aSQLException;
- // aSQLException.Message = sMsg;
+ //OExtensionNotPresentDialog aDlg(getView(), getORB());
+ //aDlg.Execute();
+ // is there no report designer available?
+ static const ::rtl::OUString sStatus = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000"));
+ String sMsg = String( ModuleRes( RID_STR_ERROR_NO_REPORT_INSTALLED ) );
+ // sMsg.SearchAndReplace('#',e.Message);
+ SQLExceptionInfo aInfo;
+
+ SQLException aSQLException;
+ aSQLException.Message = sMsg;
// // aSQLException.Context = e.Context;
- // aInfo = SQLExceptionInfo(aSQLException);
+ aInfo = SQLExceptionInfo(aSQLException);
//
- // showError(aInfo);
+ showError(aInfo);
break;
}