diff options
Diffstat (limited to 'testautomation/graphics/optional')
3 files changed, 2 insertions, 6 deletions
diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc index e069af925277..ef6baa9030cf 100755 --- a/testautomation/graphics/optional/includes/global/export_graphic.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic.inc @@ -218,7 +218,6 @@ testcase tPCT hFileOpen (sDocument) sleep (10) -<<<<<<< .working printlog "check if the document is writable" if fIsDocumentWritable = false then printlog "make the document writable and check if it's succesfull" @@ -227,9 +226,6 @@ testcase tPCT goto endsub endif endif -======= - sMakeReadOnlyDocumentEditable ->>>>>>> .merge-right.r273634 hTypeKeys ("<escape><tab>") fGetSizeXY sx1, sY, TRUE diff --git a/testautomation/graphics/optional/includes/global/g_paragraph.inc b/testautomation/graphics/optional/includes/global/g_paragraph.inc index 707ebaba85c8..882134573390 100755 --- a/testautomation/graphics/optional/includes/global/g_paragraph.inc +++ b/testautomation/graphics/optional/includes/global/g_paragraph.inc @@ -31,7 +31,7 @@ '* '/************************************************************************ '* -'* Owner : fredrik.haegg@sun.com +'* Owner : wolfram.garten@sun.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/impress/i_animation.inc b/testautomation/graphics/optional/includes/impress/i_animation.inc index 95a8e0b4bcc4..6c341de80e59 100755 --- a/testautomation/graphics/optional/includes/impress/i_animation.inc +++ b/testautomation/graphics/optional/includes/impress/i_animation.inc @@ -31,7 +31,7 @@ '* '/************************************************************************ '* -'* Owner : fredrik.haegg@sun.com +'* Owner : wolfram.garten@sun.com '* '* short description : '* |