diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 11:39:07 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 10:48:30 +0000 |
commit | 39d45390f4fab1e9e85f211d74ed2c08fda5b652 (patch) | |
tree | ac4b224a66a18429cd4722a61ee3d401f8e9951c /dbaccess | |
parent | 5c908d0431ee975c1ee7aa245af83b9eb7f95da6 (diff) |
removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms
Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/qa/extras/macros-test.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/CollectionView.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/ConnectionHelper.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/dbfindex.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/queryfilter.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/queryorder.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/tablespage.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/DExport.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/WCPage.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/WCopyTable.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 16 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableController.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/ColumnPeer.cxx | 2 |
18 files changed, 43 insertions, 43 deletions
diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx index b3f30b9f432c..2d0151c88177 100644 --- a/dbaccess/qa/extras/macros-test.cxx +++ b/dbaccess/qa/extras/macros-test.cxx @@ -72,7 +72,7 @@ private: void DBAccessTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) { - rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/")); + rtl::OUString aSep("/"); rtl::OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); @@ -86,8 +86,8 @@ DBAccessTest::DBAccessTest() void DBAccessTest::test() { - const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("testdb.")); - const rtl::OUString aFileExtension(RTL_CONSTASCII_USTRINGPARAM("odb")); + const rtl::OUString aFileNameBase("testdb."); + const rtl::OUString aFileExtension("odb"); rtl::OUString aFileName; createFileURL(aFileNameBase, aFileExtension, aFileName); uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index dc51d3c6c675..ed88d8d7dbd4 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1291,7 +1291,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) ActivateAggregate( tpScale ); pScale->SetMax(::std::max<sal_Int32>(pFieldType->nMaximumScale,pFieldDescr->GetScale())); pScale->SetMin(pFieldType->nMinimumScale); - static const ::rtl::OUString s_sPRECISION(RTL_CONSTASCII_USTRINGPARAM("PRECISION")); + static const ::rtl::OUString s_sPRECISION("PRECISION"); pScale->SetSpecialReadOnly(pFieldType->aCreateParams.isEmpty() || pFieldType->aCreateParams == s_sPRECISION); } else diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 3660aa5de92e..40516da304c1 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -285,10 +285,10 @@ void OCollectionView::initCurrentPath() if ( m_xContent.is() ) { const ::rtl::OUString sCID = m_xContent->getIdentifier()->getContentIdentifier(); - const static ::rtl::OUString s_sFormsCID(RTL_CONSTASCII_USTRINGPARAM("private:forms")); - const static ::rtl::OUString s_sReportsCID(RTL_CONSTASCII_USTRINGPARAM("private:reports")); + const static ::rtl::OUString s_sFormsCID("private:forms"); + const static ::rtl::OUString s_sReportsCID("private:reports"); m_bCreateForm = s_sFormsCID.compareTo(sCID) == 0; - ::rtl::OUString sPath(RTL_CONSTASCII_USTRINGPARAM("/")); + ::rtl::OUString sPath("/"); if ( m_bCreateForm && sCID.getLength() != s_sFormsCID.getLength()) sPath = sCID.copy(s_sFormsCID.getLength()); else if ( !m_bCreateForm && sCID.getLength() != s_sReportsCID.getLength() ) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 9c4cc2ef6b13..5b1cebced880 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -228,7 +228,7 @@ DBG_NAME(OConnectionHelper) break; case ::dbaccess::DST_MSACCESS: { - const ::rtl::OUString sExt(RTL_CONSTASCII_USTRINGPARAM("*.mdb")); + const ::rtl::OUString sExt("*.mdb"); String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, @@ -240,7 +240,7 @@ DBG_NAME(OConnectionHelper) break; case ::dbaccess::DST_MSACCESS_2007: { - const ::rtl::OUString sAccdb(RTL_CONSTASCII_USTRINGPARAM("*.accdb")); + const ::rtl::OUString sAccdb("*.accdb"); String sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 559f04a2ed9c..f600a38335b3 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -311,8 +311,8 @@ void ODbaseIndexDialog::Init() Sequence< ::rtl::OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder)); - ::rtl::OUString aIndexExt(RTL_CONSTASCII_USTRINGPARAM("ndx")); - ::rtl::OUString aTableExt(RTL_CONSTASCII_USTRINGPARAM("dbf")); + ::rtl::OUString aIndexExt("ndx"); + ::rtl::OUString aTableExt("dbf"); ::std::vector< String > aUsedIndexes; diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index c6047a15639d..12c6d9c5d272 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -349,7 +349,7 @@ bool OOdbcManagement::manageDataSources_async() // this is done in an external process, due to #i78733# // (and note this whole functionality is supported on Windows only, ATM) - ::rtl::OUString sExecutableName( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR/program/odbcconfig.exe" ) ); + ::rtl::OUString sExecutableName( "$BRAND_BASE_DIR/program/odbcconfig.exe" ); ::rtl::Bootstrap::expandMacros( sExecutableName ); //TODO: detect failure oslProcess hProcessHandle(0); oslProcessError eError = osl_executeProcess( sExecutableName.pData, NULL, 0, 0, NULL, NULL, NULL, 0, &hProcessHandle ); diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 26c0fb65bddc..130ee03ab2a9 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -328,10 +328,10 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom } } xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; - static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction")); + static ::rtl::OUString sAgg("AggregateFunction"); if ( xInfo->hasPropertyByName(sAgg) ) xColumn->getPropertyValue(sAgg) >>= bHaving; - static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function")); + static ::rtl::OUString sFunction("Function"); if ( xInfo->hasPropertyByName(sFunction) ) xColumn->getPropertyValue(sFunction) >>= bFunction; } @@ -341,7 +341,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom _rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name); if ( !sTableName.isEmpty() ) { - static ::rtl::OUString sSep(RTL_CONSTASCII_USTRINGPARAM(".")); + static ::rtl::OUString sSep("."); sTableName += sSep; sTableName += _rFilter.Name; _rFilter.Name = sTableName; diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 1f1b2e5e17dd..33d1bef259c3 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -220,8 +220,8 @@ void DlgOrderCrit::EnableLines() DBG_CHKTHIS(DlgOrderCrit,NULL); Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); - static const ::rtl::OUString sDESC(RTL_CONSTASCII_USTRINGPARAM(" DESC ")); - static const ::rtl::OUString sASC(RTL_CONSTASCII_USTRINGPARAM(" ASC ")); + static const ::rtl::OUString sDESC(" DESC "); + static const ::rtl::OUString sASC(" ASC "); Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns(); @@ -245,7 +245,7 @@ void DlgOrderCrit::EnableLines() ::rtl::OUString sRealName; xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; sName = sRealName; - static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function")); + static ::rtl::OUString sFunction("Function"); if ( xColumn->getPropertySetInfo()->hasPropertyByName(sFunction) ) xColumn->getPropertyValue(sFunction) >>= bFunction; } diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index f31c32af66f9..7817ddff32c6 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -467,8 +467,8 @@ DBG_NAME(OTableSubscriptionPage) Sequence< ::rtl::OUString > OTableSubscriptionPage::collectDetailedSelection() const { Sequence< ::rtl::OUString > aTableFilter; - static const ::rtl::OUString sDot(RTL_CONSTASCII_USTRINGPARAM(".")); - static const ::rtl::OUString sWildcard(RTL_CONSTASCII_USTRINGPARAM("%")); + static const ::rtl::OUString sDot("."); + static const ::rtl::OUString sWildcard("%"); ::rtl::OUString sComposedName; const SvTreeListEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry(); diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 5d199166bb5e..9ba2dd768061 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -838,9 +838,9 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R aSql += sComposedTableName; aSql += ::rtl::OUString(" ( "); // set values and column names - ::rtl::OUString aValues(RTL_CONSTASCII_USTRINGPARAM(" VALUES ( ")); - static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,")); - static ::rtl::OUString aComma(RTL_CONSTASCII_USTRINGPARAM(",")); + ::rtl::OUString aValues(" VALUES ( "); + static ::rtl::OUString aPara("?,"); + static ::rtl::OUString aComma(","); ::rtl::OUString aQuote; if ( _xMetaData.is() ) diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 3f409cf51eaa..98be0f40c77c 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -448,8 +448,8 @@ void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxCo // Information for a single SQL type if(xRs.is()) { - static const ::rtl::OUString aB1(RTL_CONSTASCII_USTRINGPARAM(" [ ")); - static const ::rtl::OUString aB2(RTL_CONSTASCII_USTRINGPARAM(" ]")); + static const ::rtl::OUString aB1(" [ "); + static const ::rtl::OUString aB2(" ]"); Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData(); ::connectivity::ORowSetValue aValue; ::std::vector<sal_Int32> aTypes; @@ -1376,7 +1376,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType } if ( !pTypeInfo ) { - ::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x")),sTypeName; + ::rtl::OUString sCreate("x"),sTypeName; sal_Bool bForce = sal_True; pTypeInfo = ::dbaui::getTypeInfoFromType(_rTypeInfo,DataType::VARCHAR,sTypeName,sCreate,50,0,sal_False,bForce); } diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index cb6974176626..db68666cb5a0 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -97,7 +97,7 @@ OCopyTable::OCopyTable( Window * pParent ) m_aFT_KeyName.Enable(sal_False); m_edKeyName.Enable(sal_False); - ::rtl::OUString sKeyName(RTL_CONSTASCII_USTRINGPARAM("ID")); + ::rtl::OUString sKeyName("ID"); sKeyName = m_pParent->createUniqueName(sKeyName); m_edKeyName.SetText(sKeyName); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 8255bfc0bf9f..fa220bf19b43 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -180,7 +180,7 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _ const ::rtl::OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject); const String sTargetNameTemp = (sTargetName + ::rtl::OUString(".")); - ::rtl::OUString sStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM ")); + ::rtl::OUString sStatement("SELECT * FROM "); sStatement += sTargetName; sStatement += ::rtl::OUString(" WHERE 0=1"); @@ -1113,7 +1113,7 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, _rColumns.clear(); OFieldDescription* pActFieldDescr = NULL; - ::rtl::OUString sCreateParam(RTL_CONSTASCII_USTRINGPARAM("x")); + ::rtl::OUString sCreateParam("x"); ////////////////////////////////////////////////////////////////////// // ReadOnly-Flag // On drop no line must be editable. @@ -1612,7 +1612,7 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& if ( !pType.get() ) { _bNotConvert = sal_False; - ::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x")); + ::rtl::OUString sCreate("x"); pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,DataType::VARCHAR,_pType->aTypeName,sCreate,50,0,sal_False,bForce); if ( !pType.get() ) pType = m_pTypeInfo; diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 5cab1e4a9bc7..765a240dcb7c 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -108,7 +108,7 @@ namespace dbaui // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription( ) throw (RuntimeException) { - static ::rtl::OUString sDescription(RTL_CONSTASCII_USTRINGPARAM("Relation")); + static ::rtl::OUString sDescription("Relation"); return sDescription; } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 4bb97c530104..b1b91f6beae1 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -69,8 +69,8 @@ using namespace ::com::sun::star::container; // please look at the book LargeScale C++ to know why namespace { - static const OUString C_AND(RTL_CONSTASCII_USTRINGPARAM(" AND ")); - static const OUString C_OR(RTL_CONSTASCII_USTRINGPARAM(" OR ")); + static const OUString C_AND(" AND "); + static const OUString C_OR(" OR "); // forward declarations sal_Bool InsertJoin( const OQueryDesignView* _pView, @@ -302,7 +302,7 @@ namespace { const Reference< XDatabaseMetaData > xMetaData = _xConnection->getMetaData(); const OUString aQuote = xMetaData->getIdentifierQuoteString(); - const OUString sEqual(RTL_CONSTASCII_USTRINGPARAM(" = ")); + const OUString sEqual(" = "); for(;aIter != aEnd;++aIter) { @@ -657,8 +657,8 @@ namespace OJoinTableView::OTableWindowMap* pTabList = _pView->getTableView()->GetTabWinMap(); - const static OUString sFieldSeparator(RTL_CONSTASCII_USTRINGPARAM(", ")); - const static OUString s_sAs(RTL_CONSTASCII_USTRINGPARAM(" AS ")); + const static OUString sFieldSeparator(", "); + const static OUString s_sAs(" AS "); aIter = _rFieldList.begin(); for(;aIter != aEnd;++aIter) @@ -1227,7 +1227,7 @@ namespace if ( !aGroupByStr.isEmpty() ) { aGroupByStr = aGroupByStr.replaceAt(aGroupByStr.getLength()-1,1, OUString(' ') ); - OUString aGroupByStr2(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY ")); + OUString aGroupByStr2(" GROUP BY "); aGroupByStr2 += aGroupByStr; aGroupByStr = aGroupByStr2; } @@ -2154,7 +2154,7 @@ namespace { SqlParseError eErrorCode = eOk; sal_Bool bFirstField = sal_True; - OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*")); + OUString sAsterix("*"); OJoinTableView::OTableWindowMap::iterator aIter = _pTabList->begin(); OJoinTableView::OTableWindowMap::iterator aEnd = _pTabList->end(); for(;aIter != aEnd && eOk == eErrorCode ;++aIter) @@ -2932,7 +2932,7 @@ OUString OQueryDesignView::getStatement() GenerateInnerJoinCriterias(xConnection,aJoinCrit,pConnList); if(!aJoinCrit.isEmpty()) { - OUString aTmp(RTL_CONSTASCII_USTRINGPARAM("( ")); + OUString aTmp("( "); aTmp += aJoinCrit; aTmp += OUString(RTL_CONSTASCII_USTRINGPARAM(" )")); if(aCriteriaListStr.getLength()) diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 174fb8d49e71..2a0a08e3cff8 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -204,12 +204,12 @@ namespace dbaui Reference < XPropertySet > xPropSet( xBeamerFrame, UNO_QUERY ); try { - const ::rtl::OUString aLayoutManager( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )); + const ::rtl::OUString aLayoutManager( "LayoutManager" ); Reference < XPropertySet > xLMPropSet(xPropSet->getPropertyValue( aLayoutManager ),UNO_QUERY); if ( xLMPropSet.is() ) { - const ::rtl::OUString aAutomaticToolbars( RTL_CONSTASCII_USTRINGPARAM( "AutomaticToolbars" )); + const ::rtl::OUString aAutomaticToolbars( "AutomaticToolbars" ); xLMPropSet->setPropertyValue( aAutomaticToolbars, Any( sal_False )); } } diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 77ec4fce4827..ce966a7c4a88 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -873,7 +873,7 @@ void OTableController::loadData() pTabEdRow->SetReadOnly(!bIsAlterAllowed); // search for type sal_Bool bForce; - ::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x")); + ::rtl::OUString sCreate("x"); TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,sCreate,nPrecision,nScale,bIsAutoIncrement,bForce); if ( !pTypeInfo.get() ) pTypeInfo = m_pTypeInfo; diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index a4c1ea19e060..b4e20a95599e 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -91,7 +91,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) m_pActFieldDescr = new OFieldDescription(_xColumn,sal_True); // search for type - ::rtl::OUString sCreateParam(RTL_CONSTASCII_USTRINGPARAM("x")); + ::rtl::OUString sCreateParam("x"); sal_Bool bForce; TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(*pFieldControl->getTypeInfo(),nType,sTypeName,sCreateParam,nPrecision,nScale,bAutoIncrement,bForce); if ( !pTypeInfo.get() ) |