diff options
| -rw-r--r-- | basctl/source/basicide/baside3.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/config/WinUserInfo/WinUserInfoBe.cxx | 28 | ||||
| -rw-r--r-- | fpicker/source/win32/VistaFilePickerEventHandler.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/dtrans/ftransl.cxx | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 30d158aeb51b..69fc19b74329 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -69,7 +69,7 @@ using namespace ::com::sun::star::resource; using namespace ::com::sun::star::ui::dialogs; #ifdef _WIN32 -char const FilterMask_All[] = "*.*"; +OUStringLiteral const FilterMask_All = u"*.*"; #else constexpr OUStringLiteral FilterMask_All = u"*"; #endif diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx index 7dd5c5463e46..f9f5f9545439 100644 --- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx +++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx @@ -60,23 +60,23 @@ public: namespace { -constexpr char givenname[]("givenname"); -constexpr char sn[]("sn"); +constexpr OUStringLiteral givenname(u"givenname"); +constexpr OUStringLiteral sn(u"sn"); constexpr char fathersname[]("fathersname"); -constexpr char initials[]("initials"); -constexpr char street[]("street"); -constexpr char l[]("l"); -constexpr char st[]("st"); +constexpr OUStringLiteral initials(u"initials"); +constexpr OUStringLiteral street(u"street"); +constexpr OUStringLiteral l(u"l"); +constexpr OUStringLiteral st(u"st"); constexpr char apartment[]("apartment"); -constexpr char postalcode[]("postalcode"); -constexpr char c[]("c"); -constexpr char o[]("o"); +constexpr OUStringLiteral postalcode(u"postalcode"); +constexpr OUStringLiteral c(u"c"); +constexpr OUStringLiteral o(u"o"); constexpr char position[]("position"); -constexpr char title[]("title"); -constexpr char homephone[]("homephone"); -constexpr char telephonenumber[]("telephonenumber"); -constexpr char facsimiletelephonenumber[]("facsimiletelephonenumber"); -constexpr char mail[]("mail"); +constexpr OUStringLiteral title(u"title"); +constexpr OUStringLiteral homephone(u"homephone"); +constexpr OUStringLiteral telephonenumber(u"telephonenumber"); +constexpr OUStringLiteral facsimiletelephonenumber(u"facsimiletelephonenumber"); +constexpr OUStringLiteral mail(u"mail"); // Backend class implementing access to Active Directory user data. It caches its encoded data // in a configuration entry, to allow reusing it when user later doesn't have access to AD DC diff --git a/fpicker/source/win32/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/VistaFilePickerEventHandler.cxx index 4275adf3b749..1e148bb3e1db 100644 --- a/fpicker/source/win32/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/VistaFilePickerEventHandler.cxx @@ -233,8 +233,8 @@ void VistaFilePickerEventHandler::stopListening() } } -const char PROP_CONTROL_ID[] = "control_id"; -const char PROP_PICKER_LISTENER[] = "picker_listener"; +const OUStringLiteral PROP_CONTROL_ID = u"control_id"; +const OUStringLiteral PROP_PICKER_LISTENER = u"picker_listener"; namespace { diff --git a/vcl/win/dtrans/ftransl.cxx b/vcl/win/dtrans/ftransl.cxx index f7eb3e2086ed..6bcf59066b81 100644 --- a/vcl/win/dtrans/ftransl.cxx +++ b/vcl/win/dtrans/ftransl.cxx @@ -34,7 +34,7 @@ #define CPPUTYPE_SEQSALINT8 cppu::UnoType<Sequence< sal_Int8 >>::get() #define CPPUTYPE_DEFAULT CPPUTYPE_SEQSALINT8 -const char Windows_FormatName[] = "windows_formatname"; +const OUStringLiteral Windows_FormatName = u"windows_formatname"; const css::uno::Type CppuType_ByteSequence = cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(); const css::uno::Type CppuType_String = ::cppu::UnoType<OUString>::get(); |