Code cleanups (as seemed useful today)

@returns -> @return for consistency

clickStartedWithinContainer -> clickStartedWithinCanvas for correctness

OdfCanvasAdapter -> MockOdfCanvas because it makes more sense to me (already asked for that name pattern in #316)