diff options
Diffstat (limited to 'fpicker/source')
34 files changed, 166 insertions, 192 deletions
diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx index f1b1e4cde76d..3a264fc61789 100644 --- a/fpicker/source/aqua/FPentry.cxx +++ b/fpicker/source/aqua/FPentry.cxx @@ -89,8 +89,8 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr try { Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); - pXNewKey->createKey( OUString::createFromAscii( FOLDER_PICKER_REGKEY_NAME ) ); + pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) )); + pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_REGKEY_NAME ) )); } catch( InvalidRegistryException& ) { @@ -122,7 +122,7 @@ void* SAL_CALL component_getFactory( { Sequence< OUString > aSNS( 1 ); aSNS.getArray( )[0] = - OUString::createFromAscii(FILE_PICKER_SERVICE_NAME); + OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_SERVICE_NAME)); xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), @@ -134,7 +134,7 @@ void* SAL_CALL component_getFactory( { Sequence< OUString > aSNS( 1 ); aSNS.getArray( )[0] = - OUString::createFromAscii(FOLDER_PICKER_SERVICE_NAME); + OUString(RTL_CONSTASCII_USTRINGPARAM(FOLDER_PICKER_SERVICE_NAME)); xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), diff --git a/fpicker/source/aqua/FilterHelper.cxx b/fpicker/source/aqua/FilterHelper.cxx index b85e7ab8448b..c0a590977ca3 100644 --- a/fpicker/source/aqua/FilterHelper.cxx +++ b/fpicker/source/aqua/FilterHelper.cxx @@ -372,7 +372,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: // append the filter if (bPrependSeparator) { - rtl::OUString dash = rtl::OUString::createFromAscii("-"); + rtl::OUString dash(RTL_CONSTASCII_USTRINGPARAM("-")); OUStringList emptyList; m_pFilterList->push_back(FilterEntry(dash, emptyList)); } @@ -419,7 +419,7 @@ sal_Bool FilterHelper::filenameMatchesFilter(NSString* sFilename) { rtl::OUString aName = [sFilename OUString]; - rtl::OUString allMatcher = rtl::OUString::createFromAscii(".*"); + rtl::OUString allMatcher(RTL_CONSTASCII_USTRINGPARAM(".*")); for(OUStringList::iterator iter = suffixList.begin(); iter != suffixList.end(); iter++) { if (aName.matchIgnoreAsciiCase(*iter, aName.getLength() - (*iter).getLength()) || ((*iter).equals(allMatcher))) { return sal_True; diff --git a/fpicker/source/aqua/SalAquaFilePicker.cxx b/fpicker/source/aqua/SalAquaFilePicker.cxx index e05fe4fb8dc9..12846f54caf3 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.cxx +++ b/fpicker/source/aqua/SalAquaFilePicker.cxx @@ -94,9 +94,9 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(3); - aRet[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FilePicker" ); - aRet[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" ); - aRet[2] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.AquaFilePicker" ); + aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" )); + aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFilePicker" )); + aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.AquaFilePicker" )); return aRet; } } @@ -187,7 +187,6 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException ) // if m_pDialog is nil after initialization, something must have gone wrong before // or there was no initialization (see issue http://www.openoffice.org/issues/show_bug.cgi?id=100214) if (m_pDialog == nil) { - //throw uno::RuntimeException(rtl::OUString::createFromAscii("The dialog was not properly initialized!"), static_cast< XFilePicker* >( this )); m_nDialogType = NAVIGATIONSERVICES_OPEN; } @@ -206,7 +205,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException ) rtl::OUString ouName = [windowTitle OUString]; //a window title will typically be something like "Untitled1 - OpenOffice.org Writer" //but we only want the "Untitled1" part of it - sal_Int32 indexOfDash = ouName.indexOf(rtl::OUString::createFromAscii(" - ")); + sal_Int32 indexOfDash = ouName.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - "))); if (indexOfDash > -1) { m_sSaveFileName = ouName.copy(0,indexOfDash); if (m_sSaveFileName.getLength() > 0) { @@ -244,7 +243,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException ) break; default: - throw uno::RuntimeException(rtl::OUString::createFromAscii("The dialog returned with an unknown result!"), static_cast< XFilePicker* >( this )); + throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The dialog returned with an unknown result!")), static_cast< XFilePicker* >( this )); break; } @@ -506,14 +505,14 @@ throw( uno::Exception, uno::RuntimeException ) // parameter checking uno::Any aAny; if( 0 == aArguments.getLength() ) - throw lang::IllegalArgumentException(rtl::OUString::createFromAscii( "no arguments" ), + throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), static_cast<XFilePicker*>( this ), 1 ); aAny = aArguments[0]; if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) && (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) - throw lang::IllegalArgumentException(rtl::OUString::createFromAscii( "invalid argument type" ), + throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), static_cast<XFilePicker*>( this ), 1 ); sal_Int16 templateId = -1; @@ -566,7 +565,7 @@ throw( uno::Exception, uno::RuntimeException ) OSL_TRACE( "Template: FILESAVE_AUTOEXTENSION" ); break; default: - throw lang::IllegalArgumentException(rtl::OUString::createFromAscii( "Unknown template" ), + throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), static_cast< XFilePicker* >( this ), 1 ); } @@ -625,7 +624,7 @@ throw( uno::RuntimeException ) { DBG_PRINT_ENTRY(CLASS_NAME, __func__); - rtl::OUString retVal = rtl::OUString::createFromAscii( FILE_PICKER_IMPL_NAME ); + rtl::OUString retVal(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal); diff --git a/fpicker/source/aqua/SalAquaFolderPicker.cxx b/fpicker/source/aqua/SalAquaFolderPicker.cxx index 115bc1afe50c..7f269ec2b3c4 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.cxx +++ b/fpicker/source/aqua/SalAquaFolderPicker.cxx @@ -80,8 +80,8 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FolderPicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(2); - aRet[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFolderPicker" ); - aRet[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.AquaFolderPicker" ); + aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFolderPicker" )); + aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.AquaFolderPicker" )); return aRet; } } @@ -137,7 +137,7 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException ) break; default: - throw uno::RuntimeException(rtl::OUString::createFromAscii("The dialog returned with an unknown result!"), static_cast< XFolderPicker* >( this )); + throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The dialog returned with an unknown result!")), static_cast< XFolderPicker* >( this )); break; } @@ -189,7 +189,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeEx OSL_TRACE("# of items: %d", nFiles); if (nFiles < 1) { - throw uno::RuntimeException(rtl::OUString::createFromAscii("no directory selected"), static_cast< XFolderPicker* >( this )); + throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no directory selected")), static_cast< XFolderPicker* >( this )); } rtl::OUString aDirectory; @@ -226,7 +226,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName() { DBG_PRINT_ENTRY(CLASS_NAME, __func__); - rtl::OUString retVal = rtl::OUString::createFromAscii( FOLDER_PICKER_IMPL_NAME ); + rtl::OUString retVal(RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_IMPL_NAME )); DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal); diff --git a/fpicker/source/odma/ODMAFilePicker.cxx b/fpicker/source/odma/ODMAFilePicker.cxx index 39153b631f53..685da9f377eb 100644 --- a/fpicker/source/odma/ODMAFilePicker.cxx +++ b/fpicker/source/odma/ODMAFilePicker.cxx @@ -85,7 +85,7 @@ ODMAFilePicker::ODMAFilePicker( const Reference < XMultiServiceFactory >& xFacto { m_bUseDMS = ::odma::DMSsAvailable(); m_xSystemFilePicker = xFactory->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.Win32FilePicker" ) ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.Win32FilePicker" ) )); } // XExecutableDialog functions @@ -163,7 +163,7 @@ sal_Int16 SAL_CALL ODMAFilePicker::execute( ) // Insane API... the first element is a full URI, the rest // are just the "basenames" in the same "directory". if (i == 0) - strings[0] = rtl::OUString::createFromAscii( "vnd.sun.star.odma:/" ) + rtl::OUString::createFromAscii( p ); + strings[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.odma:/" )) + rtl::OUString::createFromAscii( p ); else strings[i] = rtl::OUString::createFromAscii( p ); p += strlen( p ); @@ -198,7 +198,7 @@ sal_Int16 SAL_CALL ODMAFilePicker::execute( ) NODMUnRegisterApp( handle ); if (status == ODM_SUCCESS) { - rtl::OUString s( rtl::OUString::createFromAscii( "vnd.sun.star.odma:/" ) + + rtl::OUString s( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.odma:/" )) + rtl::OUString::createFromAscii( newdocid ) ); // Create a Content for the odma URL so that // odma::ContentProvider will learn about the DOCID we @@ -520,7 +520,7 @@ Sequence< rtl::OUString > ODMAFilePicker::impl_getStaticSupportedServiceNames( ) { Sequence< rtl::OUString > seqServiceNames( 2 ); rtl::OUString* pArray = seqServiceNames.getArray(); - pArray[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.ODMAFilePicker" ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.ODMAFilePicker" )); // Super-ugly, but check the function sal_Bool // lcl_isSystemFilePicker( const Reference< XFilePicker >& ) in @@ -530,13 +530,13 @@ Sequence< rtl::OUString > ODMAFilePicker::impl_getStaticSupportedServiceNames( ) // isn't it? If we don't claim to implement this "service" (which // is not defined in any IDL file, btw), we get hangs. - pArray[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" ); + pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFilePicker" )); return seqServiceNames ; } rtl::OUString ODMAFilePicker::impl_getStaticImplementationName( ) { - return rtl::OUString::createFromAscii( "com.sun.star.svtools.ODMAFilePicker" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.ODMAFilePicker" )); } Reference< XInterface > SAL_CALL ODMAFilePicker::impl_createInstance( diff --git a/fpicker/source/odma/ODMAFolderPicker.cxx b/fpicker/source/odma/ODMAFolderPicker.cxx index 82e83a918bc6..5c9536ac3290 100644 --- a/fpicker/source/odma/ODMAFolderPicker.cxx +++ b/fpicker/source/odma/ODMAFolderPicker.cxx @@ -67,7 +67,7 @@ ODMAFolderPicker::ODMAFolderPicker( const Reference < XMultiServiceFactory >& xF m_bUseDMS( sal_False ) { m_xInterface = xFactory->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFolderPicker" ) ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFolderPicker" ) )); } // XExecutableDialog functions @@ -166,13 +166,13 @@ Sequence< ::rtl::OUString > ODMAFolderPicker::impl_getStaticSupportedServiceName { Sequence< ::rtl::OUString > seqServiceNames( 1 ); ::rtl::OUString* pArray = seqServiceNames.getArray(); - pArray[0] = ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.ODMAFolderPicker" ); + pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.ODMAFolderPicker" )); return seqServiceNames ; } ::rtl::OUString ODMAFolderPicker::impl_getStaticImplementationName( ) { - return ::rtl::OUString::createFromAscii( "com.sun.star.svtools.ODMAFolderPicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.ODMAFolderPicker" )); } Reference< XInterface > SAL_CALL ODMAFolderPicker::impl_createInstance( const Reference< XComponentContext >& rxContext ) diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index a5ea04e122bf..20b542825c8b 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -1166,14 +1166,14 @@ Sequence< rtl::OUString > SvtFilePicker::impl_getStaticSupportedServiceNames() { Sequence< rtl::OUString > seqServiceNames( 1 ); rtl::OUString* pArray = seqServiceNames.getArray(); - pArray[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.OfficeFilePicker" ); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFilePicker" )); return seqServiceNames ; } /* Helper for XServiceInfo */ rtl::OUString SvtFilePicker::impl_getStaticImplementationName() { - return rtl::OUString::createFromAscii( "com.sun.star.svtools.OfficeFilePicker" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.OfficeFilePicker" )); } /* Helper for registry */ diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index 0077ce45bab4..945616b5ec4a 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -246,14 +246,14 @@ Sequence< ::rtl::OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames() Sequence< ::rtl::OUString > SvtFolderPicker::impl_getStaticSupportedServiceNames() { Sequence< ::rtl::OUString > seqServiceNames(1); - seqServiceNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.OfficeFolderPicker" ); + seqServiceNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFolderPicker" )); return seqServiceNames ; } /* Helper for XServiceInfo */ ::rtl::OUString SvtFolderPicker::impl_getStaticImplementationName() { - return ::rtl::OUString::createFromAscii( "com.sun.star.svtools.OfficeFolderPicker" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.OfficeFolderPicker" )); } /* Helper for registry */ diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index ea5d284d6084..59181a3db9e6 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -67,13 +67,13 @@ namespace svt { // the two properties we have registerProperty( - ::rtl::OUString::createFromAscii( "HelpURL" ), PROPERTY_ID_HELPURL, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HelpURL" )), PROPERTY_ID_HELPURL, PropertyAttribute::TRANSIENT, &m_sHelpURL, ::getCppuType( &m_sHelpURL ) ); registerProperty( - ::rtl::OUString::createFromAscii( "Window" ), PROPERTY_ID_WINDOW, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" )), PROPERTY_ID_WINDOW, PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY, &m_xWindow, ::getCppuType( &m_xWindow ) ); diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index 2c37710d1061..31c7030afb03 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -226,7 +226,7 @@ namespace svt try { ::rtl::OUString sTitle; - m_pContent->getPropertyValue( ::rtl::OUString::createFromAscii( "Title" ) ) >>= sTitle; + m_pContent->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )) ) >>= sTitle; _rTitle = sTitle; // from here on, we definately know that the content is valid diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index ef54e5662ea7..f7d48f81b72a 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -521,7 +521,7 @@ SvtFileDialog::~SvtFileDialog() SvtViewOptions aDlgOpt( E_DIALOG, _pImp->_aIniKey ); aDlgOpt.SetWindowState( String( GetWindowState(), osl_getThreadTextEncoding() ) ); String sUserData = _pFileView->GetConfigString(); - aDlgOpt.SetUserItem( ::rtl::OUString::createFromAscii( "UserData" ), + aDlgOpt.SetUserItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserData" )), makeAny( ::rtl::OUString( sUserData ) ) ); } @@ -548,8 +548,7 @@ void SvtFileDialog::Init_Impl WinBits nStyle ) { - sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - m_aImages = ImageList( SvtResId( bIsHighContrast ? RID_FILEPICKER_IMAGES_HC : RID_FILEPICKER_IMAGES ) ); + m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) ); _pImp->_nStyle = nStyle; _pImp->_a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); @@ -2072,8 +2071,8 @@ short SvtFileDialog::PrepareExecute() INetURLObject::NO_DECODE ) ), Reference< XCommandEnvironment >() ); Sequence< rtl::OUString > aProps(2); - aProps[0] = rtl::OUString::createFromAscii( "IsVolume" ); - aProps[1] = rtl::OUString::createFromAscii( "IsRemoveable" ); + aProps[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsVolume" )); + aProps[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRemoveable" )); Reference< XResultSet > xResultSet = aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_FOLDERS_ONLY ); @@ -2503,7 +2502,7 @@ void SvtFileDialog::InitSize() { SetWindowState( ByteString( String( aDlgOpt.GetWindowState() ), osl_getThreadTextEncoding() ) ); - Any aUserData = aDlgOpt.GetUserItem( ::rtl::OUString::createFromAscii( "UserData" ) ); + Any aUserData = aDlgOpt.GetUserItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserData" ) )); ::rtl::OUString sCfgStr; if ( aUserData >>= sCfgStr ) _pFileView->SetConfigString( String( sCfgStr ) ); @@ -2672,11 +2671,7 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter ) //----------------------------------------------------------------------------- void SvtFileDialog::implUpdateImages( ) { - // determine high contrast mode - { - sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - m_aImages = ImageList( SvtResId( bIsHighContrast ? RID_FILEPICKER_IMAGES_HC : RID_FILEPICKER_IMAGES ) ); - } + m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) ); // set the appropriate images on the buttons if ( _pImp->_pBtnUp ) diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src index a7c19cb601d2..249383dc8a47 100644 --- a/fpicker/source/office/iodlg.src +++ b/fpicker/source/office/iodlg.src @@ -53,13 +53,6 @@ ImageList RID_FILEPICKER_IMAGES FILEPICKER_IL_IDLIST }; -ImageList RID_FILEPICKER_IMAGES_HC -{ - Prefix = "fph"; - MASKCOLOR - FILEPICKER_IL_IDLIST -}; - // dialogs ******************************************************************* ModalDialog DLG_SVT_EXPLORERFILE diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 86d1387c9ca6..dfaac9bc7b01 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -226,8 +226,7 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu ) ::svtools::VolumeInfo aVolInfo( sal_True /* volume */, sal_False /* remote */, sal_False /* removable */, sal_False /* floppy */, sal_False /* compact disk */ ); - sal_Bool bIsHighContrast = pBox->GetSettings().GetStyleSettings().GetHighContrastMode(); - Image aVolumeImage( SvFileInformationManager::GetFolderImage( aVolInfo, bIsHighContrast ) ); + Image aVolumeImage( SvFileInformationManager::GetFolderImage( aVolInfo ) ); while ( nCount >= 1 ) { @@ -242,8 +241,7 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu ) aTitle = aObject.getName(); Image aImage = ( nCount > 1 ) // if nCount == 1 means workplace, which detects the wrong image - ? SvFileInformationManager::GetImage( aObject, bIsHighContrast ) - : aVolumeImage; + ? SvFileInformationManager::GetImage( aObject ) : aVolumeImage; _pMenu->InsertItem( nItemId++, aTitle, aImage ); _pURLs->Insert( pParentURL, _pURLs->Count() ); @@ -314,8 +312,6 @@ void SvtTravelButton_Impl::FillURLMenu( PopupMenu* _pMenu ) _pMenu->Clear(); - sal_Bool bIsHighContrast = GetDialogParent()->GetView()->GetSettings().GetStyleSettings().GetHighContrastMode(); - USHORT nItemId = 1; String sDisplayName; @@ -324,8 +320,7 @@ void SvtTravelButton_Impl::FillURLMenu( PopupMenu* _pMenu ) { if ( GetDialogParent()->isUrlAllowed( *aLoop ) ) { - Image aImage = SvFileInformationManager::GetImage( - INetURLObject(*aLoop), bIsHighContrast ); + Image aImage = SvFileInformationManager::GetImage( INetURLObject(*aLoop) ); if ( LocalFileHelper::ConvertURLToSystemPath(*aLoop, sDisplayName) ) _pMenu->InsertItem( nItemId, sDisplayName, aImage ); else diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx index 3c852ceecbbe..4e533a55ad01 100644 --- a/fpicker/source/unx/gnome/FPentry.cxx +++ b/fpicker/source/unx/gnome/FPentry.cxx @@ -115,8 +115,8 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr try { Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); - pXNewKey->createKey( OUString::createFromAscii( FOLDER_PICKER_REGKEY_NAME ) ); + pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) )); + pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_REGKEY_NAME ) )); } catch( InvalidRegistryException& ) { @@ -153,7 +153,7 @@ void* SAL_CALL component_getFactory( { Sequence< OUString > aSNS( 1 ); aSNS.getArray( )[0] = - OUString::createFromAscii(FILE_PICKER_SERVICE_NAME); + OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_SERVICE_NAME)); xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), @@ -165,7 +165,7 @@ void* SAL_CALL component_getFactory( { Sequence< OUString > aSNS( 1 ); aSNS.getArray( )[0] = - OUString::createFromAscii(FOLDER_PICKER_SERVICE_NAME); + OUString(RTL_CONSTASCII_USTRINGPARAM(FOLDER_PICKER_SERVICE_NAME)); xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx index 28e081b9f62a..4b681ab4f6fa 100644 --- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx @@ -89,9 +89,9 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(3); - aRet[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FilePicker" ); - aRet[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" ); - aRet[2] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.GtkFilePicker" ); + aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" )); + aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFilePicker" )); + aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.GtkFilePicker" )); return aRet; } } @@ -907,7 +907,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw if( sExtension.getLength() >= 3 ) // 3 = typical/minimum extension length { - static const OUString aStarDot = OUString::createFromAscii( "*." ); + static const OUString aStarDot(RTL_CONSTASCII_USTRINGPARAM( "*." )); ::rtl::OUString aNewFilter; ::rtl::OUString aOldFilter = getCurrentFilter(); @@ -917,7 +917,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw ++aListIter ) { - if( aListIter->getFilter().indexOf( aStarDot+sExtension ) >= 0 ) + if( aListIter->getFilter().equalsIgnoreAsciiCase( aStarDot+sExtension ) ) { if( !aNewFilter.getLength() ) aNewFilter = aListIter->getTitle(); @@ -977,7 +977,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw if( !bExtensionTypedIn && ( !sToken.equalsAscii( "*" ) ) ) { //if the filename does not already have the auto extension, stick it on - OUString sExtension = OUString::createFromAscii( "." ) + sToken; + OUString sExtension = OUString(RTL_CONSTASCII_USTRINGPARAM( "." )) + sToken; OUString &rBase = aSelectedFiles[nIndex]; sal_Int32 nExtensionIdx = rBase.getLength() - sExtension.getLength(); OSL_TRACE( "idx are %d %d\n", rBase.lastIndexOf( sExtension ), nExtensionIdx ); @@ -1028,7 +1028,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException ) int btn = GTK_RESPONSE_NO; uno::Reference< awt::XExtendedToolkit > xToolkit( - m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY); + m_xServiceMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")) ), uno::UNO_QUERY); RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit); uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog); @@ -1505,7 +1505,7 @@ void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection ) { gchar *title; gtk_tree_model_get (model, &iter, 2, &title, -1); - aLabel += rtl::OUString::createFromAscii( ": " ); + aLabel += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ": " )); aLabel += rtl::OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 ); g_free (title); } @@ -1640,7 +1640,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu uno::Any aAny; if( 0 == aArguments.getLength() ) throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "no arguments" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), static_cast<XFilePicker2*>( this ), 1 ); aAny = aArguments[0]; @@ -1648,7 +1648,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) && (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "invalid argument type" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), static_cast<XFilePicker2*>( this ), 1 ); sal_Int16 templateId = -1; @@ -1736,7 +1736,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu break; default: throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "Unknown template" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), static_cast< XFilePicker2* >( this ), 1 ); } @@ -1815,7 +1815,7 @@ void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException ) rtl::OUString SAL_CALL SalGtkFilePicker::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString::createFromAscii( FILE_PICKER_IMPL_NAME ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); } // ------------------------------------------------- @@ -1915,7 +1915,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O OString aFilterName = rtl::OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 ); gtk_file_filter_set_name( filter, aFilterName ); - static const OUString aStarDot = OUString::createFromAscii( "*." ); + static const OUString aStarDot(RTL_CONSTASCII_USTRINGPARAM( "*." )); OUString aTokens; bool bAllGlob = !rType.compareToAscii( "*.*" ) || !rType.compareToAscii( "*" ); @@ -1933,7 +1933,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O if (aToken.getLength()) { if (aTokens.getLength()) - aTokens += OUString::createFromAscii(","); + aTokens += OUString(RTL_CONSTASCII_USTRINGPARAM(",")); aTokens = aTokens += aToken; gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI, case_insensitive_filter, diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx index dba73a512ce8..0a3c807066d6 100644 --- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx @@ -79,8 +79,8 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FolderPicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(2); - aRet[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFolderPicker" ); - aRet[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.GtkFolderPicker" ); + aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFolderPicker" )); + aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.GtkFolderPicker" )); return aRet; } } @@ -182,7 +182,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException ) sal_Int16 retVal = 0; uno::Reference< awt::XExtendedToolkit > xToolkit( - m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY); + m_xServiceMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")) ), uno::UNO_QUERY); RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit); uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog); @@ -221,7 +221,7 @@ void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException ) rtl::OUString SAL_CALL SalGtkFolderPicker::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString::createFromAscii( FOLDER_PICKER_IMPL_NAME ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_IMPL_NAME )); } // ------------------------------------------------- diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx index 70b99fcd543b..782b44d11e7c 100644 --- a/fpicker/source/unx/gnome/SalGtkPicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx @@ -221,19 +221,19 @@ static void lcl_setGTKLanguage(const uno::Reference<lang::XMultiServiceFactory>& { uno::Reference<lang::XMultiServiceFactory> xConfigMgr = uno::Reference<lang::XMultiServiceFactory>(xServiceMgr->createInstance( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), UNO_QUERY_THROW ); Sequence< Any > theArgs(1); - theArgs[ 0 ] <<= OUString::createFromAscii("org.openoffice.Office.Linguistic/General"); + theArgs[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Linguistic/General")); uno::Reference< container::XNameAccess > xNameAccess = uno::Reference< container::XNameAccess >(xConfigMgr->createInstanceWithArguments( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), theArgs ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), theArgs ), UNO_QUERY_THROW ); if (xNameAccess.is()) - xNameAccess->getByName(OUString::createFromAscii("UILocale")) >>= sUILocale; + xNameAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale"))) >>= sUILocale; } catch (...) {} if (sUILocale.getLength()) diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx index f59a8e59637a..6587930bcba9 100644 --- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx +++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx @@ -65,7 +65,7 @@ extern "C" try { Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); + pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) )); } catch( InvalidRegistryException& ) { @@ -84,7 +84,7 @@ extern "C" if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, FILE_PICKER_IMPL_NAME ) ) ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray( )[0] = OUString::createFromAscii( FILE_PICKER_SERVICE_NAME ); + aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME )); Reference< XSingleServiceFactory > xFactory ( createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index 9e7392a0dc45..fa4d3daede21 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -99,9 +99,9 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(3); - aRet[0] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFilePicker"); - aRet[2] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.KDE4FilePicker"); + aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker")); + aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker")); + aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDE4FilePicker")); return aRet; } } @@ -615,7 +615,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) if (args.getLength() == 0) { throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "no arguments" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), static_cast< XFilePicker* >( this ), 1 ); } @@ -625,7 +625,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) ( arg.getValueType() != ::getCppuType((sal_Int8*)0))) { throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "invalid argument type" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), static_cast< XFilePicker* >( this ), 1 ); } @@ -697,7 +697,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) default: throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "Unknown template" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), static_cast< XFilePicker* >( this ), 1 ); } @@ -726,7 +726,7 @@ void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent ) rtl::OUString SAL_CALL KDE4FilePicker::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString::createFromAscii( FILE_PICKER_IMPL_NAME ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); } sal_Bool SAL_CALL KDE4FilePicker::supportsService( const rtl::OUString& ServiceName ) diff --git a/fpicker/source/unx/kde_unx/UnxFPentry.cxx b/fpicker/source/unx/kde_unx/UnxFPentry.cxx index ac011348eac6..c577440cde0b 100644 --- a/fpicker/source/unx/kde_unx/UnxFPentry.cxx +++ b/fpicker/source/unx/kde_unx/UnxFPentry.cxx @@ -82,7 +82,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey try { Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); + pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) )); } catch( InvalidRegistryException& ) { @@ -105,7 +105,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, FILE_PICKER_IMPL_NAME ) ) ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray( )[0] = OUString::createFromAscii( FILE_PICKER_SERVICE_NAME ); + aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME )); Reference< XSingleServiceFactory > xFactory ( createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx index 21e32dc7f9c9..e280d837fc3c 100644 --- a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx +++ b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx @@ -77,9 +77,9 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(3); - aRet[0] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFilePicker"); - aRet[2] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.KDEFilePicker"); + aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker")); + aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker")); + aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker")); return aRet; } } @@ -113,7 +113,7 @@ UnxFilePicker::~UnxFilePicker() { if ( m_nFilePickerPid > 0 ) { - sendCommand( ::rtl::OUString::createFromAscii( "exit" ) ); + sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exit" )) ); waitpid( m_nFilePickerPid, NULL, 0 ); } @@ -182,7 +182,7 @@ sal_Int16 SAL_CALL UnxFilePicker::execute() // this is _not_ an osl::Condition, see i#93366 m_pCommandThread->execCondition().reset(); - sendCommand( ::rtl::OUString::createFromAscii( "exec" ) ); + sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exec" ) )); m_pCommandThread->execCondition().wait(); @@ -196,8 +196,8 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode ) ::osl::MutexGuard aGuard( m_aMutex ); ::rtl::OUString aString = bMode? - ::rtl::OUString::createFromAscii( "setMultiSelection true" ): - ::rtl::OUString::createFromAscii( "setMultiSelection false" ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection true" )): + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection false" )); sendCommand( aString ); } @@ -236,7 +236,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getDisplayDirectory() checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString::createFromAscii( "getDirectory" ), + sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getDirectory" )), m_pCommandThread->getDirectoryCondition() ); return m_pCommandThread->getDirectory(); @@ -248,7 +248,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getFiles() checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString::createFromAscii( "getFiles" ), + sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getFiles" )), m_pCommandThread->getFilesCondition() ); return m_pCommandThread->getFiles(); @@ -290,7 +290,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getCurrentFilter() checkFilePicker(); ::osl::MutexGuard aGuard( m_aMutex ); - sendCommand( ::rtl::OUString::createFromAscii( "getCurrentFilter" ), + sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getCurrentFilter" )), m_pCommandThread->getCurrentFilterCondition() ); return m_pCommandThread->getCurrentFilter(); @@ -543,21 +543,21 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen uno::Any aAny; if ( 0 == rArguments.getLength( ) ) throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "no arguments" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), static_cast< XFilePicker* >( this ), 1 ); aAny = rArguments[0]; if ( ( aAny.getValueType() != ::getCppuType( (sal_Int16*)0 ) ) && ( aAny.getValueType() != ::getCppuType( (sal_Int8*)0 ) ) ) throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "invalid argument type" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )), static_cast< XFilePicker* >( this ), 1 ); sal_Int16 templateId = -1; aAny >>= templateId; - ::rtl::OUString aTypeOpen = ::rtl::OUString::createFromAscii( "setType \"open\"" ); - ::rtl::OUString aTypeSaveAs = ::rtl::OUString::createFromAscii( "setType \"save\"" ); + ::rtl::OUString aTypeOpen(RTL_CONSTASCII_USTRINGPARAM( "setType \"open\"" )); + ::rtl::OUString aTypeSaveAs(RTL_CONSTASCII_USTRINGPARAM( "setType \"save\"" )); switch ( templateId ) { @@ -634,7 +634,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen default: throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "Unknown template" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), static_cast< XFilePicker* >( this ), 1 ); } @@ -662,7 +662,7 @@ void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent ) rtl::OUString SAL_CALL UnxFilePicker::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString::createFromAscii( FILE_PICKER_IMPL_NAME ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME )); } sal_Bool SAL_CALL UnxFilePicker::supportsService( const rtl::OUString& ServiceName ) @@ -773,7 +773,7 @@ void UnxFilePicker::checkFilePicker() throw( ::com::sun::star::uno::RuntimeExcep else { throw uno::RuntimeException( - ::rtl::OUString::createFromAscii( "the external file picker does not run" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "the external file picker does not run" )), *this ); } } @@ -783,7 +783,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand ) if ( m_nFilePickerWrite < 0 ) return; - ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString::createFromAscii( "\n" ), RTL_TEXTENCODING_UTF8 ); + ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\n" )), RTL_TEXTENCODING_UTF8 ); #if OSL_DEBUG_LEVEL > 0 ::std::cerr << "UnxFilePicker sent: \"" << aUtfString.getStr() << "\"" << ::std::endl; diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index 3adf90836013..82eadcc4eb84 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -114,7 +114,7 @@ sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey ) try { Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) ); + pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) )); } catch( InvalidRegistryException& ) { @@ -138,7 +138,7 @@ void* SAL_CALL component_getFactory( if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, FILE_PICKER_IMPL_NAME ) ) ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray( )[0] = OUString::createFromAscii( FILE_PICKER_SERVICE_NAME ); + aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME )); Reference< XSingleServiceFactory > xFactory ( createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index 2021e8c93794..545c54b9fa3f 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -76,8 +76,8 @@ namespace uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(2); - aRet[0] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFilePicker"); + aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker")); + aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker")); return aRet; } } @@ -123,7 +123,7 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke { if ( rBHelper.bDisposed ) throw lang::DisposedException( - rtl::OUString::createFromAscii( "object is already disposed" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )), static_cast< XFilePicker2* >( this ) ); if ( !rBHelper.bInDispose && !rBHelper.bDisposed ) @@ -139,7 +139,7 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi { if ( rBHelper.bDisposed ) throw lang::DisposedException( - rtl::OUString::createFromAscii( "object is already disposed" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )), static_cast< XFilePicker2* >( this ) ); rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener ); @@ -462,7 +462,7 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException) OSL_ENSURE(sal_False, "Could not start event notifier thread!"); throw uno::RuntimeException( - rtl::OUString::createFromAscii("Error executing dialog"), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")), static_cast<XFilePicker2*>(this)); } @@ -630,7 +630,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) uno::Any aAny; if ( 0 == aArguments.getLength( ) ) throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "no arguments" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )), static_cast<XFilePicker2*>(this), 1); aAny = aArguments[0]; @@ -638,7 +638,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) if ( (aAny.getValueType() != ::getCppuType((sal_Int16*)0)) && (aAny.getValueType() != ::getCppuType((sal_Int8*)0)) ) throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii("invalid argument type"), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid argument type")), static_cast<XFilePicker2*>(this), 1); sal_Int16 templateId = -1; @@ -728,7 +728,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) default: throw lang::IllegalArgumentException( - rtl::OUString::createFromAscii( "Unknown template" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )), static_cast< XFilePicker2* >( this ), 1 ); } @@ -768,7 +768,7 @@ void SAL_CALL CFilePicker::cancel() rtl::OUString SAL_CALL CFilePicker::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii(FILE_PICKER_IMPL_NAME); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_IMPL_NAME)); } // ------------------------------------------------- diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 3770cdaa330c..83b040f7edff 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -92,8 +92,8 @@ namespace css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FilePicker"); - aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFilePicker"); + aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker")); + aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker")); return aRet; } } @@ -552,17 +552,9 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An throw(css::uno::Exception , css::uno::RuntimeException) { - /* - // called twice ? - if (m_pDlg) - throw css::uno::Exception( - ::rtl::OUString::createFromAscii( "XInitialization::initialize() called twice." ), - static_cast< css::ui::dialogs::XFilePicker* >( this )); - */ - if (lArguments.getLength() < 1) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii( "XInitialization::initialize() called without arguments." ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "XInitialization::initialize() called without arguments." )), static_cast< css::ui::dialogs::XFilePicker2* >( this ), 1); @@ -692,7 +684,7 @@ void SAL_CALL VistaFilePicker::cancel() ::rtl::OUString SAL_CALL VistaFilePicker::getImplementationName() throw(css::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.fpicker.VistaFileDialog"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.fpicker.VistaFileDialog")); } // ------------------------------------------------- diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx index 42bab08800b0..541d1a166687 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx @@ -164,7 +164,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnFolderChange(IFileDialog* /*pDialog* //----------------------------------------------------------------------------------------- void lcl_updateVersionListDirectly(IFileDialog* pDialog) { - static const ::rtl::OUString SERVICENAME_REVISIONPERSISTENCE = ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentRevisionListPersistence"); + static const ::rtl::OUString SERVICENAME_REVISIONPERSISTENCE(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.DocumentRevisionListPersistence")); static const ::sal_Int16 CONTROL_VERSIONLIST = css::ui::dialogs::ExtendedFilePickerElementIds::LISTBOX_VERSION; TFileDialog iDialog (pDialog); @@ -405,8 +405,8 @@ void VistaFilePickerEventHandler::stopListening() } } -static const ::rtl::OUString PROP_CONTROL_ID = ::rtl::OUString::createFromAscii("control_id"); -static const ::rtl::OUString PROP_PICKER_LISTENER = ::rtl::OUString::createFromAscii("picker_listener"); +static const ::rtl::OUString PROP_CONTROL_ID(RTL_CONSTASCII_USTRINGPARAM("control_id")); +static const ::rtl::OUString PROP_PICKER_LISTENER(RTL_CONSTASCII_USTRINGPARAM("picker_listener")); //----------------------------------------------------------------------------------------- class AsyncPickerEvents : public RequestHandler diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx index c07a476b3671..1149c9657f22 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx @@ -93,24 +93,24 @@ static const ::sal_Int32 FEATURE_PLAY = 256; static const ::sal_Int32 FEATURE_READONLY = 512; static const ::sal_Int32 FEATURE_VERSION = 1024; -static const ::rtl::OUString PROP_PICKER_LISTENER = ::rtl::OUString::createFromAscii("picker_listener" ); // [XFilePickerListenert] -static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT = ::rtl::OUString::createFromAscii("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL -static const ::rtl::OUString PROP_SELECTED_FILES = ::rtl::OUString::createFromAscii("selected_files" ); // [seq< OUString >] contains all user selected files (can be empty!) -static const ::rtl::OUString PROP_MULTISELECTION_MODE = ::rtl::OUString::createFromAscii("multiselection_mode"); // [sal_Bool] true=ON, false=OFF -static const ::rtl::OUString PROP_TITLE = ::rtl::OUString::createFromAscii("title" ); // [OUString] -static const ::rtl::OUString PROP_FILENAME = ::rtl::OUString::createFromAscii("filename" ); // [OUString] -static const ::rtl::OUString PROP_DIRECTORY = ::rtl::OUString::createFromAscii("directory" ); // [OUString] -static const ::rtl::OUString PROP_FEATURES = ::rtl::OUString::createFromAscii("features" ); // [sal_Int32] -static const ::rtl::OUString PROP_TEMPLATE_DESCR = ::rtl::OUString::createFromAscii("templatedescription"); // [sal_Int32] -static const ::rtl::OUString PROP_FILTER_TITLE = ::rtl::OUString::createFromAscii("filter_title" ); // [OUString] -static const ::rtl::OUString PROP_FILTER_VALUE = ::rtl::OUString::createFromAscii("filter_value" ); // [OUString] -static const ::rtl::OUString PROP_FORCE = ::rtl::OUString::createFromAscii("force" ); // [sal_Bool] - -static const ::rtl::OUString PROP_CONTROL_ID = ::rtl::OUString::createFromAscii("control_id" ); // [sal_Int16] -static const ::rtl::OUString PROP_CONTROL_ACTION = ::rtl::OUString::createFromAscii("control_action" ); // [sal_Int16] -static const ::rtl::OUString PROP_CONTROL_VALUE = ::rtl::OUString::createFromAscii("control_value" ); // [Any] -static const ::rtl::OUString PROP_CONTROL_LABEL = ::rtl::OUString::createFromAscii("control_label" ); // [OUString] -static const ::rtl::OUString PROP_CONTROL_ENABLE = ::rtl::OUString::createFromAscii("control_enable" ); // [sal_Bool] true=ON, false=OFF +static const ::rtl::OUString PROP_PICKER_LISTENER(RTL_CONSTASCII_USTRINGPARAM("picker_listener" ) ); // [XFilePickerListenert] +static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT(RTL_CONSTASCII_USTRINGPARAM("dialog_show_result" )); // [sal_Bool] true=OK, false=CANCEL +static const ::rtl::OUString PROP_SELECTED_FILES(RTL_CONSTASCII_USTRINGPARAM("selected_files" )); // [seq< OUString >] contains all user selected files (can be empty!) +static const ::rtl::OUString PROP_MULTISELECTION_MODE(RTL_CONSTASCII_USTRINGPARAM("multiselection_mode")); // [sal_Bool] true=ON, false=OFF +static const ::rtl::OUString PROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title" )); // [OUString] +static const ::rtl::OUString PROP_FILENAME(RTL_CONSTASCII_USTRINGPARAM("filename" ) ); // [OUString] +static const ::rtl::OUString PROP_DIRECTORY(RTL_CONSTASCII_USTRINGPARAM("directory" )); // [OUString] +static const ::rtl::OUString PROP_FEATURES(RTL_CONSTASCII_USTRINGPARAM("features" )); // [sal_Int32] +static const ::rtl::OUString PROP_TEMPLATE_DESCR(RTL_CONSTASCII_USTRINGPARAM("templatedescription")); // [sal_Int32] +static const ::rtl::OUString PROP_FILTER_TITLE(RTL_CONSTASCII_USTRINGPARAM("filter_title" )); // [OUString] +static const ::rtl::OUString PROP_FILTER_VALUE(RTL_CONSTASCII_USTRINGPARAM("filter_value" )); // [OUString] +static const ::rtl::OUString PROP_FORCE(RTL_CONSTASCII_USTRINGPARAM("force" )); // [sal_Bool] + +static const ::rtl::OUString PROP_CONTROL_ID(RTL_CONSTASCII_USTRINGPARAM("control_id" )); // [sal_Int16] +static const ::rtl::OUString PROP_CONTROL_ACTION(RTL_CONSTASCII_USTRINGPARAM("control_action" )); // [sal_Int16] +static const ::rtl::OUString PROP_CONTROL_VALUE(RTL_CONSTASCII_USTRINGPARAM("control_value" )); // [Any] +static const ::rtl::OUString PROP_CONTROL_LABEL(RTL_CONSTASCII_USTRINGPARAM("control_label" )); // [OUString] +static const ::rtl::OUString PROP_CONTROL_ENABLE(RTL_CONSTASCII_USTRINGPARAM("control_enable" )); // [sal_Bool] true=ON, false=OFF //----------------------------------------------------------------------------- /** native implementation of the file picker on Vista and upcoming windows versions. diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx index b7751a6f83a4..00c41cdfe30a 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx @@ -134,7 +134,7 @@ void CWinFileOpenImpl::setDisplayDirectory(const rtl::OUString& aDirectory) if ( ::osl::FileBase::E_None != ::osl::FileBase::getSystemPathFromFileURL(aDirectory,aSysDirectory)) throw IllegalArgumentException( - rtl::OUString::createFromAscii("Invalid directory"), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid directory")), static_cast<XFilePicker2*>(m_FilePicker), 1); // we ensure that there is a trailing '/' at the end of @@ -205,7 +205,7 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute( ) throw(uno::RuntimeException) rc = ::com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL; else throw uno::RuntimeException( - rtl::OUString::createFromAscii("Error executing dialog"), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")), static_cast<XFilePicker2*>(m_FilePicker)); return rc; @@ -224,7 +224,7 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const rtl::OUString& aTitle, const if (!bRet) throw IllegalArgumentException( - rtl::OUString::createFromAscii("filter already exists"), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter already exists")), static_cast<XFilePicker2*>(m_FilePicker), 1); // #95345# see MSDN OPENFILENAME @@ -249,7 +249,7 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const rtl::OUString& aTitle) if (filterPos < 0) throw IllegalArgumentException( - rtl::OUString::createFromAscii("filter doesn't exist"), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter doesn't exist")), static_cast<XFilePicker2*>(m_FilePicker), 1); // filter index of the base class starts with 1 diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx index 0e71ec966b3d..02805f007a8e 100644 --- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx +++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx @@ -94,12 +94,12 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type& { if ( m_rBroadcastHelper.bDisposed ) throw lang::DisposedException( - ::rtl::OUString::createFromAscii( "FilePicker is already disposed" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed" )), uno::Reference< uno::XInterface >() ); if ( m_rBroadcastHelper.bInDispose ) throw lang::DisposedException( - ::rtl::OUString::createFromAscii( "FilePicker will be disposed now." ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker will be disposed now." )), uno::Reference< uno::XInterface >() ); m_rBroadcastHelper.aLC.addInterface( aType, xListener ); @@ -114,7 +114,7 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type& { if ( m_rBroadcastHelper.bDisposed ) throw lang::DisposedException( - ::rtl::OUString::createFromAscii( "FilePicker is already disposed." ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed." )), uno::Reference< uno::XInterface >() ); m_rBroadcastHelper.aLC.removeInterface( aType, xListener ); diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx index 4047e693a50a..2c26ad2750e6 100644 --- a/fpicker/source/win32/filepicker/previewbase.cxx +++ b/fpicker/source/win32/filepicker/previewbase.cxx @@ -90,11 +90,11 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::s { if (aImageFormat != ::com::sun::star::ui::dialogs::FilePreviewImageFormats::BITMAP) throw IllegalArgumentException( - OUString::createFromAscii("unsupported image format"), 0, 1); + OUString(RTL_CONSTASCII_USTRINGPARAM("unsupported image format")), 0, 1); if (aImage.hasValue() && (aImage.getValueType() != getCppuType((Sequence<sal_Int8>*)0))) throw IllegalArgumentException( - OUString::createFromAscii("invalid image data"), 0, 2); + OUString(RTL_CONSTASCII_USTRINGPARAM("invalid image data")), 0, 2); // save the new image data and force a redraw m_ImageData = aImage; diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx index a1334518b17b..38580770515a 100644 --- a/fpicker/source/win32/filepicker/shared.hxx +++ b/fpicker/source/win32/filepicker/shared.hxx @@ -31,9 +31,9 @@ #include <rtl/ustring.hxx> -const ::rtl::OUString BACKSLASH = ::rtl::OUString::createFromAscii( "\\" ); -const ::rtl::OUString FILTER_SEPARATOR = ::rtl::OUString::createFromAscii( "------------------------------------------" ); -const ::rtl::OUString ALL_FILES_WILDCARD = ::rtl::OUString::createFromAscii( "*.*" ); +const ::rtl::OUString BACKSLASH(RTL_CONSTASCII_USTRINGPARAM( "\\" )); +const ::rtl::OUString FILTER_SEPARATOR(RTL_CONSTASCII_USTRINGPARAM( "------------------------------------------" )); +const ::rtl::OUString ALL_FILES_WILDCARD(RTL_CONSTASCII_USTRINGPARAM( "*.*" )); const ::sal_Bool ALLOW_DUPLICATES = sal_True; #endif diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx index 776268b6e2d2..a0d3aa974a0b 100644 --- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx +++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx @@ -98,7 +98,7 @@ void TestFilterManager( Reference< XFilePicker > xFilePicker ); Reference< XMultiServiceFactory > g_xFactory; -const OUString BMP_EXTENSION = OUString::createFromAscii( "bmp" ); +const OUString BMP_EXTENSION(RTL_CONSTASCII_USTRINGPARAM( "bmp" )); //------------------------------------------------------------------------------------------------------------------------- // a test client @@ -294,7 +294,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) Reference< XFilePicker > xFilePicker = Reference< XFilePicker >( g_xFactory->createInstanceWithArguments( - OUString::createFromAscii( FILE_PICKER_SERVICE_NAME ), arguments ), UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME )), arguments ), UNO_QUERY ); // install a FilePicker notifier Reference< XFilePickerListener > xFPListener( @@ -304,9 +304,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) if ( xFPNotifier.is( ) ) xFPNotifier->addFilePickerListener( xFPListener ); - xFilePicker->setTitle( OUString::createFromAscii("FileOpen Simple...")); + xFilePicker->setTitle( OUString(RTL_CONSTASCII_USTRINGPARAM("FileOpen Simple..."))); xFilePicker->setMultiSelectionMode( sal_True ); - xFilePicker->setDefaultName( OUString::createFromAscii("d:\\test2.sxw")); + xFilePicker->setDefaultName( OUString(RTL_CONSTASCII_USTRINGPARAM("d:\\test2.sxw"))); OUString aDirURL; OUString aSysPath = OStringToOUString( "d:\\ueaeoe", osl_getThreadTextEncoding( ) ); diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx index bccaac0bf418..5483b7d78ee9 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.cxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx @@ -71,7 +71,7 @@ namespace Sequence< OUString > SAL_CALL FolderPicker_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFolderPicker"); + aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFolderPicker")); return aRet; } } @@ -166,7 +166,7 @@ sal_Int16 SAL_CALL CFolderPicker::execute( ) OUString SAL_CALL CFolderPicker::getImplementationName( ) throw( RuntimeException ) { - return OUString::createFromAscii( FOLDERPICKER_IMPL_NAME ); + return OUString(RTL_CONSTASCII_USTRINGPARAM( FOLDERPICKER_IMPL_NAME )); } // ------------------------------------------------- diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx index 143d91dc3527..fdf191f07318 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx @@ -58,7 +58,7 @@ using osl::FileBase; // //------------------------------------------------------------------------ -const OUString BACKSLASH = OUString::createFromAscii( "\\" ); +const OUString BACKSLASH(RTL_CONSTASCII_USTRINGPARAM( "\\" )); //------------------------------------------------------------------------ // ctor @@ -94,7 +94,7 @@ void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirect if ( ::osl::FileBase::E_None != rc ) throw IllegalArgumentException( - OUString::createFromAscii( "directory is not a valid file url" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "directory is not a valid file url" )), static_cast< XFolderPicker* >( m_pFolderPicker ), 1 ); diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index efd0985d5836..301a5bc9e6bc 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -54,9 +54,9 @@ using ::com::sun::star::uno::Sequence; // //------------------------------------------------------------ -const rtl::OUString TILDE = OUString::createFromAscii( "~" ); +const rtl::OUString TILDE(RTL_CONSTASCII_USTRINGPARAM( "~" )); const sal_Unicode TILDE_SIGN = L'~'; -const rtl::OUString AMPERSAND = OUString::createFromAscii( "&" ); +const rtl::OUString AMPERSAND(RTL_CONSTASCII_USTRINGPARAM( "&" )); const sal_Unicode AMPERSAND_SIGN = L'&'; //------------------------------------------------------------ @@ -248,7 +248,7 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt if ( !aItem.hasValue( ) || aItem.getValueType( ) != getCppuType((OUString*)0) ) throw IllegalArgumentException( - OUString::createFromAscii( "invalid value type or any has no value" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), rXInterface, aArgPos ); @@ -270,7 +270,7 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< if ( !aItemList.hasValue( ) || aItemList.getValueType( ) != getCppuType((Sequence<OUString>*)0) ) throw IllegalArgumentException( - OUString::createFromAscii( "invalid value type or any has no value" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), rXInterface, aArgPos ); @@ -298,7 +298,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) && (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) throw IllegalArgumentException( - OUString::createFromAscii( "invalid value type or any has no value" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), rXInterface, aArgPos ); @@ -311,7 +311,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc // index was not correct if ( CB_ERR == lRet ) throw IllegalArgumentException( - OUString::createFromAscii( "inavlid item position" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid item position" )), rXInterface, aArgPos ); } @@ -350,7 +350,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) && (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) throw IllegalArgumentException( - OUString::createFromAscii( "invalid value type or any has no value" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), rXInterface, aArgPos ); @@ -359,7 +359,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref if ( nPos < -1 ) throw IllegalArgumentException( - OUString::createFromAscii("invalid index"), + OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")), rXInterface, aArgPos ); @@ -367,7 +367,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref if ( (CB_ERR == lRet) && (-1 != nPos) ) throw IllegalArgumentException( - OUString::createFromAscii("invalid index"), + OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")), rXInterface, aArgPos ); } @@ -460,7 +460,7 @@ void SAL_CALL CheckboxSetState( if ( !aState.hasValue( ) || aState.getValueType( ) != getCppuType((sal_Bool*)0) ) throw IllegalArgumentException( - OUString::createFromAscii( "invalid value type or any has no value" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), rXInterface, aArgPos ); |