diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 16:26:08 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 16:26:08 +0300 |
| commit | 11c71842f6d73f80cc40d2752421eec9af40bb51 (patch) | |
| tree | d6de27d1d9e96bae92a6b7e7db3ce661b1582afb /fpicker | |
| parent | 15083950a5c814dd5765ef49751a2700052a5a99 (diff) | |
Drop OS2
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 12 | ||||
| -rw-r--r-- | fpicker/test/makefile.mk | 4 |
2 files changed, 3 insertions, 13 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index bda16353eb34..b98b68beedb7 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -329,7 +329,7 @@ namespace void convertStringListToUrls( const String& _rColonSeparatedList, ::std::vector< String >& _rTokens, bool _bFinalSlash ) { const sal_Unicode s_cSeparator = -#if defined(WNT) || defined(OS2) +#if defined(WNT) ';' #else ':' @@ -369,7 +369,7 @@ namespace void operator()( String& _rURL ) { INetURLObject aURL( _rURL ); -#if defined(WNT) || defined(OS2) +#if defined(WNT) if ( aURL.getSegmentCount() > 1 ) #endif aURL.removeFinalSlash( ); @@ -2563,7 +2563,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilt if ( nPathTokenPos == STRING_NOTFOUND ) { String aDelim( -#if defined(WNT) || defined(OS2) +#if defined(WNT) '\\' #else '/' @@ -2571,12 +2571,6 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilt ); nPathTokenPos = aReversePath.Search( aDelim ); -#if defined(OS2) - if ( nPathTokenPos == STRING_NOTFOUND ) - { - nPathTokenPos = aReversePath.Search( '/' ); - } -#endif #if !defined( UNX ) if ( nPathTokenPos == STRING_NOTFOUND ) { diff --git a/fpicker/test/makefile.mk b/fpicker/test/makefile.mk index 4157d339bd3a..e497e794c185 100644 --- a/fpicker/test/makefile.mk +++ b/fpicker/test/makefile.mk @@ -31,10 +31,6 @@ PRJNAME=SV TARGET=svdem LIBTARGET=NO -.IF "$(GUI)" == "OS2" -TARGETTYPE=GUI -.ENDIF - # --- Settings ----------------------------------------------------- .INCLUDE : svpre.mk |