summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-06-04 08:43:27 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-06-04 08:43:27 +0000
commit82090ca58145da14b43d510eee4d51b921b905d9 (patch)
tree94d058fe9343a86bc67344954f36b5f6ac9b3674 /ucb/source
parent55326862588e24977181984aa7a864282363fdf7 (diff)
INTEGRATION: CWS tkr10 (1.18.8); FILE MERGED
2008/05/19 09:26:39 tkr 1.18.8.2: RESYNC: (1.18-1.19); FILE MERGED 2008/04/07 13:58:07 kso 1.18.8.1: #i83870# - Respect query and fragment part in source URLs.
Diffstat (limited to 'ucb/source')
-rw-r--r--ucb/source/core/ucbcmds.cxx10
1 files changed, 9 insertions, 1 deletions
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index a0798225974c..7caabc7f783d 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ucbcmds.cxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
* This file is part of OpenOffice.org.
*
@@ -426,6 +426,14 @@ static rtl::OUString createDesiredName(
{
aName = rSourceURL;
}
+
+ // query, fragment present?
+ sal_Int32 nPos = aName.indexOf( '?' );
+ if ( nPos == -1 )
+ nPos = aName.indexOf( '#' );
+
+ if ( nPos != -1 )
+ aName = aName.copy( 0, nPos );
}
return rtl::OUString( aName );
}