Re: [REVIEW][3-{4, 5}] fdo#37024 forms web layout regression

On 07/02/12 12:39, Noel Power wrote:
> Hi Michael
> On 02/02/12 13:56, Michael Stahl wrote:
> > hi all,
> >
> > these 2 patches should fix regression fdo#37024 so that forms open in
> > web layout again:
> >
> > this one is from an OOo 3.4 CWS and is in 3-5 already, should fix the
> > edit mode half-way, proposed for libreoffice-3-4:
> > 2b39501b8ec6affb8afa9c6b93dff434b075e211
> >
> > this is necessary for both open and edit modes,
> > proposed for libreoffice-3-4 and libreoffice-3-5:
> > 9d32497c01475f2b5e5bec756e4dd0ca9f9d4928
> according to the bug it seems that Kendy pushed the second one to 3.5
>
> --- a/sw/source/ui/uno/unomod.cxx
> +++ b/sw/source/ui/uno/unomod.cxx
> @@ -748,8 +748,13 @@ void SwXViewSettings::_setSingleValue( const 
> comphelper::PropertyInfo & rInfo, c
>                   aOpt.setBrowseMode( bVal );
>                   pView->GetWrtShell().ApplyViewOptions( aOpt );
>                   pView->RecheckBrowseMode();
> +
> +                // must be set in mpViewOption as this will overwrite 
> settings in _post!
>                   if(mpViewOption)
>                       mpViewOption->setBrowseMode(bVal);
>
> In 3.4 the lines containing mpViewOption don't exist, these are 
> associated with fdce768122e54dff8343ab20179f3b1d7c6867e6 ( which is to 
> do with fdo#35661 ) afaics this is unrelated right ?

ah, interesting, i never looked at 3.4 :)

so it looks like the original OOo patch (HG commit
https://bitbucket.org/mst/ooo340/changeset/086c1e20704f) also adds the
mpViewOption->setBrowseMode call; it was added in LO in commit
fdce768122e54dff8343ab20179f3b1d7c6867e6.

so we need backport 3 commits for 3.4:

fdce768122e54dff8343ab20179f3b1d7c6867e6
2b39501b8ec6affb8afa9c6b93dff434b075e211
9d32497c01475f2b5e5bec756e4dd0ca9f9d4928

> anyway, like the previous one, assuming the build ( and a quick test ) 
> succeeds I will push

thanks for reviewing