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 | a0c13ffcceea4978bf95b8559bff4a71aa55aa88 (patch) | |
| tree | 2adb4d620b027141c5578565d860434657ba0b3c /animations/source/animcore/targetpropertiescreator.cxx | |
| parent | adea34547d7bc43e9795032c7761e293a28c1df7 (diff) | |
| parent | 19232495c4985faf1423075bf8814e786da6ddcd (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 f35151d6cac7..fb953ee67f37 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> |