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 | bca4c263e39bd21f3dc0fae81f484f25bdfcf66b (patch) | |
tree | 4a98ae47aa40c0350ac02ecc082bd5f1a5632e4b | |
parent | 3637c03ada13f8b900f97109a3ed6de4798a8ff5 (diff) |
solve some merge problems
-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 4a5bd50a94..8a0a8e8ef9 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> |