diff options
| author | Zolnai Tamás <zolniatamas@caesar.elte.hu> | 2012-08-06 20:52:37 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-08-07 10:50:23 +0200 |
| commit | 2854d8b17cb873a5d61e06f9570ac344f054d666 (patch) | |
| tree | 2d48cc3b620c25c4d894716d4470b4eefc8a86dd /sw/source | |
| parent | 13b9c0513319623fd56a5a0ead5bdddecf90a10f (diff) | |
fdo#46193 MessBox was made copyable
Part of MultiLineEdit was moved down from stvools to vcl
with name VCLMultiLineEdit. MessBox uses it to display the
message in read-only mode. Some of svtools' classes - which
are necessary to implement VCLMultiLineEdit - were moved to
vcl as a whole, and their includes are rewrite.
Note: ExtTextView and ExtTextEngine classes would be leaved in svtools
if VCLMultiLineEdit is a template class, but two macros: IMPL_LINK
end IMPL_LINK_NOARG make it impossible to use template syntax.
Change-Id: I26543868d8081c225c7125404d23369de3c3afcd
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/docvw/srcedtw.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/inc/srcedtw.hxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 5cde4aacbe74..a9c86b2a8bc7 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -33,8 +33,8 @@ #include <mailmergewizard.hxx> #include <swtypes.hxx> #include <addresslistdialog.hxx> -#include <svtools/xtextedt.hxx> -#include <svtools/txtattr.hxx> +#include <vcl/xtextedt.hxx> +#include <vcl/txtattr.hxx> #include <vcl/msgbox.hxx> #include <mmconfigitem.hxx> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index c6bb14fecb14..66273f9f95a6 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -38,13 +38,13 @@ #include <rtl/oustringostreaminserter.hxx> #include <rtl/ustring.hxx> #include <sal/log.hxx> -#include <svtools/textview.hxx> +#include <vcl/textview.hxx> #include <svx/svxids.hrc> #include <vcl/scrbar.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> #include <svtools/htmltokn.h> -#include <svtools/txtattr.hxx> +#include <vcl/txtattr.hxx> #include <svtools/colorcfg.hxx> #include <editeng/flstitem.hxx> #include <vcl/metric.hxx> diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx index 8f4a443deaf6..74e1f425573e 100644 --- a/sw/source/ui/inc/srcedtw.hxx +++ b/sw/source/ui/inc/srcedtw.hxx @@ -32,7 +32,7 @@ #include <svl/lstner.hxx> #include <vcl/timer.hxx> -#include <svtools/xtextedt.hxx> +#include <vcl/xtextedt.hxx> #include <set> namespace com { namespace sun { namespace star { namespace beans { |