diff options
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/ClassificationDialog.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/frmsel.cxx | 32 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 10 | ||||
-rw-r--r-- | svx/source/form/fmdmod.cxx | 38 | ||||
-rw-r--r-- | svx/source/form/fmshimp.cxx | 44 | ||||
-rw-r--r-- | svx/source/form/fmundo.cxx | 8 | ||||
-rw-r--r-- | svx/source/inc/datanavi.hxx | 12 | ||||
-rw-r--r-- | svx/source/sidebar/inspector/InspectorTextPanel.cxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/cell.cxx | 34 | ||||
-rw-r--r-- | svx/source/table/tablelayouter.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/tablertfexporter.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 76 | ||||
-rw-r--r-- | svx/source/tbxctrls/fontworkgallery.cxx | 6 | ||||
-rw-r--r-- | svx/source/unodraw/unoprov.cxx | 500 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap3.cxx | 22 | ||||
-rw-r--r-- | svx/source/xml/xmleohlp.cxx | 4 |
17 files changed, 400 insertions, 400 deletions
diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx index ef376a8aa082..e09cbe1c8cbe 100644 --- a/svx/source/dialog/ClassificationDialog.cxx +++ b/svx/source/dialog/ClassificationDialog.cxx @@ -71,7 +71,7 @@ namespace { constexpr size_t RECENTLY_USED_LIMIT = 5; -const OUStringLiteral constRecentlyUsedFileName("recentlyUsed.xml"); +const OUStringLiteral constRecentlyUsedFileName(u"recentlyUsed.xml"); OUString lcl_getClassificationUserPath() { diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 80f56b47940e..22674e180242 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -304,22 +304,22 @@ void FrameSelectorImpl::InitColors() const OUStringLiteral aImageIds[] = { - RID_SVXBMP_FRMSEL_ARROW1, - RID_SVXBMP_FRMSEL_ARROW2, - RID_SVXBMP_FRMSEL_ARROW3, - RID_SVXBMP_FRMSEL_ARROW4, - RID_SVXBMP_FRMSEL_ARROW5, - RID_SVXBMP_FRMSEL_ARROW6, - RID_SVXBMP_FRMSEL_ARROW7, - RID_SVXBMP_FRMSEL_ARROW8, - RID_SVXBMP_FRMSEL_ARROW9, - RID_SVXBMP_FRMSEL_ARROW10, - RID_SVXBMP_FRMSEL_ARROW11, - RID_SVXBMP_FRMSEL_ARROW12, - RID_SVXBMP_FRMSEL_ARROW13, - RID_SVXBMP_FRMSEL_ARROW14, - RID_SVXBMP_FRMSEL_ARROW15, - RID_SVXBMP_FRMSEL_ARROW16 + u"" RID_SVXBMP_FRMSEL_ARROW1, + u"" RID_SVXBMP_FRMSEL_ARROW2, + u"" RID_SVXBMP_FRMSEL_ARROW3, + u"" RID_SVXBMP_FRMSEL_ARROW4, + u"" RID_SVXBMP_FRMSEL_ARROW5, + u"" RID_SVXBMP_FRMSEL_ARROW6, + u"" RID_SVXBMP_FRMSEL_ARROW7, + u"" RID_SVXBMP_FRMSEL_ARROW8, + u"" RID_SVXBMP_FRMSEL_ARROW9, + u"" RID_SVXBMP_FRMSEL_ARROW10, + u"" RID_SVXBMP_FRMSEL_ARROW11, + u"" RID_SVXBMP_FRMSEL_ARROW12, + u"" RID_SVXBMP_FRMSEL_ARROW13, + u"" RID_SVXBMP_FRMSEL_ARROW14, + u"" RID_SVXBMP_FRMSEL_ARROW15, + u"" RID_SVXBMP_FRMSEL_ARROW16 }; void FrameSelectorImpl::InitArrowImageList() diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 7fad867309d7..fbce652c6a09 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -741,7 +741,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) // prepare firing an event aModeChangeEvent.Source = *this; - aModeChangeEvent.NewMode = mbDesignMode ? OUStringLiteral( "design" ) : OUStringLiteral( "alive" ); + aModeChangeEvent.NewMode = mbDesignMode ? OUStringLiteral( u"design" ) : OUStringLiteral( u"alive" ); } // --- </mutex_lock> --- @@ -1549,8 +1549,8 @@ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol) { static const OUStringLiteral aPropsListenedTo[] = { - FM_PROP_LABEL, FM_PROP_WIDTH, FM_PROP_HIDDEN, FM_PROP_ALIGN, - FM_PROP_FORMATKEY + u"" FM_PROP_LABEL, u"" FM_PROP_WIDTH, u"" FM_PROP_HIDDEN, u"" FM_PROP_ALIGN, + u"" FM_PROP_FORMATKEY }; // as not all properties have to be supported by all columns we have to check this @@ -1574,8 +1574,8 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol) // we have to do it this way... static const OUStringLiteral aPropsListenedTo[] = { - FM_PROP_LABEL, FM_PROP_WIDTH, FM_PROP_HIDDEN, FM_PROP_ALIGN, - FM_PROP_FORMATKEY + u"" FM_PROP_LABEL, u"" FM_PROP_WIDTH, u"" FM_PROP_HIDDEN, u"" FM_PROP_ALIGN, + u"" FM_PROP_FORMATKEY }; Reference< XPropertySetInfo > xInfo = xCol->getPropertySetInfo(); diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index f7c71024d6da..3aafb279b1c0 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -58,25 +58,25 @@ using namespace ::svxform; { static const OUStringLiteral aSvxComponentServiceNameList[] = { - FM_SUN_COMPONENT_TEXTFIELD, - FM_SUN_COMPONENT_FORM, - FM_SUN_COMPONENT_LISTBOX, - FM_SUN_COMPONENT_COMBOBOX, - FM_SUN_COMPONENT_RADIOBUTTON, - FM_SUN_COMPONENT_GROUPBOX, - FM_SUN_COMPONENT_FIXEDTEXT, - FM_SUN_COMPONENT_COMMANDBUTTON, - FM_SUN_COMPONENT_CHECKBOX, - FM_SUN_COMPONENT_GRIDCONTROL, - FM_SUN_COMPONENT_IMAGEBUTTON, - FM_SUN_COMPONENT_FILECONTROL, - FM_SUN_COMPONENT_TIMEFIELD, - FM_SUN_COMPONENT_DATEFIELD, - FM_SUN_COMPONENT_NUMERICFIELD, - FM_SUN_COMPONENT_CURRENCYFIELD, - FM_SUN_COMPONENT_PATTERNFIELD, - FM_SUN_COMPONENT_HIDDENCONTROL, - FM_SUN_COMPONENT_IMAGECONTROL + u"" FM_SUN_COMPONENT_TEXTFIELD, + u"" FM_SUN_COMPONENT_FORM, + u"" FM_SUN_COMPONENT_LISTBOX, + u"" FM_SUN_COMPONENT_COMBOBOX, + u"" FM_SUN_COMPONENT_RADIOBUTTON, + u"" FM_SUN_COMPONENT_GROUPBOX, + u"" FM_SUN_COMPONENT_FIXEDTEXT, + u"" FM_SUN_COMPONENT_COMMANDBUTTON, + u"" FM_SUN_COMPONENT_CHECKBOX, + u"" FM_SUN_COMPONENT_GRIDCONTROL, + u"" FM_SUN_COMPONENT_IMAGEBUTTON, + u"" FM_SUN_COMPONENT_FILECONTROL, + u"" FM_SUN_COMPONENT_TIMEFIELD, + u"" FM_SUN_COMPONENT_DATEFIELD, + u"" FM_SUN_COMPONENT_NUMERICFIELD, + u"" FM_SUN_COMPONENT_CURRENCYFIELD, + u"" FM_SUN_COMPONENT_PATTERNFIELD, + u"" FM_SUN_COMPONENT_HIDDENCONTROL, + u"" FM_SUN_COMPONENT_IMAGECONTROL }; static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 19682a1d44f4..bb7cc70dd439 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -204,26 +204,26 @@ static const char* aConvertSlots[] = const OUStringLiteral aImgIds[] = { - RID_SVXBMP_EDITBOX, - RID_SVXBMP_BUTTON, - RID_SVXBMP_FIXEDTEXT, - RID_SVXBMP_LISTBOX, - RID_SVXBMP_CHECKBOX, - RID_SVXBMP_RADIOBUTTON, - RID_SVXBMP_GROUPBOX, - RID_SVXBMP_COMBOBOX, - RID_SVXBMP_IMAGEBUTTON, - RID_SVXBMP_FILECONTROL, - RID_SVXBMP_DATEFIELD, - RID_SVXBMP_TIMEFIELD, - RID_SVXBMP_NUMERICFIELD, - RID_SVXBMP_CURRENCYFIELD, - RID_SVXBMP_PATTERNFIELD, - RID_SVXBMP_IMAGECONTROL, - RID_SVXBMP_FORMATTEDFIELD, - RID_SVXBMP_SCROLLBAR, - RID_SVXBMP_SPINBUTTON, - RID_SVXBMP_NAVIGATIONBAR + u"" RID_SVXBMP_EDITBOX, + u"" RID_SVXBMP_BUTTON, + u"" RID_SVXBMP_FIXEDTEXT, + u"" RID_SVXBMP_LISTBOX, + u"" RID_SVXBMP_CHECKBOX, + u"" RID_SVXBMP_RADIOBUTTON, + u"" RID_SVXBMP_GROUPBOX, + u"" RID_SVXBMP_COMBOBOX, + u"" RID_SVXBMP_IMAGEBUTTON, + u"" RID_SVXBMP_FILECONTROL, + u"" RID_SVXBMP_DATEFIELD, + u"" RID_SVXBMP_TIMEFIELD, + u"" RID_SVXBMP_NUMERICFIELD, + u"" RID_SVXBMP_CURRENCYFIELD, + u"" RID_SVXBMP_PATTERNFIELD, + u"" RID_SVXBMP_IMAGECONTROL, + u"" RID_SVXBMP_FORMATTEDFIELD, + u"" RID_SVXBMP_SCROLLBAR, + u"" RID_SVXBMP_SPINBUTTON, + u"" RID_SVXBMP_NAVIGATIONBAR }; const sal_Int16 nObjectTypes[] = @@ -3668,8 +3668,8 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels return; } - static const OUStringLiteral sClassIdPropertyName = FM_PROP_CLASSID; - static const OUStringLiteral sBoundFieldPropertyName = FM_PROP_BOUNDFIELD; + static const OUStringLiteral sClassIdPropertyName = u"" FM_PROP_CLASSID; + static const OUStringLiteral sBoundFieldPropertyName = u"" FM_PROP_BOUNDFIELD; sal_Int32 nCount = _rxModels->getCount(); Reference< XPropertySet > xCurrent; Reference< XPropertySetInfo > xCurrentInfo; diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index f92403c57312..3678ba4e0e35 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -538,12 +538,12 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // if it's a "default value" property of a control model, set the according "value" property static const OUStringLiteral pDefaultValueProperties[] = { - FM_PROP_DEFAULT_TEXT, FM_PROP_DEFAULTCHECKED, FM_PROP_DEFAULT_DATE, FM_PROP_DEFAULT_TIME, - FM_PROP_DEFAULT_VALUE, FM_PROP_DEFAULT_SELECT_SEQ, FM_PROP_EFFECTIVE_DEFAULT + u"" FM_PROP_DEFAULT_TEXT, u"" FM_PROP_DEFAULTCHECKED, u"" FM_PROP_DEFAULT_DATE, u"" FM_PROP_DEFAULT_TIME, + u"" FM_PROP_DEFAULT_VALUE, u"" FM_PROP_DEFAULT_SELECT_SEQ, u"" FM_PROP_EFFECTIVE_DEFAULT }; static const OUStringLiteral aValueProperties[] = { - FM_PROP_TEXT, FM_PROP_STATE, FM_PROP_DATE, FM_PROP_TIME, - FM_PROP_VALUE, FM_PROP_SELECT_SEQ, FM_PROP_EFFECTIVE_VALUE + u"" FM_PROP_TEXT, u"" FM_PROP_STATE, u"" FM_PROP_DATE, u"" FM_PROP_TIME, + u"" FM_PROP_VALUE, u"" FM_PROP_SELECT_SEQ, u"" FM_PROP_EFFECTIVE_VALUE }; sal_Int32 nDefaultValueProps = SAL_N_ELEMENTS(pDefaultValueProperties); OSL_ENSURE(SAL_N_ELEMENTS(aValueProperties) == nDefaultValueProps, diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 83c94ddac30b..f574adc4c05a 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -82,9 +82,9 @@ namespace svxform OUString m_sInstance_UI; OUString m_sNone_UI; - static constexpr OUStringLiteral const m_sDoc_API = "all"; - static constexpr OUStringLiteral const m_sInstance_API = "instance"; - static constexpr OUStringLiteral const m_sNone_API = "none"; + static constexpr OUStringLiteral const m_sDoc_API = u"all"; + static constexpr OUStringLiteral const m_sInstance_API = u"instance"; + static constexpr OUStringLiteral const m_sNone_API = u"none"; ReplaceString( const ReplaceString& ) = delete; @@ -127,9 +127,9 @@ namespace svxform OUString m_sPut_UI; OUString m_sGet_UI; - static constexpr OUStringLiteral m_sPost_API = "post"; - static constexpr OUStringLiteral m_sPut_API = "put"; - static constexpr OUStringLiteral m_sGet_API = "get"; + static constexpr OUStringLiteral m_sPost_API = u"post"; + static constexpr OUStringLiteral m_sPut_API = u"put"; + static constexpr OUStringLiteral m_sGet_API = u"get"; MethodString( const MethodString& ) = delete; diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx b/svx/source/sidebar/inspector/InspectorTextPanel.cxx index 356dfd8cb975..0eef5fe3f8dd 100644 --- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx +++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx @@ -73,8 +73,8 @@ static bool GetPropertyValues(const OUString& rPropName, const uno::Any& rAny, O } else if (awt::FontSlant eValue; rAny >>= eValue) { - rString = (eValue == awt::FontSlant_ITALIC) ? OUStringLiteral("italic") - : OUStringLiteral("normal"); + rString = (eValue == awt::FontSlant_ITALIC) ? OUStringLiteral(u"italic") + : OUStringLiteral(u"normal"); } else if (long nValueLong; rAny >>= nValueLong) { @@ -86,7 +86,7 @@ static bool GetPropertyValues(const OUString& rPropName, const uno::Any& rAny, O else if (double fValue; rAny >>= fValue) { if (rPropName.indexOf("Weight") != -1) - rString = (fValue > 100) ? OUStringLiteral("bold") : OUStringLiteral("normal"); + rString = (fValue > 100) ? OUStringLiteral(u"bold") : OUStringLiteral(u"normal"); else rString = OUString::number((round(fValue * 100)) / 100.00); } diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index ec4ecdff0165..15a1ccec1a0b 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -504,7 +504,7 @@ double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const { const css::uno::Any* pAny; const SdrCustomShapeGeometryItem& rGeometryItem = GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - pAny = rGeometryItem.GetPropertyValueByName( bPreRotation ? OUStringLiteral( "TextPreRotateAngle" ) : OUStringLiteral( "TextRotateAngle" ) ); + pAny = rGeometryItem.GetPropertyValueByName( bPreRotation ? OUStringLiteral( u"TextPreRotateAngle" ) : OUStringLiteral( u"TextRotateAngle" ) ); double fExtraTextRotateAngle = 0.0; if ( pAny ) *pAny >>= fExtraTextRotateAngle; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 3ddea38ce131..1aa37d28b15c 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -76,27 +76,27 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet() { FILL_PROPERTIES // { "HasLevels", OWN_ATTR_HASLEVELS, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "Style", OWN_ATTR_STYLE, cppu::UnoType< css::style::XStyle >::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, - { UNO_NAME_TEXT_WRITINGMODE, SDRATTR_TEXTDIRECTION, cppu::UnoType<css::text::WritingMode>::get(), 0, 0}, - { UNO_NAME_TEXT_HORZADJUST, SDRATTR_TEXT_HORZADJUST, cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(), 0, 0}, - { UNO_NAME_TEXT_LEFTDIST, SDRATTR_TEXT_LEFTDIST, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, - { UNO_NAME_TEXT_LOWERDIST, SDRATTR_TEXT_LOWERDIST, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, - { UNO_NAME_TEXT_RIGHTDIST, SDRATTR_TEXT_RIGHTDIST, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, - { UNO_NAME_TEXT_UPPERDIST, SDRATTR_TEXT_UPPERDIST, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, - { UNO_NAME_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), 0, 0}, - { UNO_NAME_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP, cppu::UnoType<bool>::get(), 0, 0}, - - { "TableBorder", OWN_ATTR_TABLEBORDER, cppu::UnoType<TableBorder>::get(), 0, 0 }, - { "TopBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER }, - { "BottomBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER }, - { "LeftBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER }, - { "RightBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER }, - { "RotateAngle", SDRATTR_TABLE_TEXT_ROTATION, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"Style", OWN_ATTR_STYLE, cppu::UnoType< css::style::XStyle >::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { u"" UNO_NAME_TEXT_WRITINGMODE, SDRATTR_TEXTDIRECTION, cppu::UnoType<css::text::WritingMode>::get(), 0, 0}, + { u"" UNO_NAME_TEXT_HORZADJUST, SDRATTR_TEXT_HORZADJUST, cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(), 0, 0}, + { u"" UNO_NAME_TEXT_LEFTDIST, SDRATTR_TEXT_LEFTDIST, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, + { u"" UNO_NAME_TEXT_LOWERDIST, SDRATTR_TEXT_LOWERDIST, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, + { u"" UNO_NAME_TEXT_RIGHTDIST, SDRATTR_TEXT_RIGHTDIST, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, + { u"" UNO_NAME_TEXT_UPPERDIST, SDRATTR_TEXT_UPPERDIST, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, + { u"" UNO_NAME_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), 0, 0}, + { u"" UNO_NAME_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP, cppu::UnoType<bool>::get(), 0, 0}, + + { u"TableBorder", OWN_ATTR_TABLEBORDER, cppu::UnoType<TableBorder>::get(), 0, 0 }, + { u"TopBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER }, + { u"BottomBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER }, + { u"LeftBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER }, + { u"RightBorder", SDRATTR_TABLE_BORDER, cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER }, + { u"RotateAngle", SDRATTR_TABLE_TEXT_ROTATION, cppu::UnoType<sal_Int32>::get(), 0, 0 }, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - { "", 0, css::uno::Type(), 0, 0 } + { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSvxCellPropertySet( aSvxCellPropertyMap, SdrObject::GetGlobalDrawObjectItemPool() ); diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index f9160a077f3f..f0e8c735473d 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -46,7 +46,7 @@ namespace sdr::table { static SvxBorderLine gEmptyBorder; -const OUStringLiteral gsSize( "Size" ); +const OUStringLiteral gsSize( u"Size" ); TableLayouter::TableLayouter( const TableModelRef& xTableModel ) : mxTable( xTableModel ) diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index e2157e378758..528d97bd1c41 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -67,7 +67,7 @@ void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj ) aEx.Write(); } -const OUStringLiteral gsSize( "Size" ); +const OUStringLiteral gsSize( u"Size" ); SdrTableRtfExporter::SdrTableRtfExporter( SvStream& rStrm, SdrTableObj& rObj ) : mrStrm( rStrm ) diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 767fb9a99497..e073aae5e6b5 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -46,54 +46,54 @@ const char g_sExtrusionProjection[] = ".uno:ExtrusionProjection"; const OUStringLiteral aLightOffBmps[] = { - RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT, - RID_SVXBMP_LIGHT_OFF_FROM_TOP, - RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT, - RID_SVXBMP_LIGHT_OFF_FROM_LEFT, - "", - RID_SVXBMP_LIGHT_OFF_FROM_RIGHT, - RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT, - RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM, - RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT + u"" RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT, + u"" RID_SVXBMP_LIGHT_OFF_FROM_TOP, + u"" RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT, + u"" RID_SVXBMP_LIGHT_OFF_FROM_LEFT, + u"", + u"" RID_SVXBMP_LIGHT_OFF_FROM_RIGHT, + u"" RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT, + u"" RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM, + u"" RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT }; const OUStringLiteral aLightOnBmps[] = { - RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT, - RID_SVXBMP_LIGHT_ON_FROM_TOP, - RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT, - RID_SVXBMP_LIGHT_ON_FROM_LEFT, - "", - RID_SVXBMP_LIGHT_ON_FROM_RIGHT, - RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT, - RID_SVXBMP_LIGHT_ON_FROM_BOTTOM, - RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT + u"" RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT, + u"" RID_SVXBMP_LIGHT_ON_FROM_TOP, + u"" RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT, + u"" RID_SVXBMP_LIGHT_ON_FROM_LEFT, + u"", + u"" RID_SVXBMP_LIGHT_ON_FROM_RIGHT, + u"" RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT, + u"" RID_SVXBMP_LIGHT_ON_FROM_BOTTOM, + u"" RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT }; const OUStringLiteral aLightPreviewBmps[] = { - RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT, - RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP, - RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT, - RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT, - RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT, - RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT, - RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT, - RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM, - RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT + u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT, + u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP, + u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT, + u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT, + u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT, + u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT, + u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT, + u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM, + u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT }; const OUStringLiteral aDirectionBmps[] = { - RID_SVXBMP_DIRECTION_DIRECTION_NW, - RID_SVXBMP_DIRECTION_DIRECTION_N, - RID_SVXBMP_DIRECTION_DIRECTION_NE, - RID_SVXBMP_DIRECTION_DIRECTION_W, - RID_SVXBMP_DIRECTION_DIRECTION_NONE, - RID_SVXBMP_DIRECTION_DIRECTION_E, - RID_SVXBMP_DIRECTION_DIRECTION_SW, - RID_SVXBMP_DIRECTION_DIRECTION_S, - RID_SVXBMP_DIRECTION_DIRECTION_SE + u"" RID_SVXBMP_DIRECTION_DIRECTION_NW, + u"" RID_SVXBMP_DIRECTION_DIRECTION_N, + u"" RID_SVXBMP_DIRECTION_DIRECTION_NE, + u"" RID_SVXBMP_DIRECTION_DIRECTION_W, + u"" RID_SVXBMP_DIRECTION_DIRECTION_NONE, + u"" RID_SVXBMP_DIRECTION_DIRECTION_E, + u"" RID_SVXBMP_DIRECTION_DIRECTION_SW, + u"" RID_SVXBMP_DIRECTION_DIRECTION_S, + u"" RID_SVXBMP_DIRECTION_DIRECTION_SE }; static const char* aDirectionStrs[] = @@ -323,8 +323,8 @@ double ExtrusionDepthDialog::getDepth() const double const aDepthListInch[] = { 0, 1270,2540,5080,10160 }; double const aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 }; -const OUStringLiteral gsExtrusionDepth( ".uno:ExtrusionDepth" ); -const OUStringLiteral gsMetricUnit( ".uno:MetricUnit" ); +const OUStringLiteral gsExtrusionDepth( u".uno:ExtrusionDepth" ); +const OUStringLiteral gsMetricUnit( u".uno:MetricUnit" ); ExtrusionDepthWindow::ExtrusionDepthWindow(svt::PopupWindowController* pControl, weld::Widget* pParent) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/depthwindow.ui", "DepthWindow") diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 2f52fb965c12..d51f2e647422 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -278,7 +278,7 @@ private: } -const OUStringLiteral gsFontworkAlignment(".uno:FontworkAlignment"); +const OUStringLiteral gsFontworkAlignment(u".uno:FontworkAlignment"); FontworkAlignmentWindow::FontworkAlignmentWindow(svt::PopupWindowController* pControl, weld::Widget* pParent) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/fontworkalignmentcontrol.ui", "FontworkAlignmentControl") @@ -464,8 +464,8 @@ private: } -const OUStringLiteral gsFontworkCharacterSpacing(".uno:FontworkCharacterSpacing"); -const OUStringLiteral gsFontworkKernCharacterPairs(".uno:FontworkKernCharacterPairs"); +const OUStringLiteral gsFontworkCharacterSpacing(u".uno:FontworkCharacterSpacing"); +const OUStringLiteral gsFontworkKernCharacterPairs(u".uno:FontworkKernCharacterPairs"); FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow(svt::PopupWindowController* pControl, weld::Widget* pParent) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/fontworkcharacterspacingcontrol.ui", "FontworkCharacterSpacingControl") diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index de30aa2bfb8f..dcb8d61e8334 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -67,9 +67,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aShapePropertyMap_Impl; @@ -92,9 +92,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aTextShapePropertyMap_Impl; @@ -118,9 +118,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aConnectorPropertyMap_Impl; @@ -144,9 +144,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aDimensioningPropertyMap_Impl; @@ -170,9 +170,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aCirclePropertyMap_Impl; @@ -182,7 +182,7 @@ static SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap() { static SfxItemPropertyMapEntry const aPolyPolygonPropertyMap_Impl[] = { - { "Geometry", OWN_ATTR_BASE_GEOMETRY, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0, 0 }, + { u"Geometry", OWN_ATTR_BASE_GEOMETRY, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0, 0 }, SPECIAL_POLYGON_PROPERTIES SPECIAL_POLYPOLYGON_PROPERTIES SPECIAL_POLYPOLYGONBEZIER_PROPERTIES @@ -198,9 +198,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aPolyPolygonPropertyMap_Impl; @@ -229,11 +229,11 @@ static SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { "IsMirrored", OWN_ATTR_MIRRORED, cppu::UnoType<bool>::get(), 0, 0}, - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "GraphicStream", OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<css::io::XInputStream>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"IsMirrored", OWN_ATTR_MIRRORED, cppu::UnoType<bool>::get(), 0, 0}, + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"GraphicStream", OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<css::io::XInputStream>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aGraphicObjectPropertyMap_Impl; @@ -251,7 +251,7 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { "", 0, css::uno::Type(), 0, 0 } + { u"", 0, css::uno::Type(), 0, 0 } }; return a3DSceneObjectPropertyMap_Impl; @@ -270,9 +270,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return a3DCubeObjectPropertyMap_Impl; @@ -291,9 +291,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return a3DSphereObjectPropertyMap_Impl; } @@ -316,9 +316,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return a3DLatheObjectPropertyMap_Impl; @@ -342,9 +342,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return a3DExtrudeObjectPropertyMap_Impl; @@ -363,9 +363,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return a3DPolygonObjectPropertyMap_Impl; @@ -407,9 +407,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap() SPECIAL_3DBACKSCALE_PROPERTIES SPECIAL_3DPOLYGONOBJECT_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aAllPropertyMap_Impl; @@ -422,7 +422,7 @@ static SfxItemPropertyMapEntry const * ImplGetSvxGroupPropertyMap() SHAPE_DESCRIPTOR_PROPERTIES MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES - { "", 0, css::uno::Type(), 0, 0 } + { u"", 0, css::uno::Type(), 0, 0 } }; return aGroupPropertyMap_Impl; @@ -445,19 +445,19 @@ static SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap() TEXT_PROPERTIES FONTWORK_PROPERTIES - { "ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, - { "Model", OWN_ATTR_OLEMODEL , cppu::UnoType<css::frame::XModel>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "EmbeddedObject", OWN_ATTR_OLE_EMBEDDED_OBJECT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "EmbeddedObjectNoNewClient",OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "OriginalSize", OWN_ATTR_OLESIZE , cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "CLSID", OWN_ATTR_CLSID , cppu::UnoType<OUString>::get(), 0, 0 }, - { "IsInternal", OWN_ATTR_INTERNAL_OLE , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::READONLY, 0}, - { "VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, - { "Aspect", OWN_ATTR_OLE_ASPECT , cppu::UnoType<sal_Int64>::get(), 0, 0}, - { UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, - { "LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, - { UNO_NAME_GRAPHOBJ_GRAPHIC, OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, + { u"Model", OWN_ATTR_OLEMODEL , cppu::UnoType<css::frame::XModel>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"EmbeddedObject", OWN_ATTR_OLE_EMBEDDED_OBJECT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"EmbeddedObjectNoNewClient",OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"OriginalSize", OWN_ATTR_OLESIZE , cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"CLSID", OWN_ATTR_CLSID , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"IsInternal", OWN_ATTR_INTERNAL_OLE , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::READONLY, 0}, + { u"VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, + { u"Aspect", OWN_ATTR_OLE_ASPECT , cppu::UnoType<sal_Int64>::get(), 0, 0}, + { u"" UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"" UNO_NAME_GRAPHOBJ_GRAPHIC, OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aOle2PropertyMap_Impl; @@ -467,28 +467,28 @@ static SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap() { static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] = { - { "PluginMimeType", OWN_ATTR_PLUGIN_MIMETYPE , cppu::UnoType<OUString>::get(), 0, 0}, - { "PluginURL", OWN_ATTR_PLUGIN_URL , cppu::UnoType<OUString>::get(), 0, 0}, - { "PluginCommands", OWN_ATTR_PLUGIN_COMMANDS , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, - { "Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_OLE2_METAFILE, OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, - { "LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, - { "UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"PluginMimeType", OWN_ATTR_PLUGIN_MIMETYPE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"PluginURL", OWN_ATTR_PLUGIN_URL , cppu::UnoType<OUString>::get(), 0, 0}, + { u"PluginCommands", OWN_ATTR_PLUGIN_COMMANDS , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, + { u"Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_OLE2_METAFILE, OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, + { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"" UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aPluginPropertyMap_Impl; @@ -499,31 +499,31 @@ static SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap() //TODO/LATER: new properties for ScrollingMode and DefaultBorder static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] = { - { "FrameURL", OWN_ATTR_FRAME_URL , cppu::UnoType<OUString>::get(), 0, 0}, - { "FrameName", OWN_ATTR_FRAME_NAME , cppu::UnoType<OUString>::get(), 0, 0}, - { "FrameIsAutoScroll", OWN_ATTR_FRAME_ISAUTOSCROLL , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::MAYBEVOID, 0}, - { "FrameIsBorder", OWN_ATTR_FRAME_ISBORDER , cppu::UnoType<bool>::get() , 0, 0}, - { "FrameMarginWidth", OWN_ATTR_FRAME_MARGIN_WIDTH , cppu::UnoType<sal_Int32>::get(), 0, 0}, - { "FrameMarginHeight", OWN_ATTR_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { "Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_OLE2_METAFILE, OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, - { "LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, - { "UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"FrameURL", OWN_ATTR_FRAME_URL , cppu::UnoType<OUString>::get(), 0, 0}, + { u"FrameName", OWN_ATTR_FRAME_NAME , cppu::UnoType<OUString>::get(), 0, 0}, + { u"FrameIsAutoScroll", OWN_ATTR_FRAME_ISAUTOSCROLL , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::MAYBEVOID, 0}, + { u"FrameIsBorder", OWN_ATTR_FRAME_ISBORDER , cppu::UnoType<bool>::get() , 0, 0}, + { u"FrameMarginWidth", OWN_ATTR_FRAME_MARGIN_WIDTH , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"FrameMarginHeight", OWN_ATTR_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_OLE2_METAFILE, OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, + { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"" UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aFramePropertyMap_Impl; @@ -533,31 +533,31 @@ static SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap() { static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] = { - { "AppletCodeBase", OWN_ATTR_APPLET_CODEBASE , cppu::UnoType<OUString>::get(), 0, 0}, - { "AppletName", OWN_ATTR_APPLET_NAME , cppu::UnoType<OUString>::get(), 0, 0}, - { "AppletCode", OWN_ATTR_APPLET_CODE , cppu::UnoType<OUString>::get(), 0, 0}, - { "AppletCommands", OWN_ATTR_APPLET_COMMANDS , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, - { "AppletDocBase", OWN_ATTR_APPLET_DOCBASE , cppu::UnoType<OUString>::get(), 0, 0}, - { "AppletIsScript", OWN_ATTR_APPLET_ISSCRIPT , cppu::UnoType<bool>::get(), 0, 0 }, - { "Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_OLE2_METAFILE, OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, - { "LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, - { "UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"AppletCodeBase", OWN_ATTR_APPLET_CODEBASE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"AppletName", OWN_ATTR_APPLET_NAME , cppu::UnoType<OUString>::get(), 0, 0}, + { u"AppletCode", OWN_ATTR_APPLET_CODE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"AppletCommands", OWN_ATTR_APPLET_COMMANDS , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, + { u"AppletDocBase", OWN_ATTR_APPLET_DOCBASE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"AppletIsScript", OWN_ATTR_APPLET_ISSCRIPT , cppu::UnoType<bool>::get(), 0, 0 }, + { u"Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_OLE2_METAFILE, OWN_ATTR_METAFILE , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"ThumbnailGraphic", OWN_ATTR_THUMBNAIL , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_OLE2_PERSISTNAME, OWN_ATTR_PERSISTNAME , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"LinkURL", OWN_ATTR_OLE_LINKURL , cppu::UnoType<OUString>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"VisibleArea", OWN_ATTR_OLE_VISAREA , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0}, + { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"" UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aAppletPropertyMap_Impl; @@ -568,54 +568,54 @@ static SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() static SfxItemPropertyMapEntry const aControlPropertyMap_Impl[] = { // the following properties are mapped to the XControl Model of this shape - { UNO_NAME_EDIT_CHAR_FONTNAME, 0, cppu::UnoType<OUString>::get(), 0, 0 }, - { UNO_NAME_EDIT_CHAR_FONTSTYLENAME, 0, cppu::UnoType<OUString>::get(), 0, 0 }, - { UNO_NAME_EDIT_CHAR_FONTFAMILY, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { UNO_NAME_EDIT_CHAR_FONTCHARSET, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { UNO_NAME_EDIT_CHAR_HEIGHT, 0, cppu::UnoType<float>::get(), 0, 0 }, - { UNO_NAME_EDIT_CHAR_FONTPITCH, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { UNO_NAME_EDIT_CHAR_POSTURE, 0, cppu::UnoType<css::awt::FontSlant>::get(),0, 0 }, - { UNO_NAME_EDIT_CHAR_WEIGHT, 0, cppu::UnoType<float>::get(), 0, 0 }, - { UNO_NAME_EDIT_CHAR_UNDERLINE, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { UNO_NAME_EDIT_CHAR_STRIKEOUT, 0, cppu::UnoType<sal_Int16>::get(), 0, 0}, - { UNO_NAME_EDIT_CHAR_CASEMAP, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { UNO_NAME_EDIT_CHAR_COLOR, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { "CharBackColor", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { "CharBackTransparent", 0, cppu::UnoType<bool>::get(), 0, 0 }, - { "CharRelief", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { "CharUnderlineColor", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { "CharKerning", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { "CharWordMode", 0, cppu::UnoType<bool>::get(), 0, 0 }, - { UNO_NAME_EDIT_PARA_ADJUST, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { "TextVerticalAdjust", 0, cppu::UnoType<TextVerticalAdjust>::get(), MAYBEVOID, 0 }, - { "ControlBackground", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { "ControlBorder", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { "ControlBorderColor", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { "ControlSymbolColor", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { "ImageScaleMode", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { "ControlTextEmphasis", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - { "ControlWritingMode", 0, cppu::UnoType< sal_Int16 >::get(), 0, 0}, + { u"" UNO_NAME_EDIT_CHAR_FONTNAME, 0, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"" UNO_NAME_EDIT_CHAR_FONTSTYLENAME, 0, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"" UNO_NAME_EDIT_CHAR_FONTFAMILY, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"" UNO_NAME_EDIT_CHAR_FONTCHARSET, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"" UNO_NAME_EDIT_CHAR_HEIGHT, 0, cppu::UnoType<float>::get(), 0, 0 }, + { u"" UNO_NAME_EDIT_CHAR_FONTPITCH, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"" UNO_NAME_EDIT_CHAR_POSTURE, 0, cppu::UnoType<css::awt::FontSlant>::get(),0, 0 }, + { u"" UNO_NAME_EDIT_CHAR_WEIGHT, 0, cppu::UnoType<float>::get(), 0, 0 }, + { u"" UNO_NAME_EDIT_CHAR_UNDERLINE, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"" UNO_NAME_EDIT_CHAR_STRIKEOUT, 0, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"" UNO_NAME_EDIT_CHAR_CASEMAP, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"" UNO_NAME_EDIT_CHAR_COLOR, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"CharBackColor", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"CharBackTransparent", 0, cppu::UnoType<bool>::get(), 0, 0 }, + { u"CharRelief", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"CharUnderlineColor", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"CharKerning", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"CharWordMode", 0, cppu::UnoType<bool>::get(), 0, 0 }, + { u"" UNO_NAME_EDIT_PARA_ADJUST, 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"TextVerticalAdjust", 0, cppu::UnoType<TextVerticalAdjust>::get(), MAYBEVOID, 0 }, + { u"ControlBackground", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"ControlBorder", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"ControlBorderColor", 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"ControlSymbolColor", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"ImageScaleMode", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"ControlTextEmphasis", 0, cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { u"ControlWritingMode", 0, cppu::UnoType< sal_Int16 >::get(), 0, 0}, // the following properties are handled by SvxShape - { "Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - {"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, // #i112587# - { UNO_NAME_MISC_OBJ_PRINTABLE, SDRATTR_OBJPRINTABLE , cppu::UnoType<bool>::get(), 0, 0}, - { "Visible", SDRATTR_OBJVISIBLE , cppu::UnoType<bool>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_INTEROPGRABBAG, OWN_ATTR_INTEROPGRABBAG, cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"" UNO_NAME_MISC_OBJ_PRINTABLE, SDRATTR_OBJPRINTABLE , cppu::UnoType<bool>::get(), 0, 0}, + { u"Visible", SDRATTR_OBJVISIBLE , cppu::UnoType<bool>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_INTEROPGRABBAG, OWN_ATTR_INTEROPGRABBAG, cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aControlPropertyMap_Impl; @@ -625,20 +625,20 @@ static SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap() { static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] = { - { "PageNumber", OWN_ATTR_PAGE_NUMBER , cppu::UnoType<sal_Int32>::get(), 0, 0}, - { "Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"PageNumber", OWN_ATTR_PAGE_NUMBER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"Transformation", OWN_ATTR_TRANSFORMATION , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER , cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID , cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"" UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aPageShapePropertyMap_Impl; @@ -648,17 +648,17 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() { static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] = { - { "CaptionPoint", OWN_ATTR_CAPTION_POINT, cppu::UnoType<css::awt::Point>::get(), 0, 0 }, - { "CaptionType", SDRATTR_CAPTIONTYPE, cppu::UnoType<sal_Int16>::get(), 0, 0}, - { "CaptionIsFixedAngle", SDRATTR_CAPTIONFIXEDANGLE, cppu::UnoType<bool>::get(), 0, 0}, - { "CaptionAngle", SDRATTR_CAPTIONANGLE, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { "CaptionGap", SDRATTR_CAPTIONGAP, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, - { "CaptionEscapeDirection", SDRATTR_CAPTIONESCDIR, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { "CaptionIsEscapeRelative", SDRATTR_CAPTIONESCISREL, cppu::UnoType<bool>::get(), 0, 0}, - { "CaptionEscapeRelative", SDRATTR_CAPTIONESCREL, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { "CaptionEscapeAbsolute", SDRATTR_CAPTIONESCABS, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, - { "CaptionLineLength", SDRATTR_CAPTIONLINELEN, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, - { "CaptionIsFitLineLength", SDRATTR_CAPTIONFITLINELEN, cppu::UnoType<bool>::get(), 0, 0}, + { u"CaptionPoint", OWN_ATTR_CAPTION_POINT, cppu::UnoType<css::awt::Point>::get(), 0, 0 }, + { u"CaptionType", SDRATTR_CAPTIONTYPE, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"CaptionIsFixedAngle", SDRATTR_CAPTIONFIXEDANGLE, cppu::UnoType<bool>::get(), 0, 0}, + { u"CaptionAngle", SDRATTR_CAPTIONANGLE, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"CaptionGap", SDRATTR_CAPTIONGAP, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, + { u"CaptionEscapeDirection", SDRATTR_CAPTIONESCDIR, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"CaptionIsEscapeRelative", SDRATTR_CAPTIONESCISREL, cppu::UnoType<bool>::get(), 0, 0}, + { u"CaptionEscapeRelative", SDRATTR_CAPTIONESCREL, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"CaptionEscapeAbsolute", SDRATTR_CAPTIONESCABS, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, + { u"CaptionLineLength", SDRATTR_CAPTIONLINELEN, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, + { u"CaptionIsFitLineLength", SDRATTR_CAPTIONFITLINELEN, cppu::UnoType<bool>::get(), 0, 0}, EDGERADIUS_PROPERTIES FILL_PROPERTIES LINE_PROPERTIES @@ -670,9 +670,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - {"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aCaptionPropertyMap_Impl; @@ -682,9 +682,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() { static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] = { - { "CustomShapeEngine", SDRATTR_CUSTOMSHAPE_ENGINE, cppu::UnoType<OUString>::get(), 0, 0 }, - { "CustomShapeData", SDRATTR_CUSTOMSHAPE_DATA, cppu::UnoType<OUString>::get(), 0, 0 }, - { "CustomShapeGeometry", SDRATTR_CUSTOMSHAPE_GEOMETRY, + { u"CustomShapeEngine", SDRATTR_CUSTOMSHAPE_ENGINE, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"CustomShapeData", SDRATTR_CUSTOMSHAPE_DATA, cppu::UnoType<OUString>::get(), 0, 0 }, + { u"CustomShapeGeometry", SDRATTR_CUSTOMSHAPE_GEOMETRY, cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0 }, FILL_PROPERTIES LINE_PROPERTIES @@ -696,9 +696,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() SOFTEDGE_PROPERTIES SHADOW_PROPERTIES TEXT_PROPERTIES - {"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - {"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + {u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aCustomShapePropertyMap_Impl; } @@ -707,30 +707,30 @@ static SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap() { static SfxItemPropertyMapEntry const aMediaShapePropertyMap_Impl[] = { - { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID, cppu::UnoType<sal_Int16>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERNAME, SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "Transformation", OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, - { "MediaURL", OWN_ATTR_MEDIA_URL, cppu::UnoType<OUString>::get(), 0, 0}, - { "PreferredSize", OWN_ATTR_MEDIA_PREFERREDSIZE, cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "Loop", OWN_ATTR_MEDIA_LOOP, cppu::UnoType<sal_Bool>::get(), 0, 0}, - { "Mute", OWN_ATTR_MEDIA_MUTE, cppu::UnoType<sal_Bool>::get(), 0, 0}, - { "VolumeDB", OWN_ATTR_MEDIA_VOLUMEDB, cppu::UnoType<sal_Int16>::get(), 0, 0}, - { "Zoom", OWN_ATTR_MEDIA_ZOOM, cppu::UnoType<css::media::ZoomLevel>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERNAME, SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"Transformation", OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"MediaURL", OWN_ATTR_MEDIA_URL, cppu::UnoType<OUString>::get(), 0, 0}, + { u"PreferredSize", OWN_ATTR_MEDIA_PREFERREDSIZE, cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"Loop", OWN_ATTR_MEDIA_LOOP, cppu::UnoType<sal_Bool>::get(), 0, 0}, + { u"Mute", OWN_ATTR_MEDIA_MUTE, cppu::UnoType<sal_Bool>::get(), 0, 0}, + { u"VolumeDB", OWN_ATTR_MEDIA_VOLUMEDB, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"Zoom", OWN_ATTR_MEDIA_ZOOM, cppu::UnoType<css::media::ZoomLevel>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# - { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - {"PrivateStream", OWN_ATTR_MEDIA_STREAM, cppu::UnoType<css::io::XInputStream>::get(), 0, 0}, - {"PrivateTempFileURL", OWN_ATTR_MEDIA_TEMPFILEURL, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "MediaMimeType", OWN_ATTR_MEDIA_MIMETYPE, cppu::UnoType<OUString>::get(), 0, 0}, - { "FallbackGraphic", OWN_ATTR_FALLBACK_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"" UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, + {u"PrivateStream", OWN_ATTR_MEDIA_STREAM, cppu::UnoType<css::io::XInputStream>::get(), 0, 0}, + {u"PrivateTempFileURL", OWN_ATTR_MEDIA_TEMPFILEURL, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"MediaMimeType", OWN_ATTR_MEDIA_MIMETYPE, cppu::UnoType<OUString>::get(), 0, 0}, + { u"FallbackGraphic", OWN_ATTR_FALLBACK_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aMediaShapePropertyMap_Impl; @@ -740,29 +740,29 @@ static SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() { static SfxItemPropertyMapEntry const aTableShapePropertyMap_Impl[] = { - { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER, cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID, cppu::UnoType<sal_Int16>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_LAYERNAME, SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "Transformation", OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, - { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, - { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_MISC_OBJ_NAME, SDRATTR_OBJECTNAME, cppu::UnoType<OUString>::get(), 0, 0}, - { "UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, - { UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, - { "Model", OWN_ATTR_OLEMODEL , cppu::UnoType<css::table::XTable>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "TableTemplate", OWN_ATTR_TABLETEMPLATE , cppu::UnoType<css::container::XIndexAccess>::get(), 0, 0}, - { "UseFirstRowStyle", OWN_ATTR_TABLETEMPLATE_FIRSTROW, cppu::UnoType<bool>::get(),0, 0}, - { "UseLastRowStyle", OWN_ATTR_TABLETEMPLATE_LASTROW, cppu::UnoType<bool>::get(),0, 0}, - { "UseFirstColumnStyle", OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, cppu::UnoType<bool>::get(),0, 0}, - { "UseLastColumnStyle", OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, cppu::UnoType<bool>::get(),0, 0}, - { "UseBandingRowStyle", OWN_ATTR_TABLETEMPLATE_BANDINGROWS, cppu::UnoType<bool>::get(),0, 0}, - { "UseBandingColumnStyle", OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, cppu::UnoType<bool>::get(),0, 0}, - { "ReplacementGraphic", OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"" UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER, cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID, cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_LAYERNAME, SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"Transformation", OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, + { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0}, + { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_MISC_OBJ_NAME, SDRATTR_OBJECTNAME, cppu::UnoType<OUString>::get(), 0, 0}, + { u"UINameSingular", OWN_ATTR_UINAME_SINGULAR , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_MISC_OBJ_TITLE, OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType<OUString>::get(), 0, 0}, + { u"" UNO_NAME_MISC_OBJ_DESCRIPTION, OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType<OUString>::get(), 0, 0}, + { u"Model", OWN_ATTR_OLEMODEL , cppu::UnoType<css::table::XTable>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"TableTemplate", OWN_ATTR_TABLETEMPLATE , cppu::UnoType<css::container::XIndexAccess>::get(), 0, 0}, + { u"UseFirstRowStyle", OWN_ATTR_TABLETEMPLATE_FIRSTROW, cppu::UnoType<bool>::get(),0, 0}, + { u"UseLastRowStyle", OWN_ATTR_TABLETEMPLATE_LASTROW, cppu::UnoType<bool>::get(),0, 0}, + { u"UseFirstColumnStyle", OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, cppu::UnoType<bool>::get(),0, 0}, + { u"UseLastColumnStyle", OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, cppu::UnoType<bool>::get(),0, 0}, + { u"UseBandingRowStyle", OWN_ATTR_TABLETEMPLATE_BANDINGROWS, cppu::UnoType<bool>::get(),0, 0}, + { u"UseBandingColumnStyle", OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, cppu::UnoType<bool>::get(),0, 0}, + { u"ReplacementGraphic", OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; return aTableShapePropertyMap_Impl; diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index a163da88a2fe..46024c0069dc 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -404,7 +404,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames() { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3DScene" }); + std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3DScene" }); } Svx3DCubeObject::Svx3DCubeObject(SdrObject* pObj) @@ -524,8 +524,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames() { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D", - "com.sun.star.drawing.Shape3DCube" }); + std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D", + u"com.sun.star.drawing.Shape3DCube" }); } Svx3DSphereObject::Svx3DSphereObject(SdrObject* pObj) @@ -629,8 +629,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames() { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D", - "com.sun.star.drawing.Shape3DSphere" }); + std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D", + u"com.sun.star.drawing.Shape3DSphere" }); } Svx3DLatheObject::Svx3DLatheObject(SdrObject* pObj) @@ -809,8 +809,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames() { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D", - "com.sun.star.drawing.Shape3DLathe" }); + std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D", + u"com.sun.star.drawing.Shape3DLathe" }); } Svx3DExtrudeObject::Svx3DExtrudeObject(SdrObject* pObj) @@ -892,8 +892,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames( { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D", - "com.sun.star.drawing.Shape3DExtrude" }); + std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D", + u"com.sun.star.drawing.Shape3DExtrude" }); } Svx3DPolygonObject::Svx3DPolygonObject(SdrObject* pObj) @@ -1028,8 +1028,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames( { return comphelper::concatSequences( SvxShape::getSupportedServiceNames(), - std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D", - "com.sun.star.drawing.Shape3DPolygon" }); + std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D", + u"com.sun.star.drawing.Shape3DPolygon" }); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 415ceb3f5577..feb790e0aa15 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -116,8 +116,8 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput() bStreamClosed = true; } -const OUStringLiteral gaReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ); -const OUStringLiteral gaReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ); +const OUStringLiteral gaReplacementGraphicsContainerStorageName( u"" XML_CONTAINERSTORAGE_NAME ); +const OUStringLiteral gaReplacementGraphicsContainerStorageName60( u"" XML_CONTAINERSTORAGE_NAME_60 ); SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() : WeakComponentImplHelper< XEmbeddedObjectResolver, XNameAccess >( maMutex ), |