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, 20 insertions, 16 deletions

diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index eb2fda1bdd1c..4de58bbf232e 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -49,7 +49,7 @@
 #ifndef _XMLOFF_XMLFONTSTYLESCONTEXT_HXX
 #include <xmloff/XMLFontStylesContext.hxx>
 #endif
-
+#include <rtl/logfile.hxx>
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 
@@ -76,21 +76,25 @@ enum XMLFontStyleAttrTokens
     XML_TOK_FONT_STYLE_ATTR_END=XML_TOK_UNKNOWN
 };
 
-static __FAR_DATA SvXMLTokenMapEntry aFontStyleAttrTokenMap[] =
+const SvXMLTokenMapEntry* lcl_getFontStyleAttrTokenMap()
 {
-    { XML_NAMESPACE_SVG, XML_FONT_FAMILY,
-            XML_TOK_FONT_STYLE_ATTR_FAMILY },
-    { XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC,
-            XML_TOK_FONT_STYLE_ATTR_FAMILY_GENERIC },
-    { XML_NAMESPACE_STYLE, XML_FONT_ADORNMENTS,
-            XML_TOK_FONT_STYLE_ATTR_STYLENAME },
-    { XML_NAMESPACE_STYLE, XML_FONT_PITCH,
-            XML_TOK_FONT_STYLE_ATTR_PITCH },
-    { XML_NAMESPACE_STYLE, XML_FONT_CHARSET,
-            XML_TOK_FONT_STYLE_ATTR_CHARSET },
-
-    XML_TOKEN_MAP_END
-};
+    static __FAR_DATA SvXMLTokenMapEntry aFontStyleAttrTokenMap[] =
+    {
+        { XML_NAMESPACE_SVG, XML_FONT_FAMILY,
+                XML_TOK_FONT_STYLE_ATTR_FAMILY },
+        { XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC,
+                XML_TOK_FONT_STYLE_ATTR_FAMILY_GENERIC },
+        { XML_NAMESPACE_STYLE, XML_FONT_ADORNMENTS,
+                XML_TOK_FONT_STYLE_ATTR_STYLENAME },
+        { XML_NAMESPACE_STYLE, XML_FONT_PITCH,
+                XML_TOK_FONT_STYLE_ATTR_PITCH },
+        { XML_NAMESPACE_STYLE, XML_FONT_CHARSET,
+                XML_TOK_FONT_STYLE_ATTR_CHARSET },
+
+        XML_TOKEN_MAP_END
+    };
+    return aFontStyleAttrTokenMap;
+}
 
 class XMLFontStyleContext_Impl : public SvXMLStyleContext
 {
@@ -258,7 +262,7 @@ XMLFontStylesContext::XMLFontStylesContext( SvXMLImport& rImport,
     pFamilyHdl( new XMLFontFamilyPropHdl ),
     pPitchHdl( new XMLFontPitchPropHdl ),
     pEncHdl( new XMLFontEncodingPropHdl ),
-    pFontStyleAttrTokenMap( new SvXMLTokenMap(aFontStyleAttrTokenMap) ),
+    pFontStyleAttrTokenMap( new SvXMLTokenMap(lcl_getFontStyleAttrTokenMap()) ),
     eDfltEncoding( eDfltEnc )
 {
 }