diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:40:35 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:40:35 +0100 |
| commit | 571e3b112b2fda5f1fca87d8433797a72e3a306e (patch) | |
| tree | 5a4624b7579133aae2e8986b19022965dd919fd9 /animations/source/animcore/targetpropertiescreator.cxx | |
| parent | e66c2fcdf9a97fcb592d38373aec76e68332c66c (diff) | |
| parent | c4ffa8e23e4192a2494aae24ad79a53865b138a2 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
sd/source/ui/func/fuinsfil.cxx
sd/source/ui/func/fuprobjs.cxx
sd/source/ui/slideshow/slideshowimpl.cxx
sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
sd/source/ui/toolpanel/ToolPanelViewShell.cxx
sd/source/ui/view/drawview.cxx
sd/source/ui/view/drtxtob.cxx
sd/source/ui/view/outlnvsh.cxx
sd/source/ui/view/outlview.cxx
Diffstat (limited to 'animations/source/animcore/targetpropertiescreator.cxx')
| -rw-r--r-- | animations/source/animcore/targetpropertiescreator.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx index 1958ac838..f0b343988 100644 --- a/animations/source/animcore/targetpropertiescreator.cxx +++ b/animations/source/animcore/targetpropertiescreator.cxx @@ -43,7 +43,6 @@ #include <cppuhelper/compbase3.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implementationentry.hxx> -#include <comphelper/optionalvalue.hxx> #include <comphelper/broadcasthelper.hxx> #include <comphelper/sequence.hxx> |