diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-07-28 13:53:02 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-29 08:24:44 +0000 |
| commit | ec913f9549ed6fcdcb7306214594227337d274e0 (patch) | |
| tree | 9ef5ab7871f7fd9ab6e1a73ed837a6a7aca96450 /sfx2 | |
| parent | a3ba357d09ee7ae47f55d2f7eba364c4237037e8 (diff) | |
Make AddToRecentDocumentList aware of the DocumentService
This information helps to map a document with an application ID
needed for Windows 7 shell integration.
(cherry picked from commit a9ae9aefe8384a81dd79827cb76daa9ed8b58dbc)
Conflicts:
helpcontent2
Change-Id: I1224f566037ab7597a29b16f310f93d9f5441cce
WaE: unused rDocumentService in one ifdef branch
Change-Id: I542cf23c8077d9f867a2d890dc326465fce8c3a3
(cherry picked from commit 0354b4335b5c4fcf65d954e03116c44aabe7fa1d)
Reviewed-on: https://gerrit.libreoffice.org/5161
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfxpicklist.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index a32cfee1fe78..32b3ea561bad 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -197,7 +197,9 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) OUString() ); if ( aURL.GetProtocol() == INET_PROT_FILE ) - Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : OUString() ); + Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), + (pFilter) ? pFilter->GetMimeType() : OUString(), + (pFilter) ? pFilter->GetServiceName() : OUString() ); } SfxPickList& SfxPickList::Get() diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index c57c79a45549..660b843ce1f1 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2108,7 +2108,8 @@ void SfxObjectShell::AddToRecentlyUsedList() { const SfxFilter* pOrgFilter = pMedium->GetOrigFilter(); Application::AddToRecentDocumentList( aUrl.GetURLNoPass( INetURLObject::NO_DECODE ), - (pOrgFilter) ? pOrgFilter->GetMimeType() : OUString() ); + (pOrgFilter) ? pOrgFilter->GetMimeType() : OUString(), + (pOrgFilter) ? pOrgFilter->GetServiceName() : OUString() ); } } |