diff options
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/abpilot/fieldmappingimpl.cxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/bibconfig.cxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/bibload.cxx | 4 | ||||
-rw-r--r-- | extensions/source/bibliography/bibmod.cxx | 20 | ||||
-rw-r--r-- | extensions/source/bibliography/datman.cxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/toolbar.cxx | 6 | ||||
-rw-r--r-- | extensions/source/logging/csvformatter.cxx | 2 | ||||
-rw-r--r-- | extensions/source/logging/loggerconfig.cxx | 10 | ||||
-rw-r--r-- | extensions/source/ole/unoconversionutilities.hxx | 2 | ||||
-rw-r--r-- | extensions/source/ole/unoobjw.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 6 | ||||
-rw-r--r-- | extensions/source/propctrlr/selectlabeldialog.cxx | 4 |
12 files changed, 31 insertions, 31 deletions
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 76e8e4992c49..6284aa977ff5 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -49,7 +49,7 @@ namespace abp using namespace ::com::sun::star::ui::dialogs; - const char sDriverSettingsNodeName[] = "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver"; + const char16_t sDriverSettingsNodeName[] = u"/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver"; const char sAddressBookNodeName[] = "/org.openoffice.Office.DataAccess/AddressBook"; namespace fieldmapping diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 131a8bc1abdf..c6531cfda7e2 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdb; -const char cDataSourceHistory[] = "DataSourceHistory"; +const char16_t cDataSourceHistory[] = u"DataSourceHistory"; Sequence<OUString> const & BibConfig::GetPropertyNames() { diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 02150fbc0507..4bdf7a7f9b46 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -518,8 +518,8 @@ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo() { static const SfxItemPropertyMapEntry aBibProps_Impl[] = { - { "BibliographyDataFieldNames", 0, cppu::UnoType<Sequence<PropertyValue>>::get(), PropertyAttribute::READONLY, 0}, - { "", 0, css::uno::Type(), 0, 0 } + { u"BibliographyDataFieldNames", 0, cppu::UnoType<Sequence<PropertyValue>>::get(), PropertyAttribute::READONLY, 0}, + { u"", 0, css::uno::Type(), 0, 0 } }; static Reference< XPropertySetInfo > xRet = SfxItemPropertySet(aBibProps_Impl).getPropertySetInfo(); diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index 91db4921f957..9fab0c7362ae 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -89,15 +89,15 @@ BibConfig* BibModul::GetConfig() // PropertyNames -const OUStringLiteral FM_PROP_LABEL = "Label"; -const OUStringLiteral FM_PROP_CONTROLSOURCE = "DataField"; -const OUStringLiteral FM_PROP_NAME = "Name"; -const OUStringLiteral FM_PROP_FORMATKEY = "FormatKey"; -const OUStringLiteral FM_PROP_EDITMODE = "RecordMode"; -const OUStringLiteral FM_PROP_CURSORSOURCETYPE = "DataSelectionType"; -const OUStringLiteral FM_PROP_CURSORSOURCE = "DataSelection"; -const OUStringLiteral FM_PROP_DATASOURCE = "DataSource"; -const OUStringLiteral FM_PROP_VALUE = "Value"; -const OUStringLiteral FM_PROP_TEXT = "Text"; +const OUStringLiteral FM_PROP_LABEL = u"Label"; +const OUStringLiteral FM_PROP_CONTROLSOURCE = u"DataField"; +const OUStringLiteral FM_PROP_NAME = u"Name"; +const OUStringLiteral FM_PROP_FORMATKEY = u"FormatKey"; +const OUStringLiteral FM_PROP_EDITMODE = u"RecordMode"; +const OUStringLiteral FM_PROP_CURSORSOURCETYPE = u"DataSelectionType"; +const OUStringLiteral FM_PROP_CURSORSOURCE = u"DataSelection"; +const OUStringLiteral FM_PROP_DATASOURCE = u"DataSource"; +const OUStringLiteral FM_PROP_VALUE = u"Value"; +const OUStringLiteral FM_PROP_TEXT = u"Text"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index c5115703dbf9..d782b01f9f20 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -520,7 +520,7 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const css::uno::R } -OUStringLiteral const gGridName("theGrid"); +OUStringLiteral const gGridName(u"theGrid"); BibDataManager::BibDataManager() :BibDataManager_Base( GetMutex() ) diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 1bd3680e0f96..898d59337399 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -597,9 +597,9 @@ void BibToolBar::RebuildToolbar() void BibToolBar::ApplyImageList() { - SetItemImage(nTBC_BT_AUTOFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_AUTOFILTER_SC) : OUStringLiteral(RID_EXTBMP_AUTOFILTER_LC))); - SetItemImage(nTBC_BT_FILTERCRIT, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_FILTERCRIT_SC) : OUStringLiteral(RID_EXTBMP_FILTERCRIT_LC))); - SetItemImage(nTBC_BT_REMOVEFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_SC) : OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_LC))); + SetItemImage(nTBC_BT_AUTOFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(u"" RID_EXTBMP_AUTOFILTER_SC) : OUStringLiteral(u"" RID_EXTBMP_AUTOFILTER_LC))); + SetItemImage(nTBC_BT_FILTERCRIT, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(u"" RID_EXTBMP_FILTERCRIT_SC) : OUStringLiteral(u"" RID_EXTBMP_FILTERCRIT_LC))); + SetItemImage(nTBC_BT_REMOVEFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(u"" RID_EXTBMP_REMOVE_FILTER_SORT_SC) : OUStringLiteral(u"" RID_EXTBMP_REMOVE_FILTER_SORT_LC))); AdjustToolBox(); } diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index 0805d68b43fe..ce140329457e 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -88,7 +88,7 @@ namespace { const sal_Unicode quote_char = '"'; const sal_Unicode comma_char = ','; - const OUStringLiteral dos_newline = "\r\n"; + const OUStringLiteral dos_newline = u"\r\n"; bool needsQuoting(const OUString& str) { diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 4855380b5000..a78c1385363d 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -115,11 +115,11 @@ namespace logging Variable const aVariables[] = { - {OUStringLiteral("$(loggername)"), sLoggerName}, - {OUStringLiteral("$(date)"), sDate}, - {OUStringLiteral("$(time)"), sTime}, - {OUStringLiteral("$(datetime)"), sDateTime}, - {OUStringLiteral("$(pid)"), aPID} + {OUStringLiteral(u"$(loggername)"), sLoggerName}, + {OUStringLiteral(u"$(date)"), sDate}, + {OUStringLiteral(u"$(time)"), sTime}, + {OUStringLiteral(u"$(datetime)"), sDateTime}, + {OUStringLiteral(u"$(pid)"), aPID} }; for (Variable const & aVariable : aVariables) diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index 90178e2a6a21..4065fd682c92 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -1522,7 +1522,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny if (!getType(sName, type)) { throw CannotConvertException( - OUStringLiteral("[automation bridge]UnoConversionUtilities<T>::variantToAny \n" + OUStringLiteral(u"[automation bridge]UnoConversionUtilities<T>::variantToAny \n" "A UNO type with the name: ") + o3tl::toU(LPCOLESTR(sName)) + "does not exist!", nullptr, TypeClass_UNKNOWN, FailReason::TYPE_NOT_SUPPORTED,0); diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 65382fa542bc..e31ae8816ca3 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -2899,7 +2899,7 @@ HRESULT InterfaceOleWrapper::InvokeGeneral( DISPID dispidMember, unsigned short Type type; if (!getType(arg.bstrVal, type)) { - writeExcepinfo(pexcepinfo, OUStringLiteral("[automation bridge] A UNO type with the name ") + + writeExcepinfo(pexcepinfo, OUStringLiteral(u"[automation bridge] A UNO type with the name ") + o3tl::toU(arg.bstrVal) + " does not exist!"); return DISP_E_EXCEPTION; } diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 7e44e5dce226..c8a3cde773ba 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -996,8 +996,8 @@ namespace pcr aDescriptor.Control = pControl; aDescriptor.PrimaryButtonId = PROPERTY_ID_TARGET_URL == nPropId - ? OUStringLiteral(UID_PROP_DLG_ATTR_TARGET_URL) - : OUStringLiteral(UID_PROP_DLG_IMAGE_URL); + ? OUStringLiteral(u"" UID_PROP_DLG_ATTR_TARGET_URL) + : OUStringLiteral(u"" UID_PROP_DLG_IMAGE_URL); break; } @@ -1376,7 +1376,7 @@ namespace pcr aDescriptor.HasSecondaryButton = true; bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0; - aDescriptor.Category = bIsDataProperty ? OUStringLiteral("Data") : OUStringLiteral("General"); + aDescriptor.Category = bIsDataProperty ? OUStringLiteral(u"Data") : OUStringLiteral(u"General"); return aDescriptor; } diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index bc1d16111c14..05b669aa0d7b 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -91,8 +91,8 @@ namespace pcr // check which service the allowed components must support sal_Int16 nClassId = 0; try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { } - m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(SERVICE_COMPONENT_GROUPBOX) : OUStringLiteral(SERVICE_COMPONENT_FIXEDTEXT); - m_aRequiredControlImage = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(RID_EXTBMP_GROUPBOX) : OUStringLiteral(RID_EXTBMP_FIXEDTEXT); + m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(u"" SERVICE_COMPONENT_GROUPBOX) : OUStringLiteral(u"" SERVICE_COMPONENT_FIXEDTEXT); + m_aRequiredControlImage = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(u"" RID_EXTBMP_GROUPBOX) : OUStringLiteral(u"" RID_EXTBMP_FIXEDTEXT); // calc the currently set label control (so InsertEntries can calc m_xInitialSelection) Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) ); |