#i123948# fix more class/struct mismatches

fix forward declarations that don't match the actual definitions


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1560054 13f79535-47bb-0310-9956-ffa450edef68