diff options
author | Thomas Benisch <tbe@openoffice.org> | 2010-03-01 12:22:02 +0100 |
---|---|---|
committer | Thomas Benisch <tbe@openoffice.org> | 2010-03-01 12:22:02 +0100 |
commit | 9894a711a7550c717381e80c38c981e6b502beb7 (patch) | |
tree | 781477b79027c5c1101d211c79603c366a002aeb /sw/source/ui/dbui/mmaddressblockpage.hxx | |
parent | 04d7fd9828cdb09ff190bc65975e0c51df778487 (diff) | |
parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) |
chartshapes: merge with DEV300_m72
Diffstat (limited to 'sw/source/ui/dbui/mmaddressblockpage.hxx')
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 7d6c3ae81718..b47b71f1a561 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -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: mmaddressblockpage.hxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -43,7 +40,7 @@ #include <svtools/headbar.hxx> #include <svtools/svtreebx.hxx> #include <vcl/combobox.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> class SwMailMergeWizard; class SwMailMergeConfigItem; /*-- 13.04.2004 15:50:37--------------------------------------------------- |