diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-15 00:20:57 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-15 00:20:57 +0100 |
| commit | ba9aa9c427a21feeabf448846ac68db800ec0316 (patch) | |
| tree | b62650abdbe9da565a2ba4b281baac27351079e9 /sfx2 | |
| parent | c0835b075cbd5bd943c303545c4af94c1e9660e6 (diff) | |
solve some merge problems
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/viewprn.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index c7ede4f7b8a5..24d31337a662 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/view/PrintableState.hpp> #include "com/sun/star/view/XRenderable.hpp" -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <vcl/msgbox.hxx> #include <svtools/printdlg.hxx> #include <svtools/prnsetup.hxx> @@ -44,8 +44,8 @@ #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <sfx2/app.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/printwarningoptions.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/printwarningoptions.hxx> #include <tools/datetime.hxx> #include <sfx2/bindings.hxx> #include <sfx2/objface.hxx> |