[Libreoffice-commits] core.git: desktop/source include/vcl sw/inc sw/source

[Miklos Vajna (via logerrit)]

 desktop/source/lib/init.cxx       |    2 +-
 include/vcl/ITiledRenderable.hxx  |    2 +-
 sw/inc/unotxdoc.hxx               |    4 ++--
 sw/source/uibase/uno/loktxdoc.cxx |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 913b399a73c4d6dfd2c9f5983f56f612f3262fa7
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jan 9 15:30:26 2023 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Jan 10 07:06:30 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>.
    
    Change-Id: Idf3c81aadeaeb3d42a50aba2ac58d5ed4278651f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145212
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 133531034c15..35070994d943 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5878,7 +5878,7 @@ static char* doc_getCommandValues(LibreOfficeKitDocument* 
pThis, const char* pCo
     {
         return getFontSubset(aCommand.substr(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 7d3f4b7aaf33..d110e33f7e19 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -370,7 +370,7 @@ public:
     virtual void setPaintTextEdit(bool) {}
 
     /// Decides if it's OK to call getCommandValues(rCommand).
-    virtual bool supportsCommandValues(std::u16string_view /*rCommand*/) { 
return false; }
+    virtual bool supportsCommand(std::u16string_view /*rCommand*/) { return 
false; }
 
     /// Returns a json mapping of the possible values for the given command.
     virtual void getCommandValues(tools::JsonWriter& /*rJsonWriter*/, 
std::string_view /*rCommand*/)
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index a7bbcb776f44..57cb3ccca589 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -462,8 +462,8 @@ public:
     /// @see vcl::ITiledRenderable::getCommandValues().
     void getCommandValues(tools::JsonWriter& rJsonWriter, std::string_view 
rCommand) override;
 
-    /// @see vcl::ITiledRenderable::supportsCommandValues().
-    bool supportsCommandValues(std::u16string_view rCommand) override;
+    /// @see vcl::ITiledRenderable::supportsCommand().
+    bool supportsCommand(std::u16string_view 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 9c92d071e27e..2291cf3f7ab5 100644
--- a/sw/source/uibase/uno/loktxdoc.cxx
+++ b/sw/source/uibase/uno/loktxdoc.cxx
@@ -322,7 +322,7 @@ void GetSections(tools::JsonWriter& rJsonWriter, 
SwDocShell* pDocShell,
 }
 }
 
-bool SwXTextDocument::supportsCommandValues(std::u16string_view rCommand)
+bool SwXTextDocument::supportsCommand(std::u16string_view rCommand)
 {
     static const std::initializer_list<std::u16string_view> vForward
         = { u"TextFormFields", u"TextFormField", u"SetDocumentProperties",