From d8e5bfb7597f9b9e6c4822dba3368a42a1310614 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Sat, 14 Mar 2009 17:15:26 +0000
Subject: 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

---
 lingucomponent/source/lingutil/lingutil.cxx | 11 ++++-------
 lingucomponent/source/lingutil/lingutil.hxx |  5 ++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lingucomponent')

diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
index dcf61e351950..f6d24a2d059a 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -65,6 +65,7 @@
 using ::com::sun::star::lang::Locale;
 using namespace ::com::sun::star;
 
+#if 0
 //////////////////////////////////////////////////////////////////////
 
 String GetDirectoryPathFromFileURL( const String &rFileURL )
@@ -78,15 +79,13 @@ String GetDirectoryPathFromFileURL( const String &rFileURL )
     String aRes = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
     return aRes;
 }
+#endif
 
-
+#if defined(WNT)
 rtl::OString Win_GetShortPathName( const rtl::OUString &rLongPathName )
 {
-    (void) rLongPathName;
     rtl::OString aRes;
 
-#if defined(WNT)
-
     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)
 
 //////////////////////////////////////////////////////////////////////
 
diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx
index c551969a4330..9581a2ffcecf 100644
--- a/lingucomponent/source/lingutil/lingutil.hxx
+++ b/lingucomponent/source/lingutil/lingutil.hxx
@@ -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
 
 ///////////////////////////////////////////////////////////////////////////
 
-- 
cgit v1.2.3