summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui')
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx20
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx6
2 files changed, 6 insertions, 20 deletions
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index cfa282b305ed8..e72935e8e4903 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: querycontroller.cxx,v $
*
- * $Revision: 1.38 $
+ * $Revision: 1.39 $
*
- * last change: $Author: oj $ $Date: 2001-05-08 14:04:19 $
+ * last change: $Author: fs $ $Date: 2001-05-14 07:26:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -565,12 +565,7 @@ void SAL_CALL OQueryController::initialize( const Sequence< Any >& aArguments )
String aMessage(ModuleRes(RID_STR_CONNECTION_LOST));
ODataView* pWindow = getView();
InfoBox(pWindow, aMessage).Execute();
- Reference<XTask> xTask(m_xCurrentFrame,UNO_QUERY);
- if(xTask.is())
- {
- xTask->close();
- throw SQLException();
- }
+ throw SQLException();
}
}
@@ -609,14 +604,7 @@ void SAL_CALL OQueryController::initialize( const Sequence< Any >& aArguments )
bClose = aDlg.Execute() == RET_NO;
}
if(bClose)
- {
- Reference<XTask> xTask(m_xCurrentFrame,UNO_QUERY);
- if(xTask.is())
- {
- xTask->close();
- throw SQLException();
- }
- }
+ throw Exception();
}
}
}
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 1ab4a5c2174cb..5e1ad9e24fd00 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: RelationController.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: oj $ $Date: 2001-04-24 14:30:33 $
+ * last change: $Author: fs $ $Date: 2001-05-14 07:25:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -357,7 +357,6 @@ void SAL_CALL ORelationController::initialize( const Sequence< Any >& aArguments
ODataView* pWindow = getView();
InfoBox(pWindow, aMessage).Execute();
}
- closeTask();
throw SQLException();
}
}
@@ -370,7 +369,6 @@ void SAL_CALL ORelationController::initialize( const Sequence< Any >& aArguments
OSQLMessageBox aDlg(getView(),ModuleRes(STR_RELATIONDESIGN),ModuleRes(STR_RELATIONDESIGN_NOT_AVAILABLE));
aDlg.Execute();
}
- closeTask();
throw SQLException();
}
if(!m_bRelationsPossible)