sw/qa/extras/uiwriter/uiwriter2.cxx | 4 ++--
sw/qa/extras/uiwriter/uiwriter3.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7da7f6ca37c92ab33e34a76fd25efab526b7c80a
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Mar 29 15:49:19 2021 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Mar 29 19:53:59 2021 +0200
sw_uiwriter: unify data folder
Change-Id: I2506c9eb077ca8caa36010a06056b23f83b444a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113316
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/qa/extras/uiwriter/data3/AsCharTxBxTest.docx
b/sw/qa/extras/uiwriter/data/AsCharTxBxTest.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/AsCharTxBxTest.docx
rename to sw/qa/extras/uiwriter/data/AsCharTxBxTest.docx
diff --git a/sw/qa/extras/uiwriter/data3/AtPageTextBoxCrash.odt
b/sw/qa/extras/uiwriter/data/AtPageTextBoxCrash.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/AtPageTextBoxCrash.odt
rename to sw/qa/extras/uiwriter/data/AtPageTextBoxCrash.odt
diff --git a/sw/qa/extras/uiwriter/data2/floating-table-position.docx
b/sw/qa/extras/uiwriter/data/floating-table-position.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/floating-table-position.docx
rename to sw/qa/extras/uiwriter/data/floating-table-position.docx
diff --git a/sw/qa/extras/uiwriter/data2/frame_size_export.docx
b/sw/qa/extras/uiwriter/data/frame_size_export.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/frame_size_export.docx
rename to sw/qa/extras/uiwriter/data/frame_size_export.docx
diff --git a/sw/qa/extras/uiwriter/data2/image-comment-at-char.odt
b/sw/qa/extras/uiwriter/data/image-comment-at-char.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/image-comment-at-char.odt
rename to sw/qa/extras/uiwriter/data/image-comment-at-char.odt
diff --git a/sw/qa/extras/uiwriter/data2/image-comment.odt
b/sw/qa/extras/uiwriter/data/image-comment.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/image-comment.odt
rename to sw/qa/extras/uiwriter/data/image-comment.odt
diff --git a/sw/qa/extras/uiwriter/data2/lorem.fodt
b/sw/qa/extras/uiwriter/data/lorem.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/lorem.fodt
rename to sw/qa/extras/uiwriter/data/lorem.fodt
diff --git a/sw/qa/extras/uiwriter/data2/num-parent-style.docx
b/sw/qa/extras/uiwriter/data/num-parent-style.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/num-parent-style.docx
rename to sw/qa/extras/uiwriter/data/num-parent-style.docx
diff --git a/sw/qa/extras/uiwriter/data2/ofz18563.docx
b/sw/qa/extras/uiwriter/data/ofz18563.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/ofz18563.docx
rename to sw/qa/extras/uiwriter/data/ofz18563.docx
diff --git a/sw/qa/extras/uiwriter/data2/ole-save-while-edit.odt
b/sw/qa/extras/uiwriter/data/ole-save-while-edit.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/ole-save-while-edit.odt
rename to sw/qa/extras/uiwriter/data/ole-save-while-edit.odt
diff --git a/sw/qa/extras/uiwriter/data2/redline-para-join.docx
b/sw/qa/extras/uiwriter/data/redline-para-join.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/redline-para-join.docx
rename to sw/qa/extras/uiwriter/data/redline-para-join.docx
diff --git a/sw/qa/extras/uiwriter/data2/shape-page-move.odt
b/sw/qa/extras/uiwriter/data/shape-page-move.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/shape-page-move.odt
rename to sw/qa/extras/uiwriter/data/shape-page-move.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf100018-1.odt
b/sw/qa/extras/uiwriter/data/tdf100018-1.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf100018-1.odt
rename to sw/qa/extras/uiwriter/data/tdf100018-1.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf100691.fodt
b/sw/qa/extras/uiwriter/data/tdf100691.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf100691.fodt
rename to sw/qa/extras/uiwriter/data/tdf100691.fodt
diff --git a/sw/qa/extras/uiwriter/data2/tdf101534.fodt
b/sw/qa/extras/uiwriter/data/tdf101534.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf101534.fodt
rename to sw/qa/extras/uiwriter/data/tdf101534.fodt
diff --git a/sw/qa/extras/uiwriter/data3/tdf104649.docx
b/sw/qa/extras/uiwriter/data/tdf104649.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf104649.docx
rename to sw/qa/extras/uiwriter/data/tdf104649.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf105330.odt
b/sw/qa/extras/uiwriter/data/tdf105330.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf105330.odt
rename to sw/qa/extras/uiwriter/data/tdf105330.odt
diff --git a/sw/qa/extras/uiwriter/data2/tdf105413.fodt
b/sw/qa/extras/uiwriter/data/tdf105413.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf105413.fodt
rename to sw/qa/extras/uiwriter/data/tdf105413.fodt
diff --git a/sw/qa/extras/uiwriter/data2/tdf106843.docx
b/sw/qa/extras/uiwriter/data/tdf106843.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf106843.docx
rename to sw/qa/extras/uiwriter/data/tdf106843.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf107893.odt
b/sw/qa/extras/uiwriter/data/tdf107893.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf107893.odt
rename to sw/qa/extras/uiwriter/data/tdf107893.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf107975.odt
b/sw/qa/extras/uiwriter/data/tdf107975.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf107975.odt
rename to sw/qa/extras/uiwriter/data/tdf107975.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf108124.odt
b/sw/qa/extras/uiwriter/data/tdf108124.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf108124.odt
rename to sw/qa/extras/uiwriter/data/tdf108124.odt
diff --git a/sw/qa/extras/uiwriter/data2/tdf108687_tabstop.odt
b/sw/qa/extras/uiwriter/data/tdf108687_tabstop.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf108687_tabstop.odt
rename to sw/qa/extras/uiwriter/data/tdf108687_tabstop.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf112342.docx
b/sw/qa/extras/uiwriter/data/tdf112342.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf112342.docx
rename to sw/qa/extras/uiwriter/data/tdf112342.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf115815.odt
b/sw/qa/extras/uiwriter/data/tdf115815.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf115815.odt
rename to sw/qa/extras/uiwriter/data/tdf115815.odt
diff --git a/sw/qa/extras/uiwriter/data2/tdf117923.docx
b/sw/qa/extras/uiwriter/data/tdf117923.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf117923.docx
rename to sw/qa/extras/uiwriter/data/tdf117923.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf118311.fodt
b/sw/qa/extras/uiwriter/data/tdf118311.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf118311.fodt
rename to sw/qa/extras/uiwriter/data/tdf118311.fodt
diff --git a/sw/qa/extras/uiwriter/data2/tdf118699.docx
b/sw/qa/extras/uiwriter/data/tdf118699.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf118699.docx
rename to sw/qa/extras/uiwriter/data/tdf118699.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf119019.docx
b/sw/qa/extras/uiwriter/data/tdf119019.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf119019.docx
rename to sw/qa/extras/uiwriter/data/tdf119019.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf120336.docx
b/sw/qa/extras/uiwriter/data/tdf120336.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf120336.docx
rename to sw/qa/extras/uiwriter/data/tdf120336.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf120338.docx
b/sw/qa/extras/uiwriter/data/tdf120338.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf120338.docx
rename to sw/qa/extras/uiwriter/data/tdf120338.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf122942.odt
b/sw/qa/extras/uiwriter/data/tdf122942.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf122942.odt
rename to sw/qa/extras/uiwriter/data/tdf122942.odt
diff --git a/sw/qa/extras/uiwriter/data2/tdf123102.odt
b/sw/qa/extras/uiwriter/data/tdf123102.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf123102.odt
rename to sw/qa/extras/uiwriter/data/tdf123102.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf123285.odt
b/sw/qa/extras/uiwriter/data/tdf123285.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf123285.odt
rename to sw/qa/extras/uiwriter/data/tdf123285.odt
diff --git a/sw/qa/extras/uiwriter/data2/tdf124261.docx
b/sw/qa/extras/uiwriter/data/tdf124261.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf124261.docx
rename to sw/qa/extras/uiwriter/data/tdf124261.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf124397.docx
b/sw/qa/extras/uiwriter/data/tdf124397.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf124397.docx
rename to sw/qa/extras/uiwriter/data/tdf124397.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf124722.rtf
b/sw/qa/extras/uiwriter/data/tdf124722.rtf
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf124722.rtf
rename to sw/qa/extras/uiwriter/data/tdf124722.rtf
diff --git a/sw/qa/extras/uiwriter/data3/tdf125261.odt
b/sw/qa/extras/uiwriter/data/tdf125261.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf125261.odt
rename to sw/qa/extras/uiwriter/data/tdf125261.odt
diff --git a/sw/qa/extras/uiwriter/data2/tdf125310.fodt
b/sw/qa/extras/uiwriter/data/tdf125310.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf125310.fodt
rename to sw/qa/extras/uiwriter/data/tdf125310.fodt
diff --git a/sw/qa/extras/uiwriter/data2/tdf125310b.fodt
b/sw/qa/extras/uiwriter/data/tdf125310b.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf125310b.fodt
rename to sw/qa/extras/uiwriter/data/tdf125310b.fodt
diff --git a/sw/qa/extras/uiwriter/data2/tdf125881.docx
b/sw/qa/extras/uiwriter/data/tdf125881.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf125881.docx
rename to sw/qa/extras/uiwriter/data/tdf125881.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf125916.docx
b/sw/qa/extras/uiwriter/data/tdf125916.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf125916.docx
rename to sw/qa/extras/uiwriter/data/tdf125916.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf126206.docx
b/sw/qa/extras/uiwriter/data/tdf126206.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf126206.docx
rename to sw/qa/extras/uiwriter/data/tdf126206.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf126340.odt
b/sw/qa/extras/uiwriter/data/tdf126340.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf126340.odt
rename to sw/qa/extras/uiwriter/data/tdf126340.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf126504.odt
b/sw/qa/extras/uiwriter/data/tdf126504.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf126504.odt
rename to sw/qa/extras/uiwriter/data/tdf126504.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf126626.docx
b/sw/qa/extras/uiwriter/data/tdf126626.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf126626.docx
rename to sw/qa/extras/uiwriter/data/tdf126626.docx
diff --git
a/sw/qa/extras/uiwriter/data2/tdf126784_distributeSelectedColumns.odt
b/sw/qa/extras/uiwriter/data/tdf126784_distributeSelectedColumns.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf126784_distributeSelectedColumns.odt
rename to sw/qa/extras/uiwriter/data/tdf126784_distributeSelectedColumns.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf127652.odt
b/sw/qa/extras/uiwriter/data/tdf127652.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf127652.odt
rename to sw/qa/extras/uiwriter/data/tdf127652.odt
diff --git a/sw/qa/extras/uiwriter/data2/tdf128335.odt
b/sw/qa/extras/uiwriter/data/tdf128335.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf128335.odt
rename to sw/qa/extras/uiwriter/data/tdf128335.odt
diff --git a/sw/qa/extras/uiwriter/data2/tdf128603.odt
b/sw/qa/extras/uiwriter/data/tdf128603.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf128603.odt
rename to sw/qa/extras/uiwriter/data/tdf128603.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf128739.docx
b/sw/qa/extras/uiwriter/data/tdf128739.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf128739.docx
rename to sw/qa/extras/uiwriter/data/tdf128739.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf128782.odt
b/sw/qa/extras/uiwriter/data/tdf128782.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf128782.odt
rename to sw/qa/extras/uiwriter/data/tdf128782.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf129382.docx
b/sw/qa/extras/uiwriter/data/tdf129382.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf129382.docx
rename to sw/qa/extras/uiwriter/data/tdf129382.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf129655-vtextbox.odt
b/sw/qa/extras/uiwriter/data/tdf129655-vtextbox.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf129655-vtextbox.odt
rename to sw/qa/extras/uiwriter/data/tdf129655-vtextbox.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf129805.docx
b/sw/qa/extras/uiwriter/data/tdf129805.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf129805.docx
rename to sw/qa/extras/uiwriter/data/tdf129805.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf130680.odt
b/sw/qa/extras/uiwriter/data/tdf130680.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf130680.odt
rename to sw/qa/extras/uiwriter/data/tdf130680.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf130685.odt
b/sw/qa/extras/uiwriter/data/tdf130685.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf130685.odt
rename to sw/qa/extras/uiwriter/data/tdf130685.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf130746.odt
b/sw/qa/extras/uiwriter/data/tdf130746.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf130746.odt
rename to sw/qa/extras/uiwriter/data/tdf130746.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf130805.odt
b/sw/qa/extras/uiwriter/data/tdf130805.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf130805.odt
rename to sw/qa/extras/uiwriter/data/tdf130805.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf131684.docx
b/sw/qa/extras/uiwriter/data/tdf131684.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf131684.docx
rename to sw/qa/extras/uiwriter/data/tdf131684.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf131963.docx
b/sw/qa/extras/uiwriter/data/tdf131963.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf131963.docx
rename to sw/qa/extras/uiwriter/data/tdf131963.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf132160.odt
b/sw/qa/extras/uiwriter/data/tdf132160.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf132160.odt
rename to sw/qa/extras/uiwriter/data/tdf132160.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf132187.odt
b/sw/qa/extras/uiwriter/data/tdf132187.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf132187.odt
rename to sw/qa/extras/uiwriter/data/tdf132187.odt
diff --git a/sw/qa/extras/uiwriter/data2/tdf132236.odt
b/sw/qa/extras/uiwriter/data/tdf132236.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf132236.odt
rename to sw/qa/extras/uiwriter/data/tdf132236.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf132321.odt
b/sw/qa/extras/uiwriter/data/tdf132321.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf132321.odt
rename to sw/qa/extras/uiwriter/data/tdf132321.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf132420.odt
b/sw/qa/extras/uiwriter/data/tdf132420.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf132420.odt
rename to sw/qa/extras/uiwriter/data/tdf132420.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf132596.docx
b/sw/qa/extras/uiwriter/data/tdf132596.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf132596.docx
rename to sw/qa/extras/uiwriter/data/tdf132596.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf132597.odt
b/sw/qa/extras/uiwriter/data/tdf132597.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf132597.odt
rename to sw/qa/extras/uiwriter/data/tdf132597.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf132637_protectTrackChanges.doc
b/sw/qa/extras/uiwriter/data/tdf132637_protectTrackChanges.doc
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf132637_protectTrackChanges.doc
rename to sw/qa/extras/uiwriter/data/tdf132637_protectTrackChanges.doc
diff --git a/sw/qa/extras/uiwriter/data3/tdf132725.odt
b/sw/qa/extras/uiwriter/data/tdf132725.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf132725.odt
rename to sw/qa/extras/uiwriter/data/tdf132725.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf132744.odt
b/sw/qa/extras/uiwriter/data/tdf132744.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf132744.odt
rename to sw/qa/extras/uiwriter/data/tdf132744.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf132911.odt
b/sw/qa/extras/uiwriter/data/tdf132911.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf132911.odt
rename to sw/qa/extras/uiwriter/data/tdf132911.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf132944.odt
b/sw/qa/extras/uiwriter/data/tdf132944.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf132944.odt
rename to sw/qa/extras/uiwriter/data/tdf132944.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf133477.fodt
b/sw/qa/extras/uiwriter/data/tdf133477.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf133477.fodt
rename to sw/qa/extras/uiwriter/data/tdf133477.fodt
diff --git a/sw/qa/extras/uiwriter/data3/tdf133490.odt
b/sw/qa/extras/uiwriter/data/tdf133490.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf133490.odt
rename to sw/qa/extras/uiwriter/data/tdf133490.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf133967.odt
b/sw/qa/extras/uiwriter/data/tdf133967.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf133967.odt
rename to sw/qa/extras/uiwriter/data/tdf133967.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf133982.docx
b/sw/qa/extras/uiwriter/data/tdf133982.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf133982.docx
rename to sw/qa/extras/uiwriter/data/tdf133982.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf133990.odt
b/sw/qa/extras/uiwriter/data/tdf133990.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf133990.odt
rename to sw/qa/extras/uiwriter/data/tdf133990.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf134021.docx
b/sw/qa/extras/uiwriter/data/tdf134021.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf134021.docx
rename to sw/qa/extras/uiwriter/data/tdf134021.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf134227.docx
b/sw/qa/extras/uiwriter/data/tdf134227.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf134227.docx
rename to sw/qa/extras/uiwriter/data/tdf134227.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf134253.odt
b/sw/qa/extras/uiwriter/data/tdf134253.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf134253.odt
rename to sw/qa/extras/uiwriter/data/tdf134253.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf134404.odt
b/sw/qa/extras/uiwriter/data/tdf134404.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf134404.odt
rename to sw/qa/extras/uiwriter/data/tdf134404.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf134626.odt
b/sw/qa/extras/uiwriter/data/tdf134626.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf134626.odt
rename to sw/qa/extras/uiwriter/data/tdf134626.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf134931.odt
b/sw/qa/extras/uiwriter/data/tdf134931.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf134931.odt
rename to sw/qa/extras/uiwriter/data/tdf134931.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf135056.odt
b/sw/qa/extras/uiwriter/data/tdf135056.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf135056.odt
rename to sw/qa/extras/uiwriter/data/tdf135056.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf135412.docx
b/sw/qa/extras/uiwriter/data/tdf135412.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf135412.docx
rename to sw/qa/extras/uiwriter/data/tdf135412.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf135623.docx
b/sw/qa/extras/uiwriter/data/tdf135623.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf135623.docx
rename to sw/qa/extras/uiwriter/data/tdf135623.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf135661.odt
b/sw/qa/extras/uiwriter/data/tdf135661.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf135661.odt
rename to sw/qa/extras/uiwriter/data/tdf135661.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf135733.odt
b/sw/qa/extras/uiwriter/data/tdf135733.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf135733.odt
rename to sw/qa/extras/uiwriter/data/tdf135733.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf136385.odt
b/sw/qa/extras/uiwriter/data/tdf136385.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf136385.odt
rename to sw/qa/extras/uiwriter/data/tdf136385.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf136778.docx
b/sw/qa/extras/uiwriter/data/tdf136778.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf136778.docx
rename to sw/qa/extras/uiwriter/data/tdf136778.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf137964.odt
b/sw/qa/extras/uiwriter/data/tdf137964.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf137964.odt
rename to sw/qa/extras/uiwriter/data/tdf137964.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf138130.docx
b/sw/qa/extras/uiwriter/data/tdf138130.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf138130.docx
rename to sw/qa/extras/uiwriter/data/tdf138130.docx
diff --git a/sw/qa/extras/uiwriter/data3/tdf138482.docx
b/sw/qa/extras/uiwriter/data/tdf138482.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf138482.docx
rename to sw/qa/extras/uiwriter/data/tdf138482.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf139127.fodt
b/sw/qa/extras/uiwriter/data/tdf139127.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf139127.fodt
rename to sw/qa/extras/uiwriter/data/tdf139127.fodt
diff --git a/sw/qa/extras/uiwriter/data3/tdf140828.docx
b/sw/qa/extras/uiwriter/data/tdf140828.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf140828.docx
rename to sw/qa/extras/uiwriter/data/tdf140828.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf39721.fodt
b/sw/qa/extras/uiwriter/data/tdf39721.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf39721.fodt
rename to sw/qa/extras/uiwriter/data/tdf39721.fodt
diff --git a/sw/qa/extras/uiwriter/data2/tdf47471_paraStyleBackground.odt
b/sw/qa/extras/uiwriter/data/tdf47471_paraStyleBackground.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf47471_paraStyleBackground.odt
rename to sw/qa/extras/uiwriter/data/tdf47471_paraStyleBackground.odt
diff --git a/sw/qa/extras/uiwriter/data2/tdf52391.fodt
b/sw/qa/extras/uiwriter/data/tdf52391.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf52391.fodt
rename to sw/qa/extras/uiwriter/data/tdf52391.fodt
diff --git a/sw/qa/extras/uiwriter/data2/tdf54819.fodt
b/sw/qa/extras/uiwriter/data/tdf54819.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf54819.fodt
rename to sw/qa/extras/uiwriter/data/tdf54819.fodt
diff --git a/sw/qa/extras/uiwriter/data2/tdf54819b.odt
b/sw/qa/extras/uiwriter/data/tdf54819b.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf54819b.odt
rename to sw/qa/extras/uiwriter/data/tdf54819b.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf61154.fodt
b/sw/qa/extras/uiwriter/data/tdf61154.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf61154.fodt
rename to sw/qa/extras/uiwriter/data/tdf61154.fodt
diff --git a/sw/qa/extras/uiwriter/data2/tdf64242_optimizeTable.odt
b/sw/qa/extras/uiwriter/data/tdf64242_optimizeTable.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf64242_optimizeTable.odt
rename to sw/qa/extras/uiwriter/data/tdf64242_optimizeTable.odt
diff --git a/sw/qa/extras/uiwriter/data3/tdf76636.doc
b/sw/qa/extras/uiwriter/data/tdf76636.doc
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/tdf76636.doc
rename to sw/qa/extras/uiwriter/data/tdf76636.doc
diff --git a/sw/qa/extras/uiwriter/data2/tdf76817.docx
b/sw/qa/extras/uiwriter/data/tdf76817.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf76817.docx
rename to sw/qa/extras/uiwriter/data/tdf76817.docx
diff --git a/sw/qa/extras/uiwriter/data2/tdf76817.fodt
b/sw/qa/extras/uiwriter/data/tdf76817.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf76817.fodt
rename to sw/qa/extras/uiwriter/data/tdf76817.fodt
diff --git a/sw/qa/extras/uiwriter/data2/tdf90069.docx
b/sw/qa/extras/uiwriter/data/tdf90069.docx
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/tdf90069.docx
rename to sw/qa/extras/uiwriter/data/tdf90069.docx
diff --git a/sw/qa/extras/uiwriter/data2/try2.fodt
b/sw/qa/extras/uiwriter/data/try2.fodt
similarity index 100%
rename from sw/qa/extras/uiwriter/data2/try2.fodt
rename to sw/qa/extras/uiwriter/data/try2.fodt
diff --git a/sw/qa/extras/uiwriter/data3/txbx_crash.odt
b/sw/qa/extras/uiwriter/data/txbx_crash.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/txbx_crash.odt
rename to sw/qa/extras/uiwriter/data/txbx_crash.odt
diff --git a/sw/qa/extras/uiwriter/data3/udindex3.odt
b/sw/qa/extras/uiwriter/data/udindex3.odt
similarity index 100%
rename from sw/qa/extras/uiwriter/data3/udindex3.odt
rename to sw/qa/extras/uiwriter/data/udindex3.odt
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index bc471a8dda67..0f1ddaaa1cb7 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -71,7 +71,7 @@
namespace
{
-constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data2/";
+constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data/";
constexpr OUStringLiteral FLOATING_TABLE_DATA_DIRECTORY
= u"/sw/qa/extras/uiwriter/data/floating_table/";
} // namespace
@@ -3641,7 +3641,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf128603)
// only care that it doesn't assert/crash
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testOfz18563)
{
- OUString
sURL(m_directories.getURLFromSrc(u"/sw/qa/extras/uiwriter/data2/ofz18563.docx"));
+ OUString
sURL(m_directories.getURLFromSrc(u"/sw/qa/extras/uiwriter/data/ofz18563.docx"));
SvFileStream aFileStream(sURL, StreamMode::READ);
TestImportDOCX(aFileStream);
}
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 7a62505b61c0..47407eaf7149 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -42,7 +42,7 @@
namespace
{
-constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data3/";
+constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data/";
} // namespace
/// Third set of tests asserting the behavior of Writer user interface shells.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
