sc/inc/bitmaps.hlst | 3 ---
sc/inc/helpids.h | 4 ++--
sc/source/ui/view/tabvwshf.cxx | 8 ++++----
3 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 4a1e9a911e62f0421b7ed67603091d49d30f7b4b
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Dec 4 13:33:27 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Dec 4 13:31:01 2021 +0100
use more OUStringLiteral in sc
Change-Id: I6d9547bd15fa255253e1309fc3f83b4f0ed6491e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126349
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/inc/bitmaps.hlst b/sc/inc/bitmaps.hlst
index a95d0fd83a30..1b24f4b28851 100644
--- a/sc/inc/bitmaps.hlst
+++ b/sc/inc/bitmaps.hlst
@@ -24,9 +24,6 @@ inline constexpr OUStringLiteral RID_BMP_MINUS =
u"sc/res/ou010.png";
inline constexpr OUStringLiteral RID_BMP_NOTPRESSED = u"sc/res/ou011.png";
inline constexpr OUStringLiteral RID_BMP_PRESSED = u"sc/res/ou012.png";
-#define RID_BMP_SELECT_CURRENT
"sc/res/popup_select_current.png"
-#define RID_BMP_UNSELECT_CURRENT
"sc/res/popup_unselect_current.png"
-
inline constexpr OUStringLiteral RID_BMP_CONTENT_TABLE = u"sc/res/nc01.png";
inline constexpr OUStringLiteral RID_BMP_CONTENT_RANGENAME =
u"sc/res/nc02.png";
inline constexpr OUStringLiteral RID_BMP_CONTENT_DBAREA = u"sc/res/nc03.png";
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 6034949292f8..01bafecc6457 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -39,8 +39,8 @@ inline constexpr OStringLiteral HID_SC_SCENWIN_BOTTOM =
"SC_HID_SC_SCENWIN_BOTTO
inline constexpr OStringLiteral HID_SC_INPUTWIN = "SC_HID_SC_INPUTWIN";
-#define HID_SC_RENAME_NAME
"SC_HID_SC_RENAME_NAME"
-#define HID_SC_APPEND_NAME
"SC_HID_SC_APPEND_NAME"
+inline constexpr OStringLiteral HID_SC_RENAME_NAME = "SC_HID_SC_RENAME_NAME";
+inline constexpr OStringLiteral HID_SC_APPEND_NAME = "SC_HID_SC_APPEND_NAME";
inline constexpr OStringLiteral HID_SC_ADD_AUTOFMT = "SC_HID_SC_ADD_AUTOFMT";
inline constexpr OStringLiteral HID_SC_AUTOFMT_NAME = "SC_HID_SC_AUTOFMT_NAME";
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index ba800ef75234..3890373a10f1 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -387,20 +387,20 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
OUString aErrMsg ( ScResId( STR_INVALIDTABNAME ) );
OUString aName;
OUString aDlgTitle;
- const char* pHelpId = nullptr;
+ OString sHelpId;
switch ( nSlot )
{
case FID_TAB_APPEND:
aDlgTitle = ScResId(SCSTR_APDTABLE);
rDoc.CreateValidTabName( aName );
- pHelpId = HID_SC_APPEND_NAME;
+ sHelpId = HID_SC_APPEND_NAME;
break;
case FID_TAB_RENAME:
aDlgTitle = ScResId(SCSTR_RENAMETAB);
rDoc.GetName( rViewData.GetTabNo(), aName );
- pHelpId = HID_SC_RENAME_NAME;
+ sHelpId = HID_SC_RENAME_NAME;
break;
}
@@ -409,7 +409,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
ScopedVclPtr<AbstractScStringInputDlg>
pDlg(pFact->CreateScStringInputDlg(
GetFrameWeld(), aDlgTitle, ScResId(SCSTR_NAME),
aName,
GetStaticInterface()->GetSlot(nSlot)->GetCommand(),
- pHelpId));
+ sHelpId));
while ( !bDone && nRet == RET_OK )
