commit fbaea1013cc5781805254edc8830c1e46f46bd72
author Mike Kaganski <mike.kaganski@collabora.com> Sat Mar 13 15:03:59 2021 +0100
committer Mike Kaganski <mike.kaganski@collabora.com> Sat Mar 13 17:26:20 2021 +0100
tree ff56422b1f8f29fe7afa5c728ea6b822a1e78f73
parent 9932cd89ae238b97090b8447ed50fd1ee8bf19cc

Drop duplicate method

Change-Id: Ib9401c695a48673545d0adeac2bad24c7579e424
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112419
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

sw/inc/doc.hxx

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 124403b..2874508 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -677,7 +677,6 @@ public:

    void ChgDBData( const SwDBData& rNewData );
    SwDBData const & GetDBData();
    const SwDBData& GetDBDesc();

    // Some helper functions
    OUString GetUniqueGrfName() const;

sw/inc/editsh.hxx

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index a68ccce..c5f5be3 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -415,7 +415,6 @@ public:

    /// Database information.
    SwDBData const & GetDBData() const;
    const SwDBData& GetDBDesc() const;
    void ChgDBData(const SwDBData& SwDBData);
    void ChangeDBFields( const std::vector<OUString>& rOldNames,
                         const OUString& rNewName );

sw/source/core/doc/docfld.cxx

diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 5831981..3fb49544 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -343,11 +343,6 @@ OUString LookString( SwHashTable<HashStr> const & rTable, const OUString& rName 

SwDBData const & SwDoc::GetDBData()
{
    return GetDBDesc();
}

const SwDBData& SwDoc::GetDBDesc()
{
#if HAVE_FEATURE_DBCONNECTIVITY
    if(maDBData.sDataSource.isEmpty())
    {

sw/source/core/edit/edfld.cxx

diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index 2ad8695..837f37b 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -291,11 +291,6 @@ SwDBData const & SwEditShell::GetDBData() const
    return GetDoc()->GetDBData();
}

const SwDBData& SwEditShell::GetDBDesc() const
{
    return GetDoc()->GetDBDesc();
}

void SwEditShell::ChgDBData(const SwDBData& rNewData)
{
    GetDoc()->ChgDBData(rNewData);

sw/source/uibase/dbui/mmconfigitem.cxx

diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 28ed409..ae4f5b6 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -705,7 +705,7 @@ void SwMailMergeConfigItem::stopDBChangeListening()

void SwMailMergeConfigItem::updateCurrentDBDataFromDocument()
{
    const SwDBData& rDBData = m_pSourceView->GetWrtShell().GetDBDesc();
    const SwDBData& rDBData = m_pSourceView->GetWrtShell().GetDBData();
    SetCurrentDBData(rDBData);
}

sw/source/uibase/uiview/view2.cxx

diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 1946f6a3..bf756f9 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1193,7 +1193,7 @@ void SwView::Execute(SfxRequest &rReq)
            pVFrame->ChildWindowExecute(rReq);
            if(pVFrame->HasChildWindow(SID_BROWSER))
            {
                const SwDBData& rData = GetWrtShell().GetDBDesc();
                const SwDBData& rData = GetWrtShell().GetDBData();
                SwModule::ShowDBObj(*this, rData);
            }
        }

sw/source/uibase/uno/SwXDocumentSettings.cxx

diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index ebe7579..9a85ebe 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -1149,19 +1149,19 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
        break;
        case HANDLE_CURRENT_DATABASE_DATA_SOURCE:
        {
            const SwDBData& rData = mpDoc->GetDBDesc();
            const SwDBData& rData = mpDoc->GetDBData();
            rValue <<= rData.sDataSource;
        }
        break;
        case HANDLE_CURRENT_DATABASE_COMMAND:
        {
            const SwDBData& rData = mpDoc->GetDBDesc();
            const SwDBData& rData = mpDoc->GetDBData();
            rValue <<= rData.sCommand;
        }
        break;
        case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:
        {
            const SwDBData& rData = mpDoc->GetDBDesc();
            const SwDBData& rData = mpDoc->GetDBData();
            rValue <<= rData.nCommandType;
        }
        break;

sw/source/uibase/uno/unodispatch.cxx

diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index 4060c0d..7184b0f 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -242,7 +242,7 @@ void SwXDispatch::dispatch(const util::URL& aURL,
        frame::FeatureStateEvent aEvent;
        aEvent.Source = *static_cast<cppu::OWeakObject*>(this);

        const SwDBData& rData = m_pView->GetWrtShell().GetDBDesc();
        const SwDBData& rData = m_pView->GetWrtShell().GetDBData();
        svx::ODataAccessDescriptor aDescriptor;
        aDescriptor.setDataSource(rData.sDataSource);
        aDescriptor[svx::DataAccessDescriptorProperty::Command]       <<= rData.sCommand;
@@ -288,7 +288,7 @@ void SwXDispatch::addStatusListener(
    // one of the URLs requires a special state...
    if (aURL.Complete == cURLDocumentDataSource)
    {
        const SwDBData& rData = m_pView->GetWrtShell().GetDBDesc();
        const SwDBData& rData = m_pView->GetWrtShell().GetDBData();

        svx::ODataAccessDescriptor aDescriptor;
        aDescriptor.setDataSource(rData.sDataSource);