summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui')
-rw-r--r--dbaccess/source/ui/app/AppController.hxx2
-rw-r--r--dbaccess/source/ui/inc/dsitems.hxx2
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx12
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx22
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowListBox.cxx2
7 files changed, 22 insertions, 22 deletions
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 5637bb2cc65c..b5b3197353ce 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -146,7 +146,7 @@ namespace dbaui
/** return the element type for given container
@param _xContainer The container where the element type has to be found
- @return the element type coressponding to the given container
+ @return the element type corresponding to the given container
*/
ElementType getElementType(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer) const;
diff --git a/dbaccess/source/ui/inc/dsitems.hxx b/dbaccess/source/ui/inc/dsitems.hxx
index 8a6b19e633c3..2c54cd5f4c76 100644
--- a/dbaccess/source/ui/inc/dsitems.hxx
+++ b/dbaccess/source/ui/inc/dsitems.hxx
@@ -25,7 +25,7 @@ typedef sal_Int32 ItemID;
// item ids for the data source administration dialog
#define DSID_NAME 1 // name of a data source, SfxStringItem
-#define DSID_ORIGINALNAME 2 // orginal name, internal, SfxStringItem
+#define DSID_ORIGINALNAME 2 // original name, internal, SfxStringItem
#define DSID_CONNECTURL 3 // connection URL, SfxStringItem
#define DSID_TABLEFILTER 4 // table filter, OStringListItem
#define DSID_TYPECOLLECTION 5 // collection of data source types, ODsnTypeCollection
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index c58e9cd5c8a6..e57d8bc8dafc 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -203,7 +203,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor
m_sDataSourceName = _aDataDescriptor.getDataSource();
_aDataDescriptor[daCommandType] >>= m_nCommandType;
_aDataDescriptor[daCommand] >>= m_sName;
- // some additonal information
+ // some additional information
if(_aDataDescriptor.has(daConnection))
{
Reference< XConnection > xPureConn( _aDataDescriptor[daConnection], UNO_QUERY );
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 4d8bc1737ce1..fad78e1b76d1 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -613,7 +613,7 @@ namespace
OUStringBuffer aTmpStr,aFieldListStr;
- sal_Bool bAsterix = sal_False;
+ sal_Bool bAsterisk = sal_False;
int nVis = 0;
OTableFields::iterator aIter = _rFieldList.begin();
OTableFields::iterator aEnd = _rFieldList.end();
@@ -623,12 +623,12 @@ namespace
if ( pEntryField->IsVisible() )
{
if ( pEntryField->GetField().toChar() == '*' )
- bAsterix = sal_True;
+ bAsterisk = sal_True;
++nVis;
}
}
if(nVis == 1)
- bAsterix = sal_False;
+ bAsterisk = sal_False;
try
{
@@ -651,7 +651,7 @@ namespace
const OUString rAlias = pEntryField->GetAlias();
const OUString rFieldAlias = pEntryField->GetFieldAlias();
- aTmpStr.append(quoteTableAlias((bAlias || bAsterix),rAlias,aQuote));
+ aTmpStr.append(quoteTableAlias((bAlias || bAsterisk),rAlias,aQuote));
// if we have a none numeric field, the table alias could be in the name
// otherwise we are not allowed to do this (e.g. 0.1 * PRICE )
@@ -2101,14 +2101,14 @@ namespace
{
SqlParseError eErrorCode = eOk;
sal_Bool bFirstField = sal_True;
- OUString sAsterix("*");
+ OUString sAsterisk("*");
OJoinTableView::OTableWindowMap::iterator aIter = _pTabList->begin();
OJoinTableView::OTableWindowMap::iterator aEnd = _pTabList->end();
for(;aIter != aEnd && eOk == eErrorCode ;++aIter)
{
OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second);
OTableFieldDescRef aInfo = new OTableFieldDesc();
- if (pTabWin->ExistsField( sAsterix, aInfo ))
+ if (pTabWin->ExistsField( sAsterisk, aInfo ))
{
eErrorCode = _pView->InsertField(aInfo, sal_True, bFirstField);
bFirstField = sal_False;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 30655c924c3a..423882beeca9 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -63,20 +63,20 @@ using namespace ::com::sun::star::accessibility;
namespace
{
- sal_Bool isFieldNameAsterix(const OUString& _sFieldName )
+ sal_Bool isFieldNameAsterisk(const OUString& _sFieldName )
{
- sal_Bool bAsterix = !(!_sFieldName.isEmpty() && _sFieldName.toChar() != '*');
- if ( !bAsterix )
+ sal_Bool bAsterisk = !(!_sFieldName.isEmpty() && _sFieldName.toChar() != '*');
+ if ( !bAsterisk )
{
OUString sName = _sFieldName;
sal_Int32 nTokenCount = comphelper::string::getTokenCount(sName, '.');
if ( (nTokenCount == 2 && sName.getToken(1,'.')[0] == '*' )
|| (nTokenCount == 3 && sName.getToken(2,'.')[0] == '*' ) )
{
- bAsterix = sal_True;
+ bAsterisk = sal_True;
}
}
- return bAsterix;
+ return bAsterisk;
}
sal_Bool lcl_SupportsCoreSQLGrammar(const Reference< XConnection>& _xConnection)
{
@@ -569,7 +569,7 @@ void OSelectionBrowseBox::notifyFunctionFieldChanged(const OUString& _sOldFuncti
void OSelectionBrowseBox::clearEntryFunctionField(const OUString& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,sal_uInt16 _nColumnId)
{
- if ( isFieldNameAsterix( _sFieldName ) && (!_pEntry->isNoneFunction() || _pEntry->IsGroupBy()) )
+ if ( isFieldNameAsterisk( _sFieldName ) && (!_pEntry->isNoneFunction() || _pEntry->IsGroupBy()) )
{
OUString sFunctionName;
GetFunctionName(SQL_TOKEN_COUNT,sFunctionName);
@@ -736,7 +736,7 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe
// we got a valid select column
// find what type of column has be inserted
::connectivity::OSQLParseNode* pSelection = pParseNode->getChild(2);
- if ( SQL_ISRULE(pSelection,selection) ) // we found the asterix
+ if ( SQL_ISRULE(pSelection,selection) ) // we found the asterisk
{
_pEntry->SetField(_sFieldName);
clearEntryFunctionField(_sFieldName,_pEntry,_bListAction,_pEntry->GetColumnId());
@@ -1395,7 +1395,7 @@ sal_Int8 OSelectionBrowseBox::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
{
if ( IsEditing() )
{
- // allow the asterix again
+ // allow the asterisk again
m_bDisableErrorBox = sal_True;
SaveModified();
m_bDisableErrorBox = sal_False;
@@ -2697,10 +2697,10 @@ void OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef& _pEntry)
// Aggregate functions in general only available with Core SQL
if ( lcl_SupportsCoreSQLGrammar(xConnection) )
{
- // if we have an asterix, no other function than count is allowed
+ // if we have an asterisk, no other function than count is allowed
m_pFunctionCell->Clear();
m_pFunctionCell->InsertEntry(m_aFunctionStrings.getToken(0, ';'));
- if ( isFieldNameAsterix(_pEntry->GetField()) )
+ if ( isFieldNameAsterisk(_pEntry->GetField()) )
m_pFunctionCell->InsertEntry(m_aFunctionStrings.getToken(2, ';')); // 2 -> COUNT
else
{
@@ -2726,7 +2726,7 @@ void OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef& _pEntry)
else
{
// only COUNT(*) and COUNT("table".*) allowed
- sal_Bool bCountRemoved = !isFieldNameAsterix(_pEntry->GetField());
+ sal_Bool bCountRemoved = !isFieldNameAsterisk(_pEntry->GetField());
if ( bCountRemoved )
m_pFunctionCell->RemoveEntry(1);
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 4265d82c47dd..0d2ef02ec61a 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -301,7 +301,7 @@ namespace dbaui
void notifyFunctionFieldChanged(const OUString& _sOldFunctionName,const OUString& _sFunctionName,sal_Bool& _bListAction,sal_uInt16 _nColumnId);
/** clears the function fields of the submitted entry if it doesn't match the SQL standard and append an undo action.
- E.q. AGGREGATE functions are only valid when the field name isn't an asterix
+ E.q. AGGREGATE functions are only valid when the field name isn't an asterisk
@param _sFieldName
The field name.
@param _pEntry
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 5da7356a41f8..9c587855124c 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -199,7 +199,7 @@ void OTableWindowListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPi
OJoinTableView* pCont = m_pTabWin->getTableView();
if (!pCont->getDesignView()->getController().isReadOnly() && pCont->getDesignView()->getController().isConnected())
{
- // asterix was not allowed to be copied to selection browsebox
+ // asterisk was not allowed to be copied to selection browsebox
sal_Bool bFirstNotAllowed = FirstSelected() == First() && m_pTabWin->GetData()->IsShowAll();
EndSelection();
// create a description of the source
generated by cgit (git 2.34.1) at 2024-08-05 11:12:39 +0000