Indirect or reported speech question

I have a question about indirect or reported speech.

If the direct speech is in the future perfect continuous tense do we change the tense in the indirect speech to past future continuous tense?
If the direct speech is in the future continuous tense do we change the indirect speech to past future continuous tense?

Direct Speech: She said, "I shall have been working in this office for ten years by Christmas."
Indirect Speech: She said that she would have been working in that office for ten years by Christmas.

Direct Speech: He said, "They will be passing this way again."
Indirect Speech: He said that they would be passing that way again.

Thank you.