Re: [PATCH] Change in core[libreoffice-3-6-0]: fdo#38056: ODF import: fix page style attributes:

2012-07-20 Thread Bjoern Michaelsen
On Fri, Jul 20, 2012 at 01:12:37PM +0200, Michael Stahl wrote:
> On 20/07/12 12:34, Miklos Vajna wrote:
> > On Fri, Jul 20, 2012 at 10:12:58AM +, Gerrit 
> >  wrote:
> >> Hello Miklos Vajna,
> >>
> >> I'd like you to do a code review.  Please visit
> > 
> > Now this is really confusing; I already signed off this patch, so I
> > should not do a code review this time. ;-)
> 
> i agree :)
> 
> i didn't do anything explicit to add you as reviewer to this patch, so
> presumably gerrit did it automatically.

Well, gerrit sees the patch and it sees a 'new version' as it is cherry-picked
and does not have the same identity. IIRC that mail will be gone when gerrit
puts the patches on master itself (in which case it understands better what
happened).
Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [PATCH] Change in core[libreoffice-3-6-0]: fdo#38056: ODF import: fix page style attributes:

2012-07-20 Thread Michael Stahl
On 20/07/12 12:34, Miklos Vajna wrote:
> On Fri, Jul 20, 2012 at 10:12:58AM +, Gerrit 
>  wrote:
>> Hello Miklos Vajna,
>>
>> I'd like you to do a code review.  Please visit
> 
> Now this is really confusing; I already signed off this patch, so I
> should not do a code review this time. ;-)

i agree :)

i didn't do anything explicit to add you as reviewer to this patch, so
presumably gerrit did it automatically.



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [PATCH] Change in core[libreoffice-3-6-0]: fdo#38056: ODF import: fix page style attributes:

2012-07-20 Thread Miklos Vajna
On Fri, Jul 20, 2012 at 10:12:58AM +, Gerrit 
 wrote:
> Hello Miklos Vajna,
> 
> I'd like you to do a code review.  Please visit

Now this is really confusing; I already signed off this patch, so I
should not do a code review this time. ;-)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] Change in core[libreoffice-3-6-0]: fdo#38056: ODF import: fix page style attributes:

2012-07-20 Thread Gerrit
>From Michael Stahl :

Hello Miklos Vajna,

I'd like you to do a code review.  Please visit

https://gerrit.libreoffice.org/335

to review the following change.

Change subject: fdo#38056: ODF import: fix page style attributes:
..

fdo#38056: ODF import: fix page style attributes:

PageMasterImportPropMapper: in the case of a single "fo:border"
and "style:border-line-width" attribute, it is possible that the border
is imported wrongly, like this:

1. pAllBorderProperty is set from the imported value, with name "TopBorder"
2. individual pNewBorder[i] are created as copies from pAllBorderProperty,
   one of which also with name "TopBorder"
3. pNewBorder[i] is updated with widths from pBorderWidths[i]
4. the individual pNewBorder[i] are added to the property vector
5. the property vector is sorted by property name
6. the properites are applied in order; if the pNewBorder[TOP]
   happens to precede the pAllBorderProperty (which is indeterminate
   as they both have name "TopBorder"), then the pAllBorderProperty
   will overwrite the border widths computed in step 3.

Thus, nerf the various pAllFoo properties so they do not override
the individual Foo properties later on.

(cherry picked from commit 7f9928bfa561ccb6ed4e2baacc7d6960bc1ce231)

Change-Id: I87755f1184d59da2aa72ac053e6f77d7295d6958
Signed-off-by: Miklos Vajna 
(cherry picked from commit 6a05f22cd3253ae5c45495d0c081e1f44a3ff756)
---
M xmloff/source/style/PageMasterImportPropMapper.cxx
1 file changed, 51 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/335/1
--
To view, visit https://gerrit.libreoffice.org/335
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87755f1184d59da2aa72ac053e6f77d7295d6958
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-0
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Miklos Vajna 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice