diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-07-11 17:56:23 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-07-14 16:01:58 +0200 |
| commit | 077e11ea9bb4caf5c02314eefd668e41ea08491d (patch) | |
| tree | 45cf2789044ffb0e5f2ed95f5d9586cae2aa0306 /filter | |
| parent | ada8c921794a79ced76b8b8772b779312c9fbe70 (diff) | |
Show document title for embedded documents
Embedded documents had "Untitled" name.
This patch shows "<root document> (Embedded document)"
string in the title bar.
Change-Id: I6283240415f9e0c07c4c69672732a7c14eea9f5d
Reviewed-on: https://gerrit.libreoffice.org/39835
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-on: https://gerrit.libreoffice.org/39934
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index de9f0d489111..207a9012a45c 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -7154,6 +7154,10 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( rVisArea, rBaseURL)); if ( xObj.is() ) { + // remember file name to use in the title bar + INetURLObject aURL(rBaseURL); + xObj->setContainerName(aURL.GetLastName(INetURLObject::DecodeMechanism::DECODE_WITH_CHARSET)); + svt::EmbeddedObjectRef aObj( xObj, nAspect ); // TODO/LATER: need MediaType @@ -7216,6 +7220,10 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( uno::Reference < embed::XEmbeddedObject > xObj = aCnt.GetEmbeddedObject( aDstStgName ); if( xObj.is() ) { + // remember file name to use in the title bar + INetURLObject aURL( rBaseURL ); + xObj->setContainerName( aURL.GetLastName( INetURLObject::DecodeMechanism::DECODE_WITH_CHARSET ) ); + // the visual area must be retrieved from the metafile (object doesn't know it so far) if ( nAspect != embed::Aspects::MSOLE_ICON ) |