diff options
Diffstat (limited to 'sw/source/ui/shells')
30 files changed, 237 insertions, 335 deletions
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 443b181cbc..930546880e 100755 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: annotsh.cxx,v $ - * $Revision: 1.7.82.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -42,42 +39,42 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> -#include <svx/spltitem.hxx> -#include <svx/orphitem.hxx> -#include <svx/brkitem.hxx> -#include <svx/widwitem.hxx> -#include <svx/kernitem.hxx> -#include <svx/escpitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/adjitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/shdditem.hxx> -#include <svx/hyznitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/spltitem.hxx> +#include <editeng/orphitem.hxx> +#include <editeng/brkitem.hxx> +#include <editeng/widwitem.hxx> +#include <editeng/kernitem.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/hyznitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/fhgtitem.hxx> #include <svx/clipfmtitem.hxx> #include <svl/stritem.hxx> #include <svl/slstitm.hxx> -#include <svx/colritem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/cntritem.hxx> -#include <svx/postitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/frmdiritem.hxx> #include <svx/svdoutl.hxx> #include <svl/whiter.hxx> #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> #include <unotools/useroptions.hxx> #include <vcl/msgbox.hxx> -#include <svx/flditem.hxx> -#include <svx/editstat.hxx> +#include <editeng/flditem.hxx> +#include <editeng/editstat.hxx> #include <svx/hlnkitem.hxx> #include <svx/htmlmode.hxx> -#include <svx/langitem.hxx> -#include <svx/unolingu.hxx> -#include <svx/scripttypeitem.hxx> -#include <svx/writingmodeitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/unolingu.hxx> +#include <editeng/scripttypeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <swundo.hxx> #include <doc.hxx> #include <viewopt.hxx> @@ -109,12 +106,12 @@ #include <svx/svxids.hrc> #include <svl/itempool.hxx> -#include <svx/outliner.hxx> -#include <svx/editeng.hxx> -#include <svx/editview.hxx> +#include <editeng/outliner.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> #include <svl/languageoptions.hxx> -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <svtools/langtab.hxx> #include <svl/slstitm.hxx> diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 50add375c8..272a6bf7a5 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: basesh.cxx,v $ - * $Revision: 1.87 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -38,7 +35,7 @@ #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svx/htmlmode.hxx> #include <svx/imapdlg.hxx> #include <sfx2/dispatch.hxx> @@ -50,27 +47,26 @@ #include <sfx2/objitem.hxx> #include <svtools/filter.hxx> #include <svx/gallery.hxx> -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <svx/clipfmtitem.hxx> #include <svx/contdlg.hxx> #include <vcl/graph.hxx> -#include <svx/impgrf.hxx> #include <svl/slstitm.hxx> #include <vcl/msgbox.hxx> #include <svl/ptitem.hxx> #include <svl/itemiter.hxx> #include <svl/stritem.hxx> -#include <svx/colritem.hxx> -#include <svx/shaditem.hxx> -#include <svx/boxitem.hxx> -#include <svx/srchitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/opaqitem.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/boxitem.hxx> +#include <svl/srchitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/opaqitem.hxx> +#include <editeng/sizeitem.hxx> #include <svx/flagsdef.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/scripttypeitem.hxx> #include <sfx2/objface.hxx> #include <fmturl.hxx> #include <fmthdft.hxx> diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx index c370ebdfbe..b227f3df14 100644 --- a/sw/source/ui/shells/beziersh.cxx +++ b/sw/source/ui/shells/beziersh.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: beziersh.cxx,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,7 +31,7 @@ #include "cmdid.h" #include <svx/svdview.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svl/eitem.hxx> #include <svl/whiter.hxx> #include <svx/svdopath.hxx> diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx index 464c1b4e59..fad82ace6f 100644 --- a/sw/source/ui/shells/drawdlg.cxx +++ b/sw/source/ui/shells/drawdlg.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: drawdlg.cxx,v $ - * $Revision: 1.15 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index cd2c4c6a17..c29b296ad0 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.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: drawsh.cxx,v $ - * $Revision: 1.20.190.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -41,7 +38,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/objface.hxx> #include <svl/itemiter.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/xftsfit.hxx> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx index 6ec599bc6d..9b68f28f84 100644 --- a/sw/source/ui/shells/drformsh.cxx +++ b/sw/source/ui/shells/drformsh.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: drformsh.cxx,v $ - * $Revision: 1.18 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -42,7 +39,7 @@ #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/fmglob.hxx> #include <svx/svdouno.hxx> #include <com/sun/star/form/FormButtonType.hpp> diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index c5f0cb2a35..a99abc9895 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.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: drwbassh.cxx,v $ - * $Revision: 1.29 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -42,7 +39,7 @@ #include <svl/aeitem.hxx> #include <svx/svdview.hxx> #include <vcl/msgbox.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svl/whiter.hxx> #include <svx/swframevalidation.hxx> #include <svx/anchorid.hxx> diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 784fcb1f84..e1e0c3b9da 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: drwtxtex.cxx,v $ - * $Revision: 1.46.82.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,29 +31,29 @@ #include <tools/shl.hxx> #include <svx/svdview.hxx> -#include <svx/spltitem.hxx> -#include <svx/orphitem.hxx> -#include <svx/brkitem.hxx> -#include <svx/widwitem.hxx> -#include <svx/kernitem.hxx> -#include <svx/escpitem.hxx> +#include <editeng/spltitem.hxx> +#include <editeng/orphitem.hxx> +#include <editeng/brkitem.hxx> +#include <editeng/widwitem.hxx> +#include <editeng/kernitem.hxx> +#include <editeng/escpitem.hxx> #ifndef _SVX_PARAITEM_HXX //autogen -#include <svx/lspcitem.hxx> +#include <editeng/lspcitem.hxx> #endif -#include <svx/adjitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/shdditem.hxx> -#include <svx/hyznitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/colritem.hxx> -#include <svx/wghtitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/hyznitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/wghtitem.hxx> #ifndef _SVX_CNTRITEM_HXX //autogen -#include <svx/cntritem.hxx> +#include <editeng/cntritem.hxx> #endif -#include <svx/postitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/frmdiritem.hxx> #include <svx/svdoutl.hxx> #include <sfx2/viewfrm.hxx> #include <svl/whiter.hxx> @@ -66,14 +63,14 @@ #include <vcl/msgbox.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> -#include <svx/flditem.hxx> -#include <svx/editstat.hxx> +#include <editeng/flditem.hxx> +#include <editeng/editstat.hxx> #include <svx/hlnkitem.hxx> #include <svx/htmlmode.hxx> -#include <svx/langitem.hxx> -#include <svx/unolingu.hxx> -#include <svx/scripttypeitem.hxx> -#include <svx/writingmodeitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/unolingu.hxx> +#include <editeng/scripttypeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <doc.hxx> #include <wview.hxx> #include <viewopt.hxx> @@ -100,17 +97,17 @@ //modified on Jul. 30th #include <svl/languageoptions.hxx> -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <svtools/langtab.hxx> #include <svl/slstitm.hxx> #include <string.h> -#include <svx/eeitem.hxx> -#include <svx/editeng.hxx> -#include <svx/editdata.hxx> -#include <svx/outliner.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editdata.hxx> +#include <editeng/outliner.hxx> #include <vcl/window.hxx> -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include <vcl/outdev.hxx> #include <langhelper.hxx> diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index a1012eac8c..80bf51193b 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: drwtxtsh.cxx,v $ - * $Revision: 1.42.190.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,24 +32,24 @@ #include <i18npool/lang.h> #include <svl/slstitm.hxx> #include <svl/cjkoptions.hxx> -#include <svx/fontitem.hxx> -#include <svx/langitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/langitem.hxx> #include <svx/svdview.hxx> #include <vcl/msgbox.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> #include <svx/svdotext.hxx> #include <svx/xftsfit.hxx> -#include <svx/editeng.hxx> -#include <svx/editview.hxx> -#include <svx/eeitem.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/scripttypeitem.hxx> #include <sfx2/bindings.hxx> #include <svx/fontwork.hxx> #include <sfx2/request.hxx> #include <svl/whiter.hxx> -#include <svx/outliner.hxx> -#include <svx/editstat.hxx> +#include <editeng/outliner.hxx> +#include <editeng/editstat.hxx> #include <svx/svdoutl.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/i18n/TextConversionOption.hpp> diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 06f5231665..efa01b6652 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: frmsh.cxx,v $ - * $Revision: 1.22.190.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,17 +32,17 @@ #include <hintids.hxx> #include <svl/whiter.hxx> #include <svtools/imapobj.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svtools/imap.hxx> #include <sfx2/viewfrm.hxx> #include <basic/sbstar.hxx> #include <svl/rectitem.hxx> #include <svl/ptitem.hxx> #include <svl/stritem.hxx> -#include <svx/colritem.hxx> -#include <svx/bolnitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/protitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/bolnitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/protitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <sfx2/objface.hxx> diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index b820b319a5..4f7332ebbb 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: grfsh.cxx,v $ - * $Revision: 1.33 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -47,10 +44,10 @@ #include <sfx2/dispatch.hxx> #include <sfx2/objface.hxx> -#include <svx/sizeitem.hxx> -#include <svx/protitem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/protitem.hxx> #include <sfx2/request.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/htmlmode.hxx> #include <svx/sdgluitm.hxx> #include <svx/sdgcoitm.hxx> @@ -58,7 +55,7 @@ #include <svx/sdgtritm.hxx> #include <svx/sdginitm.hxx> #include <svx/sdgmoitm.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <svx/grfflt.hxx> #include <svx/tbxcolor.hxx> #include <fmturl.hxx> diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx index b57a480cd3..ec0cd2a6c2 100644 --- a/sw/source/ui/shells/grfshex.cxx +++ b/sw/source/ui/shells/grfshex.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: grfshex.cxx,v $ - * $Revision: 1.20 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -33,13 +30,9 @@ #include <docary.hxx> -#ifndef _GRFSH_HXX #include <grfsh.hxx> -#endif #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <docary.hxx> #ifndef _TEXTSH_HXX #include <textsh.hxx> @@ -53,7 +46,6 @@ #define _SVSTDARR_STRINGSSORTDTOR #include <svl/svstdarr.hxx> #include <svtools/filter.hxx> -#include <svx/impgrf.hxx> #include <svx/htmlmode.hxx> #ifndef _DOCSH_HXX #include <docsh.hxx> diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index 3fa52625b2..e32a959850 100755 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.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: langhelper.cxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -40,13 +37,13 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> -#include <svx/eeitem.hxx> -#include <svx/editeng.hxx> -#include <svx/editdata.hxx> -#include <svx/outliner.hxx> -#include <svx/editview.hxx> -#include <svx/scripttypeitem.hxx> -#include <svx/langitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editdata.hxx> +#include <editeng/outliner.hxx> +#include <editeng/editview.hxx> +#include <editeng/scripttypeitem.hxx> +#include <editeng/langitem.hxx> #include <svl/languageoptions.hxx> #include <svtools/langtab.hxx> diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index c5190449dd..6178d5b173 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: listsh.cxx,v $ - * $Revision: 1.18 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,8 +31,8 @@ #include "cmdid.h" #include "hintids.hxx" -#include <svx/sizeitem.hxx> -#include <svx/brshitem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/brshitem.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> #include <sfx2/objface.hxx> @@ -46,7 +43,7 @@ #include <svl/whiter.hxx> #include <svl/intitem.hxx> #include <tools/shl.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> // --> FME 2005-01-04 #i35572# #include <numrule.hxx> diff --git a/sw/source/ui/shells/makefile.mk b/sw/source/ui/shells/makefile.mk index 2e4a96c990..4123040225 100644 --- a/sw/source/ui/shells/makefile.mk +++ b/sw/source/ui/shells/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.14 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index 3688b33269..d5c3dd3ecd 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.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: mediash.cxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -44,10 +41,10 @@ #include <svl/whiter.hxx> #include <svl/urihelper.hxx> #include <sfx2/dispatch.hxx> -#include <svx/sizeitem.hxx> -#include <svx/protitem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/protitem.hxx> #include <sfx2/request.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/htmlmode.hxx> #include <svx/sdgluitm.hxx> #include <svx/sdgcoitm.hxx> @@ -55,7 +52,7 @@ #include <svx/sdgtritm.hxx> #include <svx/sdginitm.hxx> #include <svx/sdgmoitm.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <svx/grfflt.hxx> #include <fmturl.hxx> #include <view.hxx> diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx index 6d787f266b..537af7b0f2 100644 --- a/sw/source/ui/shells/olesh.cxx +++ b/sw/source/ui/shells/olesh.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: olesh.cxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index 92434115d7..42b3b0029a 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -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: shells.src,v $ - * $Revision: 1.54 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 6668f61d12..67d842dde1 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.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: slotadd.cxx,v $ - * $Revision: 1.30.124.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -36,8 +33,7 @@ #include "cmdid.h" #include <svl/globalnameitem.hxx> - - +#include <editeng/memberids.hrc> #include <svl/imageitm.hxx> #include <svl/aeitem.hxx> #include <svl/rectitem.hxx> @@ -51,48 +47,48 @@ #include <svx/SmartTagItem.hxx> #include <svl/ptitem.hxx> #include <svx/pageitem.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/tplpitem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/protitem.hxx> -#include <svx/opaqitem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/protitem.hxx> +#include <editeng/opaqitem.hxx> #ifndef _SVX_TSTPITEM_HXX //autogen -#include <svx/tstpitem.hxx> +#include <editeng/tstpitem.hxx> #endif -#include <svx/akrnitem.hxx> -#include <svx/keepitem.hxx> -#include <svx/kernitem.hxx> -#include <svx/spltitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/shaditem.hxx> -#include <svx/pbinitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/prntitem.hxx> -#include <svx/orphitem.hxx> -#include <svx/widwitem.hxx> -#include <svx/bolnitem.hxx> -#include <svx/pmdlitem.hxx> -#include <svx/cmapitem.hxx> -#include <svx/langitem.hxx> -#include <svx/brkitem.hxx> -#include <svx/hyznitem.hxx> -#include <svx/escpitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/adjitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/fontitem.hxx> -#include <svx/shdditem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/postitem.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/akrnitem.hxx> +#include <editeng/keepitem.hxx> +#include <editeng/kernitem.hxx> +#include <editeng/spltitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/pbinitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/prntitem.hxx> +#include <editeng/orphitem.hxx> +#include <editeng/widwitem.hxx> +#include <editeng/bolnitem.hxx> +#include <editeng/pmdlitem.hxx> +#include <editeng/cmapitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/brkitem.hxx> +#include <editeng/hyznitem.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/fhgtitem.hxx> #ifndef _SVX_CNTRITEM_HXX //autogen -#include <svx/cntritem.hxx> +#include <editeng/cntritem.hxx> #endif -#include <svx/colritem.hxx> -#include <svx/boxitem.hxx> -#include <svx/sizeitem.hxx> -#include <svx/lrspitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/lrspitem.hxx> #include <svx/xgrad.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnedit.hxx> @@ -129,12 +125,12 @@ #include "grfatr.hxx" #include "fmtline.hxx" #include <svx/clipfmtitem.hxx> -#include <svx/blnkitem.hxx> +#include <editeng/blnkitem.hxx> #include <svl/slstitm.hxx> -#include <svx/paravertalignitem.hxx> -#include <svx/charreliefitem.hxx> -#include <svx/charrotateitem.hxx> -#include <svx/charscaleitem.hxx> +#include <editeng/paravertalignitem.hxx> +#include <editeng/charreliefitem.hxx> +#include <editeng/charrotateitem.hxx> +#include <editeng/charscaleitem.hxx> #include <svx/postattr.hxx> #include <sfx2/frame.hxx> #include <svx/chrtitem.hxx> diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index d86a79f0e9..9c2658c5fc 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: tabsh.cxx,v $ - * $Revision: 1.46.212.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -40,18 +37,18 @@ #include <svl/whiter.hxx> #include <unotools/moduleoptions.hxx> #include <svx/rulritem.hxx> -#include <svx/srchitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/shaditem.hxx> -#include <svx/spltitem.hxx> -#include <svx/langitem.hxx> -#include <svx/keepitem.hxx> -#include <svx/bolnitem.hxx> -#include <svx/colritem.hxx> -#include <svx/frmdiritem.hxx> +#include <svl/srchitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/spltitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/keepitem.hxx> +#include <editeng/bolnitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/frmdiritem.hxx> #include <svx/numinf.hxx> #include <svx/svddef.hxx> #include <svx/svxdlg.hxx> diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index 0cb414385a..95f6710cc8 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.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: textdrw.cxx,v $ - * $Revision: 1.15 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index b0238213d9..03e0ce7aea 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -1,14 +1,11 @@ /************ ************************************************************* * * 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: textfld.cxx,v $ - * $Revision: 1.38.190.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -49,7 +46,7 @@ #include <svx/hlnkitem.hxx> #include <svx/svxdlg.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <unotools/localedatawrapper.hxx> #include <sfx2/dispatch.hxx> #include <fmtinfmt.hxx> diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx index 2135e33452..117320a9c9 100644 --- a/sw/source/ui/shells/textglos.cxx +++ b/sw/source/ui/shells/textglos.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: textglos.cxx,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index 8e88eded78..d9b4593e81 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.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: textidx.cxx,v $ - * $Revision: 1.14 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -37,7 +34,7 @@ #include <sfx2/viewfrm.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/sizeitem.hxx> #include <fmtfsize.hxx> #include <fldbas.hxx> #include <uiitems.hxx> diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index fe9cda4f7c..1394552f46 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: textsh.cxx,v $ - * $Revision: 1.63 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -47,28 +44,28 @@ #include <vcl/msgbox.hxx> #include <sfx2/fcontnr.hxx> #include <svx/hlnkitem.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> #include <svl/urihelper.hxx> #include <basic/sbxvar.hxx> #include <svl/whiter.hxx> #include <sfx2/request.hxx> -#include <svx/opaqitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/adjitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/sizeitem.hxx> -#include <svx/svxacorr.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/opaqitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/svxacorr.hxx> +#include <editeng/scripttypeitem.hxx> #include <svtools/filter.hxx> #include <svx/htmlmode.hxx> #include <svx/pfiledlg.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <com/sun/star/i18n/TransliterationModules.hdl> #include <sot/clsids.hxx> -#include <svx/acorrcfg.hxx> +#include <editeng/acorrcfg.hxx> #include <wdocsh.hxx> #include <fmtinfmt.hxx> #include <fmtclds.hxx> @@ -196,7 +193,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) SvxAutoCorrect* pACorr = pACfg->GetAutoCorrect(); if( pACorr && pACfg->IsAutoFmtByInput() && pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | - ChgFractionSymbol | ChgOrdinalNumber | + AddNonBrkSpace | ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | Autocorrect )) rSh.AutoCorrect( *pACorr, cIns ); else diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 09ba7b28cc..195f8228f9 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: textsh1.cxx,v $ - * $Revision: 1.70.84.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -39,7 +36,7 @@ #include <i18npool/mslangid.hxx> #include <svl/languageoptions.hxx> -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <svtools/langtab.hxx> #include <svl/slstitm.hxx> #include <string.h> @@ -54,17 +51,17 @@ #include <sfx2/request.hxx> #include <svl/eitem.hxx> #include <svl/macitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/colritem.hxx> -#include <svx/tstpitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/svxacorr.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/tstpitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/svxacorr.hxx> #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> #include <IDocumentSettingAccess.hxx> #include <charfmt.hxx> -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> #include <svx/SmartTagItem.hxx> #include <svx/dialmgr.hxx> #include <fmtinfmt.hxx> @@ -109,7 +106,7 @@ #include <SwSmartTagMgr.hxx> -#include <svx/acorrcfg.hxx> +#include <editeng/acorrcfg.hxx> #include "swabstdlg.hxx" #include "misc.hrc" #include "chrdlg.hrc" @@ -121,7 +118,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/uno/Any.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <unotools/syslocaleoptions.hxx> #include <doc.hxx> #include <view.hxx> diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index a56889491b..e08db985ec 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: textsh2.cxx,v $ - * $Revision: 1.28 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 29fc07107a..0d74c930e5 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.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: txtattr.cxx,v $ - * $Revision: 1.28.140.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -44,14 +41,14 @@ #include <swmodule.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/adjitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/escpitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/escpitem.hxx> #include <svx/htmlmode.hxx> -#include <svx/scripttypeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/scripttypeitem.hxx> +#include <editeng/frmdiritem.hxx> #include "paratr.hxx" #include <fmtinfmt.hxx> diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx index 888f5560ec..08d5f1be56 100644 --- a/sw/source/ui/shells/txtcrsr.cxx +++ b/sw/source/ui/shells/txtcrsr.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: txtcrsr.cxx,v $ - * $Revision: 1.19 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index 6b4be8da6e..0cdb405df7 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * 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: txtnum.cxx,v $ - * $Revision: 1.19 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -39,8 +36,8 @@ #include <sfx2/request.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> -#include <svx/numitem.hxx> -#include <svx/brshitem.hxx> +#include <editeng/numitem.hxx> +#include <editeng/brshitem.hxx> #include <numrule.hxx> #include "cmdid.h" |