diff options
Diffstat (limited to 'dbaccess/source/ui/querydesign')
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/querycontroller.cxx | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 64c59f9e7c99..d2606d9b2711 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -1542,7 +1542,7 @@ namespace for(;aIter != aTabEnd;++aIter) { OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second.get()); - if (pTabWin->ExistsField( OUString("*"), aDragLeft )) + if (pTabWin->ExistsField( "*", aDragLeft )) { aDragLeft->SetAlias(OUString()); aDragLeft->SetTable(OUString()); @@ -2203,7 +2203,7 @@ namespace for(;aIter != aEnd;++aIter) { OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second.get()); - if (pTabWin->ExistsField( OUString("*"), aInfo )) + if (pTabWin->ExistsField( "*", aInfo )) { aInfo->SetAlias(OUString()); aInfo->SetTable(OUString()); @@ -2726,7 +2726,7 @@ SqlParseError OQueryDesignView::InsertField( const OTableFieldDescRef& rInfo, bo sal_Int32 OQueryDesignView::getColWidth(sal_uInt16 _nColPos) const { - static sal_Int32 s_nDefaultWidth = GetTextWidth(OUString("0")) * 15; + static sal_Int32 s_nDefaultWidth = GetTextWidth("0") * 15; sal_Int32 nWidth = static_cast<OQueryController&>(getController()).getColWidth(_nColPos); if ( !nWidth ) nWidth = s_nDefaultWidth; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 006257f68f9f..30f4f013e80b 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -801,7 +801,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _ if ( nFunCount == 4 && SQL_ISRULE(pColumnRef->getChild(3),column_ref) ) bError = fillColumnRef( pColumnRef->getChild(3), xConnection, aSelEntry, _bListAction ); else if ( nFunCount == 3 ) // we have a COUNT(*) here, so take the first table - bError = fillColumnRef( OUString("*"), OUString(), xMetaData, aSelEntry, _bListAction ); + bError = fillColumnRef( "*", OUString(), xMetaData, aSelEntry, _bListAction ); else { nFunctionType |= FKT_NUMERIC; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index e4e042eb4a80..8cc18c58a052 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -884,8 +884,8 @@ void OQueryController::impl_initialize() } // non-legacy parameters which overwrite the legacy parameters - rArguments.get_ensureType( OUString(PROPERTY_COMMAND), sCommand ); - rArguments.get_ensureType( OUString(PROPERTY_COMMAND_TYPE), m_nCommandType ); + rArguments.get_ensureType( PROPERTY_COMMAND, sCommand ); + rArguments.get_ensureType( PROPERTY_COMMAND_TYPE, m_nCommandType ); // translate Command/Type into proper members // TODO/Later: all this (including those members) should be hidden behind some abstract interface, @@ -909,17 +909,17 @@ void OQueryController::impl_initialize() // more legacy parameters bool bGraphicalDesign( true ); - if ( rArguments.get_ensureType( OUString(PROPERTY_QUERYDESIGNVIEW), bGraphicalDesign ) ) + if ( rArguments.get_ensureType( PROPERTY_QUERYDESIGNVIEW, bGraphicalDesign ) ) { OSL_FAIL( "OQueryController::impl_initialize: QueryDesignView is regognized for compatibility only!" ); m_bGraphicalDesign = bGraphicalDesign; } // more non-legacy - rArguments.get_ensureType( OUString(PROPERTY_GRAPHICAL_DESIGN), m_bGraphicalDesign ); + rArguments.get_ensureType( PROPERTY_GRAPHICAL_DESIGN, m_bGraphicalDesign ); bool bEscapeProcessing( true ); - if ( rArguments.get_ensureType( OUString(PROPERTY_ESCAPE_PROCESSING), bEscapeProcessing ) ) + if ( rArguments.get_ensureType( PROPERTY_ESCAPE_PROCESSING, bEscapeProcessing ) ) { setEscapeProcessing_fireEvent( bEscapeProcessing ); @@ -938,11 +938,11 @@ void OQueryController::impl_initialize() ::comphelper::NamedValueCollection aCurrentQueryDesign( aCurrentQueryDesignProps ); if ( aCurrentQueryDesign.has( OUString(PROPERTY_GRAPHICAL_DESIGN) ) ) { - aCurrentQueryDesign.get_ensureType( OUString(PROPERTY_GRAPHICAL_DESIGN), m_bGraphicalDesign ); + aCurrentQueryDesign.get_ensureType( PROPERTY_GRAPHICAL_DESIGN, m_bGraphicalDesign ); } if ( aCurrentQueryDesign.has( OUString(PROPERTY_ESCAPE_PROCESSING) ) ) { - aCurrentQueryDesign.get_ensureType( OUString(PROPERTY_ESCAPE_PROCESSING), m_bEscapeProcessing ); + aCurrentQueryDesign.get_ensureType( PROPERTY_ESCAPE_PROCESSING, m_bEscapeProcessing ); } if ( aCurrentQueryDesign.has( "Statement" ) ) { @@ -1967,7 +1967,7 @@ bool OQueryController::allowQueries() const return false; const NamedValueCollection& rArguments( getInitParams() ); - sal_Int32 nCommandType = rArguments.getOrDefault( OUString(PROPERTY_COMMAND_TYPE), (sal_Int32)CommandType::QUERY ); + sal_Int32 nCommandType = rArguments.getOrDefault( PROPERTY_COMMAND_TYPE, (sal_Int32)CommandType::QUERY ); bool bCreatingView = ( nCommandType == CommandType::TABLE ); return !bCreatingView; } |