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

Merge DEV300_m75

Browse Source 
* resolved two conflicts caused by lineend changes in
   canvashelper_texturefill.cxx and implrenderer.cxx. Took the cws
   version, which uses new texture fill semantics, and fixes clipping
   bug
 * binned file header changes from head for deleted files
This commit is contained in:
thb
2010-03-31 14:57:58 +02:00
parent 0755c94f9a f099cd4586
commit ce1a6f9141
4082 changed files with 10819 additions and 63343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cppcanvas/source/mtfrenderer/implrenderer.cxx
View File

@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2008 by Sun Microsystems, Inc.
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: implrenderer.cxx,v $
* $Revision: 1.25.4.2 $
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify