diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-01-26 14:45:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-01-26 14:45:09 +0100 |
| commit | dd19343634909cc3ee030087f1d0e84731853d68 (patch) | |
| tree | 4baf8405ad2df703a69c028dfe672428c76b4547 /sw/source/ui/frmdlg | |
| parent | 35933081fda3551db61a81c9af5ac393fb5fc80e (diff) | |
| parent | fdde737ea0caf7450a6676f46651f78ee05321ab (diff) | |
merge DEV300_m70
Diffstat (limited to 'sw/source/ui/frmdlg')
| -rw-r--r-- | sw/source/ui/frmdlg/colex.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/frmmgr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/uiborder.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/wrap.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index 4b7a12868328..a382edf1aa5c 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -39,7 +39,7 @@ #include <algorithm> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/lrspitem.hxx> #include <svx/ulspitem.hxx> #include <svx/sizeitem.hxx> diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index af0298fe807e..e2fc242d4d7c 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -44,7 +44,7 @@ #include <svx/lrspitem.hxx> #include <svx/sizeitem.hxx> #include "svx/frmdiritem.hxx" -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> #include <swmodule.hxx> diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx index 1d872a47e919..96bc9b1c90f1 100644 --- a/sw/source/ui/frmdlg/frmmgr.cxx +++ b/sw/source/ui/frmdlg/frmmgr.cxx @@ -34,7 +34,7 @@ #include "cmdid.h" #include "hintids.hxx" -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/protitem.hxx> #include <svx/boxitem.hxx> #include <svx/opaqitem.hxx> diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index c95f97e5ae59..5c1619948829 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -42,8 +42,8 @@ #include <hintids.hxx> #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> -#include <svtools/urihelper.hxx> -#include <svtools/stritem.hxx> +#include <svl/urihelper.hxx> +#include <svl/stritem.hxx> #include <svx/impgrf.hxx> #include <svx/htmlmode.hxx> #include <svx/sizeitem.hxx> diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index fe1733b34fcc..a6baebe4d366 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -38,10 +38,10 @@ #include <svx/svxdlg.hxx> #include <svx/svxids.hrc> #include <svx/dialogs.hrc> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/flagsdef.hxx> #include <sfx2/tabdlg.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "swtypes.hxx" #include "uiborder.hxx" diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 4479b7da8b1e..23862a189c1e 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -40,7 +40,7 @@ #include <vcl/graph.hxx> #include <svx/htmlmode.hxx> #include <sfx2/objsh.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/opaqitem.hxx> #include <svx/ulspitem.hxx> #include <svx/lrspitem.hxx> |