Revert "Don't hold css::uno::Type instances by pointer"

This reverts commit 90f91088d238469b4a2262c91de3117ba40f5bde for now:
Ach, old GCC doesn't like plain string literals to initialize members
of OUString type...

Change-Id: I50563a00406259bb5d41831e2a2796762450d097

3 files changed, 87 insertions, 87 deletions

diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index e3294b42afd4..7fffe8ff342c 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -143,19 +143,19 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
     // create XPropertySet with three properties for status indicator
     comphelper::PropertyMapEntry aInfoMap[] =
     {
-        { "UsePrettyPrinting", 0,
-              ::getBooleanCppuType(),
+        { "UsePrettyPrinting", sizeof("UsePrettyPrinting")-1, 0,
+              &::getBooleanCppuType(),
               beans::PropertyAttribute::MAYBEVOID, 0},
-        { "BaseURI", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "BaseURI", sizeof("BaseURI")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamRelPath", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamRelPath", sizeof("StreamRelPath")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamName", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamName", sizeof("StreamName")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        {}
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     uno::Reference< beans::XPropertySet > xInfoSet(
                 comphelper::GenericPropertySet_CreateInstance(
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 35744bcd9de3..f8a272e95edf 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -134,19 +134,19 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
 
     comphelper::PropertyMapEntry aInfoMap[] =
     {
-        { "PrivateData", 0,
-              ::getCppuType( (Reference<XInterface> *)0 ),
+        { "PrivateData", sizeof("PrivateData")-1, 0,
+              &::getCppuType( (Reference<XInterface> *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "BaseURI", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "BaseURI", sizeof("BaseURI")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamRelPath", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamRelPath", sizeof("StreamRelPath")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        { "StreamName", 0,
-              ::getCppuType( (OUString *)0 ),
+        { "StreamName", sizeof("StreamName")-1, 0,
+              &::getCppuType( (OUString *)0 ),
               beans::PropertyAttribute::MAYBEVOID, 0 },
-        {}
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     uno::Reference< beans::XPropertySet > xInfoSet(
                 comphelper::GenericPropertySet_CreateInstance(
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 7fe88ec17b7c..bd0676824605 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -237,75 +237,75 @@ static PropertySetInfo * lcl_createModelPropertyInfo ()
 {
     static PropertyMapEntry aModelPropertyInfoMap[] =
     {
-        { "Alignment"                        , HANDLE_ALIGNMENT                          ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
-        { "BaseFontHeight"                   , HANDLE_BASE_FONT_HEIGHT                   ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
-        { "BasicLibraries"                   , HANDLE_BASIC_LIBRARIES                    ,  ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  PropertyAttribute::READONLY,  0       },
-        { "BottomMargin"                     , HANDLE_BOTTOM_MARGIN                      ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BOTTOMSPACE       },
-        { "CustomFontNameFixed"              , HANDLE_CUSTOM_FONT_NAME_FIXED             ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_FIXED             },
-        { "CustomFontNameSans"               , HANDLE_CUSTOM_FONT_NAME_SANS              ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_SANS              },
-        { "CustomFontNameSerif"              , HANDLE_CUSTOM_FONT_NAME_SERIF             ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_SERIF             },
-        { "DialogLibraries"                  , HANDLE_DIALOG_LIBRARIES                   ,  ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  PropertyAttribute::READONLY,  0       },
-        { "FontFixedIsBold"                  , HANDLE_CUSTOM_FONT_FIXED_WEIGHT           ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FIXED             },
-        { "FontFixedIsItalic"                , HANDLE_CUSTOM_FONT_FIXED_POSTURE          ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FIXED             },
-        { "FontFunctionsIsBold"              , HANDLE_FONT_FUNCTIONS_WEIGHT              ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FUNCTION          },
-        { "FontFunctionsIsItalic"            , HANDLE_FONT_FUNCTIONS_POSTURE             ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FUNCTION          },
-        { "FontNameFunctions"                , HANDLE_FONT_NAME_FUNCTIONS                ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_FUNCTION          },
-        { "FontNameNumbers"                  , HANDLE_FONT_NAME_NUMBERS                  ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_NUMBER            },
-        { "FontNameText"                     , HANDLE_FONT_NAME_TEXT                     ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_TEXT              },
-        { "FontNameVariables"                , HANDLE_FONT_NAME_VARIABLES                ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_VARIABLE          },
-        { "FontNumbersIsBold"                , HANDLE_FONT_NUMBERS_WEIGHT                ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_NUMBER            },
-        { "FontNumbersIsItalic"              , HANDLE_FONT_NUMBERS_POSTURE               ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_NUMBER            },
-        { "FontSansIsBold"                   , HANDLE_CUSTOM_FONT_SANS_WEIGHT            ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SANS              },
-        { "FontSansIsItalic"                 , HANDLE_CUSTOM_FONT_SANS_POSTURE           ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SANS              },
-        { "FontSerifIsBold"                  , HANDLE_CUSTOM_FONT_SERIF_WEIGHT           ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SERIF             },
-        { "FontSerifIsItalic"                , HANDLE_CUSTOM_FONT_SERIF_POSTURE          ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SERIF             },
-        { "FontTextIsBold"                   , HANDLE_FONT_TEXT_WEIGHT                   ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_TEXT              },
-        { "FontTextIsItalic"                 , HANDLE_FONT_TEXT_POSTURE                  ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_TEXT              },
-        { "FontVariablesIsBold"              , HANDLE_FONT_VARIABLES_WEIGHT              ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_VARIABLE          },
-        { "FontVariablesIsItalic"            , HANDLE_FONT_VARIABLES_POSTURE             ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_VARIABLE          },
-        { "Formula"                          , HANDLE_FORMULA                            ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  0                     },
-        { "IsScaleAllBrackets"               , HANDLE_IS_SCALE_ALL_BRACKETS              ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
-        { "IsTextMode"                       , HANDLE_IS_TEXT_MODE                       ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
-        { "GreekCharStyle"                   , HANDLE_GREEK_CHAR_STYLE                   ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
-        { "LeftMargin"                       , HANDLE_LEFT_MARGIN                        ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_LEFTSPACE         },
-        { "PrinterName"                      , HANDLE_PRINTER_NAME                       ,  ::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  0                     },
-        { "PrinterSetup"                     , HANDLE_PRINTER_SETUP                      ,  ::getCppuType((const Sequence < sal_Int8 >*)0),                         PROPERTY_NONE,  0                     },
-        { "RelativeBracketDistance"          , HANDLE_RELATIVE_BRACKET_DISTANCE          ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BRACKETSPACE      },
-        { "RelativeBracketExcessSize"        , HANDLE_RELATIVE_BRACKET_EXCESS_SIZE       ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BRACKETSIZE       },
-        { "RelativeFontHeightFunctions"      , HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS     ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_FUNCTION          },
-        { "RelativeFontHeightIndices"        , HANDLE_RELATIVE_FONT_HEIGHT_INDICES       ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_INDEX             },
-        { "RelativeFontHeightLimits"         , HANDLE_RELATIVE_FONT_HEIGHT_LIMITS        ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_LIMITS            },
-        { "RelativeFontHeightOperators"      , HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS     ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_OPERATOR          },
-        { "RelativeFontHeightText"           , HANDLE_RELATIVE_FONT_HEIGHT_TEXT          ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_TEXT              },
-        { "RelativeFractionBarExcessLength"  , HANDLE_RELATIVE_FRACTION_BAR_EXCESS_LENGTH,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_FRACTION          },
-        { "RelativeFractionBarLineWeight"    , HANDLE_RELATIVE_FRACTION_BAR_LINE_WEIGHT  ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_STROKEWIDTH       },
-        { "RelativeFractionDenominatorDepth" , HANDLE_RELATIVE_FRACTION_DENOMINATOR_DEPTH,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_DENOMINATOR       },
-        { "RelativeFractionNumeratorHeight"  , HANDLE_RELATIVE_FRACTION_NUMERATOR_HEIGHT ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_NUMERATOR         },
-        { "RelativeIndexSubscript"           , HANDLE_RELATIVE_INDEX_SUBSCRIPT           ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_SUBSCRIPT         },
-        { "RelativeIndexSuperscript"         , HANDLE_RELATIVE_INDEX_SUPERSCRIPT         ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_SUPERSCRIPT       },
-        { "RelativeLineSpacing"              , HANDLE_RELATIVE_LINE_SPACING              ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_VERTICAL          },
-        { "RelativeLowerLimitDistance"       , HANDLE_RELATIVE_LOWER_LIMIT_DISTANCE      ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_LOWERLIMIT        },
-        { "RelativeMatrixColumnSpacing"      , HANDLE_RELATIVE_MATRIX_COLUMN_SPACING     ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_MATRIXCOL         },
-        { "RelativeMatrixLineSpacing"        , HANDLE_RELATIVE_MATRIX_LINE_SPACING       ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_MATRIXROW         },
-        { "RelativeOperatorExcessSize"       , HANDLE_RELATIVE_OPERATOR_EXCESS_SIZE      ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_OPERATORSIZE      },
-        { "RelativeOperatorSpacing"          , HANDLE_RELATIVE_OPERATOR_SPACING          ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_OPERATORSPACE     },
-        { "RelativeRootSpacing"              , HANDLE_RELATIVE_ROOT_SPACING              ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ROOT              },
-        { "RelativeScaleBracketExcessSize"   , HANDLE_RELATIVE_SCALE_BRACKET_EXCESS_SIZE ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_NORMALBRACKETSIZE },
-        { "RelativeSpacing"                  , HANDLE_RELATIVE_SPACING                   ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_HORIZONTAL        },
-        { "RelativeSymbolMinimumHeight"      , HANDLE_RELATIVE_SYMBOL_MINIMUM_HEIGHT     ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ORNAMENTSPACE     },
-        { "RelativeSymbolPrimaryHeight"      , HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT     ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ORNAMENTSIZE      },
-        { "RelativeUpperLimitDistance"       , HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE      ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_UPPERLIMIT        },
-        { "RightMargin"                      , HANDLE_RIGHT_MARGIN                       ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_RIGHTSPACE        },
-        { "RuntimeUID"                       , HANDLE_RUNTIME_UID                        ,  ::getCppuType(static_cast< const OUString * >(0)),                      PropertyAttribute::READONLY,  0       },
-        { "Symbols"                          , HANDLE_SYMBOLS                            ,  ::getCppuType((const Sequence < SymbolDescriptor > *)0),                PROPERTY_NONE,  0                     },
-        { "UserDefinedSymbolsInUse"          , HANDLE_USED_SYMBOLS                       ,  ::getCppuType((const Sequence < SymbolDescriptor > *)0),                PropertyAttribute::READONLY,  0       },
-        { "TopMargin"                        , HANDLE_TOP_MARGIN                         ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_TOPSPACE          },
+        { RTL_CONSTASCII_STRINGPARAM( "Alignment"                        ), HANDLE_ALIGNMENT                          ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "BaseFontHeight"                   ), HANDLE_BASE_FONT_HEIGHT                   ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "BasicLibraries"                   ), HANDLE_BASIC_LIBRARIES                    ,  &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  PropertyAttribute::READONLY,  0       },
+        { RTL_CONSTASCII_STRINGPARAM( "BottomMargin"                     ), HANDLE_BOTTOM_MARGIN                      ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BOTTOMSPACE       },
+        { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameFixed"              ), HANDLE_CUSTOM_FONT_NAME_FIXED             ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_FIXED             },
+        { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSans"               ), HANDLE_CUSTOM_FONT_NAME_SANS              ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_SANS              },
+        { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSerif"              ), HANDLE_CUSTOM_FONT_NAME_SERIF             ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_SERIF             },
+        { RTL_CONSTASCII_STRINGPARAM( "DialogLibraries"                  ), HANDLE_DIALOG_LIBRARIES                   ,  &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  PropertyAttribute::READONLY,  0       },
+        { RTL_CONSTASCII_STRINGPARAM( "FontFixedIsBold"                  ), HANDLE_CUSTOM_FONT_FIXED_WEIGHT           ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FIXED             },
+        { RTL_CONSTASCII_STRINGPARAM( "FontFixedIsItalic"                ), HANDLE_CUSTOM_FONT_FIXED_POSTURE          ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FIXED             },
+        { RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsBold"              ), HANDLE_FONT_FUNCTIONS_WEIGHT              ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FUNCTION          },
+        { RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsItalic"            ), HANDLE_FONT_FUNCTIONS_POSTURE             ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FUNCTION          },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNameFunctions"                ), HANDLE_FONT_NAME_FUNCTIONS                ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_FUNCTION          },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNameNumbers"                  ), HANDLE_FONT_NAME_NUMBERS                  ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_NUMBER            },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNameText"                     ), HANDLE_FONT_NAME_TEXT                     ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_TEXT              },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNameVariables"                ), HANDLE_FONT_NAME_VARIABLES                ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_VARIABLE          },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsBold"                ), HANDLE_FONT_NUMBERS_WEIGHT                ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_NUMBER            },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsItalic"              ), HANDLE_FONT_NUMBERS_POSTURE               ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_NUMBER            },
+        { RTL_CONSTASCII_STRINGPARAM( "FontSansIsBold"                   ), HANDLE_CUSTOM_FONT_SANS_WEIGHT            ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SANS              },
+        { RTL_CONSTASCII_STRINGPARAM( "FontSansIsItalic"                 ), HANDLE_CUSTOM_FONT_SANS_POSTURE           ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SANS              },
+        { RTL_CONSTASCII_STRINGPARAM( "FontSerifIsBold"                  ), HANDLE_CUSTOM_FONT_SERIF_WEIGHT           ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SERIF             },
+        { RTL_CONSTASCII_STRINGPARAM( "FontSerifIsItalic"                ), HANDLE_CUSTOM_FONT_SERIF_POSTURE          ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SERIF             },
+        { RTL_CONSTASCII_STRINGPARAM( "FontTextIsBold"                   ), HANDLE_FONT_TEXT_WEIGHT                   ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_TEXT              },
+        { RTL_CONSTASCII_STRINGPARAM( "FontTextIsItalic"                 ), HANDLE_FONT_TEXT_POSTURE                  ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_TEXT              },
+        { RTL_CONSTASCII_STRINGPARAM( "FontVariablesIsBold"              ), HANDLE_FONT_VARIABLES_WEIGHT              ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_VARIABLE          },
+        { RTL_CONSTASCII_STRINGPARAM( "FontVariablesIsItalic"            ), HANDLE_FONT_VARIABLES_POSTURE             ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_VARIABLE          },
+        { RTL_CONSTASCII_STRINGPARAM( "Formula"                          ), HANDLE_FORMULA                            ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "IsScaleAllBrackets"               ), HANDLE_IS_SCALE_ALL_BRACKETS              ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "IsTextMode"                       ), HANDLE_IS_TEXT_MODE                       ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "GreekCharStyle"                   ), HANDLE_GREEK_CHAR_STYLE                   ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "LeftMargin"                       ), HANDLE_LEFT_MARGIN                        ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_LEFTSPACE         },
+        { RTL_CONSTASCII_STRINGPARAM( "PrinterName"                      ), HANDLE_PRINTER_NAME                       ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "PrinterSetup"                     ), HANDLE_PRINTER_SETUP                      ,  &::getCppuType((const Sequence < sal_Int8 >*)0),                         PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketDistance"          ), HANDLE_RELATIVE_BRACKET_DISTANCE          ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BRACKETSPACE      },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketExcessSize"        ), HANDLE_RELATIVE_BRACKET_EXCESS_SIZE       ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BRACKETSIZE       },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightFunctions"      ), HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS     ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_FUNCTION          },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightIndices"        ), HANDLE_RELATIVE_FONT_HEIGHT_INDICES       ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_INDEX             },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightLimits"         ), HANDLE_RELATIVE_FONT_HEIGHT_LIMITS        ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_LIMITS            },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightOperators"      ), HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS     ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_OPERATOR          },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightText"           ), HANDLE_RELATIVE_FONT_HEIGHT_TEXT          ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_TEXT              },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarExcessLength"  ), HANDLE_RELATIVE_FRACTION_BAR_EXCESS_LENGTH,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_FRACTION          },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarLineWeight"    ), HANDLE_RELATIVE_FRACTION_BAR_LINE_WEIGHT  ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_STROKEWIDTH       },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionDenominatorDepth" ), HANDLE_RELATIVE_FRACTION_DENOMINATOR_DEPTH,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_DENOMINATOR       },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionNumeratorHeight"  ), HANDLE_RELATIVE_FRACTION_NUMERATOR_HEIGHT ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_NUMERATOR         },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSubscript"           ), HANDLE_RELATIVE_INDEX_SUBSCRIPT           ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_SUBSCRIPT         },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSuperscript"         ), HANDLE_RELATIVE_INDEX_SUPERSCRIPT         ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_SUPERSCRIPT       },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeLineSpacing"              ), HANDLE_RELATIVE_LINE_SPACING              ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_VERTICAL          },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeLowerLimitDistance"       ), HANDLE_RELATIVE_LOWER_LIMIT_DISTANCE      ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_LOWERLIMIT        },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixColumnSpacing"      ), HANDLE_RELATIVE_MATRIX_COLUMN_SPACING     ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_MATRIXCOL         },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixLineSpacing"        ), HANDLE_RELATIVE_MATRIX_LINE_SPACING       ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_MATRIXROW         },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorExcessSize"       ), HANDLE_RELATIVE_OPERATOR_EXCESS_SIZE      ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_OPERATORSIZE      },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorSpacing"          ), HANDLE_RELATIVE_OPERATOR_SPACING          ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_OPERATORSPACE     },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeRootSpacing"              ), HANDLE_RELATIVE_ROOT_SPACING              ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ROOT              },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeScaleBracketExcessSize"   ), HANDLE_RELATIVE_SCALE_BRACKET_EXCESS_SIZE ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_NORMALBRACKETSIZE },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeSpacing"                  ), HANDLE_RELATIVE_SPACING                   ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_HORIZONTAL        },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolMinimumHeight"      ), HANDLE_RELATIVE_SYMBOL_MINIMUM_HEIGHT     ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ORNAMENTSPACE     },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolPrimaryHeight"      ), HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT     ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ORNAMENTSIZE      },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeUpperLimitDistance"       ), HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE      ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_UPPERLIMIT        },
+        { RTL_CONSTASCII_STRINGPARAM( "RightMargin"                      ), HANDLE_RIGHT_MARGIN                       ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_RIGHTSPACE        },
+        { RTL_CONSTASCII_STRINGPARAM( "RuntimeUID"                       ), HANDLE_RUNTIME_UID                        ,  &::getCppuType(static_cast< const OUString * >(0)),                      PropertyAttribute::READONLY,  0       },
+        { RTL_CONSTASCII_STRINGPARAM( "Symbols"                          ), HANDLE_SYMBOLS                            ,  &::getCppuType((const Sequence < SymbolDescriptor > *)0),                PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "UserDefinedSymbolsInUse"          ), HANDLE_USED_SYMBOLS                       ,  &::getCppuType((const Sequence < SymbolDescriptor > *)0),                PropertyAttribute::READONLY,  0       },
+        { RTL_CONSTASCII_STRINGPARAM( "TopMargin"                        ), HANDLE_TOP_MARGIN                         ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_TOPSPACE          },
         // #i33095# Security Options
