[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sfx2/source

[Jan Holesovsky]

 sfx2/source/view/frmload.cxx           |    2 +-
 sfx2/source/view/sfxbasecontroller.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7d6331b9866ce05e3f98e4db4a29bb04c5bc4e97
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Oct 21 10:00:47 2015 +0200

    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

diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 720714e..30ccb04 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -529,7 +529,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 fcf57d2..d1c872b 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -1339,8 +1339,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() );