diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 14:42:58 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 14:42:58 +0000 |
| commit | bed6312fd4fa271a06fa1bfd1018227342dc07f8 (patch) | |
| tree | 7f45f240e9aae4527a32dab94f6f75e4f9bf076e /sc/source/ui/formdlg/formula.cxx | |
| parent | e16b77e8e99a2ebe0beaecfce07a709f2bd45177 (diff) | |
INTEGRATION: CWS dr58_SRC680 (1.15.188); FILE MERGED
2008/01/11 12:49:57 dr 1.15.188.2: #i84412# set note visibility when copying cells, remove global depenencies from postit.hxx header
2008/01/09 12:02:46 dr 1.15.188.1: #i75893# decode URLs in reference input
Diffstat (limited to 'sc/source/ui/formdlg/formula.cxx')
| -rw-r--r-- | sc/source/ui/formdlg/formula.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index d016c0f85a5e..99a6a7986f1f 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -4,9 +4,9 @@ * * $RCSfile: formula.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: vg $ $Date: 2007-02-27 13:14:42 $ + * last change: $Author: rt $ $Date: 2008-01-29 15:42:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,10 +50,8 @@ #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <unotools/charclass.hxx> - -#ifndef _SFXSTRITEM_HXX //autogen #include <svtools/stritem.hxx> -#endif +#include <tools/urlobj.hxx> #include "formula.hxx" #include "formdlgs.hrc" @@ -1513,7 +1511,10 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc ) rRef.Format( aTmp, SCA_VALID|SCA_TAB_3D, pRefDoc ); // immer 3d SfxObjectShell* pObjSh = pRefDoc->GetDocumentShell(); - String aFileName = pObjSh->GetMedium()->GetName(); + + // #i75893# convert escaped URL of the document to something user friendly +// String aFileName = pObjSh->GetMedium()->GetName(); + String aFileName = pObjSh->GetMedium()->GetURLObject().GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); aRefStr = '\''; aRefStr += aFileName; |