CWS-TOOLING: integrate CWS dbaperf1

2009-04-02 09:12:25 +0200 oj  r270372 : CWS-TOOLING: rebase CWS dbaperf1 to trunk@270033 (milestone: DEV300:m45)
2009-03-17 10:20:34 +0100 oj  r269577 : add parameter
2009-03-17 10:20:05 +0100 oj  r269576 : add parameter
2009-03-12 12:32:24 +0100 oj  r269387 : add missing ++
2009-03-11 12:53:35 +0100 oj  r269315 : compile error
2009-03-06 08:52:11 +0100 oj  r268968 : #i99264# remove duplicate code
2009-03-06 08:20:08 +0100 oj  r268966 : add missingheader
2009-03-06 08:17:41 +0100 oj  r268965 : add header
2009-03-06 08:15:07 +0100 oj  r268964 : #i99708# remove duplicate code
2009-03-06 07:24:11 +0100 oj  r268963 : #i99708# remove duplicate code
2009-03-06 07:22:24 +0100 oj  r268962 : #i99708# use tenary operator
2009-03-06 07:19:21 +0100 oj  r268961 : remove unused rtl_logs
2009-03-06 07:15:55 +0100 oj  r268960 : #i99708# extract getLength from for loop
2009-03-06 07:15:35 +0100 oj  r268959 : #i99708# extract getLength from for loop
2009-03-06 07:14:57 +0100 oj  r268958 : remove unused rtl_logs
2009-03-06 07:13:01 +0100 oj  r268957 : insert DBG_ helper
2009-03-06 07:12:17 +0100 oj  r268956 : remove unused rtl_logs
2009-03-06 07:10:26 +0100 oj  r268955 : remove unused rtl_logs
2009-03-06 07:04:51 +0100 oj  r268954 : #i99708# use tenary operator
2009-03-05 12:04:46 +0100 oj  r268895 : comment RTL_LOG out
2009-03-05 09:05:07 +0100 oj  r268874 : add rtl logfile
2009-03-04 14:21:18 +0100 oj  r268828 : #i99708# make static inplace and some method calls in for loop removed
2009-03-04 14:20:34 +0100 oj  r268827 : #i99708# impl double check pattern for getInfohelper
2009-03-02 09:31:42 +0100 oj  r268636 : add rtl logfile
2009-03-02 08:18:37 +0100 oj  r268633 : add rtl logfile
2009-02-27 11:22:16 +0100 oj  r268570 : #i99709# change algorithm for marking objects
2009-02-27 11:17:04 +0100 oj  r268568 : #i99708# some improvements to load forms, controls faster and replacement of size() call with !empty() which is much faster
2009-02-24 10:09:35 +0100 sb  r268383 : #i99290# no longer care to set a sensible context class loader for native threads attached to the VM
2009-02-23 13:44:04 +0100 oj  r268354 : #i76606# seekrow changes
2009-02-23 12:27:30 +0100 oj  r268349 : deleted
2009-02-20 15:14:23 +0100 oj  r268325 : #i76606# some code changes
2009-02-19 14:15:25 +0100 oj  r268284 : #i76606# use of simple prep stmt instead of full blown rowset, when source and dest connection are the same use insert into ... ( select ... )
2009-02-19 11:27:55 +0100 oj  r268265 : #i76606# insert some RTL_LOG and setObject impl
2009-02-18 14:45:37 +0100 oj  r268222 : #i99363# insert RTL_LOG
2009-02-18 14:45:18 +0100 oj  r268221 : #i99363# insert RTL_LOG
2009-02-18 11:14:54 +0100 oj  r268207 : #i99363# call some impl_ methods to avoid duplicate cechCache calls
2009-02-18 11:10:47 +0100 oj  r268206 : #i99363# make isCount inline
2009-02-18 10:33:22 +0100 oj  r268203 : #i99363# use bookmarkable if available and inserted some RTL_LOG
2009-02-18 10:32:57 +0100 oj  r268202 : #i99363# use bookmarkable if available and inserted some RTL_LOG
2009-02-17 07:29:05 +0100 oj  r267843 : #i96897# remove some dll public
2009-02-16 15:01:04 +0100 oj  r267816 : #i96897# remove some dll public
2009-02-16 14:25:53 +0100 oj  r267810 : #i99264# remove duplicate code
2009-02-16 14:25:33 +0100 oj  r267809 : #i99264# remove duplicate code
2009-02-16 14:24:59 +0100 oj  r267808 : #i99264# remove duplicate code
2009-02-13 10:56:17 +0100 oj  r267703 : #i99191# comment the contextclassloader
2009-02-13 10:32:40 +0100 oj  r267700 : reduce call to resultset meta data
2009-02-13 10:27:31 +0100 oj  r267699 : reduce call to resultset meta data
2009-02-13 10:27:08 +0100 oj  r267698 : reduce call to resultset meta data

