diff options
Diffstat (limited to 'sd')
22 files changed, 342 insertions, 337 deletions
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h index 13a9fb045f30..08b2c4c025e7 100644 --- a/sd/inc/strmname.h +++ b/sd/inc/strmname.h @@ -23,12 +23,12 @@ #include <rtl/ustring.hxx> // PowerPoint-Filter -const OUStringLiteral pFilterPowerPoint97( "MS PowerPoint 97" ); -const OUStringLiteral pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" ); -const OUStringLiteral pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" ); +const OUStringLiteral pFilterPowerPoint97( u"MS PowerPoint 97" ); +const OUStringLiteral pFilterPowerPoint97Template( u"MS PowerPoint 97 Vorlage" ); +const OUStringLiteral pFilterPowerPoint97AutoPlay( u"MS PowerPoint 97 AutoPlay" ); // XML content stream -const OUStringLiteral pStarDrawXMLContent( "content.xml" ); +const OUStringLiteral pStarDrawXMLContent( u"content.xml" ); #endif // INCLUDED_SD_INC_STRMNAME_H diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 576c68cddb77..4c4703e188aa 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -81,10 +81,10 @@ static SvxItemPropertySet& GetStylePropertySet() { static const SfxItemPropertyMapEntry aFullPropertyMap_Impl[] = { - { "Family", WID_STYLE_FAMILY, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, - { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<XNameContainer>::get(), 0, 0}, - { "DisplayName", WID_STYLE_DISPNAME, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, - { "Hidden", WID_STYLE_HIDDEN, cppu::UnoType<bool>::get(), 0, 0}, + { u"Family", WID_STYLE_FAMILY, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, + { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<XNameContainer>::get(), 0, 0}, + { u"DisplayName", WID_STYLE_DISPNAME, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, + { u"Hidden", WID_STYLE_HIDDEN, cppu::UnoType<bool>::get(), 0, 0}, SVX_UNOEDIT_NUMBERING_PROPERTIE, SHADOW_PROPERTIES @@ -95,11 +95,11 @@ static SvxItemPropertySet& GetStylePropertySet() TEXT_PROPERTIES_DEFAULTS CONNECTOR_PROPERTIES SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS - { "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 }, - { "", 0, css::uno::Type(), 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"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aPropSet( aFullPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); @@ -575,39 +575,39 @@ struct ApiNameMap OUStringLiteral mpApiName; sal_uInt32 mnHelpId; } const pApiNameMap[] - = { { OUStringLiteral("title"), HID_PSEUDOSHEET_TITLE }, - { OUStringLiteral("subtitle"), HID_PSEUDOSHEET_SUBTITLE }, - { OUStringLiteral("background"), HID_PSEUDOSHEET_BACKGROUND }, - { OUStringLiteral("backgroundobjects"), HID_PSEUDOSHEET_BACKGROUNDOBJECTS }, - { OUStringLiteral("notes"), HID_PSEUDOSHEET_NOTES }, - { OUStringLiteral("standard"), HID_STANDARD_STYLESHEET_NAME }, - { OUStringLiteral("objectwithoutfill"), HID_POOLSHEET_OBJWITHOUTFILL }, - - { OUStringLiteral("Text"), HID_POOLSHEET_TEXT }, - { OUStringLiteral("A4"), HID_POOLSHEET_A4 }, - { OUStringLiteral("Title A4"), HID_POOLSHEET_A4_TITLE }, - { OUStringLiteral("Heading A4"), HID_POOLSHEET_A4_HEADLINE }, - { OUStringLiteral("Text A4"), HID_POOLSHEET_A4_TEXT }, - { OUStringLiteral("A4"), HID_POOLSHEET_A0 }, - { OUStringLiteral("Title A0"), HID_POOLSHEET_A0_TITLE }, - { OUStringLiteral("Heading A0"), HID_POOLSHEET_A0_HEADLINE }, - { OUStringLiteral("Text A0"), HID_POOLSHEET_A0_TEXT }, - - { OUStringLiteral("Graphic"), HID_POOLSHEET_GRAPHIC }, - { OUStringLiteral("Shapes"), HID_POOLSHEET_SHAPES }, - { OUStringLiteral("Filled"), HID_POOLSHEET_FILLED }, - { OUStringLiteral("Filled Blue"), HID_POOLSHEET_FILLED_BLUE }, - { OUStringLiteral("Filled Green"), HID_POOLSHEET_FILLED_GREEN }, - { OUStringLiteral("Filled Red"), HID_POOLSHEET_FILLED_RED }, - { OUStringLiteral("Filled Yellow"), HID_POOLSHEET_FILLED_YELLOW }, - { OUStringLiteral("Outlined"), HID_POOLSHEET_OUTLINE }, - { OUStringLiteral("Outlined Blue"), HID_POOLSHEET_OUTLINE_BLUE }, - { OUStringLiteral("Outlined Green"), HID_POOLSHEET_OUTLINE_GREEN }, - { OUStringLiteral("Outlined Red"), HID_POOLSHEET_OUTLINE_RED }, - { OUStringLiteral("Outlined Yellow"), HID_POOLSHEET_OUTLINE_YELLOW }, - { OUStringLiteral("Lines"), HID_POOLSHEET_LINES }, - { OUStringLiteral("Arrow Line"), HID_POOLSHEET_MEASURE }, - { OUStringLiteral("Arrow Dashed"), HID_POOLSHEET_LINES_DASHED } + = { { OUStringLiteral(u"title"), HID_PSEUDOSHEET_TITLE }, + { OUStringLiteral(u"subtitle"), HID_PSEUDOSHEET_SUBTITLE }, + { OUStringLiteral(u"background"), HID_PSEUDOSHEET_BACKGROUND }, + { OUStringLiteral(u"backgroundobjects"), HID_PSEUDOSHEET_BACKGROUNDOBJECTS }, + { OUStringLiteral(u"notes"), HID_PSEUDOSHEET_NOTES }, + { OUStringLiteral(u"standard"), HID_STANDARD_STYLESHEET_NAME }, + { OUStringLiteral(u"objectwithoutfill"), HID_POOLSHEET_OBJWITHOUTFILL }, + + { OUStringLiteral(u"Text"), HID_POOLSHEET_TEXT }, + { OUStringLiteral(u"A4"), HID_POOLSHEET_A4 }, + { OUStringLiteral(u"Title A4"), HID_POOLSHEET_A4_TITLE }, + { OUStringLiteral(u"Heading A4"), HID_POOLSHEET_A4_HEADLINE }, + { OUStringLiteral(u"Text A4"), HID_POOLSHEET_A4_TEXT }, + { OUStringLiteral(u"A4"), HID_POOLSHEET_A0 }, + { OUStringLiteral(u"Title A0"), HID_POOLSHEET_A0_TITLE }, + { OUStringLiteral(u"Heading A0"), HID_POOLSHEET_A0_HEADLINE }, + { OUStringLiteral(u"Text A0"), HID_POOLSHEET_A0_TEXT }, + + { OUStringLiteral(u"Graphic"), HID_POOLSHEET_GRAPHIC }, + { OUStringLiteral(u"Shapes"), HID_POOLSHEET_SHAPES }, + { OUStringLiteral(u"Filled"), HID_POOLSHEET_FILLED }, + { OUStringLiteral(u"Filled Blue"), HID_POOLSHEET_FILLED_BLUE }, + { OUStringLiteral(u"Filled Green"), HID_POOLSHEET_FILLED_GREEN }, + { OUStringLiteral(u"Filled Red"), HID_POOLSHEET_FILLED_RED }, + { OUStringLiteral(u"Filled Yellow"), HID_POOLSHEET_FILLED_YELLOW }, + { OUStringLiteral(u"Outlined"), HID_POOLSHEET_OUTLINE }, + { OUStringLiteral(u"Outlined Blue"), HID_POOLSHEET_OUTLINE_BLUE }, + { OUStringLiteral(u"Outlined Green"), HID_POOLSHEET_OUTLINE_GREEN }, + { OUStringLiteral(u"Outlined Red"), HID_POOLSHEET_OUTLINE_RED }, + { OUStringLiteral(u"Outlined Yellow"), HID_POOLSHEET_OUTLINE_YELLOW }, + { OUStringLiteral(u"Lines"), HID_POOLSHEET_LINES }, + { OUStringLiteral(u"Arrow Line"), HID_POOLSHEET_MEASURE }, + { OUStringLiteral(u"Arrow Dashed"), HID_POOLSHEET_LINES_DASHED } }; OUString GetApiNameForHelpId(sal_uLong nId) diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 81ce0b59e992..fa4ffc391ea8 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -122,11 +122,11 @@ static const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - {"TextField", EE_FEATURE_FIELD, cppu::UnoType<XTextField>::get(), PropertyAttribute::READONLY, 0 }, - {"TextPortionType", WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 }, - {"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0}, - {"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + {u"TextField", EE_FEATURE_FIELD, cppu::UnoType<XTextField>::get(), PropertyAttribute::READONLY, 0 }, + {u"TextPortionType", WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 }, + {u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0}, + {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() ); diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 2ef4f3d7978b..86853af8e241 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -333,11 +333,11 @@ void lclAppendStyle(OUStringBuffer& aBuffer, const OUString& aTag, const OUStrin } // anonymous namespace constexpr OUStringLiteral gaHTMLHeader( - "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\r\n" + u"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\r\n" " \"http://www.w3.org/TR/html4/transitional.dtd\">\r\n" "<html>\r\n<head>\r\n" ); -constexpr OUStringLiteral gaHTMLExtension = STR_HTMLEXP_DEFAULT_EXTENSION; +constexpr OUStringLiteral gaHTMLExtension = u"" STR_HTMLEXP_DEFAULT_EXTENSION; // constructor for the html export helper classes HtmlExport::HtmlExport( diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index c928efe81e6a..18b60542993a 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -81,9 +81,9 @@ void TransformOOo2xDocument( SdDrawDocument* pDocument ) } } -const OUStringLiteral gsEnableNumbering( "enable-numbering" ); -const OUStringLiteral gsTextNamespace( "urn:oasis:names:tc:opendocument:xmlns:text:1.0" ); -const OUStringLiteral gsTrue( "true" ); +const OUStringLiteral gsEnableNumbering( u"enable-numbering" ); +const OUStringLiteral gsTextNamespace( u"urn:oasis:names:tc:opendocument:xmlns:text:1.0" ); +const OUStringLiteral gsTrue( u"true" ); SdTransformOOo2xDocument::SdTransformOOo2xDocument( SdDrawDocument& rDocument ) : mrDocument( rDocument ) diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index cb0852345e45..64c1e6051507 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -39,7 +39,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create() SdFuncPtrCreateDialogFactory fp = nullptr; #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; - static const OUStringLiteral sLibName(SDUI_DLL_NAME); + static const OUStringLiteral sLibName(u"" SDUI_DLL_NAME); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) ) fp = reinterpret_cast<SdAbstractDialogFactory* (SAL_CALL*)()>( aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" )); diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index 2500d945cc31..2a284dd62697 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -63,7 +63,7 @@ void SAL_CALL GenericConfigurationChangeRequest::execute ( OUString SAL_CALL GenericConfigurationChangeRequest::getName() { return "GenericConfigurationChangeRequest " - + (meMode==Activation ? OUStringLiteral("activate ") : OUStringLiteral("deactivate ")) + + (meMode==Activation ? OUStringLiteral(u"activate ") : OUStringLiteral(u"deactivate ")) + FrameworkHelper::ResourceIdToString(mxResourceId); } diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index d1c5efd829de..3ececeaa506e 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -175,7 +175,7 @@ namespace { // Pane URLS. -const OUStringLiteral FrameworkHelper::msPaneURLPrefix("private:resource/pane/"); +const OUStringLiteral FrameworkHelper::msPaneURLPrefix(u"private:resource/pane/"); const OUString FrameworkHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane"); const OUString FrameworkHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane"); const OUString FrameworkHelper::msLeftImpressPaneURL( msPaneURLPrefix + "LeftImpressPane"); @@ -184,7 +184,7 @@ const OUString FrameworkHelper::msSidebarPaneURL( msPaneURLPrefix + "SidebarPane // View URLs. -const OUStringLiteral FrameworkHelper::msViewURLPrefix("private:resource/view/"); +const OUStringLiteral FrameworkHelper::msViewURLPrefix(u"private:resource/view/"); const OUString FrameworkHelper::msImpressViewURL( msViewURLPrefix + "ImpressView"); const OUString FrameworkHelper::msDrawViewURL( msViewURLPrefix + "GraphicView"); const OUString FrameworkHelper::msOutlineViewURL( msViewURLPrefix + "OutlineView"); @@ -196,11 +196,11 @@ const OUString FrameworkHelper::msSidebarViewURL( msViewURLPrefix + "SidebarView // Tool bar URLs. -const OUStringLiteral FrameworkHelper::msToolBarURLPrefix("private:resource/toolbar/"); +const OUStringLiteral FrameworkHelper::msToolBarURLPrefix(u"private:resource/toolbar/"); const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBar"); // Task panel URLs. -const OUStringLiteral FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" ); +const OUStringLiteral FrameworkHelper::msTaskPanelURLPrefix( u"private:resource/toolpanel/" ); const OUString FrameworkHelper::msAllMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "AllMasterPages" ); const OUString FrameworkHelper::msRecentMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "RecentMasterPages" ); const OUString FrameworkHelper::msUsedMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "UsedMasterPages" ); @@ -210,17 +210,17 @@ const OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPre const OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions" ); // Event URLs. -const OUStringLiteral FrameworkHelper::msResourceActivationRequestEvent( "ResourceActivationRequested" ); -const OUStringLiteral FrameworkHelper::msResourceDeactivationRequestEvent( "ResourceDeactivationRequest" ); -const OUStringLiteral FrameworkHelper::msResourceActivationEvent( "ResourceActivation" ); -const OUStringLiteral FrameworkHelper::msResourceDeactivationEvent( "ResourceDeactivation" ); -const OUStringLiteral FrameworkHelper::msResourceDeactivationEndEvent( "ResourceDeactivationEnd" ); -const OUStringLiteral FrameworkHelper::msConfigurationUpdateStartEvent( "ConfigurationUpdateStart" ); -const OUStringLiteral FrameworkHelper::msConfigurationUpdateEndEvent( "ConfigurationUpdateEnd" ); +const OUStringLiteral FrameworkHelper::msResourceActivationRequestEvent( u"ResourceActivationRequested" ); +const OUStringLiteral FrameworkHelper::msResourceDeactivationRequestEvent( u"ResourceDeactivationRequest" ); +const OUStringLiteral FrameworkHelper::msResourceActivationEvent( u"ResourceActivation" ); +const OUStringLiteral FrameworkHelper::msResourceDeactivationEvent( u"ResourceDeactivation" ); +const OUStringLiteral FrameworkHelper::msResourceDeactivationEndEvent( u"ResourceDeactivationEnd" ); +const OUStringLiteral FrameworkHelper::msConfigurationUpdateStartEvent( u"ConfigurationUpdateStart" ); +const OUStringLiteral FrameworkHelper::msConfigurationUpdateEndEvent( u"ConfigurationUpdateEnd" ); // Service names of controllers. -const OUStringLiteral FrameworkHelper::msModuleControllerService("com.sun.star.drawing.framework.ModuleController"); -const OUStringLiteral FrameworkHelper::msConfigurationControllerService("com.sun.star.drawing.framework.ConfigurationController"); +const OUStringLiteral FrameworkHelper::msModuleControllerService(u"com.sun.star.drawing.framework.ModuleController"); +const OUStringLiteral FrameworkHelper::msConfigurationControllerService(u"com.sun.star.drawing.framework.ConfigurationController"); //----- helper ---------------------------------------------------------------- namespace diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx index 66dfcafc21d9..b56f46784d30 100644 --- a/sd/source/ui/inc/unokywds.hxx +++ b/sd/source/ui/inc/unokywds.hxx @@ -72,21 +72,21 @@ inline const char sUNO_Service_ImageMapPolygonObject[] = "com.sun.star.image.Ima // properties inline const char sUNO_Prop_Background[] = "Background"; -inline const char sUNO_Prop_ForbiddenCharacters[] = "ForbiddenCharacters"; -inline const char sUNO_Prop_MapUnit[] = "MapUnit"; -inline const char sUNO_Prop_VisibleArea[] = "VisibleArea"; +inline const char16_t sUNO_Prop_ForbiddenCharacters[] = u"ForbiddenCharacters"; +inline const char16_t sUNO_Prop_MapUnit[] = u"MapUnit"; +inline const char16_t sUNO_Prop_VisibleArea[] = u"VisibleArea"; inline const char sUNO_Prop_Aspect[] = "Aspect"; -inline const char sUNO_Prop_TabStop[] = "TabStop"; -inline const char sUNO_Prop_CharLocale[] = "CharLocale"; -inline const char sUNO_Prop_AutomContFocus[] = "AutomaticControlFocus"; -inline const char sUNO_Prop_ApplyFrmDsgnMode[] = "ApplyFormDesignMode"; -inline const char sUNO_Prop_IsBackgroundVisible[] = "IsBackgroundVisible"; -inline const char sUNO_Prop_IsBackgroundObjectsVisible[] = "IsBackgroundObjectsVisible"; -inline const char sUNO_Prop_UserDefinedAttributes[] = "UserDefinedAttributes"; -inline const char sUNO_Prop_BookmarkURL[] = "BookmarkURL"; -inline const char sUNO_Prop_RuntimeUID[] = "RuntimeUID"; -inline const char sUNO_Prop_HasValidSignatures[] = "HasValidSignatures"; -inline const char sUNO_Prop_InteropGrabBag[] = "InteropGrabBag"; +inline const char16_t sUNO_Prop_TabStop[] = u"TabStop"; +inline const char16_t sUNO_Prop_CharLocale[] = u"CharLocale"; +inline const char16_t sUNO_Prop_AutomContFocus[] = u"AutomaticControlFocus"; +inline const char16_t sUNO_Prop_ApplyFrmDsgnMode[] = u"ApplyFormDesignMode"; +inline const char16_t sUNO_Prop_IsBackgroundVisible[] = u"IsBackgroundVisible"; +inline const char16_t sUNO_Prop_IsBackgroundObjectsVisible[] = u"IsBackgroundObjectsVisible"; +inline const char16_t sUNO_Prop_UserDefinedAttributes[] = u"UserDefinedAttributes"; +inline const char16_t sUNO_Prop_BookmarkURL[] = u"BookmarkURL"; +inline const char16_t sUNO_Prop_RuntimeUID[] = u"RuntimeUID"; +inline const char16_t sUNO_Prop_HasValidSignatures[] = u"HasValidSignatures"; +inline const char16_t sUNO_Prop_InteropGrabBag[] = u"InteropGrabBag"; // view settings inline const char sUNO_View_ViewId[] = "ViewId"; diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 3189bbc692a7..55e110901e1f 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -43,15 +43,15 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -const OUStringLiteral gsTextPropertyName("Text"); -const OUStringLiteral gsBitmapPropertyName("Bitmap"); -const OUStringLiteral gsSizePropertyName("Size"); -const OUStringLiteral gsBackgroundColorPropertyName("BackgroundColor"); -const OUStringLiteral gsTextColorPropertyName("TextColor"); -const OUStringLiteral gsFontDescriptorPropertyName("FontDescriptor"); -const OUStringLiteral gsTopPropertyName("Top"); -const OUStringLiteral gsTopRelativePropertyName("RelativeTop"); -const OUStringLiteral gsTotalHeightPropertyName("TotalHeight"); +const OUStringLiteral gsTextPropertyName(u"Text"); +const OUStringLiteral gsBitmapPropertyName(u"Bitmap"); +const OUStringLiteral gsSizePropertyName(u"Size"); +const OUStringLiteral gsBackgroundColorPropertyName(u"BackgroundColor"); +const OUStringLiteral gsTextColorPropertyName(u"TextColor"); +const OUStringLiteral gsFontDescriptorPropertyName(u"FontDescriptor"); +const OUStringLiteral gsTopPropertyName(u"Top"); +const OUStringLiteral gsTopRelativePropertyName(u"RelativeTop"); +const OUStringLiteral gsTotalHeightPropertyName(u"TotalHeight"); namespace sd::presenter { diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index 274c3c1a8daa..838f2acf86fc 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -209,9 +209,9 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber ) return ""; static const OUStringLiteral sNotesShapeName ( - "com.sun.star.presentation.NotesShape" ); + u"com.sun.star.presentation.NotesShape" ); static const OUStringLiteral sTextShapeName ( - "com.sun.star.drawing.TextShape" ); + u"com.sun.star.drawing.TextShape" ); if (aNotesPage.is()) { diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 823c0cf6e7a9..98c465d49eb6 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -108,22 +108,22 @@ static const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() // NOTE: First member must be sorted static const SfxItemPropertyMapEntry aPresentationPropertyMap_Impl[] = { - { "AllowAnimations", ATTR_PRESENT_ANIMATION_ALLOWED, cppu::UnoType<bool>::get(), 0, 0 }, - { "CustomShow", ATTR_PRESENT_CUSTOMSHOW, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { "Display", ATTR_PRESENT_DISPLAY, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { "FirstPage", ATTR_PRESENT_DIANAME, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { "IsAlwaysOnTop", ATTR_PRESENT_ALWAYS_ON_TOP, cppu::UnoType<bool>::get(), 0, 0 }, - { "IsAutomatic", ATTR_PRESENT_MANUEL, cppu::UnoType<bool>::get(), 0, 0 }, - { "IsEndless", ATTR_PRESENT_ENDLESS, cppu::UnoType<bool>::get(), 0, 0 }, - { "IsFullScreen", ATTR_PRESENT_FULLSCREEN, cppu::UnoType<bool>::get(), 0, 0 }, - { "IsShowAll", ATTR_PRESENT_ALL, cppu::UnoType<bool>::get(), 0, 0 }, - { "IsMouseVisible", ATTR_PRESENT_MOUSE, cppu::UnoType<bool>::get(), 0, 0 }, - { "IsShowLogo", ATTR_PRESENT_SHOW_PAUSELOGO, cppu::UnoType<bool>::get(), 0, 0 }, - { "IsTransitionOnClick", ATTR_PRESENT_CHANGE_PAGE, cppu::UnoType<bool>::get(), 0, 0 }, - { "Pause", ATTR_PRESENT_PAUSE_TIMEOUT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { "StartWithNavigator", ATTR_PRESENT_NAVIGATOR, cppu::UnoType<bool>::get(), 0, 0 }, - { "UsePen", ATTR_PRESENT_PEN, cppu::UnoType<bool>::get(), 0, 0 }, - { "", 0, css::uno::Type(), 0, 0 } + { u"AllowAnimations", ATTR_PRESENT_ANIMATION_ALLOWED, cppu::UnoType<bool>::get(), 0, 0 }, + { u"CustomShow", ATTR_PRESENT_CUSTOMSHOW, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Display", ATTR_PRESENT_DISPLAY, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"FirstPage", ATTR_PRESENT_DIANAME, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { u"IsAlwaysOnTop", ATTR_PRESENT_ALWAYS_ON_TOP, cppu::UnoType<bool>::get(), 0, 0 }, + { u"IsAutomatic", ATTR_PRESENT_MANUEL, cppu::UnoType<bool>::get(), 0, 0 }, + { u"IsEndless", ATTR_PRESENT_ENDLESS, cppu::UnoType<bool>::get(), 0, 0 }, + { u"IsFullScreen", ATTR_PRESENT_FULLSCREEN, cppu::UnoType<bool>::get(), 0, 0 }, + { u"IsShowAll", ATTR_PRESENT_ALL, cppu::UnoType<bool>::get(), 0, 0 }, + { u"IsMouseVisible", ATTR_PRESENT_MOUSE, cppu::UnoType<bool>::get(), 0, 0 }, + { u"IsShowLogo", ATTR_PRESENT_SHOW_PAUSELOGO, cppu::UnoType<bool>::get(), 0, 0 }, + { u"IsTransitionOnClick", ATTR_PRESENT_CHANGE_PAGE, cppu::UnoType<bool>::get(), 0, 0 }, + { u"Pause", ATTR_PRESENT_PAUSE_TIMEOUT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { u"StartWithNavigator", ATTR_PRESENT_NAVIGATOR, cppu::UnoType<bool>::get(), 0, 0 }, + { u"UsePen", ATTR_PRESENT_PEN, cppu::UnoType<bool>::get(), 0, 0 }, + { u"", 0, css::uno::Type(), 0, 0 } }; return aPresentationPropertyMap_Impl; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 9ca70b5ce710..3f782edaaa2e 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -479,9 +479,9 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow xShow->displaySlide( xSlide, xDrawPages, xAnimNode, comphelper::containerToSequence(aProperties) ); } -constexpr OUStringLiteral gsOnClick( "OnClick" ); -constexpr OUStringLiteral gsBookmark( "Bookmark" ); -constexpr OUStringLiteral gsVerb( "Verb" ); +constexpr OUStringLiteral gsOnClick( u"OnClick" ); +constexpr OUStringLiteral gsBookmark( u"Bookmark" ); +constexpr OUStringLiteral gsVerb( u"Verb" ); SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, vcl::Window* pParentWindow ) : SlideshowImplBase( m_aMutex ) diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index afb36ff791cf..8ff07499c0eb 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <string_view> + #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/frame/XController.hpp> @@ -45,6 +49,7 @@ #include <editeng/eeitem.hxx> #include <svx/sdr/table/tabledesign.hxx> #include <o3tl/enumrange.hxx> +#include <o3tl/string_view.hxx> #include "TableDesignPane.hxx" #include <createtabledesignpanel.hxx> @@ -73,7 +78,7 @@ const sal_Int32 nCellHeight = 7; // one pixel is shared with the next cell! const sal_Int32 nBitmapWidth = (nCellWidth * nPreviewColumns) - (nPreviewColumns - 1); const sal_Int32 nBitmapHeight = (nCellHeight * nPreviewRows) - (nPreviewRows - 1); -const OUStringLiteral gPropNames[CB_COUNT] = +const std::string_view gPropNames[CB_COUNT] = { "UseFirstRowStyle", "UseLastRowStyle", @@ -96,7 +101,7 @@ TableDesignWidget::TableDesignWidget(weld::Builder& rBuilder, ViewShellBase& rBa for (sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i) { - m_aCheckBoxes[i] = rBuilder.weld_check_button(OString(gPropNames[i].data, gPropNames[i].size)); + m_aCheckBoxes[i] = rBuilder.weld_check_button(OString(gPropNames[i].data(), gPropNames[i].size())); m_aCheckBoxes[i]->connect_toggled(LINK(this, TableDesignWidget, implCheckBoxHdl)); } @@ -346,7 +351,7 @@ void TableDesignWidget::updateControls() bool bUse = gDefaults[i]; if( bHasTable ) try { - mxSelectedTable->getPropertyValue( gPropNames[i] ) >>= bUse; + mxSelectedTable->getPropertyValue( OUString::createFromAscii(gPropNames[i]) ) >>= bUse; } catch( Exception& ) { diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 4ce00db5ec64..f042dc008543 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -61,13 +61,13 @@ static const SvxItemPropertySet* ImplGetSdLayerPropertySet() { static const SfxItemPropertyMapEntry aSdLayerPropertyMap_Impl[] = { - { UNO_NAME_LAYER_LOCKED, WID_LAYER_LOCKED, cppu::UnoType<bool>::get(), 0, 0 }, - { UNO_NAME_LAYER_PRINTABLE, WID_LAYER_PRINTABLE,cppu::UnoType<bool>::get(), 0, 0 }, - { UNO_NAME_LAYER_VISIBLE, WID_LAYER_VISIBLE, cppu::UnoType<bool>::get(), 0, 0 }, - { UNO_NAME_LAYER_NAME, WID_LAYER_NAME, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { "Title", WID_LAYER_TITLE, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { "Description", WID_LAYER_DESC, ::cppu::UnoType<OUString>::get(), 0, 0 }, - { "", 0, css::uno::Type(), 0, 0 } + { u"" UNO_NAME_LAYER_LOCKED, WID_LAYER_LOCKED, cppu::UnoType<bool>::get(), 0, 0 }, + { u"" UNO_NAME_LAYER_PRINTABLE, WID_LAYER_PRINTABLE,cppu::UnoType<bool>::get(), 0, 0 }, + { u"" UNO_NAME_LAYER_VISIBLE, WID_LAYER_VISIBLE, cppu::UnoType<bool>::get(), 0, 0 }, + { u"" UNO_NAME_LAYER_NAME, WID_LAYER_NAME, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Title", WID_LAYER_TITLE, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { u"Description", WID_LAYER_DESC, ::cppu::UnoType<OUString>::get(), 0, 0 }, + { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSDLayerPropertySet_Impl( aSdLayerPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aSDLayerPropertySet_Impl; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 0d7d14cc2f59..88c134e9be5d 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -203,7 +203,7 @@ static const SvxItemPropertySet* ImplGetDrawModelPropertySet() // Attention: the first parameter HAS TO BE sorted!!! const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] = { - { "BuildId", WID_MODEL_BUILDID, ::cppu::UnoType<OUString>::get(), 0, 0}, + { u"BuildId", WID_MODEL_BUILDID, ::cppu::UnoType<OUString>::get(), 0, 0}, { sUNO_Prop_CharLocale, WID_MODEL_LANGUAGE, ::cppu::UnoType<lang::Locale>::get(), 0, 0}, { sUNO_Prop_TabStop, WID_MODEL_TABSTOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { sUNO_Prop_VisibleArea, WID_MODEL_VISAREA, ::cppu::UnoType<awt::Rectangle>::get(), 0, 0}, @@ -211,13 +211,13 @@ static const SvxItemPropertySet* ImplGetDrawModelPropertySet() { sUNO_Prop_ForbiddenCharacters, WID_MODEL_FORBCHARS, cppu::UnoType<i18n::XForbiddenCharacters>::get(), beans::PropertyAttribute::READONLY, 0}, { sUNO_Prop_AutomContFocus, WID_MODEL_CONTFOCUS, cppu::UnoType<bool>::get(), 0, 0}, { sUNO_Prop_ApplyFrmDsgnMode, WID_MODEL_DSGNMODE, cppu::UnoType<bool>::get(), 0, 0}, - { "BasicLibraries", WID_MODEL_BASICLIBS, cppu::UnoType<script::XLibraryContainer>::get(), beans::PropertyAttribute::READONLY, 0}, - { "DialogLibraries", WID_MODEL_DIALOGLIBS, cppu::UnoType<script::XLibraryContainer>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"BasicLibraries", WID_MODEL_BASICLIBS, cppu::UnoType<script::XLibraryContainer>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"DialogLibraries", WID_MODEL_DIALOGLIBS, cppu::UnoType<script::XLibraryContainer>::get(), beans::PropertyAttribute::READONLY, 0}, { sUNO_Prop_RuntimeUID, WID_MODEL_RUNTIMEUID, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, { sUNO_Prop_HasValidSignatures, WID_MODEL_HASVALIDSIGNATURES, ::cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY, 0}, - { "Fonts", WID_MODEL_FONTS, cppu::UnoType<uno::Sequence<uno::Any>>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"Fonts", WID_MODEL_FONTS, cppu::UnoType<uno::Sequence<uno::Any>>::get(), beans::PropertyAttribute::READONLY, 0}, { sUNO_Prop_InteropGrabBag, WID_MODEL_INTEROPGRABBAG, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aDrawModelPropertySet_Impl( aDrawModelPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aDrawModelPropertySet_Impl; diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index b81b7d42decb..26b4a8e72cfc 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -106,37 +106,37 @@ using ::com::sun::star::drawing::XShape; #define WID_LEGACYFRAGMENT 25 #define IMPRESS_MAP_ENTRIES \ - { UNO_NAME_OBJ_LEGACYFRAGMENT,WID_LEGACYFRAGMENT, cppu::UnoType<drawing::XShape>::get(), 0, 0},\ - { UNO_NAME_OBJ_ANIMATIONPATH, WID_ANIMPATH, cppu::UnoType<drawing::XShape>::get(), 0, 0},\ - { UNO_NAME_OBJ_BOOKMARK, WID_BOOKMARK, cppu::UnoType<OUString>::get(), 0, 0},\ - { UNO_NAME_OBJ_DIMCOLOR, WID_DIMCOLOR, cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { UNO_NAME_OBJ_DIMHIDE, WID_DIMHIDE, cppu::UnoType<bool>::get(), 0, 0},\ - { UNO_NAME_OBJ_DIMPREV, WID_DIMPREV, cppu::UnoType<bool>::get(), 0, 0},\ - { UNO_NAME_OBJ_EFFECT, WID_EFFECT, cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\ - { UNO_NAME_OBJ_ISEMPTYPRESOBJ,WID_ISEMPTYPRESOBJ, cppu::UnoType<bool>::get(), 0, 0},\ - { UNO_NAME_OBJ_ISPRESOBJ, WID_ISPRESOBJ, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0},\ - { UNO_NAME_OBJ_MASTERDEPENDENT,WID_MASTERDEPEND, cppu::UnoType<bool>::get(), 0, 0},\ - { UNO_NAME_OBJ_CLICKACTION, WID_CLICKACTION, cppu::UnoType<presentation::ClickAction>::get(), 0, 0},\ - { UNO_NAME_OBJ_PLAYFULL, WID_PLAYFULL, cppu::UnoType<bool>::get(), 0, 0},\ - { UNO_NAME_OBJ_PRESORDER, WID_PRESORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { UNO_NAME_OBJ_STYLE, WID_STYLE, cppu::UnoType<style::XStyle>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0},\ - { UNO_NAME_OBJ_SOUNDFILE, WID_SOUNDFILE, cppu::UnoType<OUString>::get(), 0, 0},\ - { UNO_NAME_OBJ_SOUNDON, WID_SOUNDON, cppu::UnoType<bool>::get(), 0, 0},\ - { UNO_NAME_OBJ_SPEED, WID_SPEED, cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0},\ - { UNO_NAME_OBJ_TEXTEFFECT, WID_TEXTEFFECT, cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\ - { UNO_NAME_OBJ_BLUESCREEN, WID_BLUESCREEN, cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { UNO_NAME_OBJ_VERB, WID_VERB, cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { "IsAnimation", WID_ISANIMATION, cppu::UnoType<bool>::get(), 0, 0},\ - { "NavigationOrder", WID_NAVORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { "PlaceholderText", WID_PLACEHOLDERTEXT, cppu::UnoType<OUString>::get(), 0, 0},\ - { "", 0, css::uno::Type(), 0, 0 } + { u"" UNO_NAME_OBJ_LEGACYFRAGMENT,WID_LEGACYFRAGMENT, cppu::UnoType<drawing::XShape>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_ANIMATIONPATH, WID_ANIMPATH, cppu::UnoType<drawing::XShape>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_BOOKMARK, WID_BOOKMARK, cppu::UnoType<OUString>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_DIMCOLOR, WID_DIMCOLOR, cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_DIMHIDE, WID_DIMHIDE, cppu::UnoType<bool>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_DIMPREV, WID_DIMPREV, cppu::UnoType<bool>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_EFFECT, WID_EFFECT, cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_ISEMPTYPRESOBJ,WID_ISEMPTYPRESOBJ, cppu::UnoType<bool>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_ISPRESOBJ, WID_ISPRESOBJ, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0},\ + { u"" UNO_NAME_OBJ_MASTERDEPENDENT,WID_MASTERDEPEND, cppu::UnoType<bool>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_CLICKACTION, WID_CLICKACTION, cppu::UnoType<presentation::ClickAction>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_PLAYFULL, WID_PLAYFULL, cppu::UnoType<bool>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_PRESORDER, WID_PRESORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_STYLE, WID_STYLE, cppu::UnoType<style::XStyle>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0},\ + { u"" UNO_NAME_OBJ_SOUNDFILE, WID_SOUNDFILE, cppu::UnoType<OUString>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_SOUNDON, WID_SOUNDON, cppu::UnoType<bool>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_SPEED, WID_SPEED, cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_TEXTEFFECT, WID_TEXTEFFECT, cppu::UnoType<presentation::AnimationEffect>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_BLUESCREEN, WID_BLUESCREEN, cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_VERB, WID_VERB, cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { u"IsAnimation", WID_ISANIMATION, cppu::UnoType<bool>::get(), 0, 0},\ + { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { u"PlaceholderText", WID_PLACEHOLDERTEXT, cppu::UnoType<OUString>::get(), 0, 0},\ + { u"", 0, css::uno::Type(), 0, 0 } static const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertyGraphicMap_Impl() { static const SfxItemPropertyMapEntry aImpress_SdXShapePropertyGraphicMap_Impl[] = { - { "ImageMap", WID_IMAGEMAP, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 }, + { u"ImageMap", WID_IMAGEMAP, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 }, IMPRESS_MAP_ENTRIES }; return aImpress_SdXShapePropertyGraphicMap_Impl; @@ -153,11 +153,11 @@ using ::com::sun::star::drawing::XShape; } #define DRAW_MAP_ENTRIES\ - { UNO_NAME_OBJ_BOOKMARK, WID_BOOKMARK, cppu::UnoType<OUString>::get(), 0, 0},\ - { UNO_NAME_OBJ_CLICKACTION, WID_CLICKACTION, cppu::UnoType<presentation::ClickAction>::get(),0, 0},\ - { UNO_NAME_OBJ_STYLE, WID_STYLE, cppu::UnoType<style::XStyle>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0},\ - { "NavigationOrder", WID_NAVORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\ - { "", 0, css::uno::Type(), 0, 0 } + { u"" UNO_NAME_OBJ_BOOKMARK, WID_BOOKMARK, cppu::UnoType<OUString>::get(), 0, 0},\ + { u"" UNO_NAME_OBJ_CLICKACTION, WID_CLICKACTION, cppu::UnoType<presentation::ClickAction>::get(),0, 0},\ + { u"" UNO_NAME_OBJ_STYLE, WID_STYLE, cppu::UnoType<style::XStyle>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0},\ + { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},\ + { u"", 0, css::uno::Type(), 0, 0 } static const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertySimpleMap_Impl() { @@ -171,7 +171,7 @@ using ::com::sun::star::drawing::XShape; { static const SfxItemPropertyMapEntry aDraw_SdXShapePropertyGraphicMap_Impl[] = { - { "ImageMap", WID_IMAGEMAP, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 }, + { u"ImageMap", WID_IMAGEMAP, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 }, DRAW_MAP_ENTRIES }; return aDraw_SdXShapePropertyGraphicMap_Impl; @@ -231,7 +231,7 @@ using ::com::sun::star::drawing::XShape; { static const SfxItemPropertyMapEntry aEmpty_SdXShapePropertyMap_Impl[] = { - { "", 0, css::uno::Type(), 0, 0 } + { u"", 0, css::uno::Type(), 0, 0 } }; return aEmpty_SdXShapePropertyMap_Impl; } @@ -805,8 +805,8 @@ SdAnimationInfo* SdXShape::GetAnimationInfo( bool bCreate ) const uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() { - std::vector<OUStringLiteral> aAdd{ "com.sun.star.presentation.Shape", - "com.sun.star.document.LinkTarget" }; + std::vector<OUStringLiteral> aAdd{ u"com.sun.star.presentation.Shape", + u"com.sun.star.document.LinkTarget" }; SdrObject* pObj = mpShape->GetSdrObject(); if(pObj && pObj->GetObjInventor() == SdrInventor::Default ) @@ -815,10 +815,10 @@ uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() switch( nInventor ) { case OBJ_TITLETEXT: - aAdd.emplace_back("com.sun.star.presentation.TitleTextShape"); + aAdd.emplace_back(u"com.sun.star.presentation.TitleTextShape"); break; case OBJ_OUTLINETEXT: - aAdd.emplace_back("com.sun.star.presentation.OutlinerShape"); + aAdd.emplace_back(u"com.sun.star.presentation.OutlinerShape"); break; } } @@ -1057,21 +1057,21 @@ uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents( ) return new SdUnoEventsAccess( this ); } -const OUStringLiteral gaStrOnClick( "OnClick" ); -const OUStringLiteral gaStrServiceName( "com.sun.star.documents.Events" ); -const OUStringLiteral gaStrEventType( "EventType" ); -const OUStringLiteral gaStrPresentation( "Presentation" ); -const OUStringLiteral gaStrLibrary("Library"); -const OUStringLiteral gaStrMacroName("MacroName"); -const OUStringLiteral gaStrClickAction( "ClickAction" ); -const OUStringLiteral gaStrBookmark( "Bookmark" ); -const OUStringLiteral gaStrEffect( "Effect" ); -const OUStringLiteral gaStrPlayFull( "PlayFull" ); -const OUStringLiteral gaStrVerb( "Verb" ); -const OUStringLiteral gaStrSoundURL( "SoundURL" ); -const OUStringLiteral gaStrSpeed( "Speed" ); -const OUStringLiteral gaStrStarBasic( "StarBasic" ); -const OUStringLiteral gaStrScript( "Script" ); +const OUStringLiteral gaStrOnClick( u"OnClick" ); +const OUStringLiteral gaStrServiceName( u"com.sun.star.documents.Events" ); +const OUStringLiteral gaStrEventType( u"EventType" ); +const OUStringLiteral gaStrPresentation( u"Presentation" ); +const OUStringLiteral gaStrLibrary(u"Library"); +const OUStringLiteral gaStrMacroName(u"MacroName"); +const OUStringLiteral gaStrClickAction( u"ClickAction" ); +const OUStringLiteral gaStrBookmark( u"Bookmark" ); +const OUStringLiteral gaStrEffect( u"Effect" ); +const OUStringLiteral gaStrPlayFull( u"PlayFull" ); +const OUStringLiteral gaStrVerb( u"Verb" ); +const OUStringLiteral gaStrSoundURL( u"SoundURL" ); +const OUStringLiteral gaStrSpeed( u"Speed" ); +const OUStringLiteral gaStrStarBasic( u"StarBasic" ); +const OUStringLiteral gaStrScript( u"Script" ); SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw() : mpShape( pShape ) diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index b16971ad8613..16cca9c0ef34 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -107,80 +107,80 @@ static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, Page { static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] = { - { UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0}, - { UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_CHANGE, WID_PAGE_CHANGE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_DURATION, WID_PAGE_DURATION, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_EFFECT, WID_PAGE_EFFECT, ::cppu::UnoType<presentation::FadeEffect>::get(), 0, 0}, - { UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, - { UNO_NAME_PAGE_SPEED, WID_PAGE_SPEED, ::cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0}, - { UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_PREVIEW, WID_PAGE_PREVIEW, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_PREVIEWBITMAP, WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_PREVIEWMETAFILE, WID_PAGE_PREVIEWMETAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_VISIBLE, WID_PAGE_VISIBLE, cppu::UnoType<bool>::get(), 0, 0}, - { UNO_NAME_OBJ_SOUNDFILE, WID_PAGE_SOUNDFILE, cppu::UnoType<Any>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0}, + { u"" UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_CHANGE, WID_PAGE_CHANGE, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_DURATION, WID_PAGE_DURATION, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_EFFECT, WID_PAGE_EFFECT, ::cppu::UnoType<presentation::FadeEffect>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"" UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, + { u"" UNO_NAME_PAGE_SPEED, WID_PAGE_SPEED, ::cppu::UnoType<presentation::AnimationSpeed>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_PREVIEW, WID_PAGE_PREVIEW, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_PAGE_PREVIEWBITMAP, WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_PAGE_PREVIEWMETAFILE, WID_PAGE_PREVIEWMETAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_PAGE_VISIBLE, WID_PAGE_VISIBLE, cppu::UnoType<bool>::get(), 0, 0}, + { u"" UNO_NAME_OBJ_SOUNDFILE, WID_PAGE_SOUNDFILE, cppu::UnoType<Any>::get(), 0, 0}, { sUNO_Prop_IsBackgroundVisible, WID_PAGE_BACKVIS, cppu::UnoType<bool>::get(), 0, 0}, { sUNO_Prop_IsBackgroundObjectsVisible, WID_PAGE_BACKOBJVIS, cppu::UnoType<bool>::get(), 0, 0}, { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { sUNO_Prop_BookmarkURL, WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, - { "HighResDuration", WID_PAGE_HIGHRESDURATION, ::cppu::UnoType<double>::get(), 0, 0}, - { "IsBackgroundDark" , WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, - { "IsFooterVisible", WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, - { "FooterText", WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, - { "IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, - { "IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, - { "IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0}, - { "DateTimeText", WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, - { "DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { "TransitionType", WID_TRANSITION_TYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { "TransitionSubtype", WID_TRANSITION_SUBTYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { "TransitionDirection", WID_TRANSITION_DIRECTION, ::cppu::UnoType<sal_Bool>::get(), 0, 0}, - { "TransitionFadeColor", WID_TRANSITION_FADE_COLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_TRANSITION_DURATION, WID_TRANSITION_DURATION, ::cppu::UnoType<double>::get(), 0, 0}, - { "LoopSound", WID_LOOP_SOUND, cppu::UnoType<bool>::get(), 0, 0}, - { "NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"HighResDuration", WID_PAGE_HIGHRESDURATION, ::cppu::UnoType<double>::get(), 0, 0}, + { u"IsBackgroundDark" , WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"IsFooterVisible", WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, + { u"FooterText", WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, + { u"IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, + { u"IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, + { u"IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0}, + { u"DateTimeText", WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, + { u"DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"TransitionType", WID_TRANSITION_TYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"TransitionSubtype", WID_TRANSITION_SUBTYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"TransitionDirection", WID_TRANSITION_DIRECTION, ::cppu::UnoType<sal_Bool>::get(), 0, 0}, + { u"TransitionFadeColor", WID_TRANSITION_FADE_COLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_TRANSITION_DURATION, WID_TRANSITION_DURATION, ::cppu::UnoType<double>::get(), 0, 0}, + { u"LoopSound", WID_LOOP_SOUND, cppu::UnoType<bool>::get(), 0, 0}, + { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; #define DRAW_PAGE_NOTES_PROPERTIES \ - { UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ - { UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, \ - { UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ + { u"" UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, \ + { u"" UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, \ + { u"" UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \ + { u"" UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, \ + { u"" UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},\ - { "IsHeaderVisible", WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \ - { "HeaderText", WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \ - { "IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, \ - { "IsFooterVisible", WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \ - { "FooterText", WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \ - { "IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \ - { "IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \ - { "IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0}, \ - { "DateTimeText", WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \ - { "DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { "NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ - { "", 0, css::uno::Type(), 0, 0 } + { u"IsHeaderVisible", WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \ + { u"HeaderText", WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \ + { u"IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, \ + { u"IsFooterVisible", WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \ + { u"FooterText", WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \ + { u"IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \ + { u"IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, \ + { u"IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0}, \ + { u"DateTimeText", WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \ + { u"DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ + { u"", 0, css::uno::Type(), 0, 0 } static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] = { // this must be the first two entries so they can be excluded for PageKind::Standard - { UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0}, + { u"" UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0}, DRAW_PAGE_NOTES_PROPERTIES }; static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyNoBackMap_Impl[] = @@ -189,28 +189,28 @@ static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, Page }; #define GRAPHIC_PAGE_PROPERTIES \ - { UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, \ - { UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ - { UNO_NAME_PAGE_PREVIEW, WID_PAGE_PREVIEW, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, \ - { UNO_NAME_PAGE_PREVIEWBITMAP, WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},\ - { UNO_NAME_PAGE_PREVIEWMETAFILE, WID_PAGE_PREVIEWMETAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},\ + { u"" UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, \ + { u"" UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, \ + { u"" UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \ + { u"" UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, \ + { u"" UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { u"" UNO_NAME_PAGE_PREVIEW, WID_PAGE_PREVIEW, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, \ + { u"" UNO_NAME_PAGE_PREVIEWBITMAP, WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},\ + { u"" UNO_NAME_PAGE_PREVIEWMETAFILE, WID_PAGE_PREVIEWMETAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},\ { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, \ { sUNO_Prop_BookmarkURL, WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, \ - { "IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, \ - { "NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ - { "", 0, css::uno::Type(), 0, 0 } + { u"IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, \ + { u"NavigationOrder", WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \ + { u"", 0, css::uno::Type(), 0, 0 } static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] = { - { UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0}, + { u"" UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0}, GRAPHIC_PAGE_PROPERTIES }; static const SfxItemPropertyMapEntry aGraphicPagePropertyNoBackMap_Impl[] = @@ -263,46 +263,46 @@ static const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKin { static const SfxItemPropertyMapEntry aMasterPagePropertyMap_Impl[] = { - { UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), 0, 0}, - { UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, - { UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { "BackgroundFullSize", WID_PAGE_BACKFULL, cppu::UnoType<bool>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_BACKGROUND, WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_LINKDISPLAYBITMAP, WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_LINKDISPLAYNAME, WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, + { u"" UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"BackgroundFullSize", WID_PAGE_BACKFULL, cppu::UnoType<bool>::get(), 0, 0}, { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; static const SfxItemPropertyMapEntry aHandoutMasterPagePropertyMap_Impl[] = { - { UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, - { UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, - { UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_BOTTOM, WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_LEFT, WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_RIGHT, WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_TOP, WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_HEIGHT, WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_ORIENTATION, WID_PAGE_ORIENT, ::cppu::UnoType<view::PaperOrientation>::get(),0, 0}, + { u"" UNO_NAME_PAGE_NUMBER, WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"" UNO_NAME_PAGE_WIDTH, WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"" UNO_NAME_PAGE_LAYOUT, WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, - { "IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, - { "IsHeaderVisible", WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, - { "HeaderText", WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, - { "IsFooterVisible", WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, - { "FooterText", WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, - { "IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, - { "IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, - { "IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0}, - { "DateTimeText", WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, - { "DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"IsBackgroundDark", WID_PAGE_ISDARK, cppu::UnoType<bool>::get(), beans::PropertyAttribute::READONLY, 0}, + { u"IsHeaderVisible", WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, + { u"HeaderText", WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, + { u"IsFooterVisible", WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, + { u"FooterText", WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, + { u"IsPageNumberVisible", WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, + { u"IsDateTimeVisible", WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(), 0, 0}, + { u"IsDateTimeFixed", WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(), 0, 0}, + { u"DateTimeText", WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, + { u"DateTimeFormat", WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; const SvxItemPropertySet* pRet = nullptr; @@ -1491,9 +1491,9 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() { return comphelper::concatSequences( SvxFmDrawPage::getSupportedServiceNames(), - std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.GenericDrawPage", - "com.sun.star.document.LinkTarget", - "com.sun.star.document.LinkTargetSupplier" }); + std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.GenericDrawPage", + u"com.sun.star.document.LinkTarget", + u"com.sun.star.document.LinkTargetSupplier" }); } // XLinkTargetSupplier @@ -2192,10 +2192,10 @@ Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throwIfDisposed(); - std::vector<OUStringLiteral> aAdd{ "com.sun.star.drawing.DrawPage" }; + std::vector<OUStringLiteral> aAdd{ u"com.sun.star.drawing.DrawPage" }; if( IsImpressDocument() ) - aAdd.emplace_back("com.sun.star.presentation.DrawPage"); + aAdd.emplace_back(u"com.sun.star.presentation.DrawPage"); return comphelper::concatSequences(SdGenericDrawPage::getSupportedServiceNames(), aAdd); } @@ -2714,10 +2714,10 @@ Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throwIfDisposed(); - std::vector<OUStringLiteral> aAdd{ "com.sun.star.drawing.MasterPage" }; + std::vector<OUStringLiteral> aAdd{ u"com.sun.star.drawing.MasterPage" }; if( SvxFmDrawPage::mpPage && static_cast<SdPage*>(SvxFmDrawPage::mpPage)->GetPageKind() == PageKind::Handout ) - aAdd.emplace_back("com.sun.star.presentation.HandoutMasterPage"); + aAdd.emplace_back(u"com.sun.star.presentation.HandoutMasterPage"); return comphelper::concatSequences(SdGenericDrawPage::getSupportedServiceNames(), aAdd); } diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 9cf7f677a0a7..9163969fe4a6 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -39,7 +39,7 @@ const SvxItemPropertySet* ImplGetPageBackgroundPropertySet() static const SfxItemPropertyMapEntry aPageBackgroundPropertyMap_Impl[] = { FILL_PROPERTIES - { "", 0, css::uno::Type(), 0, 0 } + { u"", 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aPageBackgroundPropertySet_Impl( aPageBackgroundPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index e5ff3a50174f..d4d7f1c67228 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -44,10 +44,10 @@ static const SfxItemPropertyMapEntry* ImplGetSearchPropertyMap() { static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] = { - { UNO_NAME_SEARCH_BACKWARDS, WID_SEARCH_BACKWARDS, cppu::UnoType<bool>::get(), 0, 0 }, - { UNO_NAME_SEARCH_CASE, WID_SEARCH_CASE, cppu::UnoType<bool>::get(), 0, 0 }, - { UNO_NAME_SEARCH_WORDS, WID_SEARCH_WORDS, cppu::UnoType<bool>::get(), 0, 0 }, - { "", 0, css::uno::Type(), 0, 0 } + { u"" UNO_NAME_SEARCH_BACKWARDS, WID_SEARCH_BACKWARDS, cppu::UnoType<bool>::get(), 0, 0 }, + { u"" UNO_NAME_SEARCH_CASE, WID_SEARCH_CASE, cppu::UnoType<bool>::get(), 0, 0 }, + { u"" UNO_NAME_SEARCH_WORDS, WID_SEARCH_WORDS, cppu::UnoType<bool>::get(), 0, 0 }, + { u"", 0, css::uno::Type(), 0, 0 } }; return aSearchPropertyMap_Impl; diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 808fcc0545a6..307eb40e1ea1 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -328,21 +328,21 @@ private: //===== ToolBarManager ======================================================== -const OUStringLiteral ToolBarManager::msToolBar("toolbar"); -const OUStringLiteral ToolBarManager::msOptionsToolBar("optionsbar"); -const OUStringLiteral ToolBarManager::msCommonTaskToolBar("commontaskbar"); -const OUStringLiteral ToolBarManager::msViewerToolBar("viewerbar"); -const OUStringLiteral ToolBarManager::msSlideSorterToolBar("slideviewtoolbar"); -const OUStringLiteral ToolBarManager::msSlideSorterObjectBar("slideviewobjectbar"); -const OUStringLiteral ToolBarManager::msOutlineToolBar("outlinetoolbar"); -const OUStringLiteral ToolBarManager::msMasterViewToolBar("masterviewtoolbar"); -const OUStringLiteral ToolBarManager::msDrawingObjectToolBar("drawingobjectbar"); -const OUStringLiteral ToolBarManager::msGluePointsToolBar("gluepointsobjectbar"); -const OUStringLiteral ToolBarManager::msTextObjectBar("textobjectbar"); -const OUStringLiteral ToolBarManager::msBezierObjectBar("bezierobjectbar"); -const OUStringLiteral ToolBarManager::msGraphicObjectBar("graphicobjectbar"); -const OUStringLiteral ToolBarManager::msMediaObjectBar("mediaobjectbar"); -const OUStringLiteral ToolBarManager::msTableObjectBar("tableobjectbar"); +const OUStringLiteral ToolBarManager::msToolBar(u"toolbar"); +const OUStringLiteral ToolBarManager::msOptionsToolBar(u"optionsbar"); +const OUStringLiteral ToolBarManager::msCommonTaskToolBar(u"commontaskbar"); +const OUStringLiteral ToolBarManager::msViewerToolBar(u"viewerbar"); +const OUStringLiteral ToolBarManager::msSlideSorterToolBar(u"slideviewtoolbar"); +const OUStringLiteral ToolBarManager::msSlideSorterObjectBar(u"slideviewobjectbar"); +const OUStringLiteral ToolBarManager::msOutlineToolBar(u"outlinetoolbar"); +const OUStringLiteral ToolBarManager::msMasterViewToolBar(u"masterviewtoolbar"); +const OUStringLiteral ToolBarManager::msDrawingObjectToolBar(u"drawingobjectbar"); +const OUStringLiteral ToolBarManager::msGluePointsToolBar(u"gluepointsobjectbar"); +const OUStringLiteral ToolBarManager::msTextObjectBar(u"textobjectbar"); +const OUStringLiteral ToolBarManager::msBezierObjectBar(u"bezierobjectbar"); +const OUStringLiteral ToolBarManager::msGraphicObjectBar(u"graphicobjectbar"); +const OUStringLiteral ToolBarManager::msMediaObjectBar(u"mediaobjectbar"); +const OUStringLiteral ToolBarManager::msTableObjectBar(u"tableobjectbar"); std::shared_ptr<ToolBarManager> ToolBarManager::Create ( ViewShellBase& rBase, diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 59c9fde7c377..b4511d898c31 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -62,26 +62,26 @@ static const char* gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR const OUStringLiteral aSmallPlaceHolders[] = { - BMP_PLACEHOLDER_TABLE_SMALL, - BMP_PLACEHOLDER_CHART_SMALL, - BMP_PLACEHOLDER_IMAGE_SMALL, - BMP_PLACEHOLDER_MOVIE_SMALL, - BMP_PLACEHOLDER_TABLE_SMALL_HOVER, - BMP_PLACEHOLDER_CHART_SMALL_HOVER, - BMP_PLACEHOLDER_IMAGE_SMALL_HOVER, - BMP_PLACEHOLDER_MOVIE_SMALL_HOVER + u"" BMP_PLACEHOLDER_TABLE_SMALL, + u"" BMP_PLACEHOLDER_CHART_SMALL, + u"" BMP_PLACEHOLDER_IMAGE_SMALL, + u"" BMP_PLACEHOLDER_MOVIE_SMALL, + u"" BMP_PLACEHOLDER_TABLE_SMALL_HOVER, + u"" BMP_PLACEHOLDER_CHART_SMALL_HOVER, + u"" BMP_PLACEHOLDER_IMAGE_SMALL_HOVER, + u"" BMP_PLACEHOLDER_MOVIE_SMALL_HOVER }; const OUStringLiteral aBigPlaceHolders[] = { - BMP_PLACEHOLDER_TABLE_LARGE, - BMP_PLACEHOLDER_CHART_LARGE, - BMP_PLACEHOLDER_IMAGE_LARGE, - BMP_PLACEHOLDER_MOVIE_LARGE, - BMP_PLACEHOLDER_TABLE_LARGE_HOVER, - BMP_PLACEHOLDER_CHART_LARGE_HOVER, - BMP_PLACEHOLDER_IMAGE_LARGE_HOVER, - BMP_PLACEHOLDER_MOVIE_LARGE_HOVER + u"" BMP_PLACEHOLDER_TABLE_LARGE, + u"" BMP_PLACEHOLDER_CHART_LARGE, + u"" BMP_PLACEHOLDER_IMAGE_LARGE, + u"" BMP_PLACEHOLDER_MOVIE_LARGE, + u"" BMP_PLACEHOLDER_TABLE_LARGE_HOVER, + u"" BMP_PLACEHOLDER_CHART_LARGE_HOVER, + u"" BMP_PLACEHOLDER_IMAGE_LARGE_HOVER, + u"" BMP_PLACEHOLDER_MOVIE_LARGE_HOVER }; static BitmapEx* getButtonImage( int index, bool large ) |