commit e9b06dd9458074af36b0fc97ff41ed4c79e5de32
author Muhammet Kara <muhammet.kara@pardus.org.tr> Wed Oct 31 15:48:38 2018 +0300
committer Noel Grandin <noel.grandin@collabora.co.uk> Thu Nov 01 08:34:50 2018 +0100
tree 758094ad1833d68d6cdd9dea30d861a615b3a3cc
parent 53bc3b618b5a97702a54d3aa4dbf7853d8980a5d

tdf#112614: Include all labels in the search in Customize dialog

For uno commands

Change-Id: Ide7a30387b0ec354cd0d42ba11c78e115ec94989
Reviewed-on: https://gerrit.libreoffice.org/62693
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

cui/source/customize/CommandCategoryListBox.cxx

diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx
index 523008f..fe05b2c 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/script/browse/theBrowseNodeFactory.hpp>
#include <com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp>
#include <vcl/builderfactory.hxx>
#include <vcl/commandinfoprovider.hxx>

// include search util
#include <com/sun/star/util/SearchFlags.hpp>
@@ -215,13 +216,19 @@ void CommandCategoryListBox::FillFunctionsList(

    for (const auto & rInfo : xCommands)
    {
        OUString sUIName    = MapCommand2UIName(rInfo.Command);
        sal_Int32 aStartPos = 0;
        sal_Int32 aEndPos   = sUIName.getLength();
        OUString sUIName    = getCommandName(rInfo.Command);
        OUString sLabel     = vcl::CommandInfoProvider::GetLabelForCommand(rInfo.Command, m_sModuleLongName);
        OUString sTooltipLabel = vcl::CommandInfoProvider::GetTooltipForCommand( rInfo.Command, m_xFrame);
        OUString sPopupLabel =
                (vcl::CommandInfoProvider::GetPopupLabelForCommand(rInfo.Command, m_sModuleLongName))
                .replaceFirst("~", "");

        // Apply the search filter
        if (!filterTerm.isEmpty()
            && !textSearch.SearchForward( sUIName, &aStartPos, &aEndPos ) )
            && !textSearch.searchForward( sUIName )
            && !textSearch.searchForward( sLabel )
            && !textSearch.searchForward( sTooltipLabel )
            && !textSearch.searchForward( sPopupLabel ) )
        {
            continue;
        }
@@ -240,7 +247,7 @@ void CommandCategoryListBox::FillFunctionsList(
    }
}

OUString CommandCategoryListBox::MapCommand2UIName(const OUString& sCommand)
OUString CommandCategoryListBox::getCommandName(const OUString& sCommand)
{
    OUString sUIName;
    try

cui/source/inc/CommandCategoryListBox.hxx

diff --git a/cui/source/inc/CommandCategoryListBox.hxx b/cui/source/inc/CommandCategoryListBox.hxx
index 8d85169..f49ff2c 100644
--- a/cui/source/inc/CommandCategoryListBox.hxx
+++ b/cui/source/inc/CommandCategoryListBox.hxx
@@ -54,7 +54,7 @@ public:
                    const VclPtr<SfxConfigFunctionListBox>&  pFunctionListBox,
                    const OUString& filterTerm,
                    SaveInData *pCurrentSaveInData );
    OUString    MapCommand2UIName(const OUString& sCommand);
    OUString    getCommandName(const OUString& sCommand);

    /**
        Signals that a command category has been selected.

include/unotools/textsearch.hxx

diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 2d609fe..396ecf2 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -202,6 +202,13 @@ public:
    bool SearchForward( const OUString &rStr,
                        sal_Int32* pStart, sal_Int32* pEnd,
                        css::util::SearchResult* pRes = nullptr );
    /**
     * @brief searchForward Search forward beginning from the start to the end
     *        of the given text
     * @param rStr The text in wich we search
     * @return True if the search term is found in the text
     */
    bool searchForward( const OUString &rStr );
    bool SearchBackward( const OUString &rStr,
                        sal_Int32* pStart, sal_Int32* pEnd,
                        css::util::SearchResult* pRes = nullptr );

unotools/source/i18n/textsearch.cxx

diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 12504cc..81768e9 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -263,6 +263,16 @@ bool TextSearch::SearchForward( const OUString &rStr,
    return bRet;
}

bool TextSearch::searchForward( const OUString &rStr )
{
    sal_Int32 pStart = 0;
    sal_Int32 pEnd = rStr.getLength();

    bool bResult = SearchForward(rStr, &pStart, &pEnd);

    return bResult;
}

bool TextSearch::SearchBackward( const OUString & rStr, sal_Int32* pStart,
                                sal_Int32* pEnde, SearchResult* pRes )
{