1 files changed, 156 insertions, 80 deletions

diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 030e365a7c51..9da35549b7da 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -273,7 +273,13 @@ XMLShapeImportHelper::~XMLShapeImportHelper()
 
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
+
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetGroupShapeElemTokenMap()
+{
+    if(!mpGroupShapeElemTokenMap)
+    {
+        static __FAR_DATA SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
 {
     { XML_NAMESPACE_DRAW,           XML_G,              XML_TOK_GROUP_GROUP         },
     { XML_NAMESPACE_DRAW,           XML_RECT,           XML_TOK_GROUP_RECT          },
@@ -303,7 +309,17 @@ static __FAR_DATA SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-static __FAR_DATA SvXMLTokenMapEntry aFrameShapeElemTokenMap[] =
+        mpGroupShapeElemTokenMap = new SvXMLTokenMap(aGroupShapeElemTokenMap);
+    } // if(!mpGroupShapeElemTokenMap)
+
+    return *mpGroupShapeElemTokenMap;
+}
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetFrameShapeElemTokenMap()
+{
+    if(!mpFrameShapeElemTokenMap)
+    {
+        static __FAR_DATA SvXMLTokenMapEntry aFrameShapeElemTokenMap[] =
 {
     { XML_NAMESPACE_DRAW,           XML_TEXT_BOX,       XML_TOK_FRAME_TEXT_BOX      },
     { XML_NAMESPACE_DRAW,           XML_IMAGE,          XML_TOK_FRAME_IMAGE         },
@@ -316,23 +332,20 @@ static __FAR_DATA SvXMLTokenMapEntry aFrameShapeElemTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::GetGroupShapeElemTokenMap()
-{
-    if(!mpGroupShapeElemTokenMap)
-        mpGroupShapeElemTokenMap = new SvXMLTokenMap(aGroupShapeElemTokenMap);
-    return *mpGroupShapeElemTokenMap;
-}
-
-const SvXMLTokenMap& XMLShapeImportHelper::GetFrameShapeElemTokenMap()
-{
-    if(!mpFrameShapeElemTokenMap)
         mpFrameShapeElemTokenMap = new SvXMLTokenMap(aFrameShapeElemTokenMap);
+    } // if(!mpFrameShapeElemTokenMap)
+
     return *mpFrameShapeElemTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap()
+{
+    if(!mp3DSceneShapeElemTokenMap)
+    {
+        static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] =
 {
     { XML_NAMESPACE_DR3D,           XML_SCENE,      XML_TOK_3DSCENE_3DSCENE     },
     { XML_NAMESPACE_DR3D,           XML_CUBE,       XML_TOK_3DSCENE_3DCUBE      },
@@ -342,16 +355,20 @@ static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap()
-{
-    if(!mp3DSceneShapeElemTokenMap)
         mp3DSceneShapeElemTokenMap = new SvXMLTokenMap(a3DSceneShapeElemTokenMap);
+    } // if(!mp3DSceneShapeElemTokenMap)
+
     return *mp3DSceneShapeElemTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 /*
-static __FAR_DATA SvXMLTokenMapEntry aShapeAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetShapeAttrTokenMap()
+{
+    if(!mpShapeAttrTokenMap)
+    {
+    static __FAR_DATA SvXMLTokenMapEntry aShapeAttrTokenMap[] =
 {
     { XML_NAMESPACE_DRAW,           XML_NAME,               XML_TOK_SHAPE_NAME                          },
     { XML_NAMESPACE_DRAW,           XML_STYLE_NAME,         XML_TOK_SHAPE_DRAWSTYLE_NAME_GRAPHICS       },
@@ -363,80 +380,100 @@ static __FAR_DATA SvXMLTokenMapEntry aShapeAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::GetShapeAttrTokenMap()
-{
-    if(!mpShapeAttrTokenMap)
         mpShapeAttrTokenMap = new SvXMLTokenMap(aShapeAttrTokenMap);
+        }
+
     return *mpShapeAttrTokenMap;
 }
 */
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry a3DObjectAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap()
+{
+    if(!mp3DObjectAttrTokenMap)
+    {
+        static __FAR_DATA SvXMLTokenMapEntry a3DObjectAttrTokenMap[] =
 {
     { XML_NAMESPACE_DRAW,           XML_STYLE_NAME,         XML_TOK_3DOBJECT_DRAWSTYLE_NAME     },
     { XML_NAMESPACE_DR3D,           XML_TRANSFORM,          XML_TOK_3DOBJECT_TRANSFORM          },
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap()
-{
-    if(!mp3DObjectAttrTokenMap)
         mp3DObjectAttrTokenMap = new SvXMLTokenMap(a3DObjectAttrTokenMap);
+    } // if(!mp3DObjectAttrTokenMap)
+
     return *mp3DObjectAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap()
+{
+    if(!mp3DPolygonBasedAttrTokenMap)
+    {
+        static __FAR_DATA SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,            XML_VIEWBOX,            XML_TOK_3DPOLYGONBASED_VIEWBOX      },
     { XML_NAMESPACE_SVG,            XML_D,                  XML_TOK_3DPOLYGONBASED_D            },
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap()
-{
-    if(!mp3DPolygonBasedAttrTokenMap)
         mp3DPolygonBasedAttrTokenMap = new SvXMLTokenMap(a3DPolygonBasedAttrTokenMap);
+    } // if(!mp3DPolygonBasedAttrTokenMap)
+
     return *mp3DPolygonBasedAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap()
+{
+    if(!mp3DCubeObjectAttrTokenMap)
+    {
+        static __FAR_DATA SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] =
 {
     { XML_NAMESPACE_DR3D,           XML_MIN_EDGE,           XML_TOK_3DCUBEOBJ_MINEDGE   },
     { XML_NAMESPACE_DR3D,           XML_MAX_EDGE,           XML_TOK_3DCUBEOBJ_MAXEDGE   },
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap()
-{
-    if(!mp3DCubeObjectAttrTokenMap)
         mp3DCubeObjectAttrTokenMap = new SvXMLTokenMap(a3DCubeObjectAttrTokenMap);
+    } // if(!mp3DCubeObjectAttrTokenMap)
+
     return *mp3DCubeObjectAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap()
+{
+    if(!mp3DSphereObjectAttrTokenMap)
+    {
+        static __FAR_DATA SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] =
 {
     { XML_NAMESPACE_DR3D,           XML_CENTER,             XML_TOK_3DSPHEREOBJ_CENTER  },
     { XML_NAMESPACE_DR3D,           XML_SIZE,               XML_TOK_3DSPHEREOBJ_SIZE    },
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap()
-{
-    if(!mp3DSphereObjectAttrTokenMap)
         mp3DSphereObjectAttrTokenMap = new SvXMLTokenMap(a3DSphereObjectAttrTokenMap);
+    } // if(!mp3DSphereObjectAttrTokenMap)
+
     return *mp3DSphereObjectAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 /*
-static __FAR_DATA SvXMLTokenMapEntry aRectShapeAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetRectShapeAttrTokenMap()
+{
+    if(!mpRectShapeAttrTokenMap)
+    {
+    static __FAR_DATA SvXMLTokenMapEntry aRectShapeAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,    XML_X,                  XML_TOK_RECTSHAPE_X                 },
     { XML_NAMESPACE_SVG,    XML_Y,                  XML_TOK_RECTSHAPE_Y                 },
@@ -446,16 +483,20 @@ static __FAR_DATA SvXMLTokenMapEntry aRectShapeAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::GetRectShapeAttrTokenMap()
-{
-    if(!mpRectShapeAttrTokenMap)
         mpRectShapeAttrTokenMap = new SvXMLTokenMap(aRectShapeAttrTokenMap);
+        }
+
     return *mpRectShapeAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry aLineShapeAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetLineShapeAttrTokenMap()
+{
+    if(!mpLineShapeAttrTokenMap)
+    {
+    static __FAR_DATA SvXMLTokenMapEntry aLineShapeAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,    XML_X1,             XML_TOK_LINESHAPE_X1                },
     { XML_NAMESPACE_SVG,    XML_Y1,             XML_TOK_LINESHAPE_Y1                },
@@ -464,16 +505,20 @@ static __FAR_DATA SvXMLTokenMapEntry aLineShapeAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::GetLineShapeAttrTokenMap()
-{
-    if(!mpLineShapeAttrTokenMap)
         mpLineShapeAttrTokenMap = new SvXMLTokenMap(aLineShapeAttrTokenMap);
+        }
+
     return *mpLineShapeAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry aEllipseShapeAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetEllipseShapeAttrTokenMap()
+{
+    if(!mpEllipseShapeAttrTokenMap)
+    {
+    static __FAR_DATA SvXMLTokenMapEntry aEllipseShapeAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,    XML_RX,             XML_TOK_ELLIPSESHAPE_RX             },
     { XML_NAMESPACE_SVG,    XML_RY,             XML_TOK_ELLIPSESHAPE_RY             },
@@ -483,48 +528,60 @@ static __FAR_DATA SvXMLTokenMapEntry aEllipseShapeAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::GetEllipseShapeAttrTokenMap()
-{
-    if(!mpEllipseShapeAttrTokenMap)
         mpEllipseShapeAttrTokenMap = new SvXMLTokenMap(aEllipseShapeAttrTokenMap);
+        }
+
     return *mpEllipseShapeAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 */
-static __FAR_DATA SvXMLTokenMapEntry aPolygonShapeAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetPolygonShapeAttrTokenMap()
+{
+    if(!mpPolygonShapeAttrTokenMap)
+    {
+        static __FAR_DATA SvXMLTokenMapEntry aPolygonShapeAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,    XML_VIEWBOX,            XML_TOK_POLYGONSHAPE_VIEWBOX        },
     { XML_NAMESPACE_DRAW,   XML_POINTS,             XML_TOK_POLYGONSHAPE_POINTS         },
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::GetPolygonShapeAttrTokenMap()
-{
-    if(!mpPolygonShapeAttrTokenMap)
         mpPolygonShapeAttrTokenMap = new SvXMLTokenMap(aPolygonShapeAttrTokenMap);
+    } // if(!mpPolygonShapeAttrTokenMap)
+
     return *mpPolygonShapeAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry aPathShapeAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetPathShapeAttrTokenMap()
+{
+    if(!mpPathShapeAttrTokenMap)
+    {
+        static __FAR_DATA SvXMLTokenMapEntry aPathShapeAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,    XML_VIEWBOX,            XML_TOK_PATHSHAPE_VIEWBOX           },
     { XML_NAMESPACE_SVG,    XML_D,                  XML_TOK_PATHSHAPE_D                 },
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::GetPathShapeAttrTokenMap()
-{
-    if(!mpPathShapeAttrTokenMap)
         mpPathShapeAttrTokenMap = new SvXMLTokenMap(aPathShapeAttrTokenMap);
+    } // if(!mpPathShapeAttrTokenMap)
+
     return *mpPathShapeAttrTokenMap;
 }
 /*
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry aTextBoxShapeAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetTextBoxShapeAttrTokenMap()
+{
+    if(!mpTextBoxShapeAttrTokenMap)
+    {
+    static __FAR_DATA SvXMLTokenMapEntry aTextBoxShapeAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,    XML_X,                  XML_TOK_TEXTBOXSHAPE_X              },
     { XML_NAMESPACE_SVG,    XML_Y,                  XML_TOK_TEXTBOXSHAPE_Y              },
@@ -533,16 +590,20 @@ static __FAR_DATA SvXMLTokenMapEntry aTextBoxShapeAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::GetTextBoxShapeAttrTokenMap()
-{
-    if(!mpTextBoxShapeAttrTokenMap)
         mpTextBoxShapeAttrTokenMap = new SvXMLTokenMap(aTextBoxShapeAttrTokenMap);
+        }
+
     return *mpTextBoxShapeAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry aControlShapeAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetControlShapeAttrTokenMap()
+{
+    if(!mpControlShapeAttrTokenMap)
+    {
+    static __FAR_DATA SvXMLTokenMapEntry aControlShapeAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,    XML_X,                  XML_TOK_CONTROLSHAPE_X              },
     { XML_NAMESPACE_SVG,    XML_Y,                  XML_TOK_CONTROLSHAPE_Y              },
@@ -551,16 +612,20 @@ static __FAR_DATA SvXMLTokenMapEntry aControlShapeAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::GetControlShapeAttrTokenMap()
-{
-    if(!mpControlShapeAttrTokenMap)
         mpControlShapeAttrTokenMap = new SvXMLTokenMap(aControlShapeAttrTokenMap);
+        }
+
     return *mpControlShapeAttrTokenMap;
 }
 */
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeAttrTokenMap()
+{
+    if(!mp3DSceneShapeAttrTokenMap)
+    {
+        static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeAttrTokenMap[] =
 {
     { XML_NAMESPACE_DR3D,   XML_TRANSFORM,          XML_TOK_3DSCENESHAPE_TRANSFORM      },
     { XML_NAMESPACE_DR3D,   XML_VRP,                XML_TOK_3DSCENESHAPE_VRP            },
@@ -576,16 +641,20 @@ static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeAttrTokenMap()
-{
-    if(!mp3DSceneShapeAttrTokenMap)
         mp3DSceneShapeAttrTokenMap = new SvXMLTokenMap(a3DSceneShapeAttrTokenMap);
+    } // if(!mp3DSceneShapeAttrTokenMap)
+
     return *mp3DSceneShapeAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry a3DLightAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap()
+{
+    if(!mp3DLightAttrTokenMap)
+    {
+        static __FAR_DATA SvXMLTokenMapEntry a3DLightAttrTokenMap[] =
 {
     { XML_NAMESPACE_DR3D,   XML_DIFFUSE_COLOR,      XML_TOK_3DLIGHT_DIFFUSE_COLOR       },
     { XML_NAMESPACE_DR3D,   XML_DIRECTION,          XML_TOK_3DLIGHT_DIRECTION           },
@@ -594,16 +663,20 @@ static __FAR_DATA SvXMLTokenMapEntry a3DLightAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap()
-{
-    if(!mp3DLightAttrTokenMap)
         mp3DLightAttrTokenMap = new SvXMLTokenMap(a3DLightAttrTokenMap);
+    } // if(!mp3DLightAttrTokenMap)
+
     return *mp3DLightAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 /*
-static __FAR_DATA SvXMLTokenMapEntry aPageShapeAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetPageShapeAttrTokenMap()
+{
+    if(!mpPageShapeAttrTokenMap)
+    {
+    static __FAR_DATA SvXMLTokenMapEntry aPageShapeAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,    XML_X,                  XML_TOK_PAGESHAPE_X             },
     { XML_NAMESPACE_SVG,    XML_Y,                  XML_TOK_PAGESHAPE_Y             },
@@ -612,16 +685,20 @@ static __FAR_DATA SvXMLTokenMapEntry aPageShapeAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::GetPageShapeAttrTokenMap()
-{
-    if(!mpPageShapeAttrTokenMap)
         mpPageShapeAttrTokenMap = new SvXMLTokenMap(aPageShapeAttrTokenMap);
+        }
+
     return *mpPageShapeAttrTokenMap;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static __FAR_DATA SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] =
+
+const SvXMLTokenMap& XMLShapeImportHelper::GetGraphicObjectShapeAttrTokenMap()
+{
+    if(!mpGraphicObjectShapeAttrTokenMap)
+    {
+    static __FAR_DATA SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,    XML_X,                  XML_TOK_GOSHAPE_X                   },
     { XML_NAMESPACE_SVG,    XML_Y,                  XML_TOK_GOSHAPE_Y                   },
@@ -631,10 +708,9 @@ static __FAR_DATA SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const SvXMLTokenMap& XMLShapeImportHelper::GetGraphicObjectShapeAttrTokenMap()
-{
-    if(!mpGraphicObjectShapeAttrTokenMap)
         mpGraphicObjectShapeAttrTokenMap = new SvXMLTokenMap(aGraphicObjectShapeAttrTokenMap);
+        }
+
     return *mpGraphicObjectShapeAttrTokenMap;
 }
 */