Re: [Libreoffice-commits] core.git: 27 commits - desktop/qa desktop/source editeng/source include/LibreOfficeKit include/vcl offapi/com sc/source sfx2/source sw/source vcl/source

classic Classic list List threaded Threaded
3 messages Options
sberg sberg
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] core.git: 27 commits - desktop/qa desktop/source editeng/source include/LibreOfficeKit include/vcl offapi/com sc/source sfx2/source sw/source vcl/source

On 02/08/2019 17:45, Michael Meeks (via logerrit) wrote:

>   desktop/qa/data/objects.odt                         |binary
>   desktop/qa/desktop_lib/test_desktop_lib.cxx         |   61 +++
>   desktop/source/lib/init.cxx                         |  331 ++++++++++++++++++--
>   desktop/source/lib/lokclipboard.cxx                 |  225 +++++++++++--
>   desktop/source/lib/lokclipboard.hxx                 |   83 ++++-
>   editeng/source/editeng/editeng.cxx                  |    3
>   include/LibreOfficeKit/LibreOfficeKit.h             |   19 +
>   include/LibreOfficeKit/LibreOfficeKit.hxx           |   50 +++
>   include/LibreOfficeKit/LibreOfficeKitEnums.h        |    9
>   include/vcl/transfer.hxx                            |    1
>   offapi/com/sun/star/datatransfer/XTransferable2.idl |    5
>   sc/source/ui/app/seltrans.cxx                       |   12
>   sc/source/ui/app/transobj.cxx                       |   83 +++--
>   sc/source/ui/inc/seltrans.hxx                       |    1
>   sc/source/ui/inc/transobj.hxx                       |    1
>   sc/source/ui/view/viewfun5.cxx                      |    3
>   sfx2/source/view/lokhelper.cxx                      |   17 -
>   sw/source/filter/html/htmlplug.cxx                  |    6
>   sw/source/filter/html/wrthtml.cxx                   |   24 -
>   sw/source/filter/html/wrthtml.hxx                   |    6
>   sw/source/uibase/dochdl/swdtflvr.cxx                |   42 ++
>   sw/source/uibase/inc/swdtflvr.hxx                   |    1
>   vcl/source/treelist/transfer.cxx                    |    6
>   23 files changed, 863 insertions(+), 126 deletions(-)
>
> New commits:
[...]

> commit 7e174f327a3cf16a09e4b2f8e2ffba2225c21901
> Author:     Ashod Nakashian <[hidden email]>
> AuthorDate: Fri Jul 19 23:51:16 2019 +0100
> Commit:     Michael Meeks <[hidden email]>
> CommitDate: Fri Aug 2 11:41:47 2019 -0400
>
>      LOK: Support detecting complex selections
>      
>      Includes unit-test, but is otherwise not complete
>      implementation.
>      
>      Change-Id: I5fdcd543358caab1858f6351238c21312665839c
>
[...]

> diff --git a/offapi/com/sun/star/datatransfer/XTransferable2.idl b/offapi/com/sun/star/datatransfer/XTransferable2.idl
> index f792a969ded8..a6b53f0671e2 100644
> --- a/offapi/com/sun/star/datatransfer/XTransferable2.idl
> +++ b/offapi/com/sun/star/datatransfer/XTransferable2.idl
> @@ -31,6 +31,11 @@ interface XTransferable2 : com::sun::star::datatransfer::XTransferable
>        */
>       any getTransferData2( [in] DataFlavor aFlavor, [in] string aDestShellID )
>           raises ( UnsupportedFlavorException, com::sun::star::io::IOException );
> +
> +    /**
> +     * Returns true if the selection contains embedded objects or is a large text blob.

Please provide a @since tag.  (And one wonders why these patches didn't
get in through Gerrit.)

> +     */
> +    boolean isComplex();
>   };
>  
>   }; }; }; };
[...]
_______________________________________________
LibreOffice mailing list
[hidden email]
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Michael Meeks-5 Michael Meeks-5
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] core.git: 27 commits ...

Hi Stephan,

On 02/08/2019 17:07, Stephan Bergmann wrote:
>> +    /**
>> +     * Returns true if the selection contains embedded objects or is
>> a large text blob.
>
> Please provide a @since tag.

        Will add that.

> (And one wonders why these patches didn't get in through Gerrit.)

        Oh - that's simple, it's a chunk of work that for uninteresting,
customer related reasons had to be done internally, and fiddling with
and/or re-basing 27 stacked commits multiple times will either kill CI
for everyone or if done one by one, take an extremely long time to get
in, and/or would need squashing thus loosing the history and/or
authorship; so I pushed just a terminal commit through gerrit / CI.

        The good news is that (with the Online side which is also coming) this
gives us some excellent clipboard support for Online.

        Thanks for the review,

                Michael.

--
[hidden email] <><, GM Collabora Productivity
Hangout: [hidden email], Skype: mmeeks
(M) +44 7795 666 147 - timezone usually UK / Europe
_______________________________________________
LibreOffice mailing list
[hidden email]
https://lists.freedesktop.org/mailman/listinfo/libreoffice
sberg sberg
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] core.git: 27 commits ...

On 02/08/2019 19:09, Michael Meeks wrote:
> Oh - that's simple, it's a chunk of work that for uninteresting,
> customer related reasons had to be done internally, and fiddling with
> and/or re-basing 27 stacked commits multiple times will either kill CI
> for everyone or if done one by one, take an extremely long time to get
> in, and/or would need squashing thus loosing the history and/or
> authorship; so I pushed just a terminal commit through gerrit / CI.

I did an experiment of running 80+ commits through Gerrit the other
night, and didn't hear any complaints :)

One IMO great thing of pushing every individual commit through Gerrit is
that it gives a convenient and obvious place where to discuss changes
post commit.  But yeah, there's no ideal solution for every case.
_______________________________________________
LibreOffice mailing list
[hidden email]
https://lists.freedesktop.org/mailman/listinfo/libreoffice