diff options
-rw-r--r-- | connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx | 50 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/ADriver.cxx | 16 | ||||
-rw-r--r-- | connectivity/source/drivers/ado/Aolevariant.cxx | 2 | ||||
-rw-r--r-- | dtrans/source/win32/clipb/wcbentry.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/olecomponent.cxx | 20 | ||||
-rw-r--r-- | embeddedobj/source/msole/olevisual.cxx | 4 | ||||
-rw-r--r-- | embeddedobj/source/msole/xdialogcreator.cxx | 4 | ||||
-rw-r--r-- | embedserv/source/embed/docholder.cxx | 12 | ||||
-rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePicker.cxx | 2 | ||||
-rw-r--r-- | shell/source/backends/wininetbe/wininetbackend.cxx | 3 |
10 files changed, 57 insertions, 58 deletions
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index 381113c431fe..5be23aa03ead 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -117,7 +117,7 @@ OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId) void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() { - m_mColumns[8] = OColumn(OUString(),OUString("IS_GRANTABLE"), + m_mColumns[8] = OColumn(OUString(),"IS_GRANTABLE", ColumnValue::NULLABLE, 3,3,0, DataType::VARCHAR); @@ -125,31 +125,31 @@ void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() void ODatabaseMetaDataResultSetMetaData::setColumnsMap() { - m_mColumns[6] = OColumn(OUString(),OUString("TYPE_NAME"), + m_mColumns[6] = OColumn(OUString(),"TYPE_NAME", ColumnValue::NO_NULLS, 0,0,0, DataType::VARCHAR); - m_mColumns[11] = OColumn(OUString(),OUString("NULLABLE"), + m_mColumns[11] = OColumn(OUString(),"NULLABLE", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[12] = OColumn(OUString(),OUString("REMARKS"), + m_mColumns[12] = OColumn(OUString(),"REMARKS", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[13] = OColumn(OUString(),OUString("COLUMN_DEF"), + m_mColumns[13] = OColumn(OUString(),"COLUMN_DEF", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[14] = OColumn(OUString(),OUString("SQL_DATA_TYPE"), + m_mColumns[14] = OColumn(OUString(),"SQL_DATA_TYPE", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[15] = OColumn(OUString(),OUString("SQL_DATETIME_SUB"), + m_mColumns[15] = OColumn(OUString(),"SQL_DATETIME_SUB", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[16] = OColumn(OUString(),OUString("CHAR_OCTET_LENGTH"), + m_mColumns[16] = OColumn(OUString(),"CHAR_OCTET_LENGTH", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -157,7 +157,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap() void ODatabaseMetaDataResultSetMetaData::setTablesMap() { - m_mColumns[5] = OColumn(OUString(),OUString("REMARKS"), + m_mColumns[5] = OColumn(OUString(),"REMARKS", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -165,7 +165,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablesMap() void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() { - m_mColumns[12] = OColumn(OUString(),OUString("NULLABLE"), + m_mColumns[12] = OColumn(OUString(),"NULLABLE", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -173,11 +173,11 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() { - m_mColumns[5] = OColumn(OUString(),OUString("KEY_SEQ"), + m_mColumns[5] = OColumn(OUString(),"KEY_SEQ", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[6] = OColumn(OUString(),OUString("PK_NAME"), + m_mColumns[6] = OColumn(OUString(),"PK_NAME", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -185,15 +185,15 @@ void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() { - m_mColumns[4] = OColumn(OUString(),OUString("NON_UNIQUE"), + m_mColumns[4] = OColumn(OUString(),"NON_UNIQUE", ColumnValue::NO_NULLS, 1,1,0, DataType::BIT); - m_mColumns[5] = OColumn(OUString(),OUString("INDEX_QUALIFIER"), + m_mColumns[5] = OColumn(OUString(),"INDEX_QUALIFIER", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[10] = OColumn(OUString(),OUString("ASC_OR_DESC"), + m_mColumns[10] = OColumn(OUString(),"ASC_OR_DESC", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -201,11 +201,11 @@ void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() { - m_mColumns[6] = OColumn(OUString(),OUString("PRIVILEGE"), + m_mColumns[6] = OColumn(OUString(),"PRIVILEGE", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[7] = OColumn(OUString(),OUString("IS_GRANTABLE"), + m_mColumns[7] = OColumn(OUString(),"IS_GRANTABLE", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -213,7 +213,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() { - m_mColumns[9] = OColumn(OUString(),OUString("KEY_SEQ"), + m_mColumns[9] = OColumn(OUString(),"KEY_SEQ", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -221,27 +221,27 @@ void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() { - m_mColumns[3] = OColumn(OUString(),OUString("PRECISION"), + m_mColumns[3] = OColumn(OUString(),"PRECISION", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[7] = OColumn(OUString(),OUString("NULLABLE"), + m_mColumns[7] = OColumn(OUString(),"NULLABLE", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[12] = OColumn(OUString(),OUString("AUTO_INCREMENT"), + m_mColumns[12] = OColumn(OUString(),"AUTO_INCREMENT", ColumnValue::NO_NULLS, 1,1,0, DataType::BIT); - m_mColumns[16] = OColumn(OUString(),OUString("SQL_DATA_TYPE"), + m_mColumns[16] = OColumn(OUString(),"SQL_DATA_TYPE", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[17] = OColumn(OUString(),OUString("SQL_DATETIME_SUB"), + m_mColumns[17] = OColumn(OUString(),"SQL_DATETIME_SUB", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[18] = OColumn(OUString(),OUString("NUM_PREC_RADIX"), + m_mColumns[18] = OColumn(OUString(),"NUM_PREC_RADIX", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -249,7 +249,7 @@ void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() void ODatabaseMetaDataResultSetMetaData::setProceduresMap() { - m_mColumns[7] = OColumn(OUString(),OUString("REMARKS"), + m_mColumns[7] = OColumn(OUString(),"REMARKS", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 0494334904ec..c6a22e761dbd 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -156,22 +156,22 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString aBooleanValues[1] = "true"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("IgnoreDriverPrivileges") - ,OUString("Ignore the privileges from the database driver.") + "IgnoreDriverPrivileges" + ,"Ignore the privileges from the database driver." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("EscapeDateTime") - ,OUString("Escape date time format.") + "EscapeDateTime" + ,"Escape date time format." ,false - ,OUString( "true" ) + ,"true" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("TypeInfoSettings") - ,OUString("Defines how the type info of the database metadata should be manipulated.") + "TypeInfoSettings" + ,"Defines how the type info of the database metadata should be manipulated." ,false ,OUString( ) ,Sequence< OUString > ()) diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index b40f7d82fc39..fa63b5060db5 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -412,7 +412,7 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) throw css::sdbc::SQLException( sError, nullptr, - OUString( "S1000" ), + "S1000", 1000, css::uno::Any() ); diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx index 60e506111485..fbc33cb85544 100644 --- a/dtrans/source/win32/clipb/wcbentry.cxx +++ b/dtrans/source/win32/clipb/wcbentry.cxx @@ -42,7 +42,7 @@ namespace Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { - return Reference< XInterface >( static_cast< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), OUString( "" ) ) ) ); + return Reference< XInterface >( static_cast< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), "" ) ) ); } } diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 140ad3dc073b..adff4fee07f1 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -185,28 +185,28 @@ struct OleComponentNative_Impl { m_aSupportedGraphFormats.realloc( 5 ); m_aSupportedGraphFormats[0] = datatransfer::DataFlavor( - OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ), - OUString( "Windows Enhanced Metafile" ), + "application/x-openoffice-emf;windows_formatname=\"Image EMF\"", + "Windows Enhanced Metafile", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); m_aSupportedGraphFormats[1] = datatransfer::DataFlavor( - OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ), - OUString( "Windows Metafile" ), + "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"", + "Windows Metafile", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); m_aSupportedGraphFormats[2] = datatransfer::DataFlavor( - OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ), - OUString( "Bitmap" ), + "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", + "Bitmap", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); m_aSupportedGraphFormats[3] = datatransfer::DataFlavor( - OUString( "image/png" ), - OUString( "PNG" ), + "image/png", + "PNG", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); m_aSupportedGraphFormats[0] = datatransfer::DataFlavor( - OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ), - OUString( "GDIMetafile" ), + "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", + "GDIMetafile", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); } diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 03045f3c6ac2..f73df4f3cbdc 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -362,8 +362,8 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres changeState( embed::EmbedStates::RUNNING ); datatransfer::DataFlavor aDataFlavor( - OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ), - OUString( "Windows Metafile" ), + "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"", + "Windows Metafile", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); aVisualRepr.Data = m_pOleComponent->getTransferData( aDataFlavor ); diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index e7cc0216e938..07bc3d7333ef 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -245,8 +245,8 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia if ( nBufSize && nBufSize == GetMetaFileBitsEx( pMF->hMF, nBufSize, pBuf+22 ) ) { datatransfer::DataFlavor aFlavor( - OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ), - OUString( "Image WMF" ), + "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"", + "Image WMF", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); aObjectInfo.Options.realloc( 2 ); diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 783ca2ef765e..f8661e199c40 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -115,19 +115,19 @@ void DocumentHolder::LoadDocInFrame( bool bPluginMode ) uno::Sequence<beans::PropertyValue> aSeq( nLen ); aSeq[0] = beans::PropertyValue( - OUString("Model"), + "Model", -1, uno::Any(uno::Reference<uno::XInterface>(m_xDocument, uno::UNO_QUERY)), beans::PropertyState_DIRECT_VALUE); aSeq[1] = beans::PropertyValue( - OUString("ReadOnly"), + "ReadOnly", -1, uno::Any(false), beans::PropertyState_DIRECT_VALUE); aSeq[2] = beans::PropertyValue( - OUString("NoAutoSave"), + "NoAutoSave", -1, uno::Any(true), beans::PropertyState_DIRECT_VALUE); @@ -136,7 +136,7 @@ void DocumentHolder::LoadDocInFrame( bool bPluginMode ) { aSeq.realloc( ++nLen ); aSeq[nLen-1] = beans::PropertyValue( - OUString("PluginMode"), + "PluginMode", -1, uno::Any((sal_Int16) 3), beans::PropertyState_DIRECT_VALUE); @@ -144,13 +144,13 @@ void DocumentHolder::LoadDocInFrame( bool bPluginMode ) aSeq.realloc( nLen+=2 ); aSeq[nLen-2] = beans::PropertyValue( - OUString("InteractionHandler"), + "InteractionHandler", -1, uno::Any(xHandler), beans::PropertyState_DIRECT_VALUE); aSeq[nLen-1] = beans::PropertyValue( - OUString("MacroExecutionMode"), + "MacroExecutionMode", -1, uno::Any(m_nMacroExecMode), beans::PropertyState_DIRECT_VALUE); diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 43bbbdc7e9dd..ad50716c604f 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -358,7 +358,7 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An { if (lArguments.getLength() < 1) throw css::lang::IllegalArgumentException( - OUString( "XInitialization::initialize() called without arguments." ), + "XInitialization::initialize() called without arguments.", static_cast< css::ui::dialogs::XFilePicker2* >( this ), 1); diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index b1c2b1c344be..cfc7787f4c67 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -301,8 +301,7 @@ void WinInetBackend::setPropertyValue( OUString const &, css::uno::Any const &) { throw css::lang::IllegalArgumentException( - OUString( - "setPropertyValue not supported"), + "setPropertyValue not supported", static_cast< cppu::OWeakObject * >(this), -1); } |