mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Browse Source 
Conflicts:
	offapi/com/sun/star/animations/XAnimationNode.idl
	offapi/com/sun/star/awt/grid/XGridColumn.idl
	offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
	offapi/com/sun/star/frame/ModuleManager.idl
	offapi/com/sun/star/frame/XLayoutManager.idl
	offapi/com/sun/star/frame/XLayoutManagerListener.idl
	offapi/com/sun/star/rendering/FontInfo.idl
	offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
	offapi/com/sun/star/rendering/XCanvas.idl
	offapi/com/sun/star/rendering/XSprite.idl
	offapi/com/sun/star/report/ForceNewPage.idl
	offapi/com/sun/star/report/ReportPrintOption.idl
	offapi/com/sun/star/report/XFunctionsSupplier.idl
	offapi/com/sun/star/report/XReportControlFormat.idl
	offapi/com/sun/star/resource/StringResourceWithLocation.idl
	offapi/com/sun/star/resource/XStringResourceResolver.idl
	offapi/com/sun/star/resource/XStringResourceWithLocation.idl
	offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
	offapi/com/sun/star/security/XCertificateContainer.idl
	offapi/com/sun/star/ui/UIElementFactory.idl
	offapi/com/sun/star/ui/XImageManager.idl
	offapi/com/sun/star/ui/XUIConfigurationManager.idl
	offapi/com/sun/star/ui/XUIElementFactory.idl
	offapi/com/sun/star/ui/XUIElementSettings.idl
	offapi/com/sun/star/xml/crypto/SEInitializer.idl
	offapi/com/sun/star/xml/crypto/XSEInitializer.idl
	offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
	offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
	sal/rtl/source/alloc_arena.c
	udkapi/com/sun/star/task/XInteractionHandler2.idl
This commit is contained in:
Jan Holesovsky
2011-04-22 15:10:13 +02:00
parent 83e8a2bbe4 013fa416d3
commit bef8909ce1
327 changed files with 1786 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
io/source/TextInputStream/TextInputStream.cxx
View File

@@ -172,10 +172,10 @@ OUString OTextInputStream::readLine( )
return implReadString( aDummySeq, sal_True, sal_True );
}
OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool )
OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter )
throw(IOException, RuntimeException)
{
return implReadString( Delimiters, sal_True, sal_False );
return implReadString( Delimiters, bRemoveDelimiter, sal_False );
}
sal_Bool OTextInputStream::isEOF()