Also expand nested methods.

Only diff in workdir/SdiTarget is for SID_STYLE_WATERCAN
from sw/sdi/_basesh.sdi which changed the .uno name from
WatercanStyleModeOnOff to StyleWatercanMode, to match the
name in sfx2/sdi/sfx.sdi (it was forced by svidl to have
the same name).

Change-Id: Iaeac9f4f10a36cb0b3afe3de2b6def8cd90edc6d