diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-12 20:04:24 +0200 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-12 20:04:24 +0200 |
commit | b69204c901926a091621b92df6ff6e27f62ab8d9 (patch) | |
tree | c7a87e51b500b9398fc1f145aa9448a4cf77a58b /svx/workben | |
parent | e761f21bb4e09c90a6ccc9d23f8e1cafb2898641 (diff) | |
parent | 1955c30b72135397ff095ebf4712cc6db2a2c407 (diff) |
slidecopy: merge
Diffstat (limited to 'svx/workben')
-rw-r--r-- | svx/workben/edittest.cxx | 51 | ||||
-rw-r--r-- | svx/workben/makefile.mk | 7 | ||||
-rw-r--r-- | svx/workben/msview/makefile.mk | 6 | ||||
-rw-r--r-- | svx/workben/msview/msview.cxx | 5 | ||||
-rw-r--r-- | svx/workben/msview/xmlconfig.cxx | 5 |
5 files changed, 28 insertions, 46 deletions
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx index fa1b80b97e..2692a0e9d8 100644 --- a/svx/workben/edittest.cxx +++ b/svx/workben/edittest.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: edittest.cxx,v $ - * $Revision: 1.20.212.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svx/editeng.hxx> -#include <svx/eeitem.hxx> -#include <svx/editview.hxx> -#include <svx/editobj.hxx> -#include <editstat.hxx> +#include <editeng/editeng.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editview.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editstat.hxx> #include <eerdll.hxx> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <tools/urlobj.hxx> #include <svx/svxacorr.hxx> #include <tools/fsys.hxx> @@ -69,23 +66,23 @@ #include <sfx2/sfxuno.hxx> // SVX -#include <svx/lrspitem.hxx> -#include <svx/shdditem.hxx> -#include <svx/cntritem.hxx> -#include <svx/crsditem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/escpitem.hxx> -#include <svx/kernitem.hxx> -#include <svx/akrnitem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/colritem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/postitem.hxx> -#include <svx/adjitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/fhgtitem.hxx> -#include <fontitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/kernitem.hxx> +#include <editeng/akrnitem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/fontitem.hxx> #include <fwdtitem.hxx> // SVTOOLS diff --git a/svx/workben/makefile.mk b/svx/workben/makefile.mk index a18c81ab5c..4aa0a098f0 100644 --- a/svx/workben/makefile.mk +++ b/svx/workben/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -59,7 +55,6 @@ APP1STDLIBS=$(TOOLSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(SALLIB) \ - $(GOODIESLIB) \ $(SFXLIB) \ $(SOTLIB) \ $(VCLLIB) diff --git a/svx/workben/msview/makefile.mk b/svx/workben/msview/makefile.mk index 5b7c2a3d63..ee4d384399 100644 --- a/svx/workben/msview/makefile.mk +++ b/svx/workben/msview/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index 7e6cf43cff..58c904d66f 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: msview.cxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index 79473333d0..9b0399434d 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xmlconfig.cxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |