summaryrefslogtreecommitdiff
path: root/sw/source/ui/wrtsh
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-02-04 10:38:39 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-02-04 10:38:39 +0100
commit741ae9dce8cc393d13179a02e40865ba86fa16f6 (patch)
tree1ef2efbf248fffd4c033dc945f66df719ac9d1d3 /sw/source/ui/wrtsh
parentbd711a0e5e5e0e94cc4cb78251f50de205aeb485 (diff)
parentb36241988ea99ba2a9d290ec838a3557d0333d63 (diff)
autorecovery: commit resolved merge (after rebase to m71)
Diffstat (limited to 'sw/source/ui/wrtsh')
-rw-r--r--sw/source/ui/wrtsh/select.cxx6
1 files changed, 0 insertions, 6 deletions
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index c1dd4e2b332c..d848078c266a 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -39,15 +39,9 @@
#include <svl/macitem.hxx>
#include <unotools/charclass.hxx>
#include <svx/scripttypeitem.hxx>
-#ifndef _CMDID_H
#include <cmdid.h>
-#endif
-#ifndef _VIEW_HXX
#include <view.hxx>
-#endif
-#ifndef _BASESH_HXX
#include <basesh.hxx>
-#endif
#include <wrtsh.hxx>
#include <frmatr.hxx>
#include <initui.hxx>