diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-09 09:54:38 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-09 11:59:39 +0100 |
commit | fc1762f96540e18561fbc93c28a36e37ca6e6168 (patch) | |
tree | d0d704bbe9f4895c545a0b21bab95c78ba1c8e8c /sw/source/filter/basflt/iodetect.cxx | |
parent | 27014f48f47b1c90699d51dbf665cc57c3de1705 (diff) |
Merge these source files. Also move a function to where it's used.
Change-Id: Ia0378a58c63364a73c40dd901d93e20a596a4c29
Diffstat (limited to 'sw/source/filter/basflt/iodetect.cxx')
-rw-r--r-- | sw/source/filter/basflt/iodetect.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 2a1ad7252d8b..a71587ed0e9d 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -24,8 +24,12 @@ #include <sot/storage.hxx> #include <svtools/parhtml.hxx> #include <tools/urlobj.hxx> +#include <unotools/moduleoptions.hxx> -bool IsDocShellRegistered(); +static bool IsDocShellRegistered() +{ + return SvtModuleOptions().IsWriter(); +} SwIoDetect aFilterDetect[] = { |