summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-10-29 10:11:49 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-10-29 17:33:35 +0100
commit23d3682d0ef10ba54e7952ec861b97cda983c6fc (patch)
tree55ab941c8fcd88bf6f14a69934adaf7cb64a2f49 /sw
parent2cd6ff8a54b0db76b2f4c5f75988367cfb0feaf0 (diff)
return value from IDocumentLinksAdministration::SetData unused
since initial commit Change-Id: If104670adc57501f6712c3c060590251c266118a Reviewed-on: https://gerrit.libreoffice.org/81649 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/IDocumentLinksAdministration.hxx2
-rw-r--r--sw/source/core/doc/DocumentLinksAdministrationManager.cxx8
-rw-r--r--sw/source/core/inc/DocumentLinksAdministrationManager.hxx2
-rw-r--r--sw/source/uibase/app/docsh2.cxx3
4 files changed, 7 insertions, 8 deletions
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index 4bc8c78122a3..71302d0d3d85 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -52,7 +52,7 @@ using rtl::OUString;
*/
virtual bool GetData(const OUString& rItem, const OUString& rMimeType, css::uno::Any& rValue) const = 0;
- virtual bool SetData(const OUString& rItem) = 0;
+ virtual void SetData(const OUString& rItem) = 0;
virtual ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) = 0;
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index 9086b9faef74..ca613ae0f850 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -290,7 +290,7 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O
return false;
}
-bool DocumentLinksAdministrationManager::SetData( const OUString& rItem )
+void DocumentLinksAdministrationManager::SetData( const OUString& rItem )
{
// search for bookmarks and sections case sensitive at first. If nothing is found then try again case insensitive
bool bCaseSensitive = true;
@@ -299,7 +299,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem )
::sw::mark::DdeBookmark* const pBkmk = lcl_FindDdeBookmark(*m_rDoc.getIDocumentMarkAccess(), rItem, bCaseSensitive);
if(pBkmk)
{
- return false;
+ return;
}
// Do we already have the Item?
@@ -313,7 +313,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem )
if( aPara.pSectNd )
{
// found, so get the data
- return false;
+ return;
}
if( !bCaseSensitive )
break;
@@ -327,8 +327,6 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem )
if (!(lcl_FindTable(pFormat, &aPara)))
break;
}
-
- return false;
}
::sfx2::SvLinkSource* DocumentLinksAdministrationManager::CreateLinkSource(const OUString& rItem)
diff --git a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx
index 5c9dcdda079d..8223591d36f6 100644
--- a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx
+++ b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx
@@ -50,7 +50,7 @@ public:
bool GetData(const OUString& rItem, const OUString& rMimeType, css::uno::Any& rValue) const override;
- bool SetData(const OUString& rItem) override;
+ void SetData(const OUString& rItem) override;
::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) override;
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 16b42f8915eb..1b1c83f366f9 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1349,7 +1349,8 @@ bool SwDocShell::DdeGetData( const OUString& rItem, const OUString& rMimeType,
bool SwDocShell::DdeSetData( const OUString& rItem, const OUString& /*rMimeType*/,
const uno::Any & /*rValue*/ )
{
- return m_xDoc->getIDocumentLinksAdministration().SetData( rItem );
+ m_xDoc->getIDocumentLinksAdministration().SetData( rItem );
+ return false;
}
#endif