This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new fe81d28  Cleaned up resource files, removed MASKCOLOR
fe81d28 is described below

commit fe81d284454e327d464c08813757beddd79c9f01
Author: mseidel <msei...@apache.org>
AuthorDate: Tue Oct 8 12:45:30 2019 +0200

    Cleaned up resource files, removed MASKCOLOR
---
 main/svx/source/tbxctrls/extrusioncontrols.src | 444 ++++++++++---------------
 main/svx/source/tbxctrls/fontworkgallery.src   | 207 +++++-------
 2 files changed, 261 insertions(+), 390 deletions(-)

diff --git a/main/svx/source/tbxctrls/extrusioncontrols.src 
b/main/svx/source/tbxctrls/extrusioncontrols.src
index fa266c7..d3d4f50 100644
--- a/main/svx/source/tbxctrls/extrusioncontrols.src
+++ b/main/svx/source/tbxctrls/extrusioncontrols.src
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -24,11 +24,9 @@
 #include <svx/dialogs.hrc>
 #include "extrusioncontrols.hrc"
 
-#define MASKCOLOR      MaskColor = Color { Red=0xFFFF; Green=0x0000; 
Blue=0xFFFF; };
-
 DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
 {
-    HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DIRECTION";
+       HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DIRECTION" ;
        Border = FALSE ;
        Hide = TRUE ;
        SVLook = TRUE ;
@@ -41,165 +39,143 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
 
        Image IMG_DIRECTION + DIRECTION_NW
        {
-               ImageBitmap = Bitmap { File = "directionnorthwest_22.bmp" ; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionnorthwest_22.png" ;} ;
        };
        Image IMG_DIRECTION_H + DIRECTION_NW
        {
-               ImageBitmap = Bitmap { File = "directionnorthwest_22_h.bmp" ; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionnorthwest_22_h.png" ;} ;
        };
        Image IMG_DIRECTION + DIRECTION_N
        {
-               ImageBitmap = Bitmap { File = "directionnorth_22.bmp" ; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionnorth_22.png" ;} ;
        };
        Image IMG_DIRECTION_H + DIRECTION_N
        {
-               ImageBitmap = Bitmap { File = "directionnorth_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionnorth_22_h.png" ;} ;
        };
        Image IMG_DIRECTION + DIRECTION_NE
        {
-               ImageBitmap = Bitmap { File = "directionnortheast_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionnortheast_22.png" ;} ;
        };
        Image IMG_DIRECTION_H + DIRECTION_NE
        {
-               ImageBitmap = Bitmap { File = "directionnortheast_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionnortheast_22_h.png" ;} ;
        };
        Image IMG_DIRECTION + DIRECTION_W
        {
-               ImageBitmap = Bitmap { File = "directionwest_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionwest_22.png" ;} ;
        };
        Image IMG_DIRECTION_H + DIRECTION_W
        {
-               ImageBitmap = Bitmap { File = "directionwest_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionwest_22_h.png" ;} ;
        };
        Image IMG_DIRECTION + DIRECTION_NONE
        {
-               ImageBitmap = Bitmap { File = "directionstraight_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionstraight_22.png" ;} ;
        };
        Image IMG_DIRECTION_H + DIRECTION_NONE
        {
-               ImageBitmap = Bitmap { File = "directionstraight_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionstraight_22_h.png" ;} ;
        };
        Image IMG_DIRECTION + DIRECTION_E
        {
-               ImageBitmap = Bitmap { File = "directioneast_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directioneast_22.png" ;} ;
        };
        Image IMG_DIRECTION_H + DIRECTION_E
        {
-               ImageBitmap = Bitmap { File = "directioneast_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directioneast_22_h.png" ;} ;
        };
        Image IMG_DIRECTION + DIRECTION_SW
        {
-               ImageBitmap = Bitmap { File = "directionsouthwest_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionsouthwest_22.png" ;} ;
        };
        Image IMG_DIRECTION_H + DIRECTION_SW
        {
-               ImageBitmap = Bitmap { File = "directionsouthwest_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionsouthwest_22_h.png" ;} ;
        };
        Image IMG_DIRECTION + DIRECTION_S
        {
-               ImageBitmap = Bitmap { File = "directionsouth_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionsouth_22.png" ;} ;
        };
        Image IMG_DIRECTION_H + DIRECTION_S
        {
-               ImageBitmap = Bitmap { File = "directionsouth_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionsouth_22_h.png" ;} ;
        };
        Image IMG_DIRECTION + DIRECTION_SE
        {
-               ImageBitmap = Bitmap { File = "directionsoutheast_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionsoutheast_22.png" ;} ;
        };
        Image IMG_DIRECTION_H + DIRECTION_SE
        {
-               ImageBitmap = Bitmap { File = "directionsoutheast_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "directionsoutheast_22_h.png" ;} ;
        };
        Image IMG_PERSPECTIVE
        {
-               ImageBitmap = Bitmap { File = "perspective_16.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "perspective_16.png" ;} ;
        };
        Image IMG_PERSPECTIVE_H
        {
-               ImageBitmap = Bitmap { File = "perspective_16_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "perspective_16_h.png" ;} ;
        };
        Image IMG_PARALLEL
        {
-               ImageBitmap = Bitmap { File = "parallel_16.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "parallel_16.png" ;} ;
        };
        Image IMG_PARALLEL_H
        {
-               ImageBitmap = Bitmap { File = "parallel_16_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "parallel_16_h.png" ;} ;
        };
-       
+
        String STR_PERSPECTIVE
        {
                Text [ en-US ] = "~Perspective" ;
        };
-       
+
        String STR_PARALLEL
        {
                Text [ en-US ] = "P~arallel" ;
        };
        String STR_DIRECTION + DIRECTION_NW
        {
-               Text [ en-US ] = "Extrusion North-West";
+               Text [ en-US ] = "Extrusion North-West" ;
        };
        String STR_DIRECTION + DIRECTION_N
        {
-               Text [ en-US ] = "Extrusion North";
+               Text [ en-US ] = "Extrusion North" ;
        };
        String STR_DIRECTION + DIRECTION_NE
        {
-               Text [ en-US ] = "Extrusion North-East";
+               Text [ en-US ] = "Extrusion North-East" ;
        };
        String STR_DIRECTION + DIRECTION_W
        {
-               Text [ en-US ] = "Extrusion West";
+               Text [ en-US ] = "Extrusion West" ;
        };
        String STR_DIRECTION + DIRECTION_NONE
        {
-               Text [ en-US ] = "Extrusion Backwards";
+               Text [ en-US ] = "Extrusion Backwards" ;
        };
        String STR_DIRECTION + DIRECTION_E
        {
-               Text [ en-US ] = "Extrusion East";
+               Text [ en-US ] = "Extrusion East" ;
        };
        String STR_DIRECTION + DIRECTION_SW
        {
-               Text [ en-US ] = "Extrusion South-West";
+               Text [ en-US ] = "Extrusion South-West" ;
        };
        String STR_DIRECTION + DIRECTION_S
        {
-               Text [ en-US ] = "Extrusion South";
+               Text [ en-US ] = "Extrusion South" ;
        };
        String STR_DIRECTION + DIRECTION_SE
        {
-               Text [ en-US ] = "Extrusion South-East";
+               Text [ en-US ] = "Extrusion South-East" ;
        };
 };
-       
+
 DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
 {
-    HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DEPTH";
+       HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DEPTH" ;
        Border = FALSE ;
        Hide = TRUE ;
        SVLook = TRUE ;
@@ -209,88 +185,76 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
        Zoomable = TRUE ;
 
        Text [ en-US ] = "Extrusion Depth" ;
-       
+
        String STR_CUSTOM
        {
-               Text [ en-US ] = "~Custom...";
+               Text [ en-US ] = "~Custom..." ;
        };
-       
+
        String STR_INFINITY
        {
-               Text [ en-US ] = "~Infinity";
+               Text [ en-US ] = "~Infinity" ;
        };
 
        Image IMG_DEPTH_0
        {
-               ImageBitmap = Bitmap { File = "extrusion0inch_16.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "extrusion0inch_16.png" ;} ;
        };
        Image IMG_DEPTH_0_H
        {
-               ImageBitmap = Bitmap { File = "extrusion0inch_16_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "extrusion0inch_16_h.png" ;} ;
        };
 
        Image IMG_DEPTH_1
        {
-               ImageBitmap = Bitmap { File = "extrusion05inch_16.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "extrusion05inch_16.png" ;} ;
        };
        Image IMG_DEPTH_1_H
        {
-               ImageBitmap = Bitmap { File = "extrusion05inch_16_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "extrusion05inch_16_h.png" ;} ;
        };
 
        Image IMG_DEPTH_2
        {
-               ImageBitmap = Bitmap { File = "extrusion1inch_16.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "extrusion1inch_16.png" ;} ;
        };
        Image IMG_DEPTH_2_H
        {
-               ImageBitmap = Bitmap { File = "extrusion1inch_16_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "extrusion1inch_16_h.png" ;} ;
        };
 
        Image IMG_DEPTH_3
        {
-               ImageBitmap = Bitmap { File = "extrusion2inch_16.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "extrusion2inch_16.png" ;} ;
        };
        Image IMG_DEPTH_3_H
        {
-               ImageBitmap = Bitmap { File = "extrusion2inch_16_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "extrusion2inch_16_h.png" ;} ;
        };
 
        Image IMG_DEPTH_4
        {
-               ImageBitmap = Bitmap { File = "extrusion4inch_16.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "extrusion4inch_16.png" ;} ;
        };
        Image IMG_DEPTH_4_H
        {
-               ImageBitmap = Bitmap { File = "extrusion4inch_16_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "extrusion4inch_16_h.png" ;} ;
        };
 
        Image IMG_DEPTH_INFINITY
        {
-               ImageBitmap = Bitmap { File = "extrusioninfinity_16.bmp"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "extrusioninfinity_16.png" ;} ;
+       };
        Image IMG_DEPTH_INFINITY_H
        {
-               ImageBitmap = Bitmap { File = "extrusioninfinity_16_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "extrusioninfinity_16_h.png" ;} ;
        };
 };
 
 
 DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
 {
-    HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_LIGHTING";
+       HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_LIGHTING" ;
        Border = FALSE ;
        Hide = TRUE ;
        SVLook = TRUE ;
@@ -300,314 +264,258 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
        Zoomable = TRUE ;
 
        Text [ en-US ] = "Extrusion Lighting" ;
-       
+
        Image IMG_LIGHT_OFF + FROM_TOP_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightofffromtopleft_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffromtopleft_22.png" ;} ;
        };
        Image IMG_LIGHT_OFF + FROM_TOP
        {
-               ImageBitmap = Bitmap { File = "lightofffromtop_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffromtop_22.png" ;} ;
        };
        Image IMG_LIGHT_OFF + FROM_TOP_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightofffromtopright_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffromtopright_22.png" ;} ;
        };
        Image IMG_LIGHT_OFF + FROM_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightofffromleft_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffromleft_22.png" ;} ;
        };
        Image IMG_LIGHT_OFF + FROM_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightofffromright_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffromright_22.png" ;} ;
        };
        Image IMG_LIGHT_OFF + FROM_BOTTOM_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightofffrombottomleft_22.bmp"; 
};
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffrombottomleft_22.png" ;} 
;
        };
        Image IMG_LIGHT_OFF + FROM_BOTTOM
        {
-               ImageBitmap = Bitmap { File = "lightofffrombottom_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffrombottom_22.png" ;} ;
        };
        Image IMG_LIGHT_OFF + FROM_BOTTOM_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightofffrombottomright_22.bmp"; 
};
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffrombottomright_22.png" 
;} ;
        };
 
        Image IMG_LIGHT_OFF_H + FROM_TOP_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightofffromtopleft_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffromtopleft_22_h.png" ;} ;
        };
        Image IMG_LIGHT_OFF_H + FROM_TOP
        {
-               ImageBitmap = Bitmap { File = "lightofffromtop_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffromtop_22_h.png" ;} ;
        };
        Image IMG_LIGHT_OFF_H + FROM_TOP_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightofffromtopright_22_h.bmp"; 
};
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffromtopright_22_h.png" ;} 
;
        };
        Image IMG_LIGHT_OFF_H + FROM_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightofffromleft_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffromleft_22_h.png" ;} ;
        };
        Image IMG_LIGHT_OFF_H + FROM_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightofffromright_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffromright_22_h.png" ;} ;
        };
        Image IMG_LIGHT_OFF_H + FROM_BOTTOM_LEFT
        {
-               ImageBitmap = Bitmap { File = 
"lightofffrombottomleft_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffrombottomleft_22_h.png" 
;} ;
        };
        Image IMG_LIGHT_OFF_H + FROM_BOTTOM
        {
-               ImageBitmap = Bitmap { File = "lightofffrombottom_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffrombottom_22_h.png" ;} ;
        };
        Image IMG_LIGHT_OFF_H + FROM_BOTTOM_RIGHT
        {
-               ImageBitmap = Bitmap { File = 
"lightofffrombottomright_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightofffrombottomright_22_h.png" 
;} ;
        };
 
        Image IMG_LIGHT_ON + FROM_TOP_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightonfromtopleft_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfromtopleft_22.png" ;} ;
        };
        Image IMG_LIGHT_ON + FROM_TOP
        {
-               ImageBitmap = Bitmap { File = "lightonfromtop_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfromtop_22.png" ;} ;
        };
        Image IMG_LIGHT_ON + FROM_TOP_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightonfromtopright_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfromtopright_22.png" ;} ;
        };
        Image IMG_LIGHT_ON + FROM_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightonfromleft_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfromleft_22.png" ;} ;
        };
        Image IMG_LIGHT_ON + FROM_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightonfromright_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfromright_22.png" ;} ;
        };
        Image IMG_LIGHT_ON + FROM_BOTTOM_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightonfrombottomleft_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfrombottomleft_22.png" ;} ;
        };
        Image IMG_LIGHT_ON + FROM_BOTTOM
        {
-               ImageBitmap = Bitmap { File = "lightonfrombottom_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfrombottom_22.png" ;} ;
        };
        Image IMG_LIGHT_ON + FROM_BOTTOM_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightonfrombottomright_22.bmp"; 
};
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfrombottomright_22.png" ;} 
;
        };
 
        Image IMG_LIGHT_ON_H + FROM_TOP_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightonfromtopleft_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfromtopleft_22_h.png" ;} ;
        };
        Image IMG_LIGHT_ON_H + FROM_TOP
        {
-               ImageBitmap = Bitmap { File = "lightonfromtop_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfromtop_22_h.png" ;} ;
        };
        Image IMG_LIGHT_ON_H + FROM_TOP_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightonfromtopright_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfromtopright_22_h.png" ;} ;
        };
        Image IMG_LIGHT_ON_H + FROM_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightonfromleft_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfromleft_22_h.png" ;} ;
        };
        Image IMG_LIGHT_ON_H + FROM_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightonfromright_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfromright_22_h.png" ;} ;
        };
        Image IMG_LIGHT_ON_H + FROM_BOTTOM_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightonfrombottomleft_22_h.bmp"; 
};
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfrombottomleft_22_h.png" 
;} ;
        };
        Image IMG_LIGHT_ON_H + FROM_BOTTOM
        {
-               ImageBitmap = Bitmap { File = "lightonfrombottom_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfrombottom_22_h.png" ;} ;
        };
        Image IMG_LIGHT_ON_H + FROM_BOTTOM_RIGHT
        {
-               ImageBitmap = Bitmap { File = 
"lightonfrombottomright_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightonfrombottomright_22_h.png" 
;} ;
        };
 
        Image IMG_LIGHT_PREVIEW + FROM_TOP_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightfromtopleft_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromtopleft_22.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW + FROM_TOP
        {
-               ImageBitmap = Bitmap { File = "lightfromtop_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromtop_22.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW + FROM_TOP_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightfromtopright_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromtopright_22.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW + FROM_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightfromleft_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromleft_22.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW + FROM_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightfromright_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromright_22.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW + FROM_FRONT
        {
-               ImageBitmap = Bitmap { File = "lightfromfront_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromfront_22.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW + FROM_BOTTOM_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightfrombottomleft_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfrombottomleft_22.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW + FROM_BOTTOM
        {
-               ImageBitmap = Bitmap { File = "lightfrombottom_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfrombottom_22.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW + FROM_BOTTOM_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightfrombottomright_22.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfrombottomright_22.png" ;} ;
        };
 
        Image IMG_LIGHT_PREVIEW_H + FROM_TOP_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightfromtopleft_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromtopleft_22_h.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW_H + FROM_TOP
        {
-               ImageBitmap = Bitmap { File = "lightfromtop_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromtop_22_h.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW_H + FROM_TOP_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightfromtopright_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromtopright_22_h.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW_H + FROM_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightfromleft_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromleft_22_h.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW_H + FROM_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightfromright_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromright_22_h.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW_H + FROM_FRONT
        {
-               ImageBitmap = Bitmap { File = "lightfromfront_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfromfront_22_h.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM_LEFT
        {
-               ImageBitmap = Bitmap { File = "lightfrombottomleft_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfrombottomleft_22_h.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM
        {
-               ImageBitmap = Bitmap { File = "lightfrombottom_22_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfrombottom_22_h.png" ;} ;
        };
        Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM_RIGHT
        {
-               ImageBitmap = Bitmap { File = "lightfrombottomright_22_h.bmp"; 
};
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "lightfrombottomright_22_h.png" ;} 
;
        };
 
        Image IMG_LIGHTING_BRIGHT
        {
-               ImageBitmap = Bitmap { File = "brightlit_16.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "brightlit_16.png" ;} ;
        };
        Image IMG_LIGHTING_NORMAL
        {
-               ImageBitmap = Bitmap { File = "normallit_16.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "normallit_16.png" ;} ;
        };
        Image IMG_LIGHTING_DIM
        {
-               ImageBitmap = Bitmap { File = "dimlit_16.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "dimlit_16.png" ;} ;
        };
 
        Image IMG_LIGHTING_BRIGHT_H
        {
-               ImageBitmap = Bitmap { File = "brightlit_16_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "brightlit_16_h.png" ;} ;
        };
        Image IMG_LIGHTING_NORMAL_H
        {
-               ImageBitmap = Bitmap { File = "normallit_16_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "normallit_16_h.png" ;} ;
        };
        Image IMG_LIGHTING_DIM_H
        {
-               ImageBitmap = Bitmap { File = "dimlit_16_h.bmp"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "dimlit_16_h.png" ;} ;
        };
 
        String STR_BRIGHT
        {
-               Text [ en-US ] = "~Bright";
+               Text [ en-US ] = "~Bright" ;
        };
 
        String STR_NORMAL
        {
-               Text [ en-US ] = "~Normal";
+               Text [ en-US ] = "~Normal" ;
        };
 
        String STR_DIM
        {
-               Text [ en-US ] = "~Dim";
+               Text [ en-US ] = "~Dim" ;
        };
 };
 
 DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
 {
-    HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_SURFACE";
+       HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_SURFACE" ;
        Border = FALSE ;
        Hide = TRUE ;
        SVLook = TRUE ;
@@ -617,97 +525,89 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
        Zoomable = TRUE ;
 
        Text [ en-US ] = "Extrusion Surface" ;
-       
+
        String STR_WIREFRAME
        {
-               Text [ en-US ] = "~Wire Frame";
+               Text [ en-US ] = "~Wire Frame" ;
        };
 
        String STR_MATTE
        {
-               Text [ en-US ] = "~Matt";
+               Text [ en-US ] = "~Matt" ;
        };
 
        String STR_PLASTIC
        {
-               Text [ en-US ] = "~Plastic";
+               Text [ en-US ] = "~Plastic" ;
        };
 
        String STR_METAL
        {
-               Text [ en-US ] = "Me~tal";
+               Text [ en-US ] = "Me~tal" ;
        };
 
        Image IMG_WIRE_FRAME
        {
-               ImageBitmap = Bitmap { File = "wireframe_16.bmp"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "wireframe_16.png" ;} ;
+       };
        Image IMG_WIRE_FRAME_H
        {
-               ImageBitmap = Bitmap { File = "wireframe_16_h.bmp"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "wireframe_16_h.png" ;} ;
+       };
        Image IMG_MATTE
        {
-               ImageBitmap = Bitmap { File = "matte_16.bmp"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "matte_16.png" ;} ;
+       };
        Image IMG_MATTE_H
        {
-               ImageBitmap = Bitmap { File = "matte_16_h.bmp"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "matte_16_h.png" ;} ;
+       };
        Image IMG_PLASTIC
        {
-               ImageBitmap = Bitmap { File = "plastic_16.bmp"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "plastic_16.png" ;} ;
+       };
        Image IMG_PLASTIC_H
        {
-               ImageBitmap = Bitmap { File = "plastic_16_h.bmp"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "plastic_16_h.png" ;} ;
+       };
        Image IMG_METAL
        {
-               ImageBitmap = Bitmap { File = "metal_16.bmp"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "metal_16.png" ;} ;
+       };
        Image IMG_METAL_H
        {
-               ImageBitmap = Bitmap { File = "metal_16_h.bmp"; };
-               MASKCOLOR
-       };      
-       
+               ImageBitmap = Bitmap {File = "metal_16_h.png" ;} ;
+       };
+
 };
 
-#define WIDTH                                          140
-#define HEIGHT                                                 (4 * 3 + 3 * 14)
+#define WIDTH  140
+#define HEIGHT ( 4 * 3 + 3 * 14 )
 
 ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH
 {
-    HelpID = "svx:ModalDialog:RID_SVX_MDLG_EXTRUSION_DEPTH";
-       OutputSize = TRUE;
+       HelpID = "svx:ModalDialog:RID_SVX_MDLG_EXTRUSION_DEPTH" ;
+       OutputSize = TRUE ;
        SVLook = TRUE ;
-       Moveable = TRUE;
-       Closeable = TRUE;
+       Moveable = TRUE ;
+       Closeable = TRUE ;
 
-       Size = MAP_APPFONT( WIDTH, HEIGHT );
+       Size = MAP_APPFONT ( WIDTH, HEIGHT ) ;
 
        Text [ en-US ] = "Extrusion Depth" ;
 
-    FixedText FL_DEPTH
+       FixedText FL_DEPTH
        {
-        Pos = MAP_APPFONT ( 3 , 3 ) ;
-        Size = MAP_APPFONT ( WIDTH - 50 - 12 , 8 ) ;
+               Pos = MAP_APPFONT ( 3, 3 ) ;
+               Size = MAP_APPFONT ( WIDTH - 50 - 12, 8 ) ;
                Text [ en-US ] = "~Value" ;
        };
        MetricField MTR_DEPTH
        {
-                //HelpId = HID_SD_CTL_FAVORITES ;
+               //HelpId = HID_SD_CTL_FAVORITES ;
                Border = FALSE ;
-        Pos = MAP_APPFONT ( 3 , 14 ) ;
-        Size = MAP_APPFONT ( WIDTH - 50 - 12, 12 ) ;
+               Pos = MAP_APPFONT ( 3, 14 ) ;
+               Size = MAP_APPFONT ( WIDTH - 50 - 12, 12 ) ;
                TabStop = TRUE ;
                Repeat = TRUE ;
                Spin = TRUE ;
@@ -720,78 +620,78 @@ ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH
        };
        OkButton BTN_OK
        {
-        Pos = MAP_APPFONT ( WIDTH - 50 - 3 , 1 * 3 + 0 * 14 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
+               Pos = MAP_APPFONT ( WIDTH - 50 - 3, 1 * 3 + 0 * 14 ) ;
+               Size = MAP_APPFONT ( 50, 14 ) ;
                DefButton = TRUE ;
                TabStop = TRUE ;
        };
        CancelButton BTN_CANCEL
        {
-        Pos = MAP_APPFONT ( WIDTH - 50 - 3 , 2 * 3 + 1 * 14 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
+               Pos = MAP_APPFONT ( WIDTH - 50 - 3, 2 * 3 + 1 * 14 ) ;
+               Size = MAP_APPFONT ( 50, 14 ) ;
                TabStop = TRUE ;
        };
        HelpButton BTN_HELP
        {
-        Pos = MAP_APPFONT ( WIDTH - 50 - 3 , 3 * 3 + 2 * 14 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
+               Pos = MAP_APPFONT ( WIDTH - 50 - 3, 3 * 3 + 2 * 14 ) ;
+               Size = MAP_APPFONT ( 50, 14 ) ;
                TabStop = TRUE ;
        };
 };
 
 String RID_SVXSTR_EXTRUSION_COLOR
 {
-       Text [ en-US ] = "Extrusion Color";
+       Text [ en-US ] = "Extrusion Color" ;
 };
 
 String RID_SVXSTR_DEPTH_0
 {
-       Text [ en-US ] = "~0 cm";
+       Text [ en-US ] = "~0 cm" ;
 };
 
 String RID_SVXSTR_DEPTH_1
 {
-       Text [ en-US ] = "~1 cm";
+       Text [ en-US ] = "~1 cm" ;
 };
 
 String RID_SVXSTR_DEPTH_2
 {
-       Text [ en-US ] = "~2.5 cm";
+       Text [ en-US ] = "~2.5 cm" ;
 };
 
 String RID_SVXSTR_DEPTH_3
 {
-       Text [ en-US ] = "~5 cm";
+       Text [ en-US ] = "~5 cm" ;
 };
 
 String RID_SVXSTR_DEPTH_4
 {
-       Text [ en-US ] = "10 ~cm";
+       Text [ en-US ] = "10 ~cm" ;
 };
 
 String RID_SVXSTR_DEPTH_0_INCH
 {
-       Text [ en-US ] = "0 inch";
+       Text [ en-US ] = "0 inch" ;
 };
 
 String RID_SVXSTR_DEPTH_1_INCH
 {
-       Text [ en-US ] = "0.~5 inch";
+       Text [ en-US ] = "0.~5 inch" ;
 };
 
 String RID_SVXSTR_DEPTH_2_INCH
 {
-       Text [ en-US ] = "~1 inch";
+       Text [ en-US ] = "~1 inch" ;
 };
 
 String RID_SVXSTR_DEPTH_3_INCH
 {
-       Text [ en-US ] = "~2 inch";
+       Text [ en-US ] = "~2 inch" ;
 };
 
 String RID_SVXSTR_DEPTH_4_INCH
 {
-       Text [ en-US ] = "~4 inch";
+       Text [ en-US ] = "~4 inch" ;
 };
 
-
+// ********************************************************************** EOF
diff --git a/main/svx/source/tbxctrls/fontworkgallery.src 
b/main/svx/source/tbxctrls/fontworkgallery.src
index 3342e7a..6606e92 100644
--- a/main/svx/source/tbxctrls/fontworkgallery.src
+++ b/main/svx/source/tbxctrls/fontworkgallery.src
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -26,61 +26,51 @@
 #include "fontworkgallery.hrc"
 #include "svtools/controldims.hrc"
 
-#define WIDTH                                          256
-#define HEIGHT                                                 256
-
-#define MASKCOLOR      MaskColor = Color { Red=0xFFFF; Green=0x0000; 
Blue=0xFFFF; };
+#define WIDTH  256
+#define HEIGHT 256
 
 ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
 {
-    HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_GALLERY";
-       OutputSize = TRUE;
+       HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_GALLERY" ;
+       OutputSize = TRUE ;
        SVLook = TRUE ;
-       Moveable = TRUE;
-       Closeable = TRUE;
+       Moveable = TRUE ;
+       Closeable = TRUE ;
 
-       Size = MAP_APPFONT( WIDTH, HEIGHT );
+       Size = MAP_APPFONT ( WIDTH, HEIGHT ) ;
 
        Text [ en-US ] = "Fontwork Gallery" ;
 
-    FixedLine FL_FAVORITES
+       FixedLine FL_FAVORITES
        {
-        Pos = MAP_APPFONT ( 3 , 3 ) ;
-        Size = MAP_APPFONT ( WIDTH - 6 , 8 ) ;
+               Pos = MAP_APPFONT ( 3, 3 ) ;
+               Size = MAP_APPFONT ( WIDTH - 6, 8 ) ;
                Text [ en-US ] = "Select a Fontwork style:" ;
        };
        Control CTL_FAVORITES
        {
                HelpId = HID_CTL_FONTWORK_FAVORITES ;
                Border = FALSE ;
-        Pos = MAP_APPFONT ( 3 , 14 ) ;
-        Size = MAP_APPFONT ( WIDTH - 6,
-                             HEIGHT - RSC_CD_PUSHBUTTON_HEIGHT -
-                             6 - RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Pos = MAP_APPFONT ( 3, 14 ) ;
+               Size = MAP_APPFONT ( WIDTH - 6, HEIGHT - 
RSC_CD_PUSHBUTTON_HEIGHT - 6 - RSC_CD_PUSHBUTTON_HEIGHT ) ;
                TabStop = TRUE ;
        };
        OkButton BTN_OK
        {
-        Pos = MAP_APPFONT ( WIDTH - 3 * RSC_CD_PUSHBUTTON_WIDTH - 9 ,
-                            HEIGHT - 3 - RSC_CD_PUSHBUTTON_HEIGHT ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
-                             RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Pos = MAP_APPFONT ( WIDTH - 3 * RSC_CD_PUSHBUTTON_WIDTH - 9, 
HEIGHT - 3 - RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
                TabStop = TRUE ;
        };
        CancelButton BTN_CANCEL
        {
-        Pos = MAP_APPFONT ( WIDTH - 2 * RSC_CD_PUSHBUTTON_WIDTH - 6 ,
-                            HEIGHT - 3 - RSC_CD_PUSHBUTTON_HEIGHT ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
-                             RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Pos = MAP_APPFONT ( WIDTH - 2 * RSC_CD_PUSHBUTTON_WIDTH - 6, 
HEIGHT - 3 - RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
                TabStop = TRUE ;
        };
-    HelpButton BTN_HELP
+       HelpButton BTN_HELP
        {
-        Pos = MAP_APPFONT ( WIDTH - 1 * RSC_CD_PUSHBUTTON_WIDTH - 3 ,
-                            HEIGHT - 3 - RSC_CD_PUSHBUTTON_HEIGHT ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
-                             RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Pos = MAP_APPFONT ( WIDTH - 1 * RSC_CD_PUSHBUTTON_WIDTH - 3, 
HEIGHT - 3 - RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
                TabStop = TRUE ;
        };
        String STR_CLICK_TO_ADD_TEXT
@@ -91,7 +81,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
 
 DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
 {
-    HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_ALIGNMENT";
+       HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_ALIGNMENT" ;
        Border = FALSE ;
        Hide = TRUE ;
        SVLook = TRUE ;
@@ -101,133 +91,113 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
        Zoomable = TRUE ;
 
        Text [ en-US ] = "Fontwork Alignment" ;
-       
+
        String STR_ALIGN_LEFT
        {
-               Text [ en-US ] = "~Left Align";
+               Text [ en-US ] = "~Left Align" ;
        };
        String STR_ALIGN_CENTER
        {
-               Text [ en-US ] = "~Center";
+               Text [ en-US ] = "~Center" ;
        };
        String STR_ALIGN_RIGHT
        {
-               Text [ en-US ] = "~Right Align";
+               Text [ en-US ] = "~Right Align" ;
        };
        String STR_ALIGN_WORD
        {
-               Text [ en-US ] = "~Word Justify";
+               Text [ en-US ] = "~Word Justify" ;
        };
        String STR_ALIGN_STRETCH
        {
-               Text [ en-US ] = "S~tretch Justify";
+               Text [ en-US ] = "S~tretch Justify" ;
        };
 
        Image IMG_FONTWORK_ALIGN_LEFT_16
        {
-               ImageBitmap = Bitmap { File = "fontworkalignleft_16.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignleft_16.png" ;} ;
+       };
        Image IMG_FONTWORK_ALIGN_LEFT_16_H
        {
-               ImageBitmap = Bitmap { File = "fontworkalignleft_16_h.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignleft_16_h.png" ;} ;
+       };
        Image IMG_FONTWORK_ALIGN_LEFT_26
        {
-               ImageBitmap = Bitmap { File = "fontworkalignleft_26.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignleft_26.png" ;} ;
+       };
        Image IMG_FONTWORK_ALIGN_LEFT_26_H
        {
-               ImageBitmap = Bitmap { File = "fontworkalignleft_26_h.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignleft_26_h.png" ;} ;
+       };
        Image IMG_FONTWORK_ALIGN_CENTER_16
        {
-               ImageBitmap = Bitmap { File = "fontworkaligncentered_16.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkaligncentered_16.png" ;} ;
+       };
        Image IMG_FONTWORK_ALIGN_CENTER_16_H
        {
-               ImageBitmap = Bitmap { File = "fontworkaligncentered_16_h.png"; 
};
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkaligncentered_16_h.png" 
;} ;
+       };
        Image IMG_FONTWORK_ALIGN_CENTER_26
        {
-               ImageBitmap = Bitmap { File = "fontworkaligncentered_26.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkaligncentered_26.png" ;} ;
+       };
        Image IMG_FONTWORK_ALIGN_CENTER_26_H
        {
-               ImageBitmap = Bitmap { File = "fontworkaligncentered_26_h.png"; 
};
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "fontworkaligncentered_26_h.png" 
;} ;
        };
        Image IMG_FONTWORK_ALIGN_RIGHT_16
        {
-               ImageBitmap = Bitmap { File = "fontworkalignright_16.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignright_16.png" ;} ;
+       };
        Image IMG_FONTWORK_ALIGN_RIGHT_16_H
        {
-               ImageBitmap = Bitmap { File = "fontworkalignright_16_h.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignright_16_h.png" ;} ;
+       };
        Image IMG_FONTWORK_ALIGN_RIGHT_26
        {
-               ImageBitmap = Bitmap { File = "fontworkalignright_26.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignright_26.png" ;} ;
+       };
        Image IMG_FONTWORK_ALIGN_RIGHT_26_H
        {
-               ImageBitmap = Bitmap { File = "fontworkalignright_26_h.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignright_26_h.png" ;} ;
+       };
        Image IMG_FONTWORK_ALIGN_WORD_16
        {
-               ImageBitmap = Bitmap { File = "fontworkalignjustified_16.png"; 
};
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignjustified_16.png" ;} 
;
+       };
        Image IMG_FONTWORK_ALIGN_WORD_16_H
        {
-               ImageBitmap = Bitmap { File = 
"fontworkalignjustified_16_h.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignjustified_16_h.png" 
;} ;
+       };
        Image IMG_FONTWORK_ALIGN_WORD_26
        {
-               ImageBitmap = Bitmap { File = "fontworkalignjustified_26.png"; 
};
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignjustified_26.png" ;} 
;
+       };
        Image IMG_FONTWORK_ALIGN_WORD_26_H
        {
-               ImageBitmap = Bitmap { File = 
"fontworkalignjustified_26_h.png"; };
-               MASKCOLOR
-       };      
+               ImageBitmap = Bitmap {File = "fontworkalignjustified_26_h.png" 
;} ;
+       };
        Image IMG_FONTWORK_ALIGN_STRETCH_16
        {
-               ImageBitmap = Bitmap { File = "fontworkalignstretch_16.png"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "fontworkalignstretch_16.png" ;} ;
        };
        Image IMG_FONTWORK_ALIGN_STRETCH_16_H
        {
-               ImageBitmap = Bitmap { File = "fontworkalignstretch_16_h.png"; 
};
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "fontworkalignstretch_16_h.png" ;} 
;
        };
        Image IMG_FONTWORK_ALIGN_STRETCH_26
        {
-               ImageBitmap = Bitmap { File = "fontworkalignstretch_26.png"; };
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "fontworkalignstretch_26.png"; } ;
        };
        Image IMG_FONTWORK_ALIGN_STRETCH_26_H
        {
-               ImageBitmap = Bitmap { File = "fontworkalignstretch_26_h.png"; 
};
-               MASKCOLOR
+               ImageBitmap = Bitmap {File = "fontworkalignstretch_26_h.png"; } 
;
        };
 };
 
 DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
 {
-    HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_CHARSPACING";
+       HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_CHARSPACING" ;
        Border = FALSE ;
        Hide = TRUE ;
        SVLook = TRUE ;
@@ -237,43 +207,43 @@ DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
        Zoomable = TRUE ;
 
        Text [ en-US ] = "Fontwork Character Spacing" ;
-       
+
        String STR_CHARS_SPACING_VERY_TIGHT
        {
-               Text [ en-US ] = "~Very Tight";
+               Text [ en-US ] = "~Very Tight" ;
        };
        String STR_CHARS_SPACING_TIGHT
        {
-               Text [ en-US ] = "~Tight";
+               Text [ en-US ] = "~Tight" ;
        };
        String STR_CHARS_SPACING_NORMAL
        {
-               Text [ en-US ] = "~Normal";
+               Text [ en-US ] = "~Normal" ;
        };
        String STR_CHARS_SPACING_LOOSE
        {
-               Text [ en-US ] = "~Loose";
+               Text [ en-US ] = "~Loose" ;
        };
        String STR_CHARS_SPACING_VERY_LOOSE
        {
-               Text [ en-US ] = "Very ~Loose";
+               Text [ en-US ] = "Very ~Loose" ;
        };
        String STR_CHARS_SPACING_CUSTOM
        {
-               Text [ en-US ] = "~Custom...";
+               Text [ en-US ] = "~Custom..." ;
        };
        String STR_CHARS_SPACING_KERN_PAIRS
        {
-               Text [ en-US ] = "~Kern Character Pairs";
+               Text [ en-US ] = "~Kern Character Pairs" ;
        };
 };
 
 ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING
 {
-    HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING";
+       HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING" ;
        OutputSize = TRUE ;
        SVLook = TRUE ;
-       Size = MAP_APPFONT ( 139 , 64 ) ;
+       Size = MAP_APPFONT ( 139, 64 ) ;
        Moveable = TRUE ;
        Closeable = TRUE ;
 
@@ -281,35 +251,35 @@ ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING
 
        OKButton BTN_OK
        {
-               Pos = MAP_APPFONT ( 83 , 6 ) ;
-               Size = MAP_APPFONT ( 50 , 14 ) ;
+               Pos = MAP_APPFONT ( 83, 6 ) ;
+               Size = MAP_APPFONT ( 50, 14 ) ;
                TabStop = TRUE ;
                DefButton = TRUE ;
        };
        CancelButton BTN_CANCEL
        {
-               Pos = MAP_APPFONT ( 83 , 23 ) ;
-               Size = MAP_APPFONT ( 50 , 14 ) ;
+               Pos = MAP_APPFONT ( 83, 23 ) ;
+               Size = MAP_APPFONT ( 50, 14 ) ;
                TabStop = TRUE ;
        };
        HelpButton BTN_HELP
        {
-               Pos = MAP_APPFONT ( 83 , 43 ) ;
-               Size = MAP_APPFONT ( 50 , 14 ) ;
+               Pos = MAP_APPFONT ( 83, 43 ) ;
+               Size = MAP_APPFONT ( 50, 14 ) ;
                TabStop = TRUE ;
        };
        FixedText FT_VALUE
        {
-               Pos = MAP_APPFONT ( 6 , 6 ) ;
-               Size = MAP_APPFONT ( 76 , 8 ) ;
-               Text[ en-US ] = "~Value";
+               Pos = MAP_APPFONT ( 6, 6 ) ;
+               Size = MAP_APPFONT ( 76, 8 ) ;
+               Text [ en-US ] = "~Value" ;
        };
        MetricField MF_VALUE
        {
-           HelpID = 
"svx:MetricField:RID_SVX_MDLG_FONTWORK_CHARSPACING:MF_VALUE";
+               HelpID = 
"svx:MetricField:RID_SVX_MDLG_FONTWORK_CHARSPACING:MF_VALUE" ;
                Border = FALSE ;
-        Pos = MAP_APPFONT ( 6 , 17 ) ;
-        Size = MAP_APPFONT ( 32 , 12 ) ;
+               Pos = MAP_APPFONT ( 6, 17 ) ;
+               Size = MAP_APPFONT ( 32, 12 ) ;
                TabStop = TRUE ;
                Repeat = TRUE ;
                Spin = TRUE ;
@@ -321,3 +291,4 @@ ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING
        };
 };
 
+// ********************************************************************** EOF

Reply via email to