diff options
Diffstat (limited to 'dbaccess/source/ui/uno')
| -rw-r--r-- | dbaccess/source/ui/uno/ColumnControl.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/ColumnPeer.cxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/composerdialogs.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/copytablewizard.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/unoDirectSql.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 62d342567efa..183c3f228d75 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -44,7 +44,7 @@ OColumnControl::OColumnControl(const Reference<XComponentContext>& rxContext) { } // ----------------------------------------------------------------------------- -IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OColumnControl, SERVICE_CONTROLDEFAULT.ascii) +IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OColumnControl, SERVICE_CONTROLDEFAULT) IMPLEMENT_SERVICE_INFO_SUPPORTS(OColumnControl) IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(OColumnControl, "com.sun.star.awt.UnoControl","com.sun.star.sdb.ColumnDescriptorControl") diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index 8fa2b380c91f..62e90f78a822 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -116,12 +116,12 @@ void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value) { SolarMutexGuard aGuard; - if (_rPropertyName.equalsAsciiL(PROPERTY_COLUMN.ascii, PROPERTY_COLUMN.length) ) + if (_rPropertyName == PROPERTY_COLUMN) { Reference<XPropertySet> xProp(Value,UNO_QUERY); setColumn(xProp); } - else if (_rPropertyName.equalsAsciiL(PROPERTY_ACTIVE_CONNECTION.ascii, PROPERTY_ACTIVE_CONNECTION.length) ) + else if (_rPropertyName == PROPERTY_ACTIVE_CONNECTION) { Reference<XConnection> xCon(Value,UNO_QUERY); setConnection(xCon); @@ -134,11 +134,11 @@ Any OColumnPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc { Any aProp; OFieldDescControl* pFieldControl = static_cast<OFieldDescControl*>( GetWindow() ); - if (pFieldControl && _rPropertyName.equalsAsciiL(PROPERTY_COLUMN.ascii, PROPERTY_COLUMN.length)) + if (pFieldControl && _rPropertyName == PROPERTY_COLUMN) { aProp <<= m_xColumn; } - else if (pFieldControl && _rPropertyName.equalsAsciiL(PROPERTY_ACTIVE_CONNECTION.ascii, PROPERTY_ACTIVE_CONNECTION.length)) + else if (pFieldControl && _rPropertyName == PROPERTY_ACTIVE_CONNECTION) { aProp <<= pFieldControl->getConnection(); } diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index b6a3b0db03f7..1b3190605e8d 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -44,8 +44,8 @@ namespace dbaui #define PROPERTY_ID_QUERYCOMPOSER 100 #define PROPERTY_ID_ROWSET 101 - IMPLEMENT_CONSTASCII_USTRING( PROPERTY_QUERYCOMPOSER, "QueryComposer" ); - IMPLEMENT_CONSTASCII_USTRING( PROPERTY_ROWSET, "RowSet" ); +#define PROPERTY_QUERYCOMPOSER "QueryComposer" +#define PROPERTY_ROWSET "RowSet" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 385b70499a54..7af883ed9105 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -743,7 +743,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X OUString sUnsupportedSetting; const OUString aSettings[] = { - PROPERTY_FILTER, PROPERTY_ORDER, PROPERTY_HAVING_CLAUSE, PROPERTY_GROUP_BY + OUString(PROPERTY_FILTER), OUString(PROPERTY_ORDER), OUString(PROPERTY_HAVING_CLAUSE), OUString(PROPERTY_GROUP_BY) }; for ( size_t i=0; i < sizeof( aSettings ) / sizeof( aSettings[0] ); ++i ) { diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index b32a2d3efc5b..c3e942607af3 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -74,7 +74,7 @@ DBG_NAME(ODirectSQLDialog) //--------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(ODirectSQLDialog, "com.sun.star.comp.sdb.DirectSQLDialog") IMPLEMENT_SERVICE_INFO_SUPPORTS(ODirectSQLDialog) - IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODirectSQLDialog, SERVICE_SDB_DIRECTSQLDIALOG.ascii) + IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODirectSQLDialog, SERVICE_SDB_DIRECTSQLDIALOG) ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODirectSQLDialog::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) |