CWS-TOOLING: integrate CWS cmcfixes55
2009-03-03 10:04:14 +0100 cmc r268711 : #i99765# silence warning 2009-03-02 12:18:48 +0100 cmc r268647 : #i99772# silence warnings under >= python 2.6 and gcc 4.4 2009-03-02 10:51:12 +0100 cmc r268641 : #i99767# fix up trivial && || 2009-03-02 10:32:02 +0100 cmc r268640 : #i99766 remove && || warning 2009-03-02 10:01:05 +0100 cmc r268638 : #i99764# easy && || warnings 2009-02-27 13:03:08 +0100 cmc r268583 : #i96059# fix dodgy code 2009-02-27 12:57:38 +0100 cmc r268582 : #i99718# don't leave unused methods on non-win platform
This commit is contained in:
parent
a476b01ccb
commit
d8e5bfb759
2 changed files with 10 additions and 10 deletions
|
@ -65,6 +65,7 @@
|
|||
using ::com::sun::star::lang::Locale;
|
||||
using namespace ::com::sun::star;
|
||||
|
||||
#if 0
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
String GetDirectoryPathFromFileURL( const String &rFileURL )
|
||||
|
@ -78,14 +79,12 @@ String GetDirectoryPathFromFileURL( const String &rFileURL )
|
|||
String aRes = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
|
||||
return aRes;
|
||||
}
|
||||
|
||||
|
||||
rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName )
|
||||
{
|
||||
(void) rLongPathName;
|
||||
rtl::OString aRes;
|
||||
#endif
|
||||
|
||||
#if defined(WNT)
|
||||
rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName )
|
||||
{
|
||||
rtl::OString aRes;
|
||||
|
||||
sal_Unicode aShortBuffer[1024] = {0};
|
||||
sal_Int32 nShortBufSize = sizeof( aShortBuffer ) / sizeof( aShortBuffer[0] );
|
||||
|
@ -100,12 +99,10 @@ rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName )
|
|||
aRes = rtl::OString( OU2ENC( rtl::OUString( aShortBuffer, nShortLen ), osl_getThreadTextEncoding()) );
|
||||
else
|
||||
DBG_ERROR( "Win_GetShortPathName: buffer to short" );
|
||||
#else
|
||||
DBG_ERROR( "Win_GetShortPathName: functions should nor be called in non-Windows builds" );
|
||||
#endif //defined(WNT)
|
||||
|
||||
return aRes;
|
||||
}
|
||||
#endif //defined(WNT)
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
|
@ -79,18 +79,21 @@ inline BOOL operator == ( const ::com::sun::star::lang::Locale &rL1, const ::com
|
|||
rL1.Variant == rL2.Variant;
|
||||
}
|
||||
|
||||
#if 0
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
String GetDirectoryPathFromFileURL( const String &rFileURL );
|
||||
#endif
|
||||
|
||||
#if defined(WNT)
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// to be use to get a short path name under Windows that still can be used with
|
||||
// the 'fopen' call. This is necessary since under Windows there seems to be
|
||||
// a restriction of only about 110-130 characters length to a path name in order
|
||||
// for it to work with 'fopen'. And that length is usually easily exceeded
|
||||
// when using extensions...
|
||||
rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName );
|
||||
#endif
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
Loading…
Reference in a new issue