[PUSHED-3-5] fdo#45995 & fdo#45992

[Petr Mladek]

Petr Mladek píše v Út 14. 02. 2012 v 17:46 +0100:
> Noel Power píše v Út 14. 02. 2012 v 11:11 +0000:
> > On 14/02/12 10:39, Noel Power wrote:
> > > handle imported picture attribute from MSO Dialog ( fdo#45995 ) needed 
> > > for 3.5 ( and possibly 3.4... I need to check that )
> > > core:58255c47b1d540fd2493b4ed132aa7fa82da156e 
> > I sorta got mixed up with my comments about these bugs, this one is 
> > indeed ( and I always expected it ) valid for 3.4 ( this is the one to 
> > do with the ImageURL property in oox )
> 
> Hmm, this was not enough for 3.4. It did not show the picture. Instead
> it did a "screenshot" of the current background.
> 
> > > fix support for embedded images for basic Dialogs ( fdo#45992 ) needed 
> > > for 3.5 ( and definitely 3.5, didn't notice that ImageURL property 
> > > wasn't processed for UserForms in oox import when I removed msocximex ) 
> > this is the one I thought may be needed for 3.4 but it turns out that 
> > the merge badness happened later than I thought and this is not an issue 
> > in the 3.4 branch
> 
> It needed small update to apply in 3-5. It helped to get working the
> example from fdo#45995. It did not fix fdo#45992, though. I see white
> background instead of a picture in the dialog.

It did not work because the test document used linked picture. It works
well with the updated test document.

The changes look reasonable. They work well => I have pushed them into
the 3-5 branch, see
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5&id=4ea4f80121eedc7f87d950ea8e15336fb691e52f
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5&id=8015cd2cdbdb05b0048753e12b39fa940add2021


Noel, please ask for review once you have a working solution for 3.4
branch.


Best Regards,
Petr