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 | 9abb7d5fa33870b48d179582969dee5022f8ff70 (patch) | |
tree | 14a1ca3d97bd569201f29aea0dcbebe2e1e08379 /sd/source/ui/view/DocumentRenderer.cxx | |
parent | 2014a5db1928a36bd945837648dec85d622c7ae8 (diff) |
solve some merge problems
Diffstat (limited to 'sd/source/ui/view/DocumentRenderer.cxx')
-rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index cb6d13cd835b..6c0b7491bb5f 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -60,7 +60,7 @@ #include <tools/resary.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/msgbox.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <vector> |