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 | 97c6715a32d8c07dea063dd125cb46fe87d08c2d (patch) | |
tree | f92b4d8ad8acb939d7b0dc23355093e0c3f66916 | |
parent | 626b024960f3c2304f59b84d1d572196644d7148 (diff) |
solve some merge problems
-rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index a11e179228b8..71f4706085d8 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -43,7 +43,7 @@ #include <svl/numuno.hxx> #include <svl/smplhint.hxx> #include <unotools/undoopt.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <sfx2/printer.hxx> #include <sfx2/bindings.hxx> #include <vcl/pdfextoutdevdata.hxx> |