SwFrmAddPage::SetFrmType: take an OUString

Change-Id: I0d18aeee953d07ae9287ec1bca7d8deca8453d88
CppunitTest_sw_mailmerge: move more methods from header file

Change-Id: Idecf7c2ec3b736ba1d9a2826773c95f26ef91990