cui/inc/bitmaps.hlst | 79 +++++------
cui/source/tabpages/border.cxx | 82 ++++++------
extensions/inc/bitmaps.hlst | 4
extensions/inc/helpids.h | 13 -
extensions/inc/propctrlr.h | 4
extensions/source/propctrlr/defaultforminspection.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 4
extensions/source/propctrlr/formstrings.hxx | 5
filter/source/config/cache/constant.hxx | 1
forms/source/inc/frm_strings.hxx | 6
forms/source/inc/services.hxx | 7 -
formula/inc/bitmaps.hlst | 1
fpicker/inc/bitmaps.hlst | 1
icon-themes/breeze/links.txt | 2
icon-themes/breeze_dark/links.txt | 2
icon-themes/colibre/links.txt | 2
icon-themes/elementary/links.txt | 1
icon-themes/karasa_jaga/links.txt | 1
icon-themes/sifr/links.txt | 2
icon-themes/sifr_dark/links.txt | 2
icon-themes/sukapura/links.txt | 2
sc/source/core/data/table3.cxx | 119 +++++++++++-------
22 files changed, 157 insertions(+), 185 deletions(-)
New commits:
commit 7270f6f485f7b1308992bda059b3f874705c38db
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Wed Nov 24 12:33:06 2021 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Thu Nov 25 14:27:08 2021 +0100
avoid repeated checks with same result on fast lookup path
Change the compareByString() function to a template with a bool
parameter that will disable all the checks, allowing the compiler
to effectively generate just a small inline function. And then
compute the bool value once and call the fast version if true.
With comment #2 in tdf#136838 this actually saves 40% of time.
Change-Id: I5a5190f19a1df163b28e527090ec880e6de5bbda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125768
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 6012deb77540..877aeede34d8 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2597,12 +2597,12 @@ public:
}
}
- // The value is placed inside one parameter: [pValueSource1] or
[pValueSource2] but never in both.
- std::pair<bool,bool> compareByString(const ScQueryEntry& rEntry, const
ScQueryEntry::Item& rItem,
- const svl::SharedString* pValueSource1, const OUString * pValueSource2)
+ bool isFastCompareByString(const ScQueryEntry& rEntry) const
{
- bool bOk = false;
- bool bTestEqual = false;
+ // If this is true, then there's a fast path in compareByString() which
+ // can be selected using the template argument to get fast code
+ // that will not check the same conditions every time. This makes a
difference
+ // in fast lookups that search for an exact value (case sensitive or
not).
bool bMatchWholeCell = mbMatchWholeCell;
if (isPartialTextMatchOp(rEntry))
// may have to do partial textural comparison.
@@ -2611,10 +2611,37 @@ public:
const bool bRealWildOrRegExp = isRealWildOrRegExp(rEntry);
const bool bTestWildOrRegExp = isTestWildOrRegExp(rEntry);
+ // SC_EQUAL is part of isTextMatchOp(rEntry)
+ return rEntry.eOp == SC_EQUAL && !bRealWildOrRegExp &&
!bTestWildOrRegExp && bMatchWholeCell;
+ }
+
+ // The value is placed inside one parameter: [pValueSource1] or
[pValueSource2] but never in both.
+ // For the template argument see isFastCompareByString().
+ template<bool bFast = false>
+ std::pair<bool,bool> compareByString(const ScQueryEntry& rEntry, const
ScQueryEntry::Item& rItem,
+ const svl::SharedString* pValueSource1, const OUString * pValueSource2)
+ {
+ bool bOk = false;
+ bool bTestEqual = false;
+ bool bMatchWholeCell;
+ if(bFast)
+ bMatchWholeCell = true;
+ else
+ {
+ bMatchWholeCell = mbMatchWholeCell;
+ if (isPartialTextMatchOp(rEntry))
+ // may have to do partial textural comparison.
+ bMatchWholeCell = false;
+ }
+
+ const bool bRealWildOrRegExp = !bFast && isRealWildOrRegExp(rEntry);
+ const bool bTestWildOrRegExp = !bFast && isTestWildOrRegExp(rEntry);
+
+ assert(!bFast || pValueSource1 != nullptr); // shared string for fast
path
// [pValueSource1] or [pValueSource2] but never both of them or none
of them
assert((pValueSource1 != nullptr) != (pValueSource2 != nullptr));
- if ( bRealWildOrRegExp || bTestWildOrRegExp )
+ if ( !bFast && ( bRealWildOrRegExp || bTestWildOrRegExp ))
{
const OUString & rValue = pValueSource1 ?
pValueSource1->getString() : *pValueSource2;
@@ -2671,11 +2698,12 @@ public:
else
bTestEqual = bMatch;
}
- if ( !bRealWildOrRegExp )
+ if ( bFast || !bRealWildOrRegExp )
{
// Simple string matching i.e. no regexp match.
- if (isTextMatchOp(rEntry))
+ if (bFast || isTextMatchOp(rEntry))
{
+ // Check this even with bFast.
if (rItem.meType != ScQueryEntry::ByString &&
rItem.maString.isEmpty())
{
// #i18374# When used from functions (match, countif,
sumif, vlookup, hlookup, lookup),
@@ -2685,11 +2713,12 @@ public:
if ( rEntry.eOp == SC_NOT_EQUAL )
bOk = !bOk;
}
- else if ( bMatchWholeCell )
+ else if ( bFast || bMatchWholeCell )
{
- if (pValueSource1)
+ if (bFast || pValueSource1)
{
// Fast string equality check by comparing string
identifiers.
+ // This is the bFast path, all conditions should lead
here on bFast == true.
if (mrParam.bCaseSens)
{
bOk = pValueSource1->getData() ==
rItem.maString.getData();
@@ -2714,7 +2743,7 @@ public:
}
}
- if ( rEntry.eOp == SC_NOT_EQUAL )
+ if ( !bFast && rEntry.eOp == SC_NOT_EQUAL )
bOk = !bOk;
}
else
@@ -2937,7 +2966,7 @@ public:
std::pair<bool,bool> validQueryProcessEntry(SCROW nRow, SCCOL nCol, SCTAB
nTab, const ScQueryParam& rParam,
ScRefCellValue& aCell, bool* pbTestEqualCondition, const
ScInterpreterContext* pContext, QueryEvaluator& aEval,
- const ScDocument& rDoc, const ScQueryEntry& rEntry )
+ const ScQueryEntry& rEntry )
{
std::pair<bool,bool> aRes(false, false);
const ScQueryEntry::QueryItemsType& rItems = rEntry.GetQueryItems();
@@ -2988,45 +3017,41 @@ std::pair<bool,bool> validQueryProcessEntry(SCROW nRow,
SCCOL nCol, SCTAB nTab,
const svl::SharedString* cellSharedString = nullptr;
OUString cellString;
bool cellStringSet = false;
- if( rEntry.eOp == SC_EQUAL && rItems.size() >= 10 )
+ const bool bFastCompareByString = aEval.isFastCompareByString(rEntry);
+ if(rEntry.eOp == SC_EQUAL && rItems.size() >= 10 && bFastCompareByString)
{
// The same as above but for strings. Try to optimize the case when
- // it's a svl::SharedString comparison (case sensitive or not).
- // That happens when SC_EQUAL is used, whole cell matching is enabled,
- // and a regexp is not wanted, see compareByString() above.
- if(rDoc.GetDocOptions().IsMatchWholeCell()
- && !aEval.isRealWildOrRegExp(rEntry) &&
!aEval.isTestWildOrRegExp(rEntry))
+ // it's a svl::SharedString comparison. That happens when SC_EQUAL is
used
+ // and simple matching is used, see compareByString()
+ if(!cellStringSet)
{
- if(!cellStringSet)
- {
- cellString = aEval.getCellString(aCell, nRow, rEntry,
pContext, &cellSharedString);
- cellStringSet = true;
- }
- // For ScQueryEntry::ByString check that the cell is represented
by a shared string,
- // which means it's either a string cell or a formula error. This
is not as
- // generous as isQueryByString() but it should be enough and
better be safe.
- if(cellSharedString != nullptr)
+ cellString = aEval.getCellString(aCell, nRow, rEntry, pContext,
&cellSharedString);
+ cellStringSet = true;
+ }
+ // For ScQueryEntry::ByString check that the cell is represented by a
shared string,
+ // which means it's either a string cell or a formula error. This is
not as
+ // generous as isQueryByString() but it should be enough and better be
safe.
+ if(cellSharedString != nullptr)
+ {
+ if (rParam.bCaseSens)
{
- if (rParam.bCaseSens)
+ for (const auto& rItem : rItems)
{
- for (const auto& rItem : rItems)
+ if (rItem.meType == ScQueryEntry::ByString
+ && cellSharedString->getData() ==
rItem.maString.getData())
{
- if (rItem.meType == ScQueryEntry::ByString
- && cellSharedString->getData() ==
rItem.maString.getData())
- {
- return std::make_pair(true, true);
- }
+ return std::make_pair(true, true);
}
}
- else
+ }
+ else
+ {
+ for (const auto& rItem : rItems)
{
- for (const auto& rItem : rItems)
+ if (rItem.meType == ScQueryEntry::ByString
+ && cellSharedString->getDataIgnoreCase() ==
rItem.maString.getDataIgnoreCase())
{
- if (rItem.meType == ScQueryEntry::ByString
- && cellSharedString->getDataIgnoreCase() ==
rItem.maString.getDataIgnoreCase())
- {
- return std::make_pair(true, true);
- }
+ return std::make_pair(true, true);
}
}
}
@@ -3063,9 +3088,13 @@ std::pair<bool,bool> validQueryProcessEntry(SCROW nRow,
SCCOL nCol, SCTAB nTab,
cellString = aEval.getCellString(aCell, nRow, rEntry,
pContext, &cellSharedString);
cellStringSet = true;
}
- std::pair<bool,bool> aThisRes = cellSharedString
- ? aEval.compareByString(rEntry, rItem, cellSharedString,
nullptr)
- : aEval.compareByString(rEntry, rItem, nullptr, &cellString);
+ std::pair<bool,bool> aThisRes;
+ if( cellSharedString && bFastCompareByString ) // fast
+ aThisRes = aEval.compareByString<true>(rEntry, rItem,
cellSharedString, nullptr);
+ else if( cellSharedString )
+ aThisRes = aEval.compareByString(rEntry, rItem,
cellSharedString, nullptr);
+ else
+ aThisRes = aEval.compareByString(rEntry, rItem, nullptr,
&cellString);
aRes.first |= aThisRes.first;
aRes.second |= aThisRes.second;
}
@@ -3136,7 +3165,7 @@ bool ScTable::ValidQuery(
aCell = GetCellValue(nCol, nRow);
std::pair<bool,bool> aRes = validQueryProcessEntry(nRow, nCol, nTab,
rParam, aCell,
- pbTestEqualCondition, pContext, aEval, rDocument, rEntry);
+ pbTestEqualCondition, pContext, aEval, rEntry);
if (nPos == -1)
{
commit 9a96b1b5158428e4b1925816932d6d0060e6c3d6
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Nov 24 15:57:13 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Nov 25 14:26:56 2021 +0100
remove unused defines and convert some to OUStringLiteral
Also remove the associated links.txt entries
Change-Id: I5028fab2feb828875a0b772418fc29cbdfe4ce72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125773
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index 1fa444fc6da4..733ce7b26478 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -9,44 +9,44 @@
#pragma once
-#define RID_SVXBMP_CELL_NONE "svx/res/pr01.png"
-#define RID_SVXBMP_CELL_NONE_32 "svx/res/border_cell_none_32.png"
-#define RID_SVXBMP_CELL_ALL "svx/res/pr02.png"
-#define RID_SVXBMP_CELL_ALL_32 "svx/res/border_cell_all_32.png"
-#define RID_SVXBMP_CELL_LR "svx/res/pr03.png"
-#define RID_SVXBMP_CELL_LR_32 "svx/res/border_cell_lr_32.png"
-#define RID_SVXBMP_CELL_TB "svx/res/pr04.png"
-#define RID_SVXBMP_CELL_TB_32 "svx/res/border_cell_tb_32.png"
-#define RID_SVXBMP_CELL_L "svx/res/pr05.png"
-#define RID_SVXBMP_CELL_L_32 "svx/res/border_cell_l_32.png"
-#define RID_SVXBMP_CELL_DIAG "svx/res/pr06.png"
-#define RID_SVXBMP_CELL_DIAG_32 "svx/res/border_cell_diag_32.png"
-#define RID_SVXBMP_HOR_NONE "svx/res/pr07.png"
-#define RID_SVXBMP_HOR_OUTER "svx/res/pr08.png"
-#define RID_SVXBMP_HOR_HOR "svx/res/pr09.png"
-#define RID_SVXBMP_HOR_ALL "svx/res/pr010.png"
-#define RID_SVXBMP_HOR_OUTER2 "svx/res/pr011.png"
-#define RID_SVXBMP_VER_NONE "svx/res/pr012.png"
-#define RID_SVXBMP_VER_OUTER "svx/res/pr013.png"
-#define RID_SVXBMP_VER_VER "svx/res/pr014.png"
-#define RID_SVXBMP_VER_ALL "svx/res/pr015.png"
-#define RID_SVXBMP_VER_OUTER2 "svx/res/pr016.png"
-#define RID_SVXBMP_TABLE_NONE "svx/res/pr017.png"
-#define RID_SVXBMP_TABLE_OUTER "svx/res/pr018.png"
-#define RID_SVXBMP_TABLE_OUTERH "svx/res/pr019.png"
-#define RID_SVXBMP_TABLE_ALL "svx/res/pr020.png"
-#define RID_SVXBMP_TABLE_OUTER2 "svx/res/pr021.png"
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_NONE = u"svx/res/pr01.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_NONE_32 =
u"svx/res/border_cell_none_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_ALL = u"svx/res/pr02.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_ALL_32 =
u"svx/res/border_cell_all_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_LR = u"svx/res/pr03.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_LR_32 =
u"svx/res/border_cell_lr_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_TB = u"svx/res/pr04.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_TB_32 =
u"svx/res/border_cell_tb_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_L = u"svx/res/pr05.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_L_32 =
u"svx/res/border_cell_l_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_DIAG = u"svx/res/pr06.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELL_DIAG_32 =
u"svx/res/border_cell_diag_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_HOR_NONE = u"svx/res/pr07.png";
+inline constexpr OUStringLiteral RID_SVXBMP_HOR_OUTER = u"svx/res/pr08.png";
+inline constexpr OUStringLiteral RID_SVXBMP_HOR_HOR = u"svx/res/pr09.png";
+inline constexpr OUStringLiteral RID_SVXBMP_HOR_ALL = u"svx/res/pr010.png";
+inline constexpr OUStringLiteral RID_SVXBMP_HOR_OUTER2 = u"svx/res/pr011.png";
+inline constexpr OUStringLiteral RID_SVXBMP_VER_NONE = u"svx/res/pr012.png";
+inline constexpr OUStringLiteral RID_SVXBMP_VER_OUTER = u"svx/res/pr013.png";
+inline constexpr OUStringLiteral RID_SVXBMP_VER_VER = u"svx/res/pr014.png";
+inline constexpr OUStringLiteral RID_SVXBMP_VER_ALL = u"svx/res/pr015.png";
+inline constexpr OUStringLiteral RID_SVXBMP_VER_OUTER2 = u"svx/res/pr016.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TABLE_NONE = u"svx/res/pr017.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TABLE_OUTER = u"svx/res/pr018.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TABLE_OUTERH =
u"svx/res/pr019.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TABLE_ALL = u"svx/res/pr020.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TABLE_OUTER2 =
u"svx/res/pr021.png";
-#define RID_SVXBMP_SHADOWNONE "svx/res/sh01.png"
-#define RID_SVXBMP_SHADOWNONE_32 "svx/res/shadow_none_32.png"
-#define RID_SVXBMP_SHADOW_BOT_RIGHT "svx/res/sh02.png"
-#define RID_SVXBMP_SHADOW_BOT_RIGHT_32 "svx/res/shadow_bottom_right_32.png"
-#define RID_SVXBMP_SHADOW_BOT_LEFT "svx/res/sh03.png"
-#define RID_SVXBMP_SHADOW_BOT_LEFT_32 "svx/res/shadow_bottom_left_32.png"
-#define RID_SVXBMP_SHADOW_TOP_RIGHT "svx/res/sh04.png"
-#define RID_SVXBMP_SHADOW_TOP_RIGHT_32 "svx/res/shadow_top_right_32.png"
-#define RID_SVXBMP_SHADOW_TOP_LEFT "svx/res/sh05.png"
-#define RID_SVXBMP_SHADOW_TOP_LEFT_32 "svx/res/shadow_top_left_32.png"
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOWNONE = u"svx/res/sh01.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOWNONE_32 =
u"svx/res/shadow_none_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_RIGHT =
u"svx/res/sh02.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_RIGHT_32 =
u"svx/res/shadow_bottom_right_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_LEFT =
u"svx/res/sh03.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_LEFT_32 =
u"svx/res/shadow_bottom_left_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_RIGHT =
u"svx/res/sh04.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_RIGHT_32 =
u"svx/res/shadow_top_right_32.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_LEFT =
u"svx/res/sh05.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_LEFT_32 =
u"svx/res/shadow_top_left_32.png";
inline constexpr OUStringLiteral RID_SVXBMP_BOTTOMLOCK = u"svx/res/lo01.png";
inline constexpr OUStringLiteral RID_SVXBMP_TOPLOCK = u"svx/res/lo02.png";
@@ -62,14 +62,9 @@ inline constexpr OUStringLiteral RID_CUIBMP_HARDDISK =
u"res/harddisk_16.png";
inline constexpr OUStringLiteral RID_CUIBMP_LIB = u"res/im30820.png";
inline constexpr OUStringLiteral RID_CUIBMP_MACRO = u"res/im30821.png";
inline constexpr OUStringLiteral RID_CUIBMP_DOC = u"res/im30826.png";
-#define RID_CUIBMP_COLLAPSED "res/plus.png"
-#define RID_CUIBMP_EXPANDED "res/minus.png"
inline constexpr OUStringLiteral RID_SVXBMP_SCRIPT = u"res/script.png";
-#define RID_SVXBMP_COLLAPSEDNODE "res/sx18002.png"
-#define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png"
-
inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP1 = u"svx/res/legtyp1.png";
inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP2 = u"svx/res/legtyp2.png";
inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP3 = u"svx/res/legtyp3.png";
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index ffe631eee007..64558279be60 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -336,81 +336,81 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container*
pPage, weld::DialogControlle
,
m_xRemoveAdjacentCellBordersCB(m_xBuilder->weld_check_button("rmadjcellborders"))
,
m_xRemoveAdjacentCellBordersFT(m_xBuilder->weld_label("rmadjcellbordersft"))
{
- static std::vector<std::u16string_view> aBorderImageIds;
+ static std::vector<OUString> aBorderImageIds;
if (aBorderImageIds.empty())
{
if (comphelper::LibreOfficeKit::isActive())
{
aBorderImageIds.insert(aBorderImageIds.end(), {
- u"" RID_SVXBMP_CELL_NONE_32,
- u"" RID_SVXBMP_CELL_ALL_32,
- u"" RID_SVXBMP_CELL_LR_32,
- u"" RID_SVXBMP_CELL_TB_32,
- u"" RID_SVXBMP_CELL_L_32,
- u"" RID_SVXBMP_CELL_DIAG_32
+ RID_SVXBMP_CELL_NONE_32,
+ RID_SVXBMP_CELL_ALL_32,
+ RID_SVXBMP_CELL_LR_32,
+ RID_SVXBMP_CELL_TB_32,
+ RID_SVXBMP_CELL_L_32,
+ RID_SVXBMP_CELL_DIAG_32
});
}
else
{
aBorderImageIds.insert(aBorderImageIds.end(), {
- u"" RID_SVXBMP_CELL_NONE,
- u"" RID_SVXBMP_CELL_ALL,
- u"" RID_SVXBMP_CELL_LR,
- u"" RID_SVXBMP_CELL_TB,
- u"" RID_SVXBMP_CELL_L,
- u"" RID_SVXBMP_CELL_DIAG
+ RID_SVXBMP_CELL_NONE,
+ RID_SVXBMP_CELL_ALL,
+ RID_SVXBMP_CELL_LR,
+ RID_SVXBMP_CELL_TB,
+ RID_SVXBMP_CELL_L,
+ RID_SVXBMP_CELL_DIAG
});
}
aBorderImageIds.insert(aBorderImageIds.end(), {
- u"" RID_SVXBMP_HOR_NONE,
- u"" RID_SVXBMP_HOR_OUTER,
- u"" RID_SVXBMP_HOR_HOR,
- u"" RID_SVXBMP_HOR_ALL,
- u"" RID_SVXBMP_HOR_OUTER2,
- u"" RID_SVXBMP_VER_NONE,
- u"" RID_SVXBMP_VER_OUTER,
- u"" RID_SVXBMP_VER_VER,
- u"" RID_SVXBMP_VER_ALL,
- u"" RID_SVXBMP_VER_OUTER2,
- u"" RID_SVXBMP_TABLE_NONE,
- u"" RID_SVXBMP_TABLE_OUTER,
- u"" RID_SVXBMP_TABLE_OUTERH,
- u"" RID_SVXBMP_TABLE_ALL,
- u"" RID_SVXBMP_TABLE_OUTER2
+ RID_SVXBMP_HOR_NONE,
+ RID_SVXBMP_HOR_OUTER,
+ RID_SVXBMP_HOR_HOR,
+ RID_SVXBMP_HOR_ALL,
+ RID_SVXBMP_HOR_OUTER2,
+ RID_SVXBMP_VER_NONE,
+ RID_SVXBMP_VER_OUTER,
+ RID_SVXBMP_VER_VER,
+ RID_SVXBMP_VER_ALL,
+ RID_SVXBMP_VER_OUTER2,
+ RID_SVXBMP_TABLE_NONE,
+ RID_SVXBMP_TABLE_OUTER,
+ RID_SVXBMP_TABLE_OUTERH,
+ RID_SVXBMP_TABLE_ALL,
+ RID_SVXBMP_TABLE_OUTER2
});
}
for (auto const & rImageId : aBorderImageIds)
- m_aBorderImgVec.emplace_back(StockImage::Yes, OUString(rImageId));
+ m_aBorderImgVec.emplace_back(StockImage::Yes, rImageId);
- static std::vector<std::u16string_view> aShadowImageIds;
+ static std::vector<OUString> aShadowImageIds;
if (aShadowImageIds.empty())
{
if (comphelper::LibreOfficeKit::isActive())
{
aShadowImageIds.insert(aShadowImageIds.end(), {
- u"" RID_SVXBMP_SHADOWNONE_32,
- u"" RID_SVXBMP_SHADOW_BOT_RIGHT_32,
- u"" RID_SVXBMP_SHADOW_TOP_RIGHT_32,
- u"" RID_SVXBMP_SHADOW_BOT_LEFT_32,
- u"" RID_SVXBMP_SHADOW_TOP_LEFT_32
+ RID_SVXBMP_SHADOWNONE_32,
+ RID_SVXBMP_SHADOW_BOT_RIGHT_32,
+ RID_SVXBMP_SHADOW_TOP_RIGHT_32,
+ RID_SVXBMP_SHADOW_BOT_LEFT_32,
+ RID_SVXBMP_SHADOW_TOP_LEFT_32
});
}
else
{
aShadowImageIds.insert(aShadowImageIds.end(), {
- u"" RID_SVXBMP_SHADOWNONE,
- u"" RID_SVXBMP_SHADOW_BOT_RIGHT,
- u"" RID_SVXBMP_SHADOW_TOP_RIGHT,
- u"" RID_SVXBMP_SHADOW_BOT_LEFT,
- u"" RID_SVXBMP_SHADOW_TOP_LEFT
+ RID_SVXBMP_SHADOWNONE,
+ RID_SVXBMP_SHADOW_BOT_RIGHT,
+ RID_SVXBMP_SHADOW_TOP_RIGHT,
+ RID_SVXBMP_SHADOW_BOT_LEFT,
+ RID_SVXBMP_SHADOW_TOP_LEFT
});
}
}
for (auto const & rImageId : aShadowImageIds)
- m_aShadowImgVec.emplace_back(StockImage::Yes, OUString(rImageId));
+ m_aShadowImgVec.emplace_back(StockImage::Yes, rImageId);
assert(m_aShadowImgVec.size() == SVX_BORDER_SHADOW_COUNT);
diff --git a/extensions/inc/bitmaps.hlst b/extensions/inc/bitmaps.hlst
index 08a4d623bf58..c282df088b78 100644
--- a/extensions/inc/bitmaps.hlst
+++ b/extensions/inc/bitmaps.hlst
@@ -29,12 +29,8 @@ inline constexpr OUStringLiteral RID_EXTBMP_CURRENCYFIELD =
u"res/sx10707.png";
inline constexpr OUStringLiteral RID_EXTBMP_PATTERNFIELD = u"res/sx10708.png";
inline constexpr OUStringLiteral RID_EXTBMP_IMAGECONTROL = u"res/sx10710.png";
inline constexpr OUStringLiteral RID_EXTBMP_HIDDEN = u"res/sx18022.png";
-#define RID_EXTBMP_FORMATTEDFIELD "res/sx10728.png"
-#define RID_EXTBMP_FILTER "res/sx10715.png"
inline constexpr OUStringLiteral RID_EXTBMP_FORMS = u"res/sx18013.png";
inline constexpr OUStringLiteral RID_EXTBMP_FORM = u"res/sx10593.png";
-#define RID_EXTBMP_COLLAPSEDNODE "res/sx18002.png"
-#define RID_EXTBMP_EXPANDEDNODE "res/sx18003.png"
inline constexpr OUStringLiteral RID_EXTBMP_SCROLLBAR = u"res/sx10768.png";
inline constexpr OUStringLiteral RID_EXTBMP_SPINBUTTON = u"res/sx10769.png";
inline constexpr OUStringLiteral RID_EXTBMP_NAVIGATIONBAR = u"res/sx10607.png";
diff --git a/extensions/inc/helpids.h b/extensions/inc/helpids.h
index ea0e12ab1600..30a8736db9fe 100644
--- a/extensions/inc/helpids.h
+++ b/extensions/inc/helpids.h
@@ -75,7 +75,6 @@ inline constexpr OStringLiteral HID_GRIDWIZARD_CANCEL =
"EXTENSIONS_HID_GRIDWIZA
inline constexpr OStringLiteral HID_GRIDWIZARD_FINISH =
"EXTENSIONS_HID_GRIDWIZARD_FINISH";
inline constexpr OUStringLiteral HID_PROP_INPUT_REQUIRED =
u"EXTENSIONS_HID_PROP_INPUT_REQUIRED";
-#define HID_PROP_GROUPBOX
"EXTENSIONS_HID_PROP_GROUPBOX"
inline constexpr OUStringLiteral HID_PROP_CONTROLSOURCE =
u"EXTENSIONS_HID_PROP_CONTROLSOURCE";
inline constexpr OUStringLiteral HID_PROP_NAME = u"EXTENSIONS_HID_PROP_NAME";
inline constexpr OUStringLiteral HID_PROP_TABINDEX =
u"EXTENSIONS_HID_PROP_TABINDEX";
@@ -84,7 +83,6 @@ inline constexpr OUStringLiteral HID_PROP_SLAVEFIELDS =
u"EXTENSIONS_HID_PROP_SL
inline constexpr OUStringLiteral HID_PROP_DATASOURCE =
u"EXTENSIONS_HID_PROP_DATASOURCE";
inline constexpr OUStringLiteral HID_PROP_CURSORSOURCE =
u"EXTENSIONS_HID_PROP_CURSORSOURCE";
inline constexpr OUStringLiteral HID_PROP_CURSORSOURCETYPE =
u"EXTENSIONS_HID_PROP_CURSORSOURCETYPE";
-#define HID_PROP_CURSORTYPE
"EXTENSIONS_HID_PROP_CURSORTYPE"
inline constexpr OUStringLiteral HID_PROP_READONLY =
u"EXTENSIONS_HID_PROP_READONLY";
inline constexpr OUStringLiteral HID_PROP_DATAENTRY =
u"EXTENSIONS_HID_PROP_DATAENTRY";
inline constexpr OUStringLiteral HID_PROP_NAVIGATION =
u"EXTENSIONS_HID_PROP_NAVIGATION";
@@ -92,17 +90,9 @@ inline constexpr OUStringLiteral HID_PROP_CYCLE =
u"EXTENSIONS_HID_PROP_CYCLE";
inline constexpr OUStringLiteral HID_PROP_ALLOW_ADDITIONS =
u"EXTENSIONS_HID_PROP_ALLOW_ADDITIONS";
inline constexpr OUStringLiteral HID_PROP_ALLOW_EDITS =
u"EXTENSIONS_HID_PROP_ALLOW_EDITS";
inline constexpr OUStringLiteral HID_PROP_ALLOW_DELETIONS =
u"EXTENSIONS_HID_PROP_ALLOW_DELETIONS";
-#define HID_PROP_DIRTY
"EXTENSIONS_HID_PROP_DIRTY"
-#define HID_PROP_OLDVALUE
"EXTENSIONS_HID_PROP_OLDVALUE"
inline constexpr OUStringLiteral HID_PROP_VALUE = u"EXTENSIONS_HID_PROP_VALUE";
-#define HID_PROP_LOCKED
"EXTENSIONS_HID_PROP_LOCKED"
inline constexpr OUStringLiteral HID_PROP_FORMATKEY =
u"EXTENSIONS_HID_PROP_FORMATKEY";
-#define HID_PROP_REQUIRED
"EXTENSIONS_HID_PROP_REQUIRED"
inline constexpr OUStringLiteral HID_PROP_WHEEL_BEHAVIOR =
u"EXTENSIONS_HID_PROP_WHEEL_BEHAVIOR";
-#define HID_PROP_UNIQUE
"EXTENSIONS_HID_PROP_UNIQUE"
-#define HID_PROP_CLASSID
"EXTENSIONS_HID_PROP_CLASSID"
-#define HID_PROP_LEFT
"EXTENSIONS_HID_PROP_LEFT"
-#define HID_PROP_RIGHT
"EXTENSIONS_HID_PROP_RIGHT"
inline constexpr OUStringLiteral HID_PROP_HEIGHT =
u"EXTENSIONS_HID_PROP_HEIGHT";
inline constexpr OUStringLiteral HID_PROP_WIDTH = u"EXTENSIONS_HID_PROP_WIDTH";
inline constexpr OUStringLiteral HID_PROP_AUTOGROW =
u"EXTENSIONS_HID_PROP_AUTOGROW";
@@ -113,7 +103,6 @@ inline constexpr OUStringLiteral HID_PROP_LISTINDEX =
u"EXTENSIONS_HID_PROP_LIST
inline constexpr OUStringLiteral HID_PROP_TEXT = u"EXTENSIONS_HID_PROP_TEXT";
inline constexpr OUStringLiteral HID_PROP_LABEL = u"EXTENSIONS_HID_PROP_LABEL";
inline constexpr OUStringLiteral HID_PROP_STRINGITEMLIST =
u"EXTENSIONS_HID_PROP_STRINGITEMLIST";
-#define HID_PROP_SEARCHING
"EXTENSIONS_HID_PROP_SEARCHING"
inline constexpr OUStringLiteral HID_PROP_FONT = u"EXTENSIONS_HID_PROP_FONT";
inline constexpr OUStringLiteral HID_PROP_ROWHEIGHT =
u"EXTENSIONS_HID_PROP_ROWHEIGHT";
inline constexpr OUStringLiteral HID_PROP_BACKGROUNDCOLOR =
u"EXTENSIONS_HID_PROP_BACKGROUNDCOLOR";
@@ -227,7 +216,6 @@ inline constexpr OUStringLiteral HID_PROP_SHOW_POSITION =
u"EXTENSIONS_HID_PROP_
inline constexpr OUStringLiteral HID_PROP_SHOW_NAVIGATION =
u"EXTENSIONS_HID_PROP_SHOW_NAVIGATION";
inline constexpr OUStringLiteral HID_PROP_SHOW_RECORDACTIONS =
u"EXTENSIONS_HID_PROP_SHOW_RECORDACTIONS";
inline constexpr OUStringLiteral HID_PROP_SHOW_FILTERSORT =
u"EXTENSIONS_HID_PROP_SHOW_FILTERSORT";
-#define HID_PROP_AUTOLINEBREAK
"EXTENSIONS_HID_PROP_AUTOLINEBREAK"
inline constexpr OUStringLiteral HID_PROP_TEXTTYPE =
u"EXTENSIONS_HID_PROP_TEXTTYPE";
inline constexpr OUStringLiteral HID_PROP_LINEEND_FORMAT =
u"EXTENSIONS_HID_PROP_LINEEND_FORMAT";
inline constexpr OUStringLiteral HID_PROP_XSD_TOTAL_DIGITS =
u"EXTENSIONS_HID_PROP_XSD_TOTAL_DIGITS";
@@ -260,7 +248,6 @@ inline constexpr OUStringLiteral HID_PROP_SHOWS_HANDLES =
u"EXTENSIONS_HID_PROP_
inline constexpr OUStringLiteral HID_PROP_SHOWS_ROOT_HANDLES =
u"EXTENSIONS_HID_PROP_SHOWS_ROOT_HANDLES";
inline constexpr OUStringLiteral HID_PROP_EDITABLE =
u"EXTENSIONS_HID_PROP_EDITABLE";
inline constexpr OUStringLiteral HID_PROP_INVOKES_STOP_NOT_EDITING =
u"EXTENSIONS_HID_PROP_INVOKES_STOP_NOT_EDITING";
-#define HID_PROP_ROW_HEIGHT
"EXTENSIONS_HID_PROP_ROW_HEIGHT"
inline constexpr OUStringLiteral HID_PROP_DECORATION =
u"EXTENSIONS_HID_PROP_DECORATION";
inline constexpr OUStringLiteral HID_EVT_ACTIONPERFORMED =
u"EXTENSIONS_HID_EVT_ACTIONPERFORMED";
inline constexpr OUStringLiteral HID_EVT_AFTERUPDATE =
u"EXTENSIONS_HID_EVT_AFTERUPDATE";
diff --git a/extensions/inc/propctrlr.h b/extensions/inc/propctrlr.h
index 41d2330727fb..5c0eb956f471 100644
--- a/extensions/inc/propctrlr.h
+++ b/extensions/inc/propctrlr.h
@@ -21,11 +21,11 @@
#define EXTENSIONS_PROPCTRLR_H
inline constexpr OUStringLiteral UID_PROP_DLG_FONT_TYPE =
u"EXTENSIONS_UID_PROP_DLG_FONT_TYPE";
-#define UID_PROP_DLG_IMAGE_URL
"EXTENSIONS_UID_PROP_DLG_IMAGE_URL"
+inline constexpr OUStringLiteral UID_PROP_DLG_IMAGE_URL =
u"EXTENSIONS_UID_PROP_DLG_IMAGE_URL";
inline constexpr OUStringLiteral UID_PROP_DLG_BACKGROUNDCOLOR =
u"EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR";
inline constexpr OUStringLiteral UID_PROP_DLG_SYMBOLCOLOR =
u"EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR";
inline constexpr OUStringLiteral UID_PROP_DLG_ATTR_DATASOURCE =
u"EXTENSIONS_UID_PROP_DLG_ATTR_DATASOURCE";
-#define UID_PROP_DLG_ATTR_TARGET_URL
"EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL"
+inline constexpr OUStringLiteral UID_PROP_DLG_ATTR_TARGET_URL =
u"EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL";
inline constexpr OUStringLiteral UID_PROP_DLG_NUMBER_FORMAT =
u"EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT";
inline constexpr OUStringLiteral UID_PROP_DLG_CONTROLLABEL =
u"EXTENSIONS_UID_PROP_DLG_CONTROLLABEL";
inline constexpr OUStringLiteral UID_PROP_DLG_FILLCOLOR =
u"EXTENSIONS_UID_PROP_DLG_FILLCOLOR";
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx
b/extensions/source/propctrlr/defaultforminspection.cxx
index 4819435360be..7de6673f0d2e 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -131,7 +131,7 @@ namespace pcr
{
const char* programmaticName;
TranslateId uiNameResId;
- OUString helpId;
+ rtl::OUStringConstExpr helpId;
} const aCategories[] = {
{ "General", RID_STR_PROPPAGE_DEFAULT,
HID_FM_PROPDLG_TAB_GENERAL },
{ "Data", RID_STR_PROPPAGE_DATA,
HID_FM_PROPDLG_TAB_DATA },
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index fe4d69dcb52d..20a21ad8ae72 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -999,8 +999,8 @@ namespace pcr
aDescriptor.Control = pControl;
aDescriptor.PrimaryButtonId = PROPERTY_ID_TARGET_URL == nPropId
- ? std::u16string_view(u"" UID_PROP_DLG_ATTR_TARGET_URL)
- : std::u16string_view(u"" UID_PROP_DLG_IMAGE_URL);
+ ? OUString(UID_PROP_DLG_ATTR_TARGET_URL)
+ : OUString(UID_PROP_DLG_IMAGE_URL);
break;
}
diff --git a/extensions/source/propctrlr/formstrings.hxx
b/extensions/source/propctrlr/formstrings.hxx
index 060a608add8b..df151ab950c7 100644
--- a/extensions/source/propctrlr/formstrings.hxx
+++ b/extensions/source/propctrlr/formstrings.hxx
@@ -44,7 +44,6 @@ inline constexpr OUStringLiteral PROPERTY_INPUT_REQUIRED =
u"InputRequired";
inline constexpr OUStringLiteral PROPERTY_ENABLED = u"Enabled";
inline constexpr OUStringLiteral PROPERTY_ENABLE_VISIBLE = u"EnableVisible";
inline constexpr OUStringLiteral PROPERTY_READONLY = u"ReadOnly";
-#define PROPERTY_ISREADONLY "IsReadOnly"
inline constexpr OUStringLiteral PROPERTY_FILTER = u"Filter";
inline constexpr OUStringLiteral PROPERTY_WIDTH = u"Width";
inline constexpr OUStringLiteral PROPERTY_MULTILINE = u"MultiLine";
@@ -205,8 +204,6 @@ inline constexpr OUStringLiteral
PROPERTY_SHOWS_ROOT_HANDLES = u"ShowsRootHandle
inline constexpr OUStringLiteral PROPERTY_EDITABLE = u"Editable";
inline constexpr OUStringLiteral PROPERTY_INVOKES_STOP_NOT_EDITING =
u"InvokesStopNodeEditing";
-#define PROPERTY_HARDLINEBREAKS "HardLineBreaks"
-
inline constexpr OUStringLiteral PROPERTY_TOGGLE = u"Toggle";
inline constexpr OUStringLiteral PROPERTY_FOCUSONCLICK = u"FocusOnClick";
inline constexpr OUStringLiteral PROPERTY_HIDEINACTIVESELECTION =
u"HideInactiveSelection";
@@ -256,7 +253,6 @@ inline constexpr OUStringLiteral
PROPERTY_XSD_MIN_INCLUSIVE_DATE_TIME = u"MinInc
inline constexpr OUStringLiteral PROPERTY_XSD_MIN_EXCLUSIVE_DATE_TIME =
u"MinExclusiveDateTime";
inline constexpr OUStringLiteral PROPERTY_SUBMISSION_ID = u"SubmissionID";
inline constexpr OUStringLiteral PROPERTY_BINDING_ID = u"BindingID";
-#define PROPERTY_ID "ID"
inline constexpr OUStringLiteral PROPERTY_WRITING_MODE = u"WritingMode";
inline constexpr OUStringLiteral PROPERTY_TEXT_ANCHOR_TYPE = u"TextAnchorType";
inline constexpr OUStringLiteral PROPERTY_SHEET_ANCHOR_TYPE =
u"SheetAnchorType";
@@ -269,7 +265,6 @@ inline constexpr OUStringLiteral PROPERTY_MODEL = u"Model";
inline constexpr OUStringLiteral PROPERTY_CELL_EXCHANGE_TYPE =
u"ExchangeSelectionIndex";
inline constexpr OUStringLiteral PROPERTY_BOUND_CELL = u"BoundCell";
inline constexpr OUStringLiteral PROPERTY_LIST_CELL_RANGE = u"CellRange";
-#define PROPERTY_AUTOLINEBREAK "AutomaticLineBreak"
inline constexpr OUStringLiteral PROPERTY_TEXTTYPE = u"TextType";
inline constexpr OUStringLiteral PROPERTY_RICHTEXT = u"RichText";
inline constexpr OUStringLiteral PROPERTY_ROWSET = u"RowSet";
diff --git a/filter/source/config/cache/constant.hxx
b/filter/source/config/cache/constant.hxx
index c1c794f87e9b..6f72bf52fea8 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -146,7 +146,6 @@ inline constexpr OUStringLiteral
QUERY_IDENTIFIER_GET_SORTED_FILTERLIST = u"getS
inline constexpr OUStringLiteral QUERY_PARAM_IFLAGS = u"iflags";
inline constexpr OUStringLiteral QUERY_PARAM_EFLAGS = u"eflags";
inline constexpr OUStringLiteral QUERY_PARAM_MODULE = u"module";
-#define QUERY_PARAM_DEFAULTFIRST "default_first"
#define QUERY_CONSTVALUE_ALL "all"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx
index 8a1889701165..35d9dab77234 100644
--- a/forms/source/inc/frm_strings.hxx
+++ b/forms/source/inc/frm_strings.hxx
@@ -32,9 +32,6 @@ inline constexpr OUStringLiteral PROPERTY_FETCHSIZE =
u"FetchSize";
inline constexpr OUStringLiteral PROPERTY_VALUE = u"Value";
inline constexpr OUStringLiteral PROPERTY_TEXT = u"Text";
inline constexpr OUStringLiteral PROPERTY_LABEL = u"Label";
-#define PROPERTY_CANINSERT "CanInsert"
-#define PROPERTY_CANUPDATE "CanUpdate"
-#define PROPERTY_CANDELETE "CanDelete"
inline constexpr OUStringLiteral PROPERTY_NAVIGATION = u"NavigationBarMode";
inline constexpr OUStringLiteral PROPERTY_HASNAVIGATION = u"HasNavigationBar";
inline constexpr OUStringLiteral PROPERTY_CYCLE = u"Cycle";
@@ -90,8 +87,6 @@ inline constexpr OUStringLiteral PROPERTY_DEFAULT_DATE =
u"DefaultDate";
inline constexpr OUStringLiteral PROPERTY_DEFAULT_TIME = u"DefaultTime";
inline constexpr OUStringLiteral PROPERTY_DEFAULT_VALUE = u"DefaultValue";
inline constexpr OUStringLiteral PROPERTY_DECIMAL_ACCURACY =
u"DecimalAccuracy";
-#define PROPERTY_CURSORSOURCE "DataSelection"
-#define PROPERTY_CURSORSOURCETYPE "DataSelectionType"
inline constexpr OUStringLiteral PROPERTY_FIELDTYPE = u"Type";
inline constexpr OUStringLiteral PROPERTY_DECIMALS = u"Decimals";
inline constexpr OUStringLiteral PROPERTY_REFVALUE = u"RefValue";
@@ -162,7 +157,6 @@ inline constexpr OUStringLiteral PROPERTY_HIDDEN =
u"Hidden";
inline constexpr OUStringLiteral PROPERTY_FILTERPROPOSAL =
u"UseFilterValueProposal";
inline constexpr OUStringLiteral PROPERTY_FIELDSOURCE = u"FieldSource";
inline constexpr OUStringLiteral PROPERTY_TABLENAME = u"TableName";
-#define PROPERTY_ISFILTERAPPLIED "IsFilterApplied"
inline constexpr OUStringLiteral PROPERTY_CONTROLLABEL = u"LabelControl";
inline constexpr OUStringLiteral PROPERTY_CURRSYM_POSITION =
u"PrependCurrencySymbol";
inline constexpr OUStringLiteral PROPERTY_CURSORCOLOR = u"CursorColor";
diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx
index caf2e4ce0325..3bc9fab75cdb 100644
--- a/forms/source/inc/services.hxx
+++ b/forms/source/inc/services.hxx
@@ -19,18 +19,14 @@
#pragma once
-#define AWT_CONTROL_TEXTFIELD "com.sun.star.awt.TextField"
-#define VCL_CONTROL_EDIT "stardiv.vcl.control.Edit"
inline constexpr OUStringLiteral VCL_CONTROL_LISTBOX =
u"stardiv.vcl.control.ListBox";
inline constexpr OUStringLiteral VCL_CONTROL_COMBOBOX =
u"stardiv.vcl.control.ComboBox";
inline constexpr OUStringLiteral VCL_CONTROL_RADIOBUTTON =
u"stardiv.vcl.control.RadioButton";
inline constexpr OUStringLiteral VCL_CONTROL_GROUPBOX =
u"stardiv.vcl.control.GroupBox";
-#define VCL_CONTROL_FIXEDTEXT "stardiv.vcl.control.FixedText"
inline constexpr OUStringLiteral VCL_CONTROL_COMMANDBUTTON =
u"stardiv.vcl.control.Button";
inline constexpr OUStringLiteral VCL_CONTROL_CHECKBOX =
u"stardiv.vcl.control.CheckBox";
inline constexpr OUStringLiteral VCL_CONTROL_IMAGEBUTTON =
u"stardiv.vcl.control.ImageButton";
-#define VCL_CONTROL_FILECONTROL "stardiv.vcl.control.FileControl"
inline constexpr OUStringLiteral VCL_CONTROL_TIMEFIELD =
u"stardiv.vcl.control.TimeField";
inline constexpr OUStringLiteral VCL_CONTROL_DATEFIELD =
u"stardiv.vcl.control.DateField";
inline constexpr OUStringLiteral VCL_CONTROL_NUMERICFIELD =
u"stardiv.vcl.control.NumericField";
@@ -155,7 +151,6 @@ inline constexpr OUStringLiteral FRM_SUN_CONTROL_LISTBOX =
u"com.sun.star.form.c
inline constexpr OUStringLiteral FRM_SUN_CONTROL_COMBOBOX =
u"com.sun.star.form.control.ComboBox";
inline constexpr OUStringLiteral FRM_SUN_CONTROL_RADIOBUTTON =
u"com.sun.star.form.control.RadioButton";
inline constexpr OUStringLiteral FRM_SUN_CONTROL_GROUPBOX =
u"com.sun.star.form.control.GroupBox";
-#define FRM_SUN_CONTROL_FIXEDTEXT "com.sun.star.form.control.FixedText"
inline constexpr OUStringLiteral FRM_SUN_CONTROL_COMMANDBUTTON =
u"com.sun.star.form.control.CommandButton";
inline constexpr OUStringLiteral FRM_SUN_CONTROL_CHECKBOX =
u"com.sun.star.form.control.CheckBox";
inline constexpr OUStringLiteral FRM_SUN_CONTROL_GRIDCONTROL =
u"com.sun.star.form.control.GridControl";
@@ -193,8 +188,6 @@ inline constexpr OUStringLiteral FRM_SUN_FORMCOMPONENT =
u"com.sun.star.form.For
// misc
-#define SRV_AWT_IMAGEPRODUCER "com.sun.star.awt.ImageProducer"
-
inline constexpr OUStringLiteral SRV_SDB_ROWSET = u"com.sun.star.sdb.RowSet";
inline constexpr OUStringLiteral SRV_SDB_CONNECTION =
u"com.sun.star.sdb.Connection";
diff --git a/formula/inc/bitmaps.hlst b/formula/inc/bitmaps.hlst
index d06d785cc3ec..1d1b9743f8ca 100644
--- a/formula/inc/bitmaps.hlst
+++ b/formula/inc/bitmaps.hlst
@@ -9,7 +9,6 @@
#pragma once
-#define BMP_STR_CLOSE "formula/res/fapclose.png"
inline constexpr OUStringLiteral BMP_STR_OPEN = u"formula/res/fapopen.png";
inline constexpr OUStringLiteral BMP_STR_END = u"formula/res/fapok.png";
inline constexpr OUStringLiteral BMP_STR_ERROR = u"formula/res/faperror.png";
diff --git a/fpicker/inc/bitmaps.hlst b/fpicker/inc/bitmaps.hlst
index 57d8ed0db6c6..5771d6134b05 100644
--- a/fpicker/inc/bitmaps.hlst
+++ b/fpicker/inc/bitmaps.hlst
@@ -9,7 +9,6 @@
#pragma once
-#define RID_BMP_FOLDER_OPEN "res/folderop.png"
inline constexpr OUStringLiteral BMP_FILEDLG_PLACE_LOCAL =
u"fpicker/res/fp015.png";
inline constexpr OUStringLiteral BMP_FILEDLG_PLACE_REMOTE =
u"fpicker/res/fp016.png";
inline constexpr OUStringLiteral RID_BMP_FOLDER = u"svtools/res/folder.png";
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 5b1a5ca991b2..9d9f1fedb807 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -2215,7 +2215,6 @@ extensions/res/buttonplus.png
extensions/res/scanner/plus.png
# formula
# ==============================================
-formula/res/fapclose.png cmd/sc_open.png
formula/res/faperror.png cmd/sc_cancel.png
formula/res/fapok.png cmd/sc_ok.png
formula/res/fapopen.png cmd/sc_open.png
@@ -2258,7 +2257,6 @@ res/dir-clos.png cmd/sc_open.png
res/dir-open.png cmd/sc_open.png
res/fileopen.png cmd/sc_open.png
res/foldercl.png cmd/sc_open.png
-res/folderop.png cmd/sc_open.png
res/fp010.png cmd/sc_upsearch.png
res/grafikei.png cmd/sc_graphic.png
res/im30821.png cmd/sc_insertscript.png
diff --git a/icon-themes/breeze_dark/links.txt
b/icon-themes/breeze_dark/links.txt
index 5b1a5ca991b2..9d9f1fedb807 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -2215,7 +2215,6 @@ extensions/res/buttonplus.png
extensions/res/scanner/plus.png
# formula
# ==============================================
-formula/res/fapclose.png cmd/sc_open.png
formula/res/faperror.png cmd/sc_cancel.png
formula/res/fapok.png cmd/sc_ok.png
formula/res/fapopen.png cmd/sc_open.png
@@ -2258,7 +2257,6 @@ res/dir-clos.png cmd/sc_open.png
res/dir-open.png cmd/sc_open.png
res/fileopen.png cmd/sc_open.png
res/foldercl.png cmd/sc_open.png
-res/folderop.png cmd/sc_open.png
res/fp010.png cmd/sc_upsearch.png
res/grafikei.png cmd/sc_graphic.png
res/im30821.png cmd/sc_insertscript.png
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index c1aaa6d2c0c7..095a4a5af88f 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -2018,7 +2018,6 @@ extensions/res/buttonplus.png
extensions/res/scanner/plus.png
# formula
# ==============================================
-formula/res/fapclose.png svtools/res/folder.png
formula/res/faperror.png cmd/sc_cancel.png
formula/res/fapok.png cmd/sc_ok.png
formula/res/fapopen.png cmd/sc_open.png
@@ -2064,7 +2063,6 @@ res/extension_plus_32.png cmd/32/insertplugin.png
res/fp010.png svtools/res/up_small.png
res/fileopen.png cmd/sc_open.png
res/foldercl.png svtools/res/folder.png
-res/folderop.png cmd/sc_open.png
res/hlinettp.png cmd/32/inserthyperlink.png
res/im30820.png cmd/sc_scriptorganizer.png
res/im30821.png cmd/sc_choosemacro.png
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 3c49a478e53a..f6b3837bdd3e 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -1912,7 +1912,6 @@ res/dir-clos.png cmd/sc_open.png
res/dir-open.png cmd/sc_open.png
res/fileopen.png cmd/sc_open.png
res/foldercl.png formula/res/fapclose.png
-res/folderop.png cmd/sc_open.png
res/fp010.png cmd/sc_upsearch.png
res/grafikei.png cmd/sc_graphic.png
res/im30820.png cmd/sc_scriptorganizer.png
diff --git a/icon-themes/karasa_jaga/links.txt
b/icon-themes/karasa_jaga/links.txt
index cecd9959e24b..b023b37b9aa3 100644
--- a/icon-themes/karasa_jaga/links.txt
+++ b/icon-themes/karasa_jaga/links.txt
@@ -1612,7 +1612,6 @@ desktop/res/extension_32.png cmd/32/addons.png
extensions/res/buttonplus.png cmd/sc_add.png
extensions/res/scanner/minus.png res/minus.png
extensions/res/scanner/plus.png res/plus.png
-formula/res/fapclose.png svtools/res/folder.png
formula/res/fapopen.png res/folderop.png
formula/res/fx.png cmd/sc_insertformula.png
framework/res/addtemplate_32.png cmd/32/newdoc.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index e0d768caa69b..2b753f0cf2e0 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -1988,7 +1988,6 @@ res/tables_32.png cmd/32/dbviewtables.png
# formula
# ==============================================
-formula/res/fapclose.png svtools/res/folder.png
formula/res/faperror.png cmd/sc_cancel.png
formula/res/fapok.png cmd/sc_ok.png
formula/res/fapopen.png cmd/sc_open.png
@@ -2035,7 +2034,6 @@ res/extension_plus_26.png cmd/lc_insertplugin.png
res/extension_plus_32.png cmd/32/insertplugin.png
res/fileopen.png cmd/sc_open.png
res/foldercl.png svtools/res/folder.png
-res/folderop.png cmd/sc_open.png
res/fp010.png cmd/sc_upsearch.png
res/hldocntp.png cmd/32/adddirect.png
res/hldoctp.png cmd/32/insertreferencefield.png
diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt
index e0d768caa69b..2b753f0cf2e0 100644
--- a/icon-themes/sifr_dark/links.txt
+++ b/icon-themes/sifr_dark/links.txt
@@ -1988,7 +1988,6 @@ res/tables_32.png cmd/32/dbviewtables.png
# formula
# ==============================================
-formula/res/fapclose.png svtools/res/folder.png
formula/res/faperror.png cmd/sc_cancel.png
formula/res/fapok.png cmd/sc_ok.png
formula/res/fapopen.png cmd/sc_open.png
@@ -2035,7 +2034,6 @@ res/extension_plus_26.png cmd/lc_insertplugin.png
res/extension_plus_32.png cmd/32/insertplugin.png
res/fileopen.png cmd/sc_open.png
res/foldercl.png svtools/res/folder.png
-res/folderop.png cmd/sc_open.png
res/fp010.png cmd/sc_upsearch.png
res/hldocntp.png cmd/32/adddirect.png
res/hldoctp.png cmd/32/insertreferencefield.png
diff --git a/icon-themes/sukapura/links.txt b/icon-themes/sukapura/links.txt
index 2f9eca904f3a..db58c33b1a6e 100644
--- a/icon-themes/sukapura/links.txt
+++ b/icon-themes/sukapura/links.txt
@@ -2025,7 +2025,6 @@ extensions/res/buttonplus.png
extensions/res/scanner/plus.png
# formula
# ==============================================
-formula/res/fapclose.png cmd/sc_closedocs.png
formula/res/faperror.png cmd/sc_cancel.png
formula/res/fapok.png cmd/sc_ok.png
formula/res/fapopen.png cmd/sc_open.png
@@ -2073,7 +2072,6 @@ res/extension_plus_26.png cmd/lc_insertplugin.png
res/extension_plus_32.png cmd/32/insertplugin.png
res/fileopen.png cmd/sc_open.png
res/foldercl.png cmd/sc_closedocs.png
-res/folderop.png cmd/sc_open.png
res/grafikei.png cmd/sc_graphic.png
res/hlinettp.png cmd/32/inserthyperlink.png
res/hlmailtp.png cmd/32/insertenvelope.png
