diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-09 18:56:58 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-09 18:56:58 +0200 |
| commit | 08f512a43f6e90eadc6f280e4a6752e54664255c (patch) | |
| tree | 9f9706bec20fa861635b987caa18d735bfa53a27 /soldep | |
| parent | 2572209a92a6ed172f1650f7805f7e5829541ea3 (diff) | |
| parent | d711de79b44b5282a12d829620fcbc69b0f83391 (diff) | |
CWS changehid: resync to m89
Diffstat (limited to 'soldep')
| -rw-r--r-- | soldep/bootstrp/prj.cxx | 22 | ||||
| -rw-r--r-- | soldep/inc/soldep/prj.hxx | 2 | ||||
| -rw-r--r-- | soldep/source/makefile.mk | 10 |
3 files changed, 3 insertions, 31 deletions
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx index dfb29fe74754..36495a429de8 100644 --- a/soldep/bootstrp/prj.cxx +++ b/soldep/bootstrp/prj.cxx @@ -41,31 +41,21 @@ //#define TEST 1 -#ifdef MAC -#define putenv(x) -#endif - -#if defined(DOS) || defined(WNT) || defined(OS2) +#if defined(WNT) || defined(OS2) #define LIST_DELIMETER ';' #else #ifdef UNX #define LIST_DELIMETER ':' #else -#ifdef MAC -#define LIST_DELIMETER ',' -#endif #endif #endif -#if defined(DOS) || defined(WNT) || defined(OS2) || defined(WIN) +#if defined(WNT) || defined(OS2) #define PATH_DELIMETER '\\' #else #ifdef UNX #define PATH_DELIMETER '/' #else -#ifdef MAC -#define PATH_DELIMETER ':' -#endif #endif #endif @@ -142,14 +132,6 @@ ByteString SimpleConfig::GetNextLine() ByteString aEraseString; for ( USHORT i = 0; i<= nLength; i++) { -#ifdef MAC - if ( aTmpStr.GetChar( i ) == '"') - { - if ( bFound) bFound = FALSE; - else bFound = TRUE; - aTmpStr.SetChar( i, '\t' ); - } -#endif if ( aTmpStr.GetChar( i ) == 0x20 && !bFound ) aTmpStr.SetChar( i, 0x09 ); } diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx index 53feb3c03cf5..e5582301a9e4 100644 --- a/soldep/inc/soldep/prj.hxx +++ b/soldep/inc/soldep/prj.hxx @@ -382,7 +382,7 @@ private: ByteString aStarName; // no idee what this should be protected: - NAMESPACE_VOS( OMutex ) aMutex; + vos:: OMutex aMutex; USHORT nStarMode; SolarFileList aFileList; diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk index 5261ee5175f6..5f6b188a56d7 100644 --- a/soldep/source/makefile.mk +++ b/soldep/source/makefile.mk @@ -127,16 +127,6 @@ APP1OBJS= \ .INCLUDE : target.mk -ALLTAR : $(BIN)$/applicat.rdb - -$(BIN)$/applicat.rdb : makefile.mk $(UNOUCRRDB) - rm -f $@ - $(GNUCOPY) $(UNOUCRRDB) $@ - cd $(BIN) && \ - $(REGCOMP) -register -r applicat.rdb \ - -c i18nsearch.uno$(DLLPOST) \ - -c i18npool.uno$(DLLPOST) - $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo ------------------------------ @echo Making: $@ |