Conflicts:
	offapi/com/sun/star/sheet/NameToken.idl

also fix small typo

Do not return different values depending on the platform

Probably it was added accidently.

This is 'libreoffice-3-4-2' - the stable branch for the 3.4.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.4.x release,
please use the 'libreoffice-3-4' branch.

If you want to build something cool, unstable, and risky, use master.

Signed-off-by: Michael Meeks <michael.meeks@novell.com>

We must call the initialize() methods of the plugins which for iOS
aren't actually plugins in the sense of being dynamically loaded, but
still. Unfortunately this means we have to list the plugin interface
getter functions explicitly in the sal_cppunittester_all source.

We can't run them in the normal way, but we build the tests as static
archives, which we link into the single sal_cppunittester_all
executable. (Work in progress, so far just a part of the tests are
linked into it.)

There is no makefilery yet to actually construct a complete iOS app
bundle (.app directory), so just copy (in this case) the
sal_cppunittester_all iOS executable on top of the executbale some
dummy iOS app you build in Xcode... works fine, can be debugged that
way.