Indeed your correct.
It's also interesting that he wanted to absorb Catalonia as part of France rather than either 1) Make her an Independent state or 2) Leave her as part of Spain. Though like Poles I guess he felt the Catalans deserved to be conquered.