diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:02:35 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:29 +0100 |
commit | 9cc60839f3f3a9dfcf52d5eb76b7d36c1fbc751a (patch) | |
tree | 6995b212a06737f908c59fbadbc64f2b0c493c78 /dbaccess/source/ui/querydesign | |
parent | e1dc859bebc0ce9ec0d61ce7948aff60f94cb0e8 (diff) |
bool improvements
Change-Id: I294b930214ce82033402afecf2b3eb2d04299505
Diffstat (limited to 'dbaccess/source/ui/querydesign')
5 files changed, 32 insertions, 32 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 6ae5c32e3637..8fe635a1a312 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -276,7 +276,7 @@ void OJoinController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& if ( m_pAddTableDialog->IsVisible() ) { - m_pAddTableDialog->Show( sal_False ); + m_pAddTableDialog->Show( false ); getView()->GrabFocus(); } else @@ -285,7 +285,7 @@ void OJoinController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& WaitObject aWaitCursor( getView() ); m_pAddTableDialog->Update(); } - m_pAddTableDialog->Show( sal_True ); + m_pAddTableDialog->Show( true ); ::dbaui::notifySystemWindow(getView(),m_pAddTableDialog,::comphelper::mem_fun(&TaskPaneList::AddWindow)); } break; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 723e120c4021..dec894f54095 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -119,7 +119,7 @@ namespace { sTableRange = ::connectivity::OSQLParseNode::getTableRange(_pTableRef); if ( sTableRange.isEmpty() ) - _pTableRef->parseNodeToStr(sTableRange,xConnection,NULL,sal_False,sal_False); + _pTableRef->parseNodeToStr(sTableRange,xConnection,NULL,false,false); } return sTableRange; } @@ -804,7 +804,7 @@ namespace pParseNode->getChild(node)->parseNodeToStr( sHavingStr, xConnection, &rContext, - sal_False, + false, !pEntryField->isOtherFunction()); aHavingStr = sHavingStr; } @@ -834,7 +834,7 @@ namespace pParseNode->parseNodeToStr( aWhere, xConnection, &rContext, - sal_False, + false, !pEntryField->isOtherFunction() ); aWhereStr = aWhere; } @@ -1177,7 +1177,7 @@ namespace pParseNode->getChild(0)->parseNodeToStr( sGroupBy, xConnection, &rController.getParser().getContext(), - sal_False, + false, !pEntryField->isOtherFunction()); sGroupByPart += sGroupBy; } @@ -1523,8 +1523,8 @@ namespace pFunction->parseNodeToStr( aColumnName, xConnection, &rController.getParser().getContext(), - sal_True, - sal_True); // quote is to true because we need quoted elements inside the function + true, + true); // quote is to true because we need quoted elements inside the function // don't display the column name aCondition = aCondition.copy(aColumnName.getLength()); aCondition = aCondition.trim(); @@ -1722,7 +1722,7 @@ namespace pLhs->parseNodeToStr(aName, xConnection, &rController.getParser().getContext(), - sal_True); + true); // Criteria aCondition = pCondition->getChild(1)->getTokenValue(); pRhs->parseNodeToPredicateStr(aCondition, @@ -2223,8 +2223,8 @@ namespace pParamRef->parseNodeToStr( sFieldName, xConnection, &rController.getParser().getContext(), - sal_True, - sal_True); // quote is to true because we need quoted elements inside the function + true, + true); // quote is to true because we need quoted elements inside the function } aInfo->SetDataType(DataType::DOUBLE); aInfo->SetFieldType(TAB_NORMAL_FIELD); @@ -2257,8 +2257,8 @@ namespace pColumnRef->parseNodeToStr( aColumns, xConnection, &rController.getParser().getContext(), - sal_True, - sal_True); // quote is to true because we need quoted elements inside the function + true, + true); // quote is to true because we need quoted elements inside the function aInfo->SetTabWindow( NULL ); @@ -2419,8 +2419,8 @@ namespace pArgument->parseNodeToStr( sGroupByExpression, xConnection, &rController.getParser().getContext(), - sal_True, - sal_True); // quote is to true because we need quoted elements inside the function + true, + true); // quote is to true because we need quoted elements inside the function _pView->fillFunctionInfo(pArgument,sGroupByExpression,aDragInfo); aDragInfo->SetFunctionType(FKT_OTHER); aDragInfo->SetGroupBy(sal_True); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 3c6442973d8c..3fb10b21430b 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -142,9 +142,9 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) m_pOrderCell->InsertEntry(aTxt.getToken(nIdx, ';')); for(long i=0;i < BROW_ROW_CNT;i++) - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); - m_bVisibleRow[BROW_FUNCTION_ROW] = sal_False; // first hide + m_bVisibleRow[BROW_FUNCTION_ROW] = false; // first hide m_timerInvalidate.SetTimeout(200); m_timerInvalidate.SetTimeoutHdl(LINK(this, OSelectionBrowseBox, OnInvalidateTimer)); @@ -516,7 +516,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon m_pVisibleCell->GetBox().Check(pEntry->IsVisible()); m_pVisibleCell->GetBox().SaveValue(); m_pVisibleCell->GetBox().Disable(); - m_pVisibleCell->GetBox().EnableInput(sal_False); + m_pVisibleCell->GetBox().EnableInput(false); OUString aMessage(ModuleRes(STR_QRY_ORDERBY_UNRELATED)); OQueryDesignView* paDView = getDesignView(); InfoBox(paDView, aMessage).Execute(); @@ -813,7 +813,7 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe // now parse the parameters OUString sParameters; for(sal_uInt32 function = 2; function < nFunCount; ++function) // we only want to parse the parameters of the function - pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), sal_True, bQuote ); + pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), true, bQuote ); aSelEntry->SetFunctionType(nFunctionType); aSelEntry->SetField(sParameters); @@ -838,8 +838,8 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe pColumnRef->parseNodeToStr( sFunction, xConnection, &rController.getParser().getContext(), - sal_True, - sal_True); // quote is to true because we need quoted elements inside the function + true, + true); // quote is to true because we need quoted elements inside the function getDesignView()->fillFunctionInfo(pColumnRef,sFunction,aSelEntry); @@ -851,7 +851,7 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe sal_uInt32 nFunCount = pColumnRef->count(); OUString sParameters; for(sal_uInt32 function = 0; function < nFunCount; ++function) - pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), sal_True, sal_True ); + pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), true, true ); sOldAlias = aSelEntry->GetAlias(); sal_Int32 nNewFunctionType = aSelEntry->GetFunctionType() | FKT_NUMERIC | FKT_OTHER; @@ -1175,7 +1175,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() if ( bAppendRow ) { RowInserted( GetRowCount()-1, 1, sal_True ); - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); ++m_nVisibleCount; } @@ -1710,10 +1710,10 @@ void OSelectionBrowseBox::DuplicateConditionLevel( const sal_uInt16 nLevel) if ( nNewLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1) ) { RowInserted( GetRowCount()-1, 1, sal_True ); - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); ++m_nVisibleCount; } - m_bVisibleRow[BROW_CRIT1_ROW + nNewLevel] = sal_True; + m_bVisibleRow[BROW_CRIT1_ROW + nNewLevel] = true; } } } @@ -1757,10 +1757,10 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1)) { RowInserted( GetRowCount()-1, 1, sal_True ); - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); ++m_nVisibleCount; } - m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = sal_True; + m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = true; break; } if ( _bAddOrOnOneLine ) @@ -1785,10 +1785,10 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1)) { RowInserted( GetRowCount()-1, 1, sal_True ); - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); ++m_nVisibleCount; } - m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = sal_True; + m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = true; } else if (aIter == rFields.end()) { @@ -1801,7 +1801,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1)) { RowInserted( GetRowCount()-1, 1, sal_True ); - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); ++m_nVisibleCount; } } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 28077ea68612..f445c2a6b575 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -923,7 +923,7 @@ void OQueryController::impl_initialize() // more non-legacy rArguments.get_ensureType( (OUString)PROPERTY_GRAPHICAL_DESIGN, m_bGraphicalDesign ); - bool bEscapeProcessing( sal_True ); + bool bEscapeProcessing( true ); if ( rArguments.get_ensureType( (OUString)PROPERTY_ESCAPE_PROCESSING, bEscapeProcessing ) ) { setEscapeProcessing_fireEvent( bEscapeProcessing ); diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 99e1988d9cfa..caf3e433b328 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -217,7 +217,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) m_pTableControl->enableRelation(false); OUString sEmpty; m_pConnData->AppendConnLine(sEmpty,sEmpty); - aPB_OK.Enable(sal_True); + aPB_OK.Enable(true); } break; } |