summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-01-08 18:32:51 +0100
committerMathias Bauer <mba@openoffice.org>2010-01-08 18:32:51 +0100
commit062389b010a139129682709876e3d092de234af5 (patch)
treec6e91a6bfbafb5069abfec8657395ef068e2d343 /basctl
parent8478b0c12b1e51be005551a5e00b7b577b8a3d60 (diff)
#i107450#: build all other modules with new editeng lib
Diffstat (limited to 'basctl')
-rw-r--r--basctl/inc/pch/precompiled_basctl.hxx78
-rw-r--r--basctl/sdi/basslots.hrc2
-rw-r--r--basctl/source/basicide/basdoc.cxx2
-rw-r--r--basctl/source/basicide/basicbox.cxx2
-rw-r--r--basctl/source/basicide/baside3.cxx2
-rw-r--r--basctl/source/basicide/ide_pch.hxx87
-rw-r--r--basctl/source/dlged/managelang.cxx2
-rw-r--r--basctl/util/makefile.mk1
8 files changed, 51 insertions, 125 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index b29702a42489..82999fa71e4b 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -164,46 +164,46 @@
#define ITEMID_BRUSH 0
#include "svl/srchitem.hxx"
-#include "svx/flstitem.hxx"
-#include "svx/fontitem.hxx"
-#include "svx/postitem.hxx"
-#include "svx/wghtitem.hxx"
-#include "svx/fhgtitem.hxx"
-#include "svx/fwdtitem.hxx"
-#include "svx/udlnitem.hxx"
-#include "svx/crsditem.hxx"
-#include "svx/shdditem.hxx"
-#include "svx/akrnitem.hxx"
-#include "svx/wrlmitem.hxx"
-#include "svx/cntritem.hxx"
-#include "svx/prszitem.hxx"
-#include "svx/colritem.hxx"
-#include "svx/cscoitem.hxx"
-#include "svx/kernitem.hxx"
-
-#include "svx/cmapitem.hxx"
-#include "svx/escpitem.hxx"
-#include "svx/langitem.hxx"
-#include "svx/nlbkitem.hxx"
-#include "svx/nhypitem.hxx"
-#include "svx/lcolitem.hxx"
-#include "svx/blnkitem.hxx"
-
-#include "svx/pbinitem.hxx"
-#include "svx/sizeitem.hxx"
-#include "svx/lrspitem.hxx"
-#include "svx/ulspitem.hxx"
-#include "svx/prntitem.hxx"
-#include "svx/opaqitem.hxx"
-#include "svx/protitem.hxx"
-#include "svx/shaditem.hxx"
-#include "svx/boxitem.hxx"
-#include "svx/brkitem.hxx"
-#include "svx/keepitem.hxx"
-#include "svx/bolnitem.hxx"
-#include "svx/brshitem.hxx"
+#include "editeng/flstitem.hxx"
+#include "editeng/fontitem.hxx"
+#include "editeng/postitem.hxx"
+#include "editeng/wghtitem.hxx"
+#include "editeng/fhgtitem.hxx"
+#include "editeng/fwdtitem.hxx"
+#include "editeng/udlnitem.hxx"
+#include "editeng/crsditem.hxx"
+#include "editeng/shdditem.hxx"
+#include "editeng/akrnitem.hxx"
+#include "editeng/wrlmitem.hxx"
+#include "editeng/cntritem.hxx"
+#include "editeng/prszitem.hxx"
+#include "editeng/colritem.hxx"
+#include "editeng/cscoitem.hxx"
+#include "editeng/kernitem.hxx"
+
+#include "editeng/cmapitem.hxx"
+#include "editeng/escpitem.hxx"
+#include "editeng/langitem.hxx"
+#include "editeng/nlbkitem.hxx"
+#include "editeng/nhypitem.hxx"
+#include "editeng/lcolitem.hxx"
+#include "editeng/blnkitem.hxx"
+
+#include "editeng/pbinitem.hxx"
+#include "editeng/sizeitem.hxx"
+#include "editeng/lrspitem.hxx"
+#include "editeng/ulspitem.hxx"
+#include "editeng/prntitem.hxx"
+#include "editeng/opaqitem.hxx"
+#include "editeng/protitem.hxx"
+#include "editeng/shaditem.hxx"
+#include "editeng/boxitem.hxx"
+#include "editeng/brkitem.hxx"
+#include "editeng/keepitem.hxx"
+#include "editeng/bolnitem.hxx"
+#include "editeng/brshitem.hxx"
#include "svx/xmlsecctrl.hxx"
-#include "svx/unolingu.hxx"
+#include "editeng/unolingu.hxx"
#include "xmlscript/xmldlg_imexp.hxx"
diff --git a/basctl/sdi/basslots.hrc b/basctl/sdi/basslots.hrc
index ca42723efeff..5fc716399614 100644
--- a/basctl/sdi/basslots.hrc
+++ b/basctl/sdi/basslots.hrc
@@ -29,4 +29,4 @@
************************************************************************/
#include <svx/svxids.hrc>
-
+#include <editeng/memberids.hrc>
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 4dd0dbd2aeca..c2c89e12c048 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -33,7 +33,7 @@
#include <ide_pch.hxx>
-
+#include <svx/svxids.hrc>
#define GLOBALOVERFLOW2
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index fb73babe54a5..c2e954a26319 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -48,7 +48,7 @@
#include "localizationmgr.hxx"
#include "managelang.hxx"
#include "dlgresid.hrc"
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
#include <svtools/langtab.hxx>
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index d33310b6e339..92682768337e 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -64,7 +64,7 @@
#include <helpid.hrc>
#include <bastype2.hxx>
#include <svx/svdview.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx
index 60432ef4745f..f1029890f550 100644
--- a/basctl/source/basicide/ide_pch.hxx
+++ b/basctl/source/basicide/ide_pch.hxx
@@ -29,6 +29,9 @@
************************************************************************/
#include <svheader.hxx>
+#define ITEMID_SEARCH 0
+#define ITEMID_SIZE 0
+
#include <vcl/wrkwin.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/menu.hxx>
@@ -38,6 +41,8 @@
#include <svl/aeitem.hxx>
#include <svl/stritem.hxx>
#include <svl/whiter.hxx>
+#include <svl/intitem.hxx>
+#include <svl/srchitem.hxx>
#define _BASIC_TEXTPORTIONS
#include <basic/sbdef.hxx>
@@ -63,86 +68,6 @@
#include <sfx2/dinfdlg.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/progress.hxx>
+#include <editeng/sizeitem.hxx>
-#define ITEMID_FONT 0
-#define ITEMID_POSTURE 0
-#define ITEMID_WEIGHT 0
-#define ITEMID_SHADOWED 0
-#define ITEMID_CONTOUR 0
-#define ITEMID_CROSSEDOUT 0
-#define ITEMID_UNDERLINE 0
-#define ITEMID_FONTHEIGHT 0
-#define ITEMID_COLOR 0
-#define ITEMID_ADJUST 0
-#define ITEMID_LINESPACING 0
-#define ITEMID_TABSTOP 0
-#define ITEMID_LRSPACE 0
-#define ITEMID_ULSPACE 0
-#define ITEMID_SEARCH 0
-#define ITEMID_SEARCH 0
-#define ITEMID_SIZE 0
-#define ITEMID_FONTLIST 0
-#define ITEMID_AUTOKERN 0
-#define ITEMID_WORDLINEMODE 0
-#define ITEMID_PROPSIZE 0
-#define ITEMID_CHARSETCOLOR 0
-#define ITEMID_KERNING 0
-#define ITEMID_CASEMAP 0
-#define ITEMID_ESCAPEMENT 0
-#define ITEMID_LANGUAGE 0
-#define ITEMID_NOLINEBREAK 0
-#define ITEMID_NOHYPHENHERE 0
-#define ITEMID_BLINK 0
-#define ITEMID_PAPERBIN 0
-#define ITEMID_PRINT 0
-#define ITEMID_OPAQUE 0
-#define ITEMID_PROTECT 0
-#define ITEMID_SHADOW 0
-#define ITEMID_BOX 0
-#define ITEMID_BOXINFO 0
-#define ITEMID_FMTBREAK 0
-#define ITEMID_FMTKEEP 0
-#define ITEMID_LINE 0
-#define ITEMID_BRUSH 0
-
-#include <svl/srchitem.hxx>
-#include <svx/flstitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/fwdtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/prszitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/kernitem.hxx>
-
-#include <svx/cmapitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/nlbkitem.hxx>
-#include <svx/nhypitem.hxx>
-#include <svx/lcolitem.hxx>
-#include <svx/blnkitem.hxx>
-
-#include <svx/pbinitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/prntitem.hxx>
-#include <svx/opaqitem.hxx>
-#include <svx/protitem.hxx>
-#include <svx/shaditem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brkitem.hxx>
-#include <svx/keepitem.hxx>
-#include <svx/bolnitem.hxx>
-#include <svx/brshitem.hxx>
-
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index d1ba13209147..8f797c87bdeb 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -56,7 +56,7 @@
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <unotools/localedatawrapper.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
#include <svtools/langtab.hxx>
diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk
index 0f2a919ff655..de2514e0ff78 100644
--- a/basctl/util/makefile.mk
+++ b/basctl/util/makefile.mk
@@ -54,6 +54,7 @@ SHL1TARGET= basctl$(DLLPOSTFIX)
SHL1IMPLIB= basctl
SHL1BASE = 0x1d800000
SHL1STDLIBS= \
+ $(EDITENGLIB) \
$(SVXCORELIB) \
$(SVXLIB) \
$(SFX2LIB) \