desktop/source/lib/init.cxx | 2 +-
include/vcl/ITiledRenderable.hxx | 2 +-
sw/inc/unotxdoc.hxx | 2 +-
sw/source/uibase/uno/loktxdoc.cxx | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bc6048083aec4328ccec298a7388bb822062b4b8
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jan 9 15:30:26 2023 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Jan 11 12:46:56 2023 +0000
vcl ITiledRenderable: rename supportsCommandValues() to supportsCommand()
It gets a single command (to determine if using it with
getCommandValues() is OK or not), so the plural was confusing, as
mentioned at
<https://gerrit.libreoffice.org/c/core/+/145082/5#message-802b1be9194440a3dcee0cad5e54795cbbdea584>.
(cherry picked from commit 913b399a73c4d6dfd2c9f5983f56f612f3262fa7)
Conflicts:
include/vcl/ITiledRenderable.hxx
sw/inc/unotxdoc.hxx
sw/source/uibase/uno/loktxdoc.cxx
Change-Id: Idf3c81aadeaeb3d42a50aba2ac58d5ed4278651f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145278
Tested-by: Miklos Vajna <vmik...@collabora.com>
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c4aa15270fa3..75a0748fee84 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5890,7 +5890,7 @@ static char* doc_getCommandValues(LibreOfficeKitDocument*
pThis, const char* pCo
{
return getFontSubset(std::string_view(pCommand +
aFontSubset.getLength()));
}
- else if
(pDoc->supportsCommandValues(INetURLObject(OUString::fromUtf8(aCommand)).GetURLPath()))
+ else if
(pDoc->supportsCommand(INetURLObject(OUString::fromUtf8(aCommand)).GetURLPath()))
{
tools::JsonWriter aJsonWriter;
pDoc->getCommandValues(aJsonWriter, aCommand);
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index d0ce32d2753f..87975268c375 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -371,7 +371,7 @@ public:
virtual void setPaintTextEdit(bool) {}
/// Decides if it's OK to call getCommandValues(rCommand).
- virtual bool supportsCommandValues(const OUString& /*rCommand*/) { return
false; }
+ virtual bool supportsCommand(const OUString& /*rCommand*/) { return false;
}
/// Returns a json mapping of the possible values for the given command.
virtual void getCommandValues(tools::JsonWriter& /*rJsonWriter*/, const
OString& /*rCommand*/)
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 07c3f5b6e6e0..e2d3ac144992 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -462,7 +462,7 @@ public:
void getCommandValues(tools::JsonWriter& rJsonWriter, const OString&
rCommand) override;
/// @see vcl::ITiledRenderable::supportsCommandValues().
- bool supportsCommandValues(const OUString& rCommand) override;
+ bool supportsCommand(const OUString& rCommand) override;
void Invalidate();
void Reactivate(SwDocShell* pNewDocShell);
diff --git a/sw/source/uibase/uno/loktxdoc.cxx
b/sw/source/uibase/uno/loktxdoc.cxx
index 30722fb6af69..6d5ddd675c23 100644
--- a/sw/source/uibase/uno/loktxdoc.cxx
+++ b/sw/source/uibase/uno/loktxdoc.cxx
@@ -325,7 +325,7 @@ void GetSections(tools::JsonWriter& rJsonWriter,
SwDocShell* pDocShell,
}
}
-bool SwXTextDocument::supportsCommandValues(const OUString& rCommand)
+bool SwXTextDocument::supportsCommand(const OUString& rCommand)
{
static const std::initializer_list<std::u16string_view> vForward
= { u"TextFormFields", u"TextFormField", u"SetDocumentProperties",
