diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2004-09-09 08:48:21 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-09-09 08:48:21 +0000 |
commit | d811b88eda882c026e801f531ff0212196d6d316 (patch) | |
tree | 85ea18ab8bb5fcf56effb364233226ce26d3c56d /dbaccess/source/ui/querydesign/QueryDesignView.cxx | |
parent | 5e2b28b5c6af9663e3ef1a9bf9efba34010ad0d3 (diff) |
INTEGRATION: CWS insight02 (1.68.2); FILE MERGED
2004/08/13 09:01:07 oj 1.68.2.1: #i32563# toolbox changes
Diffstat (limited to 'dbaccess/source/ui/querydesign/QueryDesignView.cxx')
-rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 74c4721d8..4d815dd28 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2,9 +2,9 @@ * * $RCSfile: QueryDesignView.cxx,v $ * - * $Revision: 1.68 $ + * $Revision: 1.69 $ * - * last change: $Author: hr $ $Date: 2004-08-02 16:12:50 $ + * last change: $Author: rt $ $Date: 2004-09-09 09:48:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1472,7 +1472,7 @@ namespace ::rtl::OUString sCondition = ParseCondition(pController,pCondition,sDecimal,aLocale,1); OTableFieldDescRef aDragLeft = new OTableFieldDesc(); if ( eOk == ( eErrorCode = FillDragInfo(_pView,pCondition->getChild(0),aDragLeft)) ) - _pSelectionBrw->AddCondition(aDragLeft, sCondition, nLevel); + _pSelectionBrw->AddCondition(aDragLeft, sCondition, nLevel); } } else if( SQL_ISRULEOR2(pCondition,existence_test,unique_test) ) @@ -1952,7 +1952,7 @@ namespace if(SQL_ISTOKEN(pParseTree->getChild(1),DISTINCT)) { pController->setDistinct(sal_True); - pController->InvalidateFeature(ID_BROWSER_QUERY_DISTINCT_VALUES); + pController->InvalidateFeature(SID_QUERY_DISTINCT_VALUES); } if ( (eErrorCode = InstallFields(_pView,pParseTree, pTableView->GetTabWinMap())) == eOk ) { @@ -2817,13 +2817,13 @@ void OQueryDesignView::setSlotEnabled(sal_Int32 _nSlotId,sal_Bool _bEnable) sal_uInt16 nRow; switch (_nSlotId) { - case ID_BROWSER_QUERY_VIEW_FUNCTIONS: + case SID_QUERY_VIEW_FUNCTIONS: nRow = BROW_FUNCTION_ROW; break; - case ID_BROWSER_QUERY_VIEW_TABLES: + case SID_QUERY_VIEW_TABLES: nRow = BROW_TABLE_ROW; break; - case ID_BROWSER_QUERY_VIEW_ALIASES: + case SID_QUERY_VIEW_ALIASES: nRow = BROW_COLUMNALIAS_ROW; break; default: @@ -2840,13 +2840,13 @@ sal_Bool OQueryDesignView::isSlotEnabled(sal_Int32 _nSlotId) sal_uInt16 nRow; switch (_nSlotId) { - case ID_BROWSER_QUERY_VIEW_FUNCTIONS: + case SID_QUERY_VIEW_FUNCTIONS: nRow = BROW_FUNCTION_ROW; break; - case ID_BROWSER_QUERY_VIEW_TABLES: + case SID_QUERY_VIEW_TABLES: nRow = BROW_TABLE_ROW; break; - case ID_BROWSER_QUERY_VIEW_ALIASES: + case SID_QUERY_VIEW_ALIASES: nRow = BROW_COLUMNALIAS_ROW; break; default: |