diff options
| -rw-r--r-- | starmath/inc/applicat.hxx | 12 | ||||
| -rw-r--r-- | starmath/sdi/makefile.mk | 16 | ||||
| -rw-r--r-- | sw/sdi/makefile.mk | 28 | ||||
| -rw-r--r-- | sw/source/core/frmedt/fecopy.cxx | 7 |
4 files changed, 8 insertions, 55 deletions
diff --git a/starmath/inc/applicat.hxx b/starmath/inc/applicat.hxx index 9ee212c51741..c4d712823433 100644 --- a/starmath/inc/applicat.hxx +++ b/starmath/inc/applicat.hxx @@ -2,9 +2,9 @@ * * $RCSfile: applicat.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tl $ $Date: 2001-05-16 13:24:52 $ + * last change: $Author: fme $ $Date: 2001-08-16 09:14:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -131,19 +131,11 @@ protected: virtual void OpenClients(); // initialization / deinitialization -#ifndef VCL - virtual void Init(int nArgs, char* pArgs[]); -#else virtual void Init(); -#endif virtual void Exit(); public: -#ifndef VCL - void Main(int nArgc, char* pArgv[]); -#else void Main(); -#endif SmApplicat() : SfxApplication("iso") diff --git a/starmath/sdi/makefile.mk b/starmath/sdi/makefile.mk index 968aa01b8709..0271591cee73 100644 --- a/starmath/sdi/makefile.mk +++ b/starmath/sdi/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 16:57:25 $ +# last change: $Author: fme $ $Date: 2001-08-16 09:16:02 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -103,18 +103,6 @@ ALL: \ .INCLUDE : target.mk -.IF "$(GUIBASE)$(VCL)"=="WIN" -$(BIN)$/$(SDINAME).tlb: \ - $(MISCX)$/$(SDINAME).odl - rscpp -I.;$(SVSDIINC);$(INC) -DSOLAR_VERSION=$(solar_version) $(MISC)$/$(SDINAME).odl $(MISC)$/$(SDINAME).odx -.IF "$(GUI)"=="WIN" - wx /w /a mktyplib /nocpp /o $(MISC)$/$(SDINAME).err /tlb $(BIN)$/$(SDINAME).tlb $(MISC)$/$(SDINAME).odx -.ELSE - mktyplib /win32 /nocpp /o $(MISC)$/$(SDINAME).err /tlb $(BIN)$/$(SDINAME).tlb $(MISC)$/$(SDINAME).odx -.ENDIF - +type $(MISC)$/$(SDINAME).err -.ELSE $(BIN)$/$(SDINAME).tlb: @echo nix -.ENDIF diff --git a/sw/sdi/makefile.mk b/sw/sdi/makefile.mk index 4506f71cb6b3..a51dd7e6819d 100644 --- a/sw/sdi/makefile.mk +++ b/sw/sdi/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 17:14:30 $ +# last change: $Author: fme $ $Date: 2001-08-16 09:17:14 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -146,33 +146,9 @@ ALL: \ .INCLUDE : target.mk -.IF "$(GUIBASE)$(VCL)"=="WIN" -$(BIN)$/$(SDINAME).tlb: \ - $(MISCX)$/$(SDINAME).odl - rscpp -I.;$(SVSDIINC);$(INC) -DSOLAR_VERSION=$(solar_version) $(MISC)$/$(SDINAME).odl $(MISC)$/$(SDINAME).odx -.IF "$(GUI)"=="WIN" - wx /w /a mktyplib /nocpp /o $(MISC)$/$(SDINAME).err /tlb $(BIN)$/$(SDINAME).tlb $(MISC)$/$(SDINAME).odx -.ELSE - mktyplib /win32 /nocpp /o $(MISC)$/$(SDINAME).err /tlb $(BIN)$/$(SDINAME).tlb $(MISC)$/$(SDINAME).odx -.ENDIF - +type $(MISC)$/$(SDINAME).err -.ELSE $(BIN)$/$(SDINAME).tlb: @echo nix -.ENDIF -.IF "$(GUIBASE)$(VCL)"=="WIN" -$(BIN)$/$(SDI2NAME).tlb: \ - $(MISCX)$/$(SDI2NAME).odl - rscpp -I.;$(SVSDIINC);$(INC) -DSOLAR_VERSION=$(solar_version) $(MISC)$/$(SDI2NAME).odl $(MISC)$/$(SDI2NAME).odx -.IF "$(GUI)"=="WIN" - wx mktyplib /nocpp /o $(MISC)$/$(SDI2NAME).err /tlb $(BIN)$/$(SDI2NAME).tlb $(MISC)$/$(SDI2NAME).odx -.ELSE - mktyplib /win32 /nocpp /o $(MISC)$/$(SDI2NAME).err /tlb $(BIN)$/$(SDI2NAME).tlb $(MISC)$/$(SDI2NAME).odx -.ENDIF - +type $(MISC)$/$(SDI2NAME).err -.ELSE $(BIN)$/$(SDI2NAME).tlb: @echo nix -.ENDIF diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 25ca87a5e704..e2839efc21a9 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fecopy.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2001-08-09 15:43:38 $ + * last change: $Author: fme $ $Date: 2001-08-16 09:18:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1107,9 +1107,6 @@ BOOL SwFEShell::GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const aMtf.Stop(); aMtf.SetPrefMapMode( aTmp ); aMtf.SetPrefSize( aSz ); -#ifndef VCL - aMtf.SetPrefPalette( OutputDevice::GetDitherPalette() ); -#endif rGrf = aMtf; } } |