diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:02:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:02:44 +0000 |
| commit | 412bdef3da7573736b4f71536fa57e05a4b26d83 (patch) | |
| tree | 2b90c8689c0d23ee81cf5f101145e17dbb2ff851 /scripting | |
| parent | 2eb85ab0d0bedcf61c0c71cf3a45f20ee6d14118 (diff) | |
INTEGRATION: CWS basmgr03 (1.20.44); FILE MERGED
2007/09/24 12:40:51 fs 1.20.44.1: #i81786# xModelToTDocTitle removed (superseded by ::comphelper::DocumentInfo::getDocumentTitle in the course of #i73331#, just forgot to remove it here)
Diffstat (limited to 'scripting')
| -rwxr-xr-x | scripting/source/provider/MasterScriptProvider.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index c4d75ef357b6..24f2e211726d 100755 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -4,9 +4,9 @@ * * $RCSfile: MasterScriptProvider.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2006-09-16 12:28:15 $ + * last change: $Author: kz $ $Date: 2007-10-09 15:02:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,6 +36,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_scripting.hxx" +#include <comphelper/documentinfo.hxx> + #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/factory.hxx> #include <com/sun/star/frame/XModel.hpp> @@ -422,18 +424,13 @@ MasterScriptProvider::getName() ::rtl::OUString sCtx = getContextString(); if ( sCtx.indexOf( OUSTR( "vnd.sun.star.tdoc" ) ) == 0 ) { - // @@@ cannot be used because title returned is not the same - // as returned by MiscUtils::xModelToDocTitle(). And this - // would break code in SVX (source/dialog/selector.cxx). - //m_sNodeName = MiscUtils::tDocUrlToTitle( sCtx ); - Reference< frame::XModel > xModel = m_xModel; if ( !xModel.is() ) { xModel = MiscUtils::tDocUrlToModel( sCtx ); } - m_sNodeName = MiscUtils::xModelToDocTitle( xModel ); + m_sNodeName = ::comphelper::DocumentInfo::getDocumentTitle( xModel ); } else { |