diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 12:09:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 12:09:48 +0000 |
| commit | cfc2bbb52bca692fb78a5e39bb557717d71c9bd4 (patch) | |
| tree | 67f5acd15a3256a6454b451cb34f4767fdd0f1b1 /basctl | |
| parent | 6d58c7f230428f00ffdd629988029cdbee44023b (diff) | |
INTEGRATION: CWS dba30d (1.7.14); FILE MERGED
2008/06/15 19:18:25 fs 1.7.14.1: #i90757# getTitle: use DocumentInfo::getDocumentTitle, which properly respects XTitle now
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/scriptdocument.cxx | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 41792d7b1103..99f57b5aaec1 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: scriptdocument.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -78,7 +78,7 @@ #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/processfactory.hxx> +#include <comphelper/documentinfo.hxx> #include <comphelper/componentcontext.hxx> #include <vos/mutex.hxx> @@ -868,30 +868,7 @@ namespace basctl ::rtl::OUString sTitle; if ( isValid() && isDocument() ) { - INetURLObject aURL( getURL() ); - sTitle = aURL.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - if ( sTitle.getLength() == 0 ) - { - // this is a hack. There is no UNO equivalent to retrieve the title of an unsaved - // document (which is something like "Untitled<no>"). Until AS finishes his document - // title framework, we need to use the below workaround - try - { - Reference< XFrame > xFrame; - getCurrentFrame( xFrame ); - Reference< XPropertySet > xFrameProps( xFrame, UNO_QUERY_THROW ); - OSL_VERIFY( xFrameProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) ) >>= sTitle ); - - sal_Int32 nWhiteSpacePos = sTitle.indexOf( ' ' ); - OSL_ENSURE( nWhiteSpacePos >= 0, "ScriptDocument_Impl::getTitle: Title hack doesn't work anymore! (FS)" ); - if ( nWhiteSpacePos >= 0 ) - sTitle = sTitle.copy( 0, nWhiteSpacePos ); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - } + sTitle = ::comphelper::DocumentInfo::getDocumentTitle( m_xDocument ); } return sTitle; } |