summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2006-08-01 10:19:05 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2006-08-01 10:19:05 +0000
commit830664d8770235e8b2ada56003c98b282929f8c7 (patch)
treed777674af902c7ee1ede2591e59f729ee1ae0585 /sfx2
parent97980c1d92109b03f6772f6be8b09ed1890ad271 (diff)
INTEGRATION: CWS fwk40 (1.78.32); FILE MERGED
2006/06/30 14:26:48 mav 1.78.32.2: RESYNC: (1.78-1.80); FILE MERGED 2006/06/30 09:45:58 mav 1.78.32.1: #i65519# integrate the patch
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/objmisc.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 948ec3427565..7feefb80a34d 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: objmisc.cxx,v $
*
- * $Revision: 1.80 $
+ * $Revision: 1.81 $
*
- * last change: $Author: rt $ $Date: 2006-06-26 09:52:22 $
+ * last change: $Author: ihi $ $Date: 2006-08-01 11:19:05 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -858,6 +858,10 @@ String SfxObjectShell::GetTitle
// ggf. Titel aus Dateiname generieren
if ( !pImp->aTitle.Len() )
pImp->aTitle = aURL.GetBase();
+
+ // workaround for the case when the name can not be retrieved from URL by INetURLObject
+ if ( !pImp->aTitle.Len() )
+ pImp->aTitle = aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
}
// ganzer Titel