summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-09-20 13:36:13 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-09-20 13:36:13 +0000
commitb34908ce131f20807e21b9bef593ca53017862f8 (patch)
tree86c5535d31dd7770b856457e78e9ca6210470046
parent679559b8fb6fff6b706a164a5d01d3ed7aad3b42 (diff)
INTEGRATION: CWS os2port01 (1.11.16); FILE MERGED
2007/09/05 07:56:03 obr 1.11.16.3: RESYNC: (1.17-1.18); FILE MERGED 2007/07/17 10:44:07 obr 1.11.16.2: RESYNC: (1.11-1.17); FILE MERGED 2006/12/28 14:56:07 ydario 1.11.16.1: OS/2 initial import.
-rw-r--r--fpicker/source/office/iodlg.cxx16
1 files changed, 11 insertions, 5 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 12d60bddb293..ed5afb18f8c5 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: iodlg.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: ihi $ $Date: 2007-07-11 12:54:30 $
+ * last change: $Author: vg $ $Date: 2007-09-20 14:36:13 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -461,7 +461,7 @@ namespace
void convertStringListToUrls( const String& _rColonSeparatedList, ::std::vector< String >& _rTokens, bool _bFinalSlash )
{
const sal_Unicode s_cSeparator =
-#if defined(WNT)
+#if defined(WNT) || defined(OS2)
';'
#else
':'
@@ -501,7 +501,7 @@ namespace
void operator()( String& _rURL )
{
INetURLObject aURL( _rURL );
-#ifdef WNT
+#if defined(WNT) || defined(OS2)
if ( aURL.getSegmentCount() > 1 )
#endif
aURL.removeFinalSlash( );
@@ -2748,7 +2748,7 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
if ( nPathTokenPos == STRING_NOTFOUND )
{
String aDelim(
-#ifdef WNT
+#if defined(WNT) || defined(OS2)
'\\'
#else
'/'
@@ -2756,6 +2756,12 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
);
nPathTokenPos = aReversePath.Search( aDelim );
+#if defined(OS2)
+ if ( nPathTokenPos == STRING_NOTFOUND )
+ {
+ nPathTokenPos = aReversePath.Search( '/' );
+ }
+#endif
#if !defined( UNX )
if ( nPathTokenPos == STRING_NOTFOUND )
{