editeng/source/xml/xmltxtexp.cxx | 2 +- filter/source/msfilter/msdffimp.cxx | 4 ++-- sot/source/sdstor/stg.cxx | 2 +- sot/workben/testsot.cxx | 2 +- sw/qa/core/uwriter.cxx | 2 +- sw/source/uibase/dochdl/swdtflvr.cxx | 2 +- vcl/qa/cppunit/outdev.cxx | 2 +- vcl/unx/gtk/gdi/salprn-gtk.cxx | 2 +- vcl/win/source/gdi/salgdi3.cxx | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 006e59a25e6396b05cf6da39c94a3a7a5c48eeb3 Author: Noel Grandin <[email protected]> Date: Wed Jan 7 11:47:47 2015 +0200 fix windows build and a handful of other currently uncompiled spots, after my commit 7f8f277b94704a289fbbd1b836e4e5d66311580d "fdo#84938: convert STREAM_ #defines to 'enum class'" Change-Id: I550f6fb850e1d71a6f08767eeb222a18071b89d5 diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 5d72034..dbec0da 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -417,7 +417,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& /* testcode const OUString aURL( "file:///e:/test.xml" ); - SfxMedium aMedium( aURL, StreamMode::WRITE | STREAM_TRUNC, sal_True ); + SfxMedium aMedium( aURL, StreamMode::WRITE | StreamMode::TRUNC, sal_True ); uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) ); */ diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index ba30b8a..cc19ec8 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6360,7 +6360,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect SAL_INFO("filter.ms", "dumping " << aURLStr); - boost::scoped_ptr<SvStream> pDbgOut(::utl::UcbStreamHelper::CreateStream(aURLStr, StreamMode::TRUNC | STREAM_WRITE)); + boost::scoped_ptr<SvStream> pDbgOut(::utl::UcbStreamHelper::CreateStream(aURLStr, StreamMode::TRUNC | StreamMode::WRITE)); if( pDbgOut ) { @@ -6914,7 +6914,7 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS OUString aTmpName("/tmp/embedded_stream_"); aTmpName += OUString::number(nOleCount++); aTmpName += ".bin"; - SvFileStream aTmpStream(aTmpName,STREAM_READ|STREAM_WRITE|STREAM_TRUNC); + SvFileStream aTmpStream(aTmpName,StreamMode::READ|StreamMode::WRITE|StreamMode::TRUNC); xMemStream->Seek(0); *xMemStream >> aTmpStream; aTmpStream.Close(); diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 1d6c222..a199f2e 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -34,7 +34,7 @@ static long nTmpCount = 0; -// The internal open mode is StreamMode::READ | STREAM_TRUNC, which is silly +// The internal open mode is StreamMode::READ | StreamMode::TRUNC, which is silly // by itself. It inhibits the checking of sharing modes and is used // during CopyTo() and MoveTo() for opening a stream in read mode // although it may be open in DENYALL mode diff --git a/sot/workben/testsot.cxx b/sot/workben/testsot.cxx index a674b4e..1d6185b 100644 --- a/sot/workben/testsot.cxx +++ b/sot/workben/testsot.cxx @@ -31,7 +31,7 @@ int main (int argc, sal_Char **argv) SotStorageRef xStor = new SotStorage( "c:\\temp\\video.sdb" ); SotStorageRef x2Stor = xStor->OpenSotStorage( "1117" ); - SotStorageStreamRef xStm = x2Stor->OpenSotStream( "Genres", STREAM_STD_READWRITE | STREAM_TRUNC); + SotStorageStreamRef xStm = x2Stor->OpenSotStream( "Genres", STREAM_STD_READWRITE | StreamMode::TRUNC); //BYTE szData[100]; //xStm->Write( szData, 100 ); UINT32 nSize = xStm->GetSize(); diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index 80c4ce4..9d52233 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -945,7 +945,7 @@ void SwDocTest::testGraphicAnchorDeletion() #ifdef DEBUG_AS_HTML { - SvFileStream aPasteDebug(OUString("cppunitDEBUG.html"), STREAM_WRITE|STREAM_TRUNC); + SvFileStream aPasteDebug(OUString("cppunitDEBUG.html"), StreamMode::WRITE|StreamMode::TRUNC); WriterRef xWrt; GetHTMLWriter( String(), String(), xWrt ); SwWriter aDbgWrt( aPasteDebug, *m_pDoc ); diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index ea65e3f..08a025b 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -743,7 +743,7 @@ bool SwTransferable::WriteObject( SotStorageStreamRef& xStream, #if defined(DEBUGPASTE) SvFileStream aPasteDebug(OUString( - "PASTEBUFFER.debug"), STREAM_WRITE|STREAM_TRUNC); + "PASTEBUFFER.debug"), StreamMode::WRITE|StreamMode::TRUNC); SwWriter aDbgWrt( aPasteDebug, *pDoc ); aDbgWrt.Write( xWrt ); #endif diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx index 63d88b8..6ee3593 100644 --- a/vcl/qa/cppunit/outdev.cxx +++ b/vcl/qa/cppunit/outdev.cxx @@ -48,7 +48,7 @@ void VclOutdevTest::testVirtualDevice() OUString rFileName("/tmp/foo-unx.png"); try { vcl::PNGWriter aWriter( aBmp ); - SvFileStream sOutput( rFileName, STREAM_WRITE ); + SvFileStream sOutput( rFileName, StreamMode::WRITE ); aWriter.Write( sOutput ); sOutput.Close(); } catch (...) { diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index 2b4b454..a636af5 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -922,7 +922,7 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe if (xController.is()) xDoc = uno::Reference< XComponent >(xController->getModel(), UNO_QUERY); - SvFileStream aStream(rFileURL, STREAM_READWRITE | StreamMode::SHARE_DENYWRITE | STREAM_TRUNC); + SvFileStream aStream(rFileURL, STREAM_READWRITE | StreamMode::SHARE_DENYWRITE | StreamMode::TRUNC); uno::Reference< XOutputStream > xOStm(new utl::OOutputStreamWrapper(aStream)); uno::Reference< XExporter > xExport(xFilter, UNO_QUERY); diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index f8da349..01e31a1 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -150,7 +150,7 @@ ImplFontAttrCache::~ImplFontAttrCache() { if ( bModified ) { - SvFileStream aCacheFile( aCacheFileName, STREAM_WRITE|STREAM_TRUNC ); + SvFileStream aCacheFile( aCacheFileName, StreamMode::WRITE|StreamMode::TRUNC ); if ( aCacheFile.IsWritable() ) { sal_uInt32 nCacheMagic = ImplFontAttrCache::MAGIC; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
