diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
commit | 1ec86b92249d382223f96f9c2bf7a5a0f06aaa1f (patch) | |
tree | fc0cbf5ac3650ee8660a75653702efc24b2137b0 /testautomation/global/win/bars.win | |
parent | 7f4fa441c9a3f04aeaf89be7aa5b5735b165de70 (diff) | |
parent | 4de2643ea718f0c246a87667036dbadacdbc708d (diff) |
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
Diffstat (limited to 'testautomation/global/win/bars.win')
-rwxr-xr-x | testautomation/global/win/bars.win | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win index fb34b4548564..dd65f825893d 100755 --- a/testautomation/global/win/bars.win +++ b/testautomation/global/win/bars.win @@ -1,17 +1,12 @@ 'encoding UTF-8 Do not remove or change this line! '************************************************************************** +'* '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. '* -'* Copyright 2008 by Sun Microsystems, Inc. +'* Copyright 2000, 2010 Oracle and/or its affiliates. '* '* OpenOffice.org - a multi-platform office productivity suite '* -'* $RCSfile: bars.win,v $ -'* -'* $Revision: 1.1 $ -'* -'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:11 $ -'* '* This file is part of OpenOffice.org. '* '* OpenOffice.org is free software: you can redistribute it and/or modify @@ -256,6 +251,7 @@ Textobjekt .uno:DrawText Toolbox SID_DRAW_SELECT VerticalCallout .uno:VerticalCaption VerticalText .uno:VerticalText +LineArrowEnd .uno:LineArrowEnd BasicShapes .uno:BasicShapes SymbolShapes .uno:SymbolShapes BlockArrows .uno:ArrowShapes @@ -360,7 +356,7 @@ ExtrusionLightingFloater .uno:ExtrusionLightingFloater ExtrusionSurfaceFloater .uno:ExtrusionSurfaceFloater Extrusion3DColor .uno:Extrusion3DColor '------------------------------------------------------------------------- -Flowchart .HelpId:flowchartshapes +*Flowchart .HelpId:flowchartshapes '------------------------------------------------------------------------- Process .uno:FlowChartShapes.flowchart-process AlternateProcess .uno:FlowChartShapes.flowchart-alternate-process @@ -591,7 +587,6 @@ EigenschaftenControls SID_SHOW_BROWSER EigenschaftenObjekt .uno:FrameDialog GanzNachHinten .uno:SendToBack GanzNachVorn .uno:BringToFront -GrafikBearbeiten SID_SIM_START Hintergrundfarbe .uno:BackgroundColor Hintergrundmuster SID_BACKGROUND_PATTERN HorizontalSpiegeln FN_FLIP_HORZ_GRAFIC @@ -671,7 +666,6 @@ Flaechenstil SID_ATTR_FILL_STYLE Gamma .uno:GrafGamma GanzNachHinten SID_FRAME_TO_BOTTOM GanzNachVorn SID_FRAME_TO_TOP -GrafikBearbeiten SID_SIM_START GrafikEigenschaften FN_FORMAT_GRAFIC_DLG Grafikmodus .uno:GrafMode Gruenanteil .uno:GrafGreen |