From f94cf3e25ae6d432bbcf50269e6da826ae0e8857 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 21 Oct 2015 10:00:47 +0200 Subject: tdf#95095: Rename "AvoidRecentDocs" to "PickListEntry" for consistency. It turns out that Base already has a similar property called "PickListEntry". Let's make it consistent then, and rename "AvoidRecentDocs", so that it works in all the apps the same way. So instead of setting "AvoidRecentDocs" to true, set "PickListEntry" to false. Change-Id: Idf0dd8e8892218f387944f0ad43b292c4b052be6 --- sfx2/source/view/frmload.cxx | 2 +- sfx2/source/view/sfxbasecontroller.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 1ccfe7dbe5a5..618b577ed473 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -530,7 +530,7 @@ void SfxFrameLoader_Impl::impl_removeLoaderArguments( ::comphelper::NamedValueCo { const sal_Char* pKnownViewArgs[] = { "JumpMark", - "AvoidRecentDocs" + "PickListEntry" }; ::comphelper::NamedValueCollection aViewArgs; diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index f8cfe0c3b3f6..ba6edfb7467e 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1353,8 +1353,8 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) ::comphelper::NamedValueCollection aViewArgs(getCreationArguments()); // sometimes we want to avoid adding to the recent documents - bool bAvoidRecentDocs = aViewArgs.getOrDefault("AvoidRecentDocs", false); - m_pData->m_pViewShell->GetObjectShell()->AvoidRecentDocs(bAvoidRecentDocs); + bool bAllowPickListEntry = aViewArgs.getOrDefault("PickListEntry", true); + m_pData->m_pViewShell->GetObjectShell()->AvoidRecentDocs(!bAllowPickListEntry); // if there's a JumpMark given, then, well, jump to it const OUString sJumpMark = aViewArgs.getOrDefault( "JumpMark", OUString() ); -- cgit v1.2.3