diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-07-16 16:40:11 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-07-16 16:40:11 +0000 |
| commit | 59cf811a68b8788d8d78dd525fbe622588a21372 (patch) | |
| tree | 9cdf0e1f240febb47134827f045126dd5f41925f /testautomation/graphics | |
| parent | d805bf8cfc822eb118dfbc1a813ef4d683d368e4 (diff) | |
CWS-TOOLING: integrate CWS automationdev300m52cat0
2009-07-14 14:41:44 +0200 oc r273974 : #i103538# Issue-id added
2009-07-14 14:40:10 +0200 oc r273973 : #i103438
2009-07-14 14:03:06 +0200 oc r273971 : #i103535# additional check added
2009-07-14 13:46:19 +0200 hde r273969 : #i103529#testcases excluded to to issue 102752
2009-07-14 07:48:41 +0200 hde r273957 : changed fileowner from fredrik.haegg@sun.com to helge.delfs@sun.com
2009-07-13 16:03:42 +0200 oc r273942 : #i103513# Issue-ID added
2009-07-13 16:02:14 +0200 hde r273941 : no writer document was opened when options dialog called. Added hNewDocument before opening options dialog
2009-07-13 14:17:14 +0200 oc r273935 : #i103503# macrobutton outcommented
2009-07-13 14:13:30 +0200 wg r273934 : i103501 deleting fragments of diff
2009-07-13 13:10:21 +0200 hde r273931 : Issue 103382
2009-07-13 12:59:14 +0200 hde r273930 : changed fileowner from fredrik.haegg@sun.com to wolfram.garten@sun.com
2009-07-13 12:03:41 +0200 hde r273927 : changed fileowner from fredrik.haegg@sun.com to helge.delfs@sun.com
2009-07-13 12:01:47 +0200 hde r273926 : changed fileowner from helge.delfs@sun.com to oliver.craemer@sun.com
Diffstat (limited to 'testautomation/graphics')
4 files changed, 2 insertions, 14 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 : '* diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc index 4ed30615fe31..25c07170c9f3 100755 --- a/testautomation/graphics/tools/id_tools_2.inc +++ b/testautomation/graphics/tools/id_tools_2.inc @@ -282,11 +282,7 @@ sub SaveMeasurementSetFirst elseIf (gApplication = "CALC") then sApplication = "CALC" endif -<<<<<<< .working - printlog " '/// - save states ///'" -======= printlog " - save states " ->>>>>>> .merge-right.r273717 ToolsOptions hToolsOptions (sApplication,"General") ReferenceOld = Masseinheit.GetSelText @@ -340,11 +336,7 @@ sub ResetMeasurement elseIf (gApplication = "CALC") then sApplication = "CALC" endif -<<<<<<< .working - printlog "'/// - Reset states back to what they were before ///'" -======= printlog " - Reset states back to what they were before " ->>>>>>> .merge-right.r273717 ToolsOptions hToolsOptions (sApplication,"General") if Masseinheit.GetSelText <> ReferenceOld then 'find the right one. |