diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
| commit | 6a75a47be7b3aafbb655ffa70609fd2ed7ca4b3e (patch) | |
| tree | d00d2024213e09b8eba4704b8b6660eb42c3921c /extensions/source/propctrlr/genericpropertyhandler.cxx | |
| parent | 7fb1e1ea8c9f8d3ef13524d1327272824df7110d (diff) | |
| parent | eee3dbc7af039669d447d2e55abd896ea3383df1 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
automation/source/communi/communi.cxx
automation/source/server/recorder.cxx
automation/source/server/server.cxx
basctl/source/basicide/basobj2.cxx
Diffstat (limited to 'extensions/source/propctrlr/genericpropertyhandler.cxx')
| -rw-r--r-- | extensions/source/propctrlr/genericpropertyhandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 2c684db31bcc..3802e68dd039 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -43,7 +43,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> /** === end UNO includes === **/ #include <tools/debug.hxx> -#include <cppuhelper/extract.hxx> +#include <comphelper/extract.hxx> #include <algorithm> #include <o3tl/compat_functional.hxx> |