-        { "LoadReadonly"                     , HANDLE_LOAD_READONLY                      ,  ::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "LoadReadonly"                     ), HANDLE_LOAD_READONLY                      ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
         // #i972#
-        { "BaseLine"                         , HANDLE_BASELINE                           ,  ::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
-        { "InteropGrabBag"                   , HANDLE_INTEROP_GRAB_BAG                   ,  ::getCppuType((uno::Sequence< beans::PropertyValue >*)0),       PROPERTY_NONE,  0                     },
-        {}
+        { RTL_CONSTASCII_STRINGPARAM( "BaseLine"                         ), HANDLE_BASELINE                           ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "InteropGrabBag"                   ), HANDLE_INTEROP_GRAB_BAG                   ,  &::getCppuType((uno::Sequence< beans::PropertyValue >*)0),       PROPERTY_NONE,  0                     },
+        { NULL, 0, 0, NULL, 0, 0 }
     };
     PropertySetInfo *pInfo = new PropertySetInfo ( aModelPropertyInfoMap );
     return pInfo;
@@ -759,7 +759,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
             {
                 const SmFace &  rFace = aFormat.GetFont((*ppEntries)->mnMemberId);
                 bool bVal = IsItalic( rFace );
-                (*pValue).setValue(&bVal, (*ppEntries)->maType);
+                (*pValue).setValue(&bVal, *(*ppEntries)->mpType);
             }
             break;
             case HANDLE_CUSTOM_FONT_FIXED_WEIGHT :
@@ -772,7 +772,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
             {
                 const SmFace &  rFace = aFormat.GetFont((*ppEntries)->mnMemberId);
                 bool bVal = IsBold( rFace ); // bold?
-                (*pValue).setValue(&bVal, (*ppEntries)->maType);
+                (*pValue).setValue(&bVal, *(*ppEntries)->mpType);
             }
             break;
             case HANDLE_BASE_FONT_HEIGHT                   :