Re: Adding NeoOffice code to existing LibreOffice code
Thanks Thorsten! Just to set expectations: in most cases, the actual code copied will only be a few lines here and there. With LibreOffice, I try to do a new implementation and only look at the NeoOffice code when I see a familiar bug. For example, most of the macOS full screen feature is already in the LibreOffice code and it worked until it was disabled. The only problem was it had a few big bugs that we solved in NeoOffice e.g. the empty screen after closing all full screen windows. Patrick > On Feb 18, 2024, at 12:09 PM, Thorsten Behrens wrote: > > Hi Patrick, > > Patrick Luby wrote: >> Is this something that the ESC or legal committee needs to discuss? >> > I've poked Florian (and the new board, which is just today settling > in). I believe NeoOffice being MPL now makes this a rather simple > exercise, so I'd not block on getting this perhaps internally > reviewed. > > Thanks a lot btw for your contributions & willingness to donate much > more of NeoOffice's code - it is much appreciated! The Mac OS > experience is still behind that of other platforms, in quite a few > areas. > > Cheers, > > -- Thorsten
Re: Adding NeoOffice code to existing LibreOffice code
Hi Patrick, Patrick Luby wrote: > Is this something that the ESC or legal committee needs to discuss? > I've poked Florian (and the new board, which is just today settling in). I believe NeoOffice being MPL now makes this a rather simple exercise, so I'd not block on getting this perhaps internally reviewed. Thanks a lot btw for your contributions & willingness to donate much more of NeoOffice's code - it is much appreciated! The Mac OS experience is still behind that of other platforms, in quite a few areas. Cheers, -- Thorsten signature.asc Description: PGP signature
Re: Adding NeoOffice code to existing LibreOffice code
I was able to avoid copying any NeoOffice code for tdf#126638. The NeoOffice fix used “selector swizzling” to override -[NSWindow performKeyEquivalent:] and I wanted to avoid any swizzling. Fortunately, I was able to use one the standard NSMenuDelegate callbacks to detect the problem. I would still like to know if there we have any standard wording in the license header when adding third-party code inline. While I didn’t need to copy any code this time, there are lots and lots of inline fixes in the NeoOffice code that, over time, I would like to copy in. Is this something that the ESC or legal committee needs to discuss? Patrick > On Feb 16, 2024, at 9:35 AM, Patrick Luby wrote: > > I would like to add some NeoOffice code to LibreOffice to fix the following > macOS bug: > > https://bugs.documentfoundation.org/show_bug.cgi?id=126638 > > NeoOffice is now MPL v2.0 like LibreOffice so I assume that I will need to > add some text in the license header of any LibreOffice files that I add > NeoOffice code to. > > I see that LibreOffice already has a template for the Apache code (see below) > but it looks customized to specifically Apache. So my question is there a > template for incorporating MPL v2.0 code that I can use? > > > * This file incorporates work covered by the following license notice: > * > * Licensed to the Apache Software Foundation (ASF) under one or more > * contributor license agreements. See the NOTICE file distributed > * with this work for additional information regarding copyright > * ownership. The ASF licenses this file to you under the Apache > * License, Version 2.0 (the "License"); you may not use this file > * except in compliance with the License. You may obtain a copy of > * the License at http://www.apache.org/licenses/LICENSE-2.0 . > > > Patrick
Adding NeoOffice code to existing LibreOffice code
I would like to add some NeoOffice code to LibreOffice to fix the following macOS bug: https://bugs.documentfoundation.org/show_bug.cgi?id=126638 NeoOffice is now MPL v2.0 like LibreOffice so I assume that I will need to add some text in the license header of any LibreOffice files that I add NeoOffice code to. I see that LibreOffice already has a template for the Apache code (see below) but it looks customized to specifically Apache. So my question is there a template for incorporating MPL v2.0 code that I can use? * This file incorporates work covered by the following license notice: * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed * with this work for additional information regarding copyright * ownership. The ASF licenses this file to you under the Apache * License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . Patrick