diff options
author | Gülşah Köse <gulsah.kose@collabora.com> | 2021-05-24 00:19:53 +0300 |
---|---|---|
committer | Gülşah Köse <gulsah.kose@collabora.com> | 2021-05-24 10:02:00 +0200 |
commit | 5ef0461b647dbb01a037459b39b47240abb85fca (patch) | |
tree | 9ab7f12936f1fd6769ac5204dd03418eaa383bec /sw/source/uibase | |
parent | f47dbc7e12f0bab7bcbae487460ccbdc2f5c171a (diff) |
Mail Merge: Remove the missing data source warning on load.
User can easily forget that they (or somebody else ) added a
data source to document. This warning is only useful for the
user that plans to use mail merge wizard. When they don't plan
to use mail merge wizard and see that warning on infobar they
can confuse. We already have the same warning on mail merge
dialog itself. We don't need on load warning anymore.
Change-Id: I8d80148a9637ee66cc35e2ef583fff51a04386eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116029
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/uiview/view.cxx | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 2590b3afe94d..5612191cc77a 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -212,11 +212,6 @@ IMPL_LINK_NOARG(SwView, FormControlActivated, LinkParamNone*, void) } } -IMPL_LINK_NOARG(SwView, ExchangeDatabaseHandler, weld::Button&, void) -{ - GetDispatcher().Execute(FN_CHANGE_DBFIELD); -} - namespace { uno::Reference<frame::XLayoutManager> getLayoutManager(const SfxViewFrame& rViewFrame) @@ -1643,23 +1638,6 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } else { - if (auto pSfxEventHint = dynamic_cast<const SfxEventHint*>(&rHint)) - { - switch( pSfxEventHint->GetEventId() ) - { - case SfxEventHintId::CreateDoc: - case SfxEventHintId::OpenDoc: - { - OUString sDataSourceName = GetDataSourceName(); - if ( !sDataSourceName.isEmpty() && !IsDataSourceAvailable(sDataSourceName)) - AppendDataSourceInfobar(); - } - break; - default: - break; - } - } - SfxHintId nId = rHint.GetId(); switch ( nId ) @@ -1923,19 +1901,6 @@ bool SwView::IsDataSourceAvailable(const OUString sDataSourceName) return xDatabaseContext->hasByName(sDataSourceName); } -void SwView::AppendDataSourceInfobar() -{ - auto pInfoBar = GetViewFrame()->AppendInfoBar("datasource", "", - SwResId(STR_DATASOURCE_NOT_AVAILABLE), - InfobarType::WARNING); - if (!pInfoBar) - return; - - weld::Button& rBtn = pInfoBar->addButton(); - rBtn.set_label(SwResId(STR_EXCHANGE_DATABASE)); - rBtn.connect_clicked(LINK(this, SwView, ExchangeDatabaseHandler)); -} - namespace sw { void InitPrintOptionsFromApplication(SwPrintData & o_rData, bool const bWeb) |