diff options
Diffstat (limited to 'filter/source/xsltdialog/xmlfiltertestdialog.cxx')
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertestdialog.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 6cbea30926fb..e89ecc2d13d3 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -43,7 +43,7 @@ #include <sfx2/filedlghelper.hxx> #include <osl/file.hxx> #include <unotools/tempfile.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> @@ -199,7 +199,7 @@ void XMLFilterTestDialog::test( const filter_info_impl& rFilterInfo ) m_xDialog->run(); } -static OUString getFileNameFromURL( OUString const & rURL ) +static OUString getFileNameFromURL( std::u16string_view rURL ) { INetURLObject aURL( rURL ); OUString aName( aURL.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset) ); @@ -310,7 +310,7 @@ void XMLFilterTestDialog::onExportBrowse() int nFound = 0; - for( const PropertyValue& rValue : std::as_const(aValues) ) + for (const PropertyValue& rValue : aValues) { if ( rValue.Name == "Type" ) { @@ -348,7 +348,7 @@ void XMLFilterTestDialog::onExportBrowse() if( aAny >>= aValues2 ) { OUString aExtension; - for( const PropertyValue& rProp : std::as_const(aValues2) ) + for (const PropertyValue& rProp : aValues2) { if ( rProp.Name == "Extensions" ) { @@ -418,15 +418,14 @@ void XMLFilterTestDialog::doExport( const Reference< XComponent >& xComp ) Reference< XStorable > xStorable( xComp, UNO_QUERY ); if( xStorable.is() ) { - OUString const ext(".xml"); - utl::TempFile aTempFile(OUString(), true, &ext); + utl::TempFileNamed aTempFile(u"", true, u".xml"); OUString aTempFileURL( aTempFile.GetURL() ); const application_info_impl* pAppInfo = getApplicationInfo( m_xFilterInfo->maExportService ); if( pAppInfo ) { File aOutputFile( aTempFileURL ); - /* File::RC rc = */ aOutputFile.open( osl_File_OpenFlag_Write ); + (void)aOutputFile.open( osl_File_OpenFlag_Write ); // create xslt exporter Reference< XOutputStream > xIS( new comphelper::OSLOutputStreamWrapper( aOutputFile ) ); @@ -578,15 +577,14 @@ void XMLFilterTestDialog::import( const OUString& rURL ) if( m_xCBXDisplaySource->get_active() ) { - OUString const ext(".xml"); - TempFile aTempFile(OUString(), true, &ext); + TempFileNamed aTempFile(u"", true, u".xml"); OUString aTempFileURL( aTempFile.GetURL() ); Reference< XImportFilter > xImporter( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.documentconversion.XSLTFilter", mxContext ), UNO_QUERY ); if( xImporter.is() ) { osl::File aInputFile( rURL ); - aInputFile.open( osl_File_OpenFlag_Read ); + (void)aInputFile.open( osl_File_OpenFlag_Read ); Reference< XInputStream > xIS( new comphelper::OSLInputStreamWrapper( aInputFile ) ); @@ -599,7 +597,7 @@ void XMLFilterTestDialog::import( const OUString& rURL ) Reference< XWriter > xWriter = Writer::create( mxContext ); File aOutputFile( aTempFileURL ); - aOutputFile.open( osl_File_OpenFlag_Write ); + (void)aOutputFile.open( osl_File_OpenFlag_Write ); Reference< XOutputStream > xOS( new OSLOutputStreamWrapper( aOutputFile ) ); xWriter->setOutputStream( xOS ); |