summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPovilas Kanapickas <povilas.kanapickas@gmail.com>2010-10-18 16:52:05 +0100
committerMichael Meeks <michael.meeks@novell.com>2010-10-18 16:52:27 +0100
commit849a713ffd29a58ae79e48f80835c28bbd9d5a72 (patch)
tree7d2c662f43a00f3bc04a0d51c685544074538a5c /tools
parentf7cbde525450a1a9427873c264791c65056c4f2a (diff)
remove non-compiled code
Diffstat (limited to 'tools')
-rw-r--r--tools/inc/tools/fsys.hxx4
-rw-r--r--tools/inc/tools/poly.hxx6
-rw-r--r--tools/inc/tools/pstm.hxx4
-rw-r--r--tools/inc/tools/ref.hxx2
-rw-r--r--tools/inc/tools/resary.hxx2
-rw-r--r--tools/inc/tools/table.hxx2
-rw-r--r--tools/source/fsys/dirent.cxx16
-rw-r--r--tools/source/fsys/os2.cxx129
-rw-r--r--tools/source/inet/inetmsg.cxx7
-rw-r--r--tools/source/stream/strmos2.cxx178
10 files changed, 0 insertions, 350 deletions
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 5d7e8669a21d..01b61c03829f 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -269,8 +269,6 @@ private:
DirEntryFlag aDirFlag,
FSysPathStyle eStyle );
-//#if 0 // _SOLAR__PRIVATE
-
friend class Dir;
friend class FileStat;
friend const char* ImpCheckDirEntry( const void* p );
@@ -298,8 +296,6 @@ protected:
void ImpSetStat( FileStat *p ) { pStat = p; }
#endif
-//#endif
-
protected:
void SetError( ULONG nErr ) { nError = nErr; }
DirEntry* GetParent() { return pParent; }
diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index 3b5a4807fe01..09cfeebfdb49 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -121,8 +121,6 @@ private:
TOOLS_DLLPRIVATE inline void ImplMakeUnique();
-//#if 0 // _SOLAR__PRIVATE
-
public:
Point* ImplGetPointAry();
@@ -132,8 +130,6 @@ public:
void ImplRead( SvStream& rIStream );
void ImplWrite( SvStream& rOStream ) const;
-//#endif // __PRIVATE
-
public:
Polygon();
Polygon( USHORT nSize );
@@ -256,11 +252,9 @@ private:
ImplPolyPolygon* mpImplPolyPolygon;
-//#if 0 // _SOLAR__PRIVATE
TOOLS_DLLPRIVATE void ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, ULONG nOperation ) const;
TOOLS_DLLPRIVATE void *ImplCreateArtVpath() const;
TOOLS_DLLPRIVATE void ImplSetFromArtVpath( void *pVpath );
-//#endif // __PRIVATE
public:
diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx
index d62aa39490b1..bd77d30214cc 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/tools/inc/tools/pstm.hxx
@@ -158,11 +158,7 @@ public:\
SV_DECL_PERSIST_LIST(ClassName,EntryName)\
SV_IMPL_PERSIST_LIST(ClassName,EntryName)
-//#if 0 // _SOLAR__PRIVATE
DECLARE_UNIQUEINDEX( SvPersistUIdx,SvPersistBase *)
-//#else
-//typedef UniqueIndex SvPersistUIdx;
-//#endif
//=========================================================================
class SvStream;
diff --git a/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx
index b1c1d9975b78..ab1c3d0e8435 100644
--- a/tools/inc/tools/ref.hxx
+++ b/tools/inc/tools/ref.hxx
@@ -367,11 +367,9 @@ public:
UINT32 GetRefCount() const { return nRefCount; }
};
-//#if 0 // _SOLAR__PRIVATE
#ifndef EMPTYARG
#define EMPTYARG
#endif
-//#endif
SV_DECL_IMPL_REF(SvRefBase)
diff --git a/tools/inc/tools/resary.hxx b/tools/inc/tools/resary.hxx
index a7a87300d396..6f3af5869580 100644
--- a/tools/inc/tools/resary.hxx
+++ b/tools/inc/tools/resary.hxx
@@ -41,12 +41,10 @@ struct ImplResStringItem
XubString maStr;
long mnValue;
-//#if 0 // _SOLAR__PRIVATE
#ifdef _TOOLS_RESARY_CXX
ImplResStringItem( const XubString& rStr ) :
maStr( rStr ) {}
#endif
-//#endif
};
// ------------------
diff --git a/tools/inc/tools/table.hxx b/tools/inc/tools/table.hxx
index caa98dcd92e4..b29c5a955826 100644
--- a/tools/inc/tools/table.hxx
+++ b/tools/inc/tools/table.hxx
@@ -42,9 +42,7 @@ class TOOLS_DLLPUBLIC Table : private Container
{
private:
ULONG nCount;
-//#if 0 // _SOLAR__PRIVATE
TOOLS_DLLPRIVATE ULONG ImplGetIndex( ULONG nKey, ULONG* pIndex = NULL ) const;
-//#endif
public:
Table( USHORT nInitSize = 16, USHORT nReSize = 16 );
Table( const Table& rTable ) : Container( rTable )
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index db90f1f09827..6342f9bcb6aa 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -2499,22 +2499,6 @@ BOOL DirEntry::MakeShortName( const String& rLongName, DirEntryKind eKind,
// Auf Novell-Servern (wegen der rottigen Clients) nur 7bit ASCII
- // HRO: #69627# Weg mit dem Scheiss. Wenn es Client gibt, die so einen
- // BUG haben, dann muss halt der Client ersetzt werden, aber doch nicht das
- // Office kastrieren !!!
-
-#if 0
- if ( FSYS_STYLE_NWFS == GetPathStyle( ImpGetTopPtr()->GetName() ) )
- {
- for ( USHORT n = aLongName.Len(); n; --n )
- {
- short nChar = aLongName(n-1);
- if ( nChar < 32 || nChar >= 127 )
- aLongName.Erase( n-1, 1 );
- }
- }
-#endif
-
// bei FSYS_KIND_ALL den alten Namen merken und abh"angen (rename)
ByteString aOldName;
if ( FSYS_KIND_ALL == eKind )
diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx
index f60efa8161d5..3cc3918fe5a6 100644
--- a/tools/source/fsys/os2.cxx
+++ b/tools/source/fsys/os2.cxx
@@ -244,66 +244,6 @@ BOOL DirEntry::SetCWD( BOOL bSloppy ) const
|*
*************************************************************************/
-#if 0 // YD see dirent.cxx
-BOOL createLongNameEA( const PCSZ pszPath, ULONG ulAttributes, const String& aLongName );
-
-FSysError DirEntry::MoveTo( const DirEntry& rDest ) const
-{
- DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
-
- DirEntry aTmpDest(rDest);
- FileStat aTmpStat(aTmpDest);
- if ( aTmpStat.IsKind(FSYS_KIND_DIR) )
- aTmpDest += DirEntry( GetName() );
-
- String aSource( GetFull() );
- String aDest( aTmpDest.GetFull() );
- String aShortSource("");
- String aShortDest("");
-
- if (Folder::IsAvailable())
- {
- if (IsLongNameOnFAT())
- {
- // in kurzen Pfad wandeln
- ItemIDPath aItemIDPath(aSource);
- aShortSource = aItemIDPath.GetHostNotationPath();
- }
- if (rDest.IsLongNameOnFAT())
- {
- // in kurzen Pfad wandeln
- ItemIDPath aItemIDPath(aDest);
- aShortDest = aItemIDPath.GetHostNotationPath();
- }
- }
-
- APIRET nRet = DosMove( aShortSource.Len()>0?(PSZ)aShortSource.GetStr():(PSZ)aSource.GetStr(),
- aShortDest.Len()>0?(PSZ)aShortDest.GetStr():(PSZ)aDest.GetStr());
-
- if ( nRet == ERROR_DIRECTORY_IN_CDS ||
- nRet == ERROR_CURRENT_DIRECTORY )
- {
- // 2nd chance with modified CWD
- DosSetCurrentDir( (PSZ) "\\" );
- nRet = DosMove( aShortSource.Len()>0?(PSZ)aShortSource.GetStr():(PSZ)aSource.GetStr(),
- aShortDest.Len()>0?(PSZ)aShortDest.GetStr():(PSZ)aDest.GetStr());
- }
- else if ( nRet == ERROR_NOT_SAME_DEVICE )
- {
- // other volume => copy+delete
- FileCopier aMover( *this, rDest );
- nRet = aMover.Execute( FSYS_ACTION_MOVE|FSYS_ACTION_RECURSIVE );
- return nRet;
- }
-
- if ( (nRet==NO_ERROR) && aShortDest.Len()>0)
- {
- createLongNameEA((const char*)aShortDest, FILE_NORMAL, rDest.GetName());
- }
-
- return ApiRet2ToSolarError_Impl( nRet );
-}
-#endif // 0
//-------------------------------------------------------------------------
@@ -535,15 +475,6 @@ BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL bAccessRemovableDevice )
aTempDirEntry.ToAbs();
ByteString aFullName( aTempDirEntry.GetFull(), osl_getThreadTextEncoding() );
-#if 0 // YD
- if (Folder::IsAvailable() && aTempDirEntry.IsLongNameOnFAT())
- {
- // in String mit kurzem Pfad wandeln
- ItemIDPath aItemIDPath(aTempDirEntry.GetFull());
- aFullName = ByteString( aItemIDPath.GetHostNotationPath(), osl_getThreadTextEncoding() );
- }
-#endif
-
p = (char *) aFullName.GetBuffer();
FILESTATUS3 filestat;
@@ -618,18 +549,6 @@ BOOL IsRedirectable_Impl( const ByteString &rPath )
return FALSE;
}
-#if 0
-BOOL IsRedirectable_Impl( const String &rPath )
-{
- if ( rPath.Len() >= 3 && ':' == rPath.GetStr()[1] )
- {
- DriveMapItem &rItem = aDriveMap[toupper(rPath[0]) - 'A'];
- return FSYS_KIND_FIXED != rItem.nKind;
- }
- return FALSE;
-}
-#endif
-
/*************************************************************************
|*
@@ -705,54 +624,6 @@ const char* TempDirImpl( char *pBuf )
#define NLS_CODEPAGE 850
/*====================================================================
- * CreateCaseMapImpl()
- * creates a map of each character to convert to lower
- *--------------------------------------------------------------------*/
-
-#if 0
-void CreateCaseMapImpl()
-{
- // build a string starting with code 0 as first character upto 255
- char sTemp[256];
- USHORT n;
-
- for ( n = 0; n < 256; ++n )
- sTemp[n] = (char) n;
-
- // convert string to upper case
- COUNTRYCODE aCountry;
- aCountry.country = CURRENT_COUNTRY; /* Country code */
- aCountry.codepage = NLS_CODEPAGE; /* Code page */
- DosMapCase( 255, &aCountry, sTemp+1 );
-
- // fill a global buffer starting with code 0 as first character upto 255
- for ( n = 0; n < 256; ++n )
- sCaseMap[n] = (char) n;
-
- // reorder by upper-code and store in a global buffer
- for ( n = 255; n > 0; --n )
- // was this character converted?
- if ( sTemp[n] != (char) n )
- // we found a convertion from upper to lower
- sCaseMap[ (unsigned char) sTemp[n] ] = (char) n;
-
- bCaseMap = TRUE;
-}
-
-String ToLowerImpl( const String& rSource )
-{
- if ( !bCaseMap )
- CreateCaseMapImpl();
-
- // TH sagt: International ist zu langsam, also mit einer eigenen Map
- ByteString aLower( rSource );
- for ( USHORT n = 0; n < aLower.Len(); ++n )
- aLower[n] = sCaseMap[ (unsigned char) aLower[n] ];
- return aLower;
-}
-#endif // 0
-
-/*====================================================================
* CreateDriveMapImpl()
* creates a map of drive-infos like FileSystem (style) and Kind (remote)
*--------------------------------------------------------------------*/
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 4bea9ff0666e..cc3f587e3e90 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -688,13 +688,6 @@ ULONG INetRFC822Message::SetHeaderField (
nIdx = INETMSG_RFC822_X_MAILER;
break;
-#if 0 /* NYI */
- case 'p':
- check = "riority";
- eOkState = INETMSG_RFC822_X_PRIORITY;
- break;
-#endif /* NYI */
-
default:
eState = INETMSG_RFC822_JUNK;
break;
diff --git a/tools/source/stream/strmos2.cxx b/tools/source/stream/strmos2.cxx
index e035d63cd883..1e3281ef718a 100644
--- a/tools/source/stream/strmos2.cxx
+++ b/tools/source/stream/strmos2.cxx
@@ -484,48 +484,10 @@ sal_Bool SvFileStream::UnlockFile()
|*
*************************************************************************/
-#if 0
-BOOL createLongNameEA ( const PCSZ pszPath, ULONG ulAttributes, const String& aLongName );
-#endif
-
void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
{
String aParsedFilename;
-#if 0
- if ( Folder::IsAvailable() && (rFilename.Search('{') < 9) )
- {
- String aVirtualPart;
- String aRealPart;
- String aVirtualPath;
- ItemIDPath aVirtualURL;
- ULONG nDivider = 0;
-
- String aVirtualString(rFilename);
-
- for (int x=aVirtualString.Len(); x>0; x--)
- {
- if (aVirtualString.Copy(x,1).Compare("}")==COMPARE_EQUAL)
- {
- nDivider = x;
- break;
- }
- }
-
- aVirtualPart = aVirtualString.Copy(0,nDivider+1);
- aRealPart = aVirtualString.Copy(nDivider+2);
-
- aVirtualURL = aVirtualPart;
- aVirtualPath = aVirtualURL.GetHostNotationPath();
-
- DirEntry aTempDirEntry(aVirtualPath);
-
- aTempDirEntry += aRealPart;
-
- aParsedFilename = aTempDirEntry.GetFull();
- }
- else
-#endif // 0
{
aParsedFilename = rFilename;
}
@@ -587,24 +549,6 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
nOpenAction |= OPEN_ACTION_OPEN_IF_EXISTS;
}
-#if 0 // YD
- //
- // resolves long FAT names used by OS2
- //
- BOOL bIsLongOS2=FALSE;
- if (Folder::IsAvailable())
- {
- DirEntry aDirEntry(rFilename);
- if (aDirEntry.IsLongNameOnFAT())
- {
- // in kurzen Pfad wandeln
- ItemIDPath aItemIDPath(rFilename);
- aParsedFilename = aItemIDPath.GetHostNotationPath();
- bIsLongOS2 = TRUE;
- }
- }
-#endif
-
aFilename = aParsedFilename;
ByteString aFileNameA( aFilename, gsl_getSystemTextEncoding());
FSysRedirector::DoRedirect( aFilename );
@@ -650,22 +594,6 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
if( nReadWriteBits != OPEN_ACCESS_READONLY )
bIsWritable = TRUE;
}
-
-#if 0
- if (bIsOpen && bIsLongOS2)
- {
- //file schließen, da sonst createLongName u.U. nicht möglich
- Close();
-
- // erzeugtem File langen Namen geben
- DirEntry aDirEntry(rFilename);
- createLongNameEA(aFileNameA.GetBuffer(), FILE_NORMAL, aDirEntry.GetName());
-
- // und wieder oeffnen
- ReOpen();
- }
-#endif
-
}
/*************************************************************************
@@ -756,110 +684,4 @@ void SvFileStream::SetSize( ULONG nSize )
}
}
-#if 0
-/*************************************************************************
-|*
-|* SvSharedMemoryStream::AllocateMemory()
-|*
-|* Beschreibung STREAM.SDW
-|* Ersterstellung CL 05.05.95
-|* Letzte Aenderung CL 05.05.95
-|*
-*************************************************************************/
-
-sal_Bool SvSharedMemoryStream::AllocateMemory( ULONG nNewSize )
-{
- DBG_ASSERT(aHandle==0,"Keine Handles unter OS/2");
- DBG_ASSERT(nNewSize,"Cannot allocate zero Bytes");
- APIRET nRet = DosAllocSharedMem( (void**)&pBuf, (PSZ)NULL, nNewSize,
- PAG_READ | PAG_WRITE | PAG_COMMIT |
- OBJ_GIVEABLE | OBJ_GETTABLE | OBJ_ANY);
- return( nRet == 0 );
-}
-
-/*************************************************************************
-|*
-|* SvSharedMemoryStream::ReAllocateMemory() (Bozo-Algorithmus)
-|*
-|* Beschreibung STREAM.SDW
-|* Ersterstellung CL 05.05.95
-|* Letzte Aenderung CL 05.05.95
-|*
-*************************************************************************/
-
-sal_Bool SvSharedMemoryStream::ReAllocateMemory( long nDiff )
-{
- DBG_ASSERT(aHandle==0,"Keine Handles unter OS/2");
- sal_Bool bRetVal = FALSE;
- ULONG nNewSize = nSize + nDiff;
- if( nNewSize )
- {
- // neuen Speicher nicht ueber AllocateMemory holen, da wir den
- // alten Speicher behalten wollen, falls nicht genuegend Platz
- // fuer den neuen Block da ist
- char* pNewBuf;
- APIRET nRet = DosAllocSharedMem( (void**)&pNewBuf,(PSZ)NULL,nNewSize,
- PAG_READ | PAG_WRITE | PAG_COMMIT |
- OBJ_GIVEABLE | OBJ_GETTABLE | OBJ_ANY);
- DBG_ASSERT(!nRet,"DosAllocSharedMem failed");
-
- if( !nRet )
- {
- bRetVal = TRUE; // Success!
- if( nNewSize < nSize ) // Verkleinern ?
- {
- memcpy( pNewBuf, pBuf, (size_t)nNewSize );
- if( nPos > nNewSize )
- nPos = 0L;
- if( nEndOfData >= nNewSize )
- nEndOfData = nNewSize-1L;
- }
- else
- memcpy( pNewBuf, pBuf, (size_t)nSize );
-
- FreeMemory(); // den alten Block loeschen ...
-
- // und den neuen Block in Dienst stellen
- pBuf = (sal_uInt8*)pNewBuf;
- nSize = nNewSize;
- }
- }
- else
- {
- bRetVal = TRUE;
- FreeMemory();
- pBuf = 0;
- nSize = 0;
- nEndOfData = 0;
- }
- return bRetVal;
-}
-
-void SvSharedMemoryStream::FreeMemory()
-{
- DBG_ASSERT(aHandle==0,"Keine Handles unter OS/2");
- DosFreeMem( pBuf );
-}
-
-/*************************************************************************
-|*
-|* SvSharedMemoryStream::SetHandle()
-|*
-|* Beschreibung STREAM.SDW
-|* Ersterstellung OV 05.10.95
-|* Letzte Aenderung OV 05.10.95
-|*
-*************************************************************************/
-
-void* SvSharedMemoryStream::SetHandle( void* aNewHandle, sal_Size nSize,
- sal_Bool bOwnsData, sal_Size nEOF )
-{
- DBG_ERROR("OS/2 does not support memory handles");
- // return SetBuffer(aNewHandle, nSize, bOwnsData, nEOF );
- return 0;
-}
-
-
-#endif // 0
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */