diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-09 08:47:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-09 08:47:44 +0000 |
| commit | 31d854f46a070855208b616b8730d05e47abec8d (patch) | |
| tree | a140130ffab086954279f1081f16b6464e4078e7 /dbaccess/source/ui/querydesign/JoinController.cxx | |
| parent | d54c4888b004a43cb3714e1009d931a5850592de (diff) | |
INTEGRATION: CWS insight02 (1.30.2); FILE MERGED
2004/08/24 07:49:15 oj 1.30.2.3: #i32563# disable .uno:ConfigureDialog until the dialog is not more sfx based
2004/08/13 14:28:20 oj 1.30.2.2: #i32563# toolbox changes
2004/08/13 09:01:07 oj 1.30.2.1: #i32563# toolbox changes
Diffstat (limited to 'dbaccess/source/ui/querydesign/JoinController.cxx')
| -rw-r--r-- | dbaccess/source/ui/querydesign/JoinController.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index fe5569e1ab53..559fbb35599e 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -2,9 +2,9 @@ * * $RCSfile: JoinController.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: hr $ $Date: 2004-08-02 16:12:25 $ + * last change: $Author: rt $ $Date: 2004-09-09 09:47:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,9 +64,6 @@ #ifndef _DBU_QRY_HRC_ #include "dbu_qry.hrc" #endif -#ifndef _SV_TOOLBOX_HXX -#include <vcl/toolbox.hxx> -#endif #ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" #endif @@ -236,7 +233,7 @@ void OJoinController::disposing() void OJoinController::setModified(sal_Bool _bModified) { OJoinController_BASE::setModified(_bModified); - InvalidateFeature(ID_RELATION_ADD_RELATION); + InvalidateFeature(SID_RELATION_ADD_RELATION); } // ----------------------------------------------------------------------------- void OJoinController::SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, long nOffsetY) @@ -280,7 +277,7 @@ FeatureState OJoinController::GetState(sal_uInt16 _nId) const return aReturn; } // ----------------------------------------------------------------------------- -void OJoinController::Execute(sal_uInt16 _nId) +void OJoinController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& aArgs) { switch(_nId) { @@ -326,7 +323,7 @@ void OJoinController::Execute(sal_uInt16 _nId) } break; default: - OJoinController_BASE::Execute(_nId); + OJoinController_BASE::Execute(_nId,aArgs); } InvalidateFeature(_nId); } @@ -354,10 +351,12 @@ void OJoinController::removeConnectionData(OTableConnectionData* _pData) // ----------------------------------------------------------------------------- void OJoinController::AddSupportedFeatures() { + OJoinController_BASE::AddSupportedFeatures(); m_aSupportedFeatures[ ::rtl::OUString::createFromAscii(".uno:Redo")] = ID_BROWSER_REDO; m_aSupportedFeatures[ ::rtl::OUString::createFromAscii(".uno:Save")] = ID_BROWSER_SAVEDOC; m_aSupportedFeatures[ ::rtl::OUString::createFromAscii(".uno:Undo")] = ID_BROWSER_UNDO; - m_aSupportedFeatures[ ::rtl::OUString::createFromAscii(".uno:DB/AddTable")] = ID_BROWSER_ADDTABLE; + m_aSupportedFeatures[ ::rtl::OUString::createFromAscii(".uno:AddTable")] = ID_BROWSER_ADDTABLE; + m_aSupportedFeatures[ ::rtl::OUString::createFromAscii(".uno:EditDoc")] = ID_BROWSER_EDITDOC; } // ----------------------------------------------------------------------------- sal_Bool SAL_CALL OJoinController::suspend(sal_Bool _bSuspend) throw( RuntimeException ) |