diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-11 15:37:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-11 15:38:30 +0100 |
| commit | 123e2c3e9350463fde38fbcbb522e3d6d8340ee6 (patch) | |
| tree | c0f9350733d93f6a906cfe2f19b5dac66a655283 /forms/source/richtext | |
| parent | 90f91088d238469b4a2262c91de3117ba40f5bde (diff) | |
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
Diffstat (limited to 'forms/source/richtext')
| -rw-r--r-- | forms/source/richtext/richtextunowrapper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx index 1b0810dd2e52..817bf2f634a7 100644 --- a/forms/source/richtext/richtextunowrapper.cxx +++ b/forms/source/richtext/richtextunowrapper.cxx @@ -49,9 +49,9 @@ namespace frm SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - { "TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, ::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 }, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, ::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 }, - {} + { MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 }, + { MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 }, + { NULL, 0, 0, NULL, 0, 0 } }; static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap, SdrObject::GetGlobalDrawObjectItemPool() ); return &aTextEnginePropertySet; |