CWS-TOOLING: integrate CWS ooxml03

2009-08-11 12:16:50 +0200 kendy r274852 : CWS-TOOLING: rebase CWS ooxml03 to trunk@274622 (milestone: DEV300:m54) 2009-07-17 17:55:14 +0200 hbrinkm r274100 : resolved warning on unxlngi6.pro 2009-07-15 17:11:09 +0200 kendy r274015 : #i96319# With the disabled docx pieces, libmsword is not a UNO library. 2009-07-15 13:38:36 +0200 hbrinkm r274010 : removed unresolved symbols 2009-07-13 16:06:11 +0200 hbrinkm r273943 : resolved warnings 2009-07-10 14:01:03 +0200 hbrinkm r273889 : changes to make compile on Windows 2009-06-22 19:46:17 +0200 kendy r273252 : #i96319# Disable the DOCX export, it's not perfect yet... 2009-06-22 13:04:32 +0200 kendy r273219 : CWS-TOOLING: rebase CWS ooxml03 to trunk@272827 (milestone: DEV300:m50) 2009-06-11 17:11:39 +0200 kendy r272890 : #i96319# Fix regression in the Word 95 output of hyperlinks. 2009-06-05 17:53:08 +0200 kendy r272710 : #i96319# Fix regression in Word 95 output (wrong style number when nodes recurse). 2009-06-03 00:19:27 +0200 kendy r272529 : #i96319# Fix regression in output of the section breaks. 2009-05-29 18:30:19 +0200 kendy r272475 : CWS-TOOLING: rebase CWS ooxml03 to trunk@272291 (milestone: DEV300:m49) 2009-05-29 09:58:02 +0200 kendy r272435 : #i102354# Don't write the debug info directly to the document. 2009-05-28 15:57:01 +0200 kendy r272411 : #i102260# Revert another trivial fix. 2009-05-26 16:43:07 +0200 kendy r272310 : #i102260# Disable fix of FILLIN fields. 2009-05-26 14:14:09 +0200 kendy r272302 : #i96319# Fix regression in the calculation of size of cells. 2009-05-26 01:42:29 +0200 kendy r272274 : #i96319# Fix a regression - don't export RES_PARATR_LINESPACING and RES_UL_SPACE with every style. [And additionally some beautification.] 2009-05-23 00:37:44 +0200 thb r272212 : #i102156# added XFastSAXSerializable plus implementation 2009-05-22 16:43:09 +0200 kendy r272201 : CWS-TOOLING: rebase CWS ooxml03 to trunk@271830 (milestone: DEV300:m48) 2009-05-14 23:37:02 +0200 thb r271924 : #i10000# post-filter split fixes - make non-pro compile again 2009-05-14 22:35:54 +0200 thb r271923 : #i10000# post-svx split fixes - both librpt and librptui need libsvx 2009-05-14 21:39:08 +0200 thb r271922 : #i10000# post-svx split work - getting nonpro build working again 2009-05-11 09:11:23 +0200 kendy r271740 : #i99638# svxcore library is not a UNO library. 2009-04-29 17:31:45 +0200 kendy r271389 : #i96319# Fixed a corner case in docx export of nested tables. Actually, this even simplifies the code a bit :-) 2009-04-29 12:10:08 +0200 kendy r271364 : #i96319# Fix output of spacing in docx. 2009-04-29 10:56:43 +0200 kendy r271357 : #i96319# Fix an endless loop in the docx export of bookmarks. 2009-04-29 01:06:21 +0200 kendy r271348 : #i96319# Fix output of cell width and height. 2009-04-27 13:29:02 +0200 kendy r271264 : #i96319# Fix output of section columns (their number + widths) for docx. 2009-04-24 15:51:23 +0200 kendy r271219 : #i96319# Fix output of dates - xsi:type=... should be there only for dcterms. 2009-04-23 18:27:28 +0200 kendy r271190 : #i96319# Fix output of gridCol's. 2009-04-23 17:13:44 +0200 kendy r271184 : #i96319# Avoid incorrect double output of tcPr. 2009-04-22 15:58:10 +0200 kendy r271125 : #i96319# Fix the output of the nested tables after all the rebases. 2009-04-20 15:16:48 +0200 kendy r270989 : #i96319# More correct output of the nodes. 2009-04-20 13:27:06 +0200 kendy r270976 : #i96319# Make it build after the rebase to m46 again; maybe does not run yet. 2009-04-10 23:00:46 +0200 kendy r270725 : CWS-TOOLING: rebase CWS ooxml03 to trunk@270723 (milestone: DEV300:m46) 2009-04-09 17:31:44 +0200 kendy r270716 : #i96319# Fix output of headers/footers. 2009-04-09 16:42:13 +0200 kendy r270715 : #i99638# Fix visibility for the debug build of svx. 2009-04-03 10:27:50 +0200 kendy r270466 : #i99683# One forgotten gid_File_Filter_Emp -> gid_File_Filter_Sdfilt. 2009-03-06 16:19:03 +0100 kendy r269013 : #i99638# Remove SpecialProgress-related methods and members, not used any more, and breaks linking on Win32. 2009-03-06 09:43:55 +0100 kendy r268974 : #i99638# Resolve some more unresolved symbols on Win32. 2009-03-05 23:01:39 +0100 kendy r268946 : #i99638# Export less SdStyleSheetPool symbols. 2009-03-05 15:31:23 +0100 kendy r268910 : #i99638# MSVC needs struct WW8_PdAttrDesc declared, otherwise fails to link. 2009-03-04 14:15:23 +0100 kendy r268826 : #i99638# More Win32-related build fixes. 2009-03-04 13:47:48 +0100 kendy r268823 : #i99638# Disable pptx export again, brougth in by mistake. 2009-03-04 09:54:00 +0100 kendy r268786 : #i99638# Deliver also isvxcore.lib and isvxmsfilter.lib. 2009-03-03 17:42:25 +0100 kendy r268773 : #i99638# SdrModel::setUnoModel() should not be inline. 2009-03-03 17:25:59 +0100 kendy r268770 : #i99638# Ugh, revert. 2009-03-03 17:05:16 +0100 kendy r268765 : #i99638# Make ObjectContact dll private. 2009-03-03 15:35:41 +0100 kendy r268733 : #i99638# More destructors visible for Win32 linking. 2009-03-03 14:26:23 +0100 kendy r268726 : #i99638# Make some destructors visible, and change one static inline to static to Win32 linking happy. 2009-03-03 10:42:12 +0100 kendy r268712 : #i99638# More moving stuff around to make Win32 linking happy. 2009-03-03 09:48:17 +0100 kendy r268708 : #i99638# Reduce the includes, needed for Win32 linking. 2009-03-03 08:48:00 +0100 kendy r268705 : #i99638# ImpGetResStr() visibility markup moved to the header. 2009-03-02 16:30:17 +0100 kendy r268664 : #i99638# Fix visibility problems that appeared on x86. 2009-02-27 22:25:57 +0100 kendy r268618 : #i96319# Better definition of DBG in utils.hxx. 2009-02-27 21:53:17 +0100 kendy r268616 : #i96319# License for utils.hxx, define DBG only for the debug builds. 2009-02-27 21:44:25 +0100 kendy r268615 : #i96319# Fixed types for printf etc. parameters. 2009-02-27 17:23:17 +0100 kendy r268607 : #i96319# Fix build after the rebase. 2009-02-27 15:12:49 +0100 kendy r268597 : CWS-TOOLING: rebase CWS ooxml03 to trunk@268395 (milestone: DEV300:m42) 2009-02-27 12:37:57 +0100 kendy r268580 : #i96319# Fix build dependency in oox. 2009-02-26 22:02:06 +0100 kendy r268547 : #i99683# Move ppt import to a separate library. The ppt export is already separate, so it makes sense to give there the import as well. The current library 'emp' was renamed to 'scfilt', it links against svxmsfilter, and few symbols had to be made visible (28 of them). 2009-02-26 14:36:25 +0100 kendy r268520 : #i99638# Whitespace fixes. 2009-02-26 14:31:35 +0100 kendy r268518 : #i99638# Split svx into svxcore, svxmsfilter and the rest. SvxImportMSVBasic's SaveOrDelMSVBAStorage(), GetSaveWarningOfMSVBAStorage(), and GetMSBasicStorageName() must go to svxcore (because of Writer). 2009-02-26 00:16:32 +0100 kendy r268471 : #i99638# Split libsvx into 3 pieces - svxcore, svxmsfilter, and svx (the rest). This contains: - the split (based on inter-object dependencies) - svxcore is actually a closure on a graph where the objects are vertexes, and where there's an edge between 2 vertexes when one needs symbol from the second ;-) - maybe still could be split, but that will be most probably harder to achieve - svxmsfilter is a subset that is needed just by the filters of the MS Office formats - the new svx contains the rest that did not fit the above 2 - visibility for svxcore - some svxcore symbols had to be exposed for svxmsfilter or svx - adaption of modules linking against svx - in some cases, linking just against svxcore is enough 2009-02-25 23:35:03 +0100 kendy r268470 : #i99545# Get rid of struct ConstAsciiString, and use simple #define's instead - it's a pre-requisite for a svx split, and also saves memory on x86-64, and some symbol names. 2009-02-25 22:39:02 +0100 kendy r268468 : #i96319# Get rid of the now unneecessary debug class DOCX. 2009-02-17 20:35:29 +0100 kendy r268190 : #i96319# WW8 filter rework + docx export License header + whitespace fixes. 2009-02-17 20:02:39 +0100 kendy r268189 : #i96319# WW8 filter rework + docx export Add license header to preset-definitions-to-shape-types.pl. 2009-02-17 19:58:11 +0100 kendy r268188 : #i96319# WW8 filter rework + docx export oox does not have to depend on FASTSAXLIB. 2009-02-17 17:05:34 +0100 kendy r268182 : #i96319# WW8 filter rework + docx export Fix the sax compilation, apparently some of the changes were missing. 2009-02-17 13:04:14 +0100 kendy r268163 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Fix output of shape paths (point components can be either 16 or 32 bit). [And also implement a fallback for the missing shapes - treated as rectangle.] 2009-02-17 13:03:56 +0100 kendy r268162 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Correction of some values. Now the shapes seem to be good enough; time to abandon them ;-) 2009-02-17 13:03:37 +0100 kendy r268161 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Better detection of consts. 2009-02-17 13:03:19 +0100 kendy r268160 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Fixed the 'sun' shape. 2009-02-17 13:03:00 +0100 kendy r268159 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Better check for unneeded 'prod's. 2009-02-17 13:02:42 +0100 kendy r268158 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Fix the adj values. 2009-02-17 13:02:23 +0100 kendy r268157 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Fix pentagon and star5 shapes. 2009-02-17 13:02:04 +0100 kendy r268156 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Fix most of the 'star' shapes by preventing an overflow. 2009-02-17 13:01:41 +0100 kendy r268155 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * fixed build after resolving conflicts 2009-02-17 13:01:19 +0100 kendy r268154 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * added TODO comment 2009-02-17 13:00:59 +0100 kendy r268153 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * implemented adjustments export in custom shapes 2009-02-17 13:00:40 +0100 kendy r268152 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * partially refactored EscherPropertyContainer::CreateCustomShapeProperties extracted 3 helper functions, which are now used in ooxml export 2009-02-17 13:00:17 +0100 kendy r268151 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * make mAny member of DrawingML protected, so that ShapeExport can access it * export connector shape * added DrawingML::WriteConnectorConnections * fixed bezier shape outline export (regression fix) 2009-02-17 12:59:54 +0100 kendy r268150 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * make EscherConnectorListEntry structure public, so that it can be used by ooxml export 2009-02-17 12:59:34 +0100 kendy r268149 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * added mapping of shapes to shape IDs * cleaned a bit shape name generation 2009-02-17 12:59:13 +0100 kendy r268148 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Fixed some of the text shapes, 166/202. In the 202, I counted even shapes that are marked 'should not be used' (and their definition is missing) even in the documentation. The only really missing shapes are those that use general arcTo... 2009-02-17 12:58:53 +0100 kendy r268147 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Found missing shapes, now 159/202. 2009-02-17 12:58:36 +0100 kendy r268146 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Optimize the amount of formulas a bit. Adds one more shape that previously reached the top amount of formulas ;-) 2009-02-17 12:58:15 +0100 kendy r268145 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Implemented quadratic beziers, 144/202 now. I was unable to use 'qb', it did not produce good results, no idea why :-( Instead used 'c' - cubic bezier - and recounted the control points (mathematically equivalent representation). The downside is that for some shapes I run out of formulas :-( - TODO later. 2009-02-17 12:57:56 +0100 kendy r268144 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Fix presetShapeDefinitions.xml, there's an error there. 2009-02-17 12:57:31 +0100 kendy r268143 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Implemented cubicBezTo + few formulas, now 136/202. 2009-02-17 12:57:11 +0100 kendy r268142 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Fixed units of sin/cos, which makes it now 118/202. Realized that some of the shapes are 'too small' - like <10 units, insetad of ~21600; have to look at that. 2009-02-17 12:56:43 +0100 kendy r268141 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: More arcTo shapes, 116/202 now. 2009-02-17 12:56:21 +0100 kendy r268140 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Better conversion of */ (fixes some shapes). Implemented nostroke/nofill. 2009-02-17 12:56:01 +0100 kendy r268139 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: More formulas, and partially implemented 'arcTo' - 93/202 shapes now. 2009-02-17 12:55:39 +0100 kendy r268138 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Radically changed the conversion of formulas to be able to implement +/. [...and actually implemented it ;-), 60/202 shapes now.] 2009-02-17 12:55:19 +0100 kendy r268137 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Shape types generation plugged to the build, 53/202 shapes now. 2009-02-17 12:54:57 +0100 kendy r268136 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: More predefined shapes generated (thanks to 'pin' translation). 2009-02-17 12:54:36 +0100 kendy r268135 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Script that creates the predefined shape types + the definitions. The shape types themselves come from the OOXML documentation; the script just converts them from DrawingML to a VML representation in a C++ file. The converter is not feature-complete yet, resulting in some missing shapes. Also it is not yet part of the build (makefile.mk not modified yet). 2009-02-17 12:54:10 +0100 kendy r268134 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: + Fixed a regression on sections output + Columns break has to be postponed to the next paragraph + Implemented sections properly + Columns formatting properties exported 2009-02-17 12:53:49 +0100 kendy r268133 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> haven't I fixed those problems? 2009-02-17 12:53:29 +0100 kendy r268132 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: + table alignment is now exported 2009-02-17 12:53:07 +0100 kendy r268131 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Integrate VMLExport with Calc for Comment export. Few minor changes needed to VMLExport so that Calc could customize the behavior. Specifically, Calc needed to be able to: - Explicitly specify the //v:shape/@type attribute value so that Excel wouldn't show a diagonal "arrow" underneath the note text instead of showing an actual box. - Add custom Escher properties such as "hidden", etc. - Insert the //v:shape/x:ClientData element before //v:shape is closed. * oox/inc/oox/export/vmlexport.hxx, oox/source/export/vmlexport.cxx: - Make Commit(), StartShape(), and EndShape() protected so that Calc can override those methods - StartShape() is needed to add //v:shape/@type - Commit() is needed to add new Escher properties - EndShape() is needed to generate //v:shape/x:ClientData. - Add AddShapeAttribute() method, so Calc can set the //v:shape/@type value. - Output "visibility:hidden" for the ESCHER_Prop_fHidden property. 2009-02-17 12:52:46 +0100 kendy r268130 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Finish the transition of VMLExport from 'sw' to 'oox' + few trivial fixes. The VML export code is now accessible as oox::vml::VMLExport. The (not that related) fixes include SAL_DLLPUBLIC_EXPORT -> OOX_DLLPUBLIC change and few warning fixes. 2009-02-17 12:52:24 +0100 kendy r268129 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Moved vmlexport.[hc]xx to oox. 2009-02-17 12:52:04 +0100 kendy r268128 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Cleanup before we move to oox. 2009-02-17 12:51:41 +0100 kendy r268127 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: Some more features for tables export 2009-02-17 12:51:21 +0100 kendy r268126 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: + nested tables export refinement + export row height and table headers 2009-02-17 12:50:58 +0100 kendy r268125 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Initialize a local variable. 2009-02-17 12:50:34 +0100 kendy r268124 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: fixed table layout for nested tables. Fixed nested tables output 2009-02-17 12:50:13 +0100 kendy r268123 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: added support of nested tables. Still needs to be heavily tested. Some problems are occuring with the grid layout. 2009-02-17 12:49:49 +0100 kendy r268122 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Change SAL_DLLPUBLIC_EXPORT to SW_DLLPUBLIC which is more appropriate here. 2009-02-17 12:49:28 +0100 kendy r268121 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Fix line-callout-3 translation. The `line-callout-3' callout was being mapped to the `accentBorderCallout90' OOXML callout, which Excel didn't like at all. Changing this to `borderCallout3' produces OOXML that Excel will load. Not sure what mso-spt49 is supposed to be, but given the other mso-spt* values I think accentBorderCallout90 makes more sense (but cannot find such a value in the OOXML XSD files). 2009-02-17 12:49:05 +0100 kendy r268120 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Fix refactoring of DrawingML::WritePolyPolygon(). The original version only checked rPoly.GetFlags() for every item *after* the first item -- i.e. the first item was skipped. Change the `for' loop start index to follow this behavior. 2009-02-17 12:48:42 +0100 kendy r268119 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Fix Bezier output. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit The //a:cubicBezTo element (?5.1.11.7) requires that there be *three* //a:pt child elements. Ensure that this is the case (otherwise Excel yells at me about invalid DrawingML if I export a free-form shape). This also cleans up the code slightly, by moving out a `if(j==0)` block to before the for loop, and re-indenting the code to simplify understanding. 2009-02-17 12:48:22 +0100 kendy r268118 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Flush documentation. 2009-02-17 12:48:00 +0100 kendy r268117 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: + implemented table cell margins and fixed grid layout + reapplied missing patch from m34 about default spacing of paragraphs 2009-02-17 12:47:40 +0100 kendy r268116 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Migrate Calc to use ShapeExport. Minor snafu here: XML_nvPr is valid only within Impress, so if Calc exports it Excel doesn't like the resulting documents. Remove XML_nvPr output from ShapeExport and replace with calls to ShapeExport::WriteNonVisualProperties(). PowerPointShapeExport can thus override ShapeExport::WriteNonVisualProperties() to generate the required //p:nvPr elements. * oox/inc/oox/export/shapes.hxx: Declare ShapeExport::WriteNonVisualProperties(). * oox/source/export/shapes.cxx: * - Replace XML_nvPr generation with calls to WriteNonVisualProperties(). - Get the GraphicObject name property from the shape instead of generating "Picture N" values (if the shape has a Name property). - Generate a GraphicObject Description attribute, if present. - Remove unused method parameter names (to remove warnings). 2009-02-17 12:47:15 +0100 kendy r268114 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * fixed few shape names, which were missing Shape at the end * fixed mso-spt202 custom shape translation, which was causing problems with word wrapping * enabled wrap attribure for bodyPr tag * fixed 2 compiler warnings 2009-02-17 12:46:55 +0100 kendy r268113 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: column spans in tables are now exported 2009-02-17 12:46:33 +0100 kendy r268112 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx: + Fixed table structure output + Output table borders + Fixed borders output 2009-02-17 12:46:11 +0100 kendy r268111 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Excercise ShapeExport::WriteShape(). Refactor PowerPointExport::WriteShapeTree() to use ShapeExport::WriteShape(), overloading ShapeExport virtual Write* methods as appropriate to insert support for additional shapes. * oox/source/export/shapes.cxx: Correct the shape names (often by appending "Shape") so that the table lookup works as expected. 2009-02-17 12:45:49 +0100 kendy r268110 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Implement multiplexing ShapeExport::WriteShape(). What got me started on this whole "migrate large fractions of sd into oox" binge was PowerPointExport::WriteShapeTree(), which included a "multiplexer" -- a method that took the XShape's shape type and translated it into a (set of) member function(s) to call to convert the shape. I needed just such a multiplexer for Calc, and was loathe to copy/paste it. However, PowerPointExport::WriteShapeTree() is far more complicated for something to go into oox, dealing as it does with grouping and myriad other sd-specific details. Thus, an overhaul: All the ShapeExport::Write* methods are now virtual. The multiplexing ShapeExport::WriteShape() method will consult a string type -> member function lookup table, and if a matching member function is found it will be invoked. This allows subclasses to customize behavior. If no matching conversion member function is found, then ShapeExport::WriteUnknownShape() is invoked, allowing subclasses to transparently handle additional shapes w/o special-casing the WriteShape() call. * oox/inc/oox/export/shapes.hxx, oox/source/export/shapes.cxx: Make Write* methods virtual; Add WriteUnknownShape(); Replace the (non-functional) WriteShapeTree() with the multiplexing WriteShape(), and provide a hashtable mapping shape type to conversion method. 2009-02-17 12:45:28 +0100 kendy r268109 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Move Impress DrawingML Export code into oox::drawingml::ShapeExport. Begin moving sharable sd/source/filter/eppt/epptooxml.cxx DrawingML code into oox::drawingml::ShapeExport, so that DrawingML elements (w/ different namespaces) can use the same export code. WARNING: the migration makes the assumption that mXPropSet comes from mXShape, that is: Reference< XPropertySet > mXPropSet( mXShape, UNO_QUERY ); If this is wrong, things will obviously break. This *should* be correct, as the altered code path rooted in PowerPointExport::WriteShapeTree() calls PPTWriterBase::GetShapeByIndex(), which ensures that mXPropSet is the XPropertySet for the mXShape instance: Any aAny( mXShape->queryInterface( ::getCppuType( (const Reference< XPropertySet >*) 0 ) )); aAny >>= mXPropSet; * oox/inc/oox/export/shapes.hxx, oox/source/export/shapes.cxx: Sync with the above removed PowerPointExport methods. 2009-02-17 12:45:11 +0100 kendy r268108 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Deliver inc/oox/export/shapes.hxx. 2009-02-17 12:44:51 +0100 kendy r268107 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Abstract out sd's shape export code. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit DrawingML is an evil, evil thing -- it's highly duplicative. For example, the <cNvPr/> element has been duplicated no less than four times into different XML namespaces: ?4.4.1.12, ?5.1.2.1.8, ?5.2.2.3, ?5.6.2.8, i.e. in the following XML namespaces (from the XSD files): http://schemas.openxmlformats.org/drawingml/2006/chartDrawing http://schemas.openxmlformats.org/drawingml/2006/main http://schemas.openxmlformats.org/drawingml/2006/picture http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing http://schemas.openxmlformats.org/presentationml/2006/main In all these cases, they all have the same attributes, the same parent elements, and the same child elements. They are, for all intents and purposes, identica EXCEPT for the XML namespace. Instead of rampantly duplicating sd's shape export code and doing s/XML_p/XML_???/g (i.e. replace the namespace), I'm refactoring sd's export code into oox::drawingml::ShapeExport. The ShapeExport constructor takes the target XML namespace as a parameter, and generates all XML relative to this namespace. * inc/oox/export/drawingml.hxx: Add DrawingML::GetFB() and DrawingML::GetFS() accessor methods, which are needed by ShapeExport. * source/export/makefile.mk: Add shapes.cxx to the build. * inc/oox/export/shapes.hxx, source/export/shapes.cxx: Declare and implement oox::drawingml::ShapeExport. 2009-02-17 12:44:32 +0100 kendy r268106 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * extracted paragraph adjustment translation * added text wrap (commented out as it doesn't work flawlessly yet) 2009-02-17 12:44:12 +0100 kendy r268105 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: now able to export the tables structures 2009-02-17 12:43:53 +0100 kendy r268104 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Fixed a bug in doc table export. 2009-02-17 12:43:34 +0100 kendy r268103 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Fixed several build bugs: + strange integer conversion + unexported symbol dbg_out + Reintegrated missing patches from m34 + Reupdated scp2 module to flag libmsword as a uno component 2009-02-17 12:43:15 +0100 kendy r268102 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Change hardcoded numbers into sprm constants. 2009-02-17 12:42:58 +0100 kendy r268101 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Make the tables build even with the docx-related changes. 2009-02-17 12:42:38 +0100 kendy r268100 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Write shapes defined by paths. 2009-02-17 12:42:14 +0100 kendy r268099 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: implemented paraSnapToGrid & suppressAutoHyphens 2009-02-17 12:41:54 +0100 kendy r268098 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: Implemented ParaScriptSpace and its friends 2009-02-17 12:41:32 +0100 kendy r268097 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx export: Keep with next paragraph 2009-02-17 12:41:11 +0100 kendy r268096 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx: Fixed tab position export, left margin was missing 2009-02-17 12:40:48 +0100 kendy r268095 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> TOX export: + fixed export fields expression containing tabs + fixed the begin element of fields like TOX, Hyperlinks and index marks + implemented export of index marks (same missing things than binary filter) 2009-02-17 12:40:28 +0100 kendy r268094 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Export the core revision document property. The mapping between revision and getEditingCycles() was found by perusing the existing OLE Structured Storage output source. 2009-02-17 12:40:10 +0100 kendy r268093 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Preparations for the predefined shape types. 2009-02-17 12:39:50 +0100 kendy r268092 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Implemented the most interesting stroke properties. 2009-02-17 12:39:31 +0100 kendy r268091 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Minimal working TOX export, not fully tested yet. Implemented DocxExport::AppendBookmark method 2009-02-17 12:39:11 +0100 kendy r268090 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Implemented the most interesting fill properties. 2009-02-17 12:38:53 +0100 kendy r268089 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> VML: Output of lines. 2009-02-17 12:38:35 +0100 kendy r268088 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Thanks to kendy, dateToW3CDTF is now useless 2009-02-17 12:38:16 +0100 kendy r268087 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Uncomplete merge + change the timestamp generation with the use of strftime 2009-02-17 12:37:58 +0100 kendy r268086 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> + Fixes in core properties export: - the first keyword was duplicated, - the CreationTime in apps.xml was written several times + Refactored the fields output to prepare the place for TOX: now using a stack of fields to output + Refactored the Hyperlink export implementation to handle links with anchors in documents 2009-02-17 12:37:36 +0100 kendy r268085 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> MS Word begins to like the VML generated by the docx export :-) We can export basic groups, rects and ellipses now; TODO other shapes and lots of properties. 2009-02-17 12:37:18 +0100 kendy r268084 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Propagate bounding rectangle in EscherEx::Commit(). Ignored in EscherEx itself, but mandatory for the VML export. 2009-02-17 12:36:59 +0100 kendy r268083 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Comment out output of XML_TotalTime (xProperties->getEditingDuration()), breaks here. #i96319# WW8 filter rework + docx export confuses MS Office terribly. 2009-02-17 12:36:42 +0100 kendy r268082 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> The boost datetime conversion broke from time to time, no idea why :-( Now using the most trivial approach... 2009-02-17 12:36:24 +0100 kendy r268081 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Implementation of few basic VML shapes and properties. 2009-02-17 12:36:06 +0100 kendy r268080 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Add EscherPropertyContainer::GetOpts() to be able to get all the options at once. 2009-02-17 12:35:48 +0100 kendy r268079 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Include "tokens.hxx" instead of <oox/core/tokens.hxx>. The latter attempts to take the version from solver which is not there yet when building from scratch ;-) 2009-02-17 12:35:28 +0100 kendy r268078 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Forgot to remove an include. Compiler didn't crash on it... strange 2009-02-17 12:35:10 +0100 kendy r268077 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Merged the properties export code with the one of jonp. In fact, only the date formatting code of mine has been kept to replace jon's one. 2009-02-17 12:34:49 +0100 kendy r268076 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Export of core properties migrated to oox module 2009-02-17 12:34:23 +0100 kendy r268075 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Add some trace/debugging information. Some of the app/core properties are #ifdef'd, as I don't know what XDocumentProperties attribute is the appropriate mapping. My suspicion is that many of the remaining app/core properties may be found within the DocumentStatistics attribute, and thus I print out the document statistics found. (So far, I'm not seeing any from Calc, but this may bear some fruit with .docx or .pptx export...) 2009-02-17 12:34:01 +0100 kendy r268074 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Document Properties: skip empty elements. * xmlfilterbase.cxx (writeElement): Don't generate an element if the element has no value. 2009-02-17 12:33:35 +0100 kendy r268073 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Initial stab at exporting document properties. Short, short version: to export document properties call XmlFilterBase::exportDocumentProperties(Reference<XDocumentProperties>). * oox/inc/oox/core/xmlfilterbase.hxx, oox/source/core/xmlfilterbase.cxx: Add and implement XmlFilterBase::exportDocumentProperties(), which generates docProps/core.xml and docProps/app.xml. * oox/source/token/tokens.txt: Add XML_vt element. * sc/source/filter/excel/excdoc.cxx: call XmlFilterBase::exportDocumentProperties(). * sc/source/filter/excel/expop2.cxx: Remove sfx2::SaveOlePropertySet() call, as it isn't useful for OOXML output. 2009-02-17 12:33:17 +0100 kendy r268072 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Beginnings of the VML export. The shapes are exported, but with no attributes - so their position is not written yet, etc. 2009-02-17 12:32:54 +0100 kendy r268070 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Do more EscherEx methods virtual. We want to re-use EscherEx for the export of VML. For this, some of the methods have to be made virtual so that we can change them to do what we need ;-) 2009-02-17 12:32:26 +0100 kendy r268069 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Removed debug fprintf's 2009-02-17 12:32:09 +0100 kendy r268068 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx: bookmarks now exported 2009-02-17 12:31:52 +0100 kendy r268067 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * export polypolygons * export transformation defined by rectangle 2009-02-17 12:31:35 +0100 kendy r268066 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Split text runs to be able to insert bookmark tags 2009-02-17 12:31:18 +0100 kendy r268065 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Enum for specifying the document type to DrawingML. Various document types need it differently... 2009-02-17 12:30:57 +0100 kendy r268064 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Provide an appropriate //Relationship/@Target value. * oox/source/export/drawingml.cxx: The //Relationship/@Target value needs to be a path relative to the DrawingML document. For Excel, the DrawingML is in xl/drawings/drawing*.xml, while the embedded media is in xl/media/image*. Thus, to get from xl/drawings/drawing*.xml to xl/media/image*, we need "../media/image", not "media/image". Without this change, Excel throws an error when loading the Spreadsheet, as it can't find the resource. 2009-02-17 12:30:35 +0100 kendy r268063 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Fixed output of the properties that are written at </pPr> or </rPr> time. Fixes the most annoying "the first run has strange properties" bug, and generally improves the quality of output of styles a lot. 2009-02-17 12:30:16 +0100 kendy r268062 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Generate valid DrawingML. The DrawingML is a hack, with hard-coded values in various places that have no business being hardcoded, but it is valid, and Excel does load the DrawingML without error. (It instead errors out because xl/drawings/_rels/drawing1.xml.rels contains an invalid file path. :-( * oox/inc/oox/export/drawingml.hxx, oox/source/export/drawingml.cxx: Add a WriteBlipFill() overload which takes the XML namespace as an argument. This is necessary because Excel wants a <xdr:blipFill/> element, not <a:blipFill/>, and I don't want to have to duplicate the rest of the WriteBlipFill() logic within sc. 2009-02-17 12:29:59 +0100 kendy r268061 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Remove one of the 2 fixes of the same problem ;-) 2009-02-17 12:29:32 +0100 kendy r268060 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Few whitespace fixes. 2009-02-17 12:29:12 +0100 kendy r268059 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Basic output of images works, both embedded as well as linked. Still some TODOs in FlyFrameGraphic(), to be solved later... 2009-02-17 12:28:51 +0100 kendy r268058 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Add TwipsToEMU() to oox/export/utils.hxx. 2009-02-17 12:28:30 +0100 kendy r268057 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Fix the build. DrawingML::WriteImage(const Graphic&) needs to have a Graphic type in scope. 2009-02-17 12:28:10 +0100 kendy r268056 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Change define FSEND -1 to const sal_Int32 FSEND = -1. The former can hide errors, like startElementNS( ..., "xyz" FSEND ), because it compiles without warning, but then gets part of the string, and we end up without a sentinel. 2009-02-17 12:27:50 +0100 kendy r268055 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Docx export: Dropdown field now exported 2009-02-17 12:27:28 +0100 kendy r268054 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Add the xdr token. The `xdr' token is used as the XML namespace in Spreadsheet DrawingML documents. 2009-02-17 12:27:08 +0100 kendy r268053 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> With a bit of cheating, images can be written... Everything (but the image itself) is hardcoded so far. 2009-02-17 12:26:47 +0100 kendy r268052 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Write the location of the image as media/image, not ../media/image. Hopefully it does not break pptx - but for docx it's necessary. 2009-02-17 12:26:24 +0100 kendy r268051 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Improved mergeTopMarks(). - instead of bool, it accepts MergeMarksEnum with values MERGE_MARKS_APPEND, MERGE_MARKS_PREPEND, and MERGE_MARKS_POSTPONE, which should be more readable - MERGE_MARKS_POSTPONE is a new thing, it allows to write output that is written with the next mergeTopMarks() - useful when you get some data too early and need to write them after the end of data that you are just writing. 2009-02-17 12:26:05 +0100 kendy r268050 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Output of images; framework is mostly done, but disabled due to problems with order. [So far it would be output inside rPr which is not what we want ;-)] 2009-02-17 12:25:41 +0100 kendy r268049 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Intoduced OUString DrawingML::WriteImage( const Graphic& rGraphic ). Additionally - added the possibility to write images to word/ subdir in the zip container, not just ppt/ - added 'wp' to the known tokens - fixed Graphic::GetLink() in vcl to be 'const' - added svx and vcl to the dependencies of oox 2009-02-17 12:25:18 +0100 kendy r268048 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> merged binary and ooxml filters export. 2009-02-17 12:24:55 +0100 kendy r268047 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Core properties created (still have to write the dates) 2009-02-17 12:24:32 +0100 kendy r268046 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Added support for GetExpression and SetExpression fields (only in text format). 2009-02-17 12:24:09 +0100 kendy r268045 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Some more fields supported 2009-02-17 12:23:49 +0100 kendy r268044 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Some more fields 2009-02-17 12:23:27 +0100 kendy r268043 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Write also numbering type "none". 2009-02-17 12:23:07 +0100 kendy r268041 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Numbering finished, implemented the rest of the level information. 2009-02-17 12:22:45 +0100 kendy r268040 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx fields exports: the start of the way 2009-02-17 12:22:23 +0100 kendy r268039 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Write abstract numbering definitions including the levels. Not all of the information is written yet, but will be soon ;-) 2009-02-17 12:22:00 +0100 kendy r268038 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Implementation of the abstract numbering definitions, not yet finished. 2009-02-17 12:21:39 +0100 kendy r268037 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Output numbering definition instances. Abstract numbering definitions are still TODO. 2009-02-17 12:21:21 +0100 kendy r268036 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Rename OutListTab() -> NumberingDefinitions(), and OutListTabLevels() -> AbstractNumberingDefinitions(). This is better aligned with what is used in the docx documentation. 2009-02-17 12:21:00 +0100 kendy r268035 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Changed the ColorToHex to support the "auto" value Code cleaning according to kendy's remarks 2009-02-17 12:20:37 +0100 kendy r268034 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> table horizontal merge 2009-02-17 12:20:15 +0100 kendy r268033 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> impl_convertColor() is not necessary, we already have impl_ColorToHex(). 2009-02-17 12:19:52 +0100 kendy r268032 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx Line numbering 2009-02-17 12:19:31 +0100 kendy r268031 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> docx: Implemented Section Types 2009-02-17 12:19:09 +0100 kendy r268030 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> FIX for borders: documents with no section border didn't wrote completely 2009-02-17 12:18:50 +0100 kendy r268029 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Fixed some output errors for paragraphs borders 2009-02-17 12:18:31 +0100 kendy r268028 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Fixed docx page border export problems and added color support 2009-02-17 12:18:13 +0100 kendy r268027 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Beginning of page borders implementation 2009-02-17 12:17:54 +0100 kendy r268026 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * export line arrow ends 2009-02-17 12:17:34 +0100 kendy r268025 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * make helper function GetLineArrow public so that it can be used in ooxml export put it in EscherPropertyContainer class (static method) 2009-02-17 12:17:16 +0100 kendy r268024 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> renamed AppendRelation to AddRelation. 2009-02-17 12:16:58 +0100 kendy r268023 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Fixed hyperlinks style. Fixed having a run of text before the hyperlink 2009-02-17 12:16:39 +0100 kendy r268022 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Initialize m_pHyperlinkAttrList to NULL. 2009-02-17 12:16:17 +0100 kendy r268021 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> Fixed the Hyperlink output Partly fixed the language Id output 2009-02-17 12:15:54 +0100 kendy r268020 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * fix type mismatch in gradient code * add flip and rotation parameters to shape transformation 2009-02-17 12:15:29 +0100 kendy r268019 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * finished gradient fill 2009-02-17 12:15:07 +0100 kendy r268018 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> + docx URL export: output is still wrong 2009-02-17 12:14:44 +0100 kendy r268017 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * export linear and axial gradients 2009-02-17 12:14:27 +0100 kendy r268016 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * export line joint type 2009-02-17 12:14:05 +0100 kendy r268015 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * export dashed lines 2009-02-17 12:13:48 +0100 kendy r268014 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat <cbosdonnat@novell.com> cast problems fixed 2009-02-17 12:13:25 +0100 kendy r268013 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> * added outline export * wrapped debug printfs in DBG * fix text color and typeface placement * do not write empty runs * do not write empty paragraph properties * added end paragraph properties - need to be filled later 2009-02-17 12:13:02 +0100 kendy r268012 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> export language and fonts are now accepted by msppt 2009-02-17 12:12:44 +0100 kendy r268011 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> re-enable pptx export - it was disabled by ooxml02 changes committed to git repo 2009-02-17 12:12:22 +0100 kendy r268010 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> fix build 2009-02-17 12:12:04 +0100 kendy r268009 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Merge ooxml02 fixes. 2009-02-17 12:11:43 +0100 kendy r268008 : #i96319# WW8 filter rework + docx export From: Radek Doulik <rodo@novell.com> move drawingml export to oox/ from sd/ 2009-02-17 12:11:20 +0100 kendy r268007 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Revert commit 8b63649bf0a5d14703459bbf31e1599d592a5dff. It was already fixed easier way. 2009-02-17 12:11:00 +0100 kendy r268006 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> oox fixes to help sc compile... * inc/oox/core/contexthandler2.hxx, inc/oox/drawingml/chart/modelbase.hxx, inc/oox/drawingml/customshapeproperties.hxx, inc/oox/helper/attributelist.hxx, inc/oox/ppt/pptimport.hxx, inc/oox/ppt/slidepersist.hxx: #include <oox/core/tokens.hxx> not "tokens.hxx" as these files are deployed into solver, and there is no "tokens.hxx" in other modules (such as sc). * prj/d.lst: Deliver enough header files to let sc build some more... 2009-02-17 12:10:34 +0100 kendy r268005 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor <jpryor@novell.com> Deliver tablestylelist.hxx. * d.lst: Deliver inc/oox/drawingml/table/tablestylelist.hxx, as it's needed by sc export. 2009-02-17 12:10:13 +0100 kendy r268004 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Fix few warnings in sw, and disable DocxExport::WriteNumbering() for now. 2009-02-17 12:09:56 +0100 kendy r268003 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Add empty implementations of 2 abstract import XmlFilterBase methods. To be able to instantiate DocxExportFilter again... 2009-02-17 12:09:35 +0100 kendy r268002 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Resolve an unresolved, forgotten chunk [GetAttr() -> GetFmtAttr()]. 2009-02-17 12:09:08 +0100 kendy r268001 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Field work seems to compile now. Contains also a rename of OutField() to OutputField() to match better the other changes. 2009-02-17 12:08:46 +0100 kendy r268000 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Fix build, WriteOutliner() is now in WW8Export. 2009-02-17 12:08:26 +0100 kendy r267999 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> OutListTab() split into 2 methods [OutListTab() and OutListTabLevels()]. Also introduced a general WW8Export::WriteNumbering() which calls the needed methods. OutListTabLevels() is planned to be reused in docx export as well. 2009-02-17 12:08:09 +0100 kendy r267998 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> DupNumRuleWithLvlStart() renamed to DuplicateNumRule(). 2009-02-17 12:07:40 +0100 kendy r267997 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Check for max numbering level can be in ParaNumRule(). 2009-02-17 12:07:20 +0100 kendy r267996 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Few whitespace changes. 2009-02-17 12:06:49 +0100 kendy r267995 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> GetId( const SwNumRule& rNumRule ) should not be const. If the first thing it does is a const_cast<...>( this ), then something is wrong ;-) 2009-02-17 12:06:29 +0100 kendy r267994 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Redlining: Save author and date. 2009-02-17 12:06:07 +0100 kendy r267993 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Output redlining. So far just insertion and deletion of text, and without author and timestamp. 2009-02-17 12:05:45 +0100 kendy r267992 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Write the font table. 2009-02-17 12:05:27 +0100 kendy r267991 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Get ready to output the fonts. 2009-02-17 12:05:06 +0100 kendy r267990 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Fix namespace of relation id, and output of headers and footers works now... It's r:id, not w:id ;-) 2009-02-17 12:04:40 +0100 kendy r267988 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Write actual headers and footers in docx. #i96319# WW8 filter rework + docx export 2009-02-17 12:04:17 +0100 kendy r267987 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> A small cleanup. 2009-02-17 12:04:00 +0100 kendy r267986 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Fix the regression, caused by SetupSectionPositions() not being virtual (accidentally). 2009-02-17 12:03:40 +0100 kendy r267985 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> another iteration of numbering, utterly broken, but not crashing anything 2009-02-17 12:03:18 +0100 kendy r267984 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> SectionProperties() code is now common for binary and docx. Unfortunately binary output does not pass the tests now. 2009-02-17 12:02:49 +0100 kendy r267983 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Improving the SectionProperties() method to be shared between ww8 and docx. Not there yet, but getting closer ;-) The docx code is still a placeholder only. 2009-02-17 12:02:29 +0100 kendy r267982 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> some more work towards the numbering.xml 2009-02-17 12:02:08 +0100 kendy r267981 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Get rid of rLnNumInfo and aLineNum. 2009-02-17 12:01:44 +0100 kendy r267980 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> We are in attribute output already. 2009-02-17 12:01:21 +0100 kendy r267979 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Get rid of unsigned int nHdFtGroup. 2009-02-17 12:01:03 +0100 kendy r267978 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Introduce WW8AttributeOutput::SectionProperties(). The goal is to share this between ww8 and docx. 2009-02-17 12:00:45 +0100 kendy r267977 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Be careful, m_pSections/CurrentSectionInfo() might be NULL. 2009-02-17 12:00:22 +0100 kendy r267976 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Write section properties even for the last section. 2009-02-17 11:59:59 +0100 kendy r267975 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Output sections (w:sectPr) and columns. 2009-02-17 11:59:34 +0100 kendy r267974 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> WW8_SepInfo: Move to constructor, what belongs there. 2009-02-17 11:59:14 +0100 kendy r267973 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Remove an obsolete commented out piece. 2009-02-17 11:58:53 +0100 kendy r267972 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Output columns break (when the section has more columns). 2009-02-17 11:58:35 +0100 kendy r267971 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Hook the output of the docx sections to the right place. 2009-02-17 11:58:17 +0100 kendy r267970 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Rename OutputSfxBreakItems() to OutputSectionBreaks(). 2009-02-17 11:57:58 +0100 kendy r267969 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Remove an non-needed comment, add an interesting one. 2009-02-17 11:57:39 +0100 kendy r267968 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Get rid of OutputPageSectionBreaks(), dissolve it into other methods. 2009-02-17 11:57:19 +0100 kendy r267967 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Fix regression in AttributeOutputBase::FormatBreak(). git bisect, thank you so much! :-) 2009-02-17 11:57:00 +0100 kendy r267966 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Move pDop and pFib to WW8Export. 2009-02-17 11:56:42 +0100 kendy r267965 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Implement DocxExport::PrepareNewPageDesc(). 2009-02-17 11:56:24 +0100 kendy r267964 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Improve WW8Export::PrepareNewPageDesc(). 2009-02-17 11:56:04 +0100 kendy r267963 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Move part of WW8_WrPlcSepx::OutHeaderFooter() to MSWordExportBase::WriteHeaderFooterText(). 2009-02-17 11:55:27 +0100 kendy r267961 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Share OutHeader() nad OutFooter() (remove copy'n'paste). 2009-02-17 11:55:06 +0100 kendy r267960 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Rename WriteKFTxt1() to WriteHeaderFooterText() and move it to MSWordExportBase. 2009-02-17 11:54:41 +0100 kendy r267959 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> extracting the ParaNumRule to MSWordExportBase 2009-02-17 11:54:20 +0100 kendy r267958 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> write out w:numPr node into document.xml + converting some tabs to 4 spaces 2009-02-17 11:53:56 +0100 kendy r267957 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> MSWordSections split into the base and WW8 specific (WW8_WrPlcSepx). [WW8_WrPlcSepx was the original name of MSWordSections - let it there to decrease confusion ;-)] 2009-02-17 11:53:31 +0100 kendy r267956 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Fix docx export crash by initializing pSepx. 2009-02-17 11:53:11 +0100 kendy r267955 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> MSWordExportBase::OutputPageSectionBreaks() is now common for binary and docx. 2009-02-17 11:52:48 +0100 kendy r267954 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> AttributeOutputBase::FormatPageDescription() is now common for binary and docx. 2009-02-17 11:52:28 +0100 kendy r267953 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> write an empty numbering stream 2009-02-17 11:52:06 +0100 kendy r267952 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> some more of the spacing 2009-02-17 11:51:39 +0100 kendy r267951 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Rename WW8_WrPlcSepx to MSWordSections. 2009-02-17 11:51:19 +0100 kendy r267950 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Move pSepx initialization to the WW8_WrPlcSepx constructor. 2009-02-17 11:50:53 +0100 kendy r267949 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Fixed styles id's (in styles.xml). Now the styles seem to work pretty well. 2009-02-17 11:50:33 +0100 kendy r267948 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Rename AttributeOutput's Style() to ParagraphStyle(), that is more correct. 2009-02-17 11:50:11 +0100 kendy r267947 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> FormatBreak() is now in the common AttributeOutputBase. And pageBreakBefore works now... 2009-02-17 11:49:49 +0100 kendy r267946 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Few obvious m_rWW8Export -> GetExport() in WW8AttributeOutput::FormatBreak(). 2009-02-17 11:49:28 +0100 kendy r267945 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Add PageBreakBefore() to AttrbuteOutput's. It's a preparation for moving FormatBreak() to the generic AttributeOutputBase, and also kills some copy and paste. 2009-02-17 11:49:08 +0100 kendy r267944 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Debug output of attributes is not needed any more, remove. 2009-02-17 11:48:46 +0100 kendy r267943 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Don't create a new AttributeOutput in WW8_WrPlcSepx::WriteKFTxt(). 2009-02-17 11:48:25 +0100 kendy r267942 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Move pEnd and pFtn from MSWordExportBase to WW8Export. 2009-02-17 11:48:03 +0100 kendy r267941 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Now outputting footnotes and endnotes. Their styles are not output correctly yet, thus the number of the footnote resp. endnote is not distinguished from the text of the paragraph. Another problem that <w:endnoteRef/> is missing. 2009-02-17 11:47:42 +0100 kendy r267940 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Output of footnote/endnote references. And it's prepared for the output of footnote.xml resp. endnote.xml as well. 2009-02-17 11:47:21 +0100 kendy r267939 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> some more para properties: widows control, para-splitting and incomplete implementation of spacing 2009-02-17 11:46:59 +0100 kendy r267938 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Make a bit more obvious what's happenning with AttributeLists. 2009-02-17 11:46:38 +0100 kendy r267937 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Part of the footnote/endnote stuff is shared now between binary and docx. It is just a small part, but better than nothing ;-) I'm not sure that sharing more is possible/reasonable at all... 2009-02-17 11:46:16 +0100 kendy r267936 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> adding paragraph indentation 2009-02-17 11:45:56 +0100 kendy r267935 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Rename AddWordBookmark() -> AppendWordBookmark(). 2009-02-17 11:45:36 +0100 kendy r267934 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Remove 2nd param from AppendBookmark(), nobody was using that anyway. 2009-02-17 11:45:19 +0100 kendy r267933 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Readability improvements in WW8_WrPlcSubDoc::WriteGenericPlc(). 2009-02-17 11:44:53 +0100 kendy r267932 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Better readable WW8_WrPlcSubDoc::WriteGenericTxt(). 2009-02-17 11:44:35 +0100 kendy r267931 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Move WriteSpecialText() from WW8Export to MSWordExportBase. 2009-02-17 11:44:12 +0100 kendy r267930 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Support for color value 'auto' - used often in the styles. 2009-02-17 11:43:48 +0100 kendy r267929 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Comment the mark()/mergeTopMarks() magic for paragraphs + par. properties. 2009-02-17 11:43:31 +0100 kendy r267928 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Remove the styles debug output. 2009-02-17 11:43:14 +0100 kendy r267927 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Output of styles reworked. The ooxml stuff is implemented as well, but not tested yet. 2009-02-17 11:42:54 +0100 kendy r267926 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Output word/styles.xml - empty one for now. 2009-02-17 11:42:36 +0100 kendy r267925 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> Paragraph properties framework + tab stop + paragraph justification + converting some tabs to 4 spaces 2009-02-17 11:42:18 +0100 kendy r267924 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> More preparations for outputting the styles table in docx. 2009-02-17 11:41:56 +0100 kendy r267923 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Initialize pStyles even for docx. MSWordStyles was changed so that it can be initialized from any pDoc, it needs WW8Export just for writing ww8 styles. 2009-02-17 11:41:36 +0100 kendy r267922 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Rename WW8WrtStyle to MSWordStyles. 2009-02-17 11:41:14 +0100 kendy r267921 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Uncomment nStyleBeforeFly = GetId( lcl_getFormatCollection( *this, &rNode ) ); 2009-02-17 11:40:50 +0100 kendy r267920 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> oops, write actually the lang property 2009-02-17 11:40:24 +0100 kendy r267919 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> character kerning and character language 2009-02-17 11:40:06 +0100 kendy r267918 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> implement font names and also the asian layout part of run properties 2009-02-17 11:39:41 +0100 kendy r267917 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> this looks like a typo, it should be EndBracket for this one, I assume 2009-02-17 11:39:21 +0100 kendy r267916 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> removing some unnecessary warnings 2009-02-17 11:38:56 +0100 kendy r267915 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> OutputTableNode() finally moved to MSWordExportBase. EndTableRow() from *AttributeOutput gets too much parameters now, but unfortunately, at the moment it was the easiest solution. As more functionality will move to the actuall cell output, this will get a bit nicer I hope ;-) 2009-02-17 11:38:36 +0100 kendy r267913 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Trivial output of table cells. Still not complete, OutputTableNode() still contains some WW8-only stuff. 2009-02-17 11:38:10 +0100 kendy r267912 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Reduced code in DocxAttributeOutput::RunText()/impl_RunText(). 2009-02-17 11:37:51 +0100 kendy r267911 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> handle also tabs :) 2009-02-17 11:37:28 +0100 kendy r267910 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> generically filter out any character that is ascii < 0x20 from the string we write to the file 2009-02-17 11:37:10 +0100 kendy r267909 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> wrap debug output in #if #endif statements 2009-02-17 11:36:48 +0100 kendy r267908 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> StartTableRow(), EndTableRow(), and TableRowProperties() for *AttributeOutput. And the appropriate rework in OutputTableNode() (still no ooxml output yet, but getting closer. 2009-02-17 11:36:29 +0100 kendy r267907 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> StartTable() and EndTable() for *AttributeOutput. And the appropriate rework in OutputTableNode() [which is still let in WW8Export, but it's move to MSWordExportBase is close ;-)]. 2009-02-17 11:36:09 +0100 kendy r267906 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Improve readability in OutputTableNode; Out_SfxBreakItems -> MSWordExportBase. Out_SfxBreakItems was also renamed to OutputSfxBreakItems. 2009-02-17 11:35:50 +0100 kendy r267905 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Cosmetic change: OutputFlyFrameImpl() -> OutputFlyFrame_Impl(). 2009-02-17 11:35:30 +0100 kendy r267904 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Change WW8SaveData into SaveData() and RestoreData() methods. WW8SaveData was hard to extend to be able to handle WW8Export and DocxExport at the same time; so instead there are now SaveData() and RestoreData() virtual methods in MSWordExportBase, and the appropriate additions are solved directly in WW8Export (nothing for DocxExport [yet?]). 2009-02-17 11:35:12 +0100 kendy r267903 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Write line breaks. 2009-02-17 11:34:54 +0100 kendy r267902 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> More from WW8Export::ExportDocument_Impl() to MSWordExportBase::ExportDocument(). 2009-02-17 11:34:36 +0100 kendy r267901 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Rename StoreDoc() to ExportDocument(), and move it to MSWordExportBase. The format-dependant parts were moved to a virtual ExportDocument_Impl(). 2009-02-17 11:34:19 +0100 kendy r267900 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Explicitely default construct maMarkStack [to be safe ;-)]. 2009-02-17 11:34:01 +0100 kendy r267899 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Fix few crashes in DocAttributeOutput.cxx (missing FSNS() in vararg). 2009-02-17 11:33:43 +0100 kendy r267898 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Rename writeMarked() to mergeTopMarks() and improve the implementation. Just writing the top mark is not enough; in more complex scenarios it would destroy the order completely. This way we have better control over what's happening, and can nest the mark()/mergeTopMarks()/mergeTopMarks( true ) as necessary directly in the start/end tags. 2009-02-17 11:33:25 +0100 kendy r267897 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Use serializer's mark() and writeMarked() to change order of <t> and <rPr> ... instead of using m_aText to remember the content of the text. That wouldn't work later anyway - we will probably need to change the order of the paragraph properties and text runs as well which will be done easily using mark() and writeMarked() as well. 2009-02-17 11:33:06 +0100 kendy r267896 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Outputting docx runs with attributes works now. 2009-02-17 11:32:48 +0100 kendy r267895 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> The msword filter compiles again. Added empty implementations of the virtual methods to DocxExport and DocxAttributeBase [printing 'TODO Blah::bleh()' ;-)]. The thing binary output still passes the testsuite, yay! 2009-02-17 11:32:30 +0100 kendy r267894 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> OutputTextNode() is not virtual any more and sits in MSWordExportBase. Lots of stuff has been moved around again - mostly from WW8Export to MSWordExportBase (for the gerenalized stuff) and to WW8AttributeOutput (for the 'hardcore' output of bytes/sprms/data/...) At the moment, it compiles, but the docx part of the filter does not link thanks to the missing implementation of DocxAttributeOutput methods (the new ones). 2009-02-17 11:32:11 +0100 kendy r267893 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Documentation updates. 2009-02-17 11:31:48 +0100 kendy r267892 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Change harcoded sprm ids to consts (reused from writerfilter). This adds a build dependency of sw on writerfilter - hopefully it's OK. 2009-02-17 11:31:28 +0100 kendy r267891 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Get rid of *NodeOutput classes, the code belongs directly to *Export. The callbacks I moved to newly created classes NodeOutputBase, WW8NodeOutput, or DocxNodeOutput respectively in fact should not be in separate classes, but directy in MSWordExportBase, WW8Export, or DocxExport respectively. This commit moves them accordingly. 2009-02-17 11:31:06 +0100 kendy r267890 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> bUnicode -> m_rWW8Export.bWrtWW8; it's the same in this context. 2009-02-17 11:30:44 +0100 kendy r267889 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Remove unnecessary {} block. 2009-02-17 11:30:24 +0100 kendy r267888 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Several German comments to English. 2009-02-17 11:30:08 +0100 kendy r267887 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Move pO cleanup directly into aAttrIter.OutAttr(). 2009-02-17 11:29:44 +0100 kendy r267886 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Shorten WW8NodeOutput::TextNode() by moving SwFmtDrop output to a separate method. 2009-02-17 11:29:22 +0100 kendy r267885 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Unified the use of m_rWW8Export.pO in WW8NodeOutput::TextNode(). In some cases, it was used as m_rWW8Export.pO, in the others as only pO (but meaning the same thing). Changed all the occurences to the simple pO to improve readability. 2009-02-17 11:29:00 +0100 kendy r267884 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> and other attributes coming in; we start to have all the more or less easy ones covered now 2009-02-17 11:28:43 +0100 kendy r267883 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> some more attributes are comming in 2009-02-17 11:28:26 +0100 kendy r267882 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Create DocxNodeOutput. The basic one with a trivial implementation of TexNode() method so that it at least outputs all the paragraphs as one text run. 2009-02-17 11:28:03 +0100 kendy r267881 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> WriteText() moved from WW8Export do MSWordExportBase. And some refactoring implied by the move. 2009-02-17 11:27:35 +0100 kendy r267880 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> some more character attributes implemented 2009-02-17 11:27:18 +0100 kendy r267879 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> some text attributes + build fixes (not very informative, but it is me) 2009-02-17 11:26:57 +0100 kendy r267878 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> WW8Export holds an instance of WW8NodeOutput. Instead of creating a new one with every call of WW8Export::WriteText(). 2009-02-17 11:26:35 +0100 kendy r267877 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Get rid of aWW8NodeFnTab callbacks. Introduce NodeOutputBase/WW8NodeOutput instead, and change the OutWW8_* functions to the WW8NodeOutput methods. 2009-02-17 11:26:13 +0100 kendy r267876 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> pCurPam and pOrigPam back to MSWordExportBase. Looks necessary there... 2009-02-17 11:25:52 +0100 kendy r267875 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> DocxAttributeOutput implementation. So far just bare bones printing TODO's to stderr + output of real <w:b/> and <w:i/>; also nothing instantiates it yet. 2009-02-17 11:25:30 +0100 kendy r267874 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Fixed a problem that more attributes were exported than necessary. 2009-02-17 11:25:10 +0100 kendy r267873 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Moving more stuff from MSWordExportBase to WW8Export. pCurPam and pOrigPam, pO, and pTableStream and pDataStream. Hopefully I won't have to move them back at some stage ;-) 2009-02-17 11:24:49 +0100 kendy r267872 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Cosmetic. 2009-02-17 11:24:27 +0100 kendy r267871 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> fix nondebug build too 2009-02-17 11:24:07 +0100 kendy r267870 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> After rework - even saves a trivial document :-) 2009-02-17 11:23:45 +0100 kendy r267869 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> SwWW8Writer and the attributes rework compiles now. Of course, no idea yet if it works at all. 2009-02-17 11:23:25 +0100 kendy r267868 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Ancestor of MSWordExportBase for docx. Just a dump of the work, still just writing the 'Hello, world!' document [if it compiled, which it does not ;-)] 2009-02-17 11:23:03 +0100 kendy r267867 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Instead of callbacks, use virtual functions to output attributes. This is just a dump of the rewrite, for sure does not compile. All the SwWW8Out_ callbacks were moved to a class dedicated for output - WW8AttributeOutput. It is a descendant of AttributeOutputBase; there will be a separate implementation for the docx case. 2009-02-17 11:22:43 +0100 kendy r267866 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Partial split of SwWW8Writer. Introduced a new structure - the logic of the filter will be in class MSWordExportBase, from which we will derive WW8Export and DocxExport. SwWW8Writer has been split into WW8Export (for the logic) and SwWW8Writer (for the actual access to the stream). For most of the methods it means renaming SwWW8Writer::MethodName() to WW8Export::MethodName() + cleaning access to the attributes/other methods. All this is not finished yet, and does not even compile - but it is necessary to dump the current status ;-) 2009-02-17 11:22:25 +0100 kendy r267865 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> do the filter forwarding the pure UNO way (hell expensive, but no build dependency on anything) 2009-02-17 11:22:06 +0100 kendy r267864 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> yay, we have the same component doing the import and export for word 2007 2009-02-17 11:21:46 +0100 kendy r267863 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> more work towards having the import and export in the same component 2009-02-17 11:21:20 +0100 kendy r267862 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> starting to forward export in writerfilter 2009-02-17 11:20:58 +0100 kendy r267860 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> trying to fix some of the registration stuff 2009-02-17 11:20:35 +0100 kendy r267859 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Exporting a real document. So far just a hardcoded 'Hello, world!' of course ;-) 2009-02-17 11:20:13 +0100 kendy r267858 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Renamed DocxWriter to DocxExportFilter. (...and also the files that contain it) 2009-02-17 11:19:52 +0100 kendy r267857 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> The initial exporter. Can be chosen from the menu, but so far we can just get a SwDoc* in the exportDocument() method, and consequently the exported file has zero size. 2009-02-17 11:19:30 +0100 kendy r267854 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Simple output of the styles. As just the <w:b/> and <w:i/> attributes work for now, the output is not much helpful ;-) - but as a proof-of-concept, this must be enough... 2009-02-17 11:15:14 +0100 kendy r267852 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> The fonts are between <w:fonts> and </w:fonts>. 2009-02-17 11:11:06 +0100 kendy r267851 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Proof-of-concept saving the fonts (word/fontTable.xml). As with the previous commits, it is just dumped to stderr. 2009-02-17 11:08:36 +0100 kendy r267850 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Proof-of-concept saving attributes of the text runs. Still using the DOCX debug class, which will be gone in the real implementation. 2009-02-17 11:04:40 +0100 kendy r267848 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky <kendy@suse.cz> Proof-of-concept save of paragraphs/runs/text. The paragraph pieces of DOCX just get dumped to stdout while saving the 'normal' DOC. This is just a hacky way of doing it, will be cleaned up (and converted to actual output to a stream) when I get the attributes, and distinction between main document/headers/footers/etc. right. 2009-02-17 11:02:54 +0100 kendy r267847 : #i96319# WW8 filter rework + docx export From: Fridrich Strba <fstrba@novell.com> Make writerfilter export filter too (at least formally) 2009-02-16 22:48:29 +0100 kendy r267840 : CWS-TOOLING: rebase CWS ooxml03 to trunk@267171 (milestone: DEV300:m41)
author: Release Engineers <releng@openoffice.org> 2009-08-25 11:00:47 +0000
committer: Release Engineers <releng@openoffice.org> 2009-08-25 11:00:47 +0000
commit: 683075355577530673bfee031ed79ce1cbfd77b7 (patch)
tree: 85e80c888c4d38201acfcfb06c89ed438e75686b /svx/source
parent: cfdf021edce4f9a451b78c30424e1d7680aa6fea (diff)
70 files changed, 949 insertions, 1339 deletions
diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk
index f953adc1dd..8b1802bf1a 100755
--- a/svx/source/accessibility/makefile.mk
+++ b/svx/source/accessibility/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..$/..
 
 PRJNAME=svx
 TARGET=accessibility
+LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -42,7 +43,12 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =	\
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
+    $(SLO)$/AccessibleStringWrap.obj
+
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
     $(SLO)$/charmapacc.obj						\
     $(SLO)$/svxrectctaccessiblecontext.obj		\
     $(SLO)$/GraphCtlAccessibleContext.obj		\
@@ -63,13 +69,14 @@ SLOFILES =	\
     $(SLO)$/AccessibleStaticTextBase.obj		\
     $(SLO)$/AccessibleParaManager.obj			\
     $(SLO)$/AccessibleEditableTextPara.obj		\
-    $(SLO)$/AccessibleStringWrap.obj			\
     $(SLO)$/AccessibleImageBullet.obj			\
     $(SLO)$/ShapeTypeHandler.obj				\
     $(SLO)$/SvxShapeTypes.obj					\
     $(SLO)$/AccessibleControlShape.obj			\
     $(SLO)$/DGColorNameLookUp.obj				\
     $(SLO)$/AccessibleFrameSelector.obj
+    
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
 
 SRS2NAME = accessibility
 SRC2FILES = accessibility.src
diff --git a/svx/source/cui/showcols.cxx b/svx/source/cui/showcols.cxx
index d226ecade4..af6f4a54ea 100644
--- a/svx/source/cui/showcols.cxx
+++ b/svx/source/cui/showcols.cxx
@@ -36,19 +36,17 @@
 #endif
 #include "showcols.hxx"
 
-#ifndef _SVX_FMRESIDS_HRC
 #include "fmresids.hrc"
-#endif
 #include <tools/shl.hxx>
 #include <svx/dialmgr.hxx>
 #include <vcl/msgbox.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
-#include "fmstatic.hxx" //CHINA001 
 
-IMPLEMENT_CONSTASCII_USTRING(CUIFM_PROP_HIDDEN, "Hidden");
-IMPLEMENT_CONSTASCII_USTRING(CUIFM_PROP_LABEL,"Label");
+#define CUIFM_PROP_HIDDEN rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Hidden" ) )
+#define CUIFM_PROP_LABEL  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" ) )
+
 //==========================================================================
 //	FmShowColsDialog
 //==========================================================================
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/source/customshapes/EnhancedCustomShape2d.hxx
index b1b4ba47d9..134118e3bf 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.hxx
@@ -32,28 +32,19 @@
 #define _ENHANCEDCUSTOMSHAPE2D_HXX
 
 #include <svx/msdffdef.hxx>
-#include <svx/msdffimp.hxx>
 #include <svx/sdasitm.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#ifndef _com_sun_star_beans_PropertyValues_hpp__
 #include <com/sun/star/beans/PropertyValues.hpp>
-#endif
 #include <com/sun/star/awt/Point.hpp>
 #include <svtools/itemset.hxx>
-#ifndef __com_sun_star_drawing_EnhancedCustomShapeParameterPair_hpp__
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
-#endif
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp>
-#ifndef __COM_SUN_STAR_DRAWING_ENHANCEDCUSTOMSHAPETEXTFRAME_HPP__
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
-#endif
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <EnhancedCustomShapeFunctionParser.hxx>
 
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
 #include <boost/shared_ptr.hpp>
-#endif
 #include <vector>
 
 #define DFF_CUSTOMSHAPE_FLIP_V		1
@@ -84,6 +75,7 @@ class SvxMSDffAdjustmentHandle;
 // between X_RANGE and Y_RANGE
 
 class SdrPathObj;
+
 class EnhancedCustomShape2d : public SfxItemSet
 {
         SdrObject*					pCustomShapeObj;
@@ -164,17 +156,17 @@ class EnhancedCustomShape2d : public SfxItemSet
         sal_Bool					IsFlipHorz() { return bFlipH; };
         sal_Int32					GetRotateAngle() { return nRotateAngle; };
 
-        SdrObject*					CreateLineGeometry();
-        SdrObject*					CreateObject( sal_Bool bLineGeometryNeededOnly );
-        void						ApplyGluePoints( SdrObject* pObj );
-        Rectangle					GetTextRect() const;
+        SVX_DLLPUBLIC SdrObject*					CreateLineGeometry();
+        SVX_DLLPUBLIC SdrObject*					CreateObject( sal_Bool bLineGeometryNeededOnly );
+        SVX_DLLPUBLIC void						ApplyGluePoints( SdrObject* pObj );
+        SVX_DLLPUBLIC Rectangle					GetTextRect() const;
 
-        sal_uInt32					GetHdlCount() const;
-        sal_Bool					GetHandlePosition( const sal_uInt32 nIndex, Point& rReturnPosition ) const;
-        sal_Bool					SetHandleControllerPosition( const sal_uInt32 nIndex, const com::sun::star::awt::Point& rPosition );
+        SVX_DLLPUBLIC sal_uInt32					GetHdlCount() const;
+        SVX_DLLPUBLIC sal_Bool					GetHandlePosition( const sal_uInt32 nIndex, Point& rReturnPosition ) const;
+        SVX_DLLPUBLIC sal_Bool					SetHandleControllerPosition( const sal_uInt32 nIndex, const com::sun::star::awt::Point& rPosition );
 
-        EnhancedCustomShape2d( SdrObject* pSdrObjCustomShape );
-        ~EnhancedCustomShape2d();
+        SVX_DLLPUBLIC EnhancedCustomShape2d( SdrObject* pSdrObjCustomShape );
+        SVX_DLLPUBLIC ~EnhancedCustomShape2d();
 
         enum EnumFunc
         {
@@ -198,15 +190,15 @@ class EnhancedCustomShape2d : public SfxItemSet
         double						GetEquationValueAsDouble( const sal_Int32 nIndex ) const;
         sal_Int32					GetAdjustValueAsInteger( const sal_Int32 nIndex, const sal_Int32 nDefault = 0 ) const;
 
-        static rtl::OUString		GetEquation( const sal_uInt16 nFlags, sal_Int16 nPara1, sal_Int16 nPara2, sal_Int16 nPara3 );
+        SVX_DLLPUBLIC static rtl::OUString		GetEquation( const sal_uInt16 nFlags, sal_Int16 nPara1, sal_Int16 nPara2, sal_Int16 nPara3 );
 
         static void					AppendEnhancedCustomShapeEquationParameter( rtl::OUString& rParameter, const sal_Int16 nPara, const sal_Bool bIsSpecialValue );
 
         static void					SetEnhancedCustomShapeEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
                                         rParameter, const sal_Int16 nPara, const sal_Bool bIsSpecialValue );
-        static void					SetEnhancedCustomShapeParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
+        SVX_DLLPUBLIC static void					SetEnhancedCustomShapeParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
                                         rParameter, const sal_Int32 nValue );
-        static void					SetEnhancedCustomShapeHandleParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
+        SVX_DLLPUBLIC static void					SetEnhancedCustomShapeHandleParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
                                         rParameter, const sal_Int32 nPara, const sal_Bool bIsSpecialValue, sal_Bool bHorz );
         static sal_Bool				ConvertSequenceToEnhancedCustomShape2dHandle( const com::sun::star::beans::PropertyValues& rHandleProperties,
                                         EnhancedCustomShape2d::Handle& rDestinationHandle );
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx
index f7f4acd85a..45d98d9e4c 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx
@@ -31,14 +31,15 @@
 #ifndef _ENHANCEDCUSTOMSHAPE3D_HXX
 #define _ENHANCEDCUSTOMSHAPE3D_HXX
 
-#include <svx/msdffimp.hxx>
 #include <vector>
-//#include <poly3d.hxx>
-//#include <goodies/point3d.hxx>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
 #include <basegfx/point/b3dpoint.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 
+#include <tools/gen.hxx>
+
+class SdrObject;
+
 class EnhancedCustomShape3d
 {
     class Transformation2D
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
index 30e5bb4e7c..d216c5bb48 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
@@ -93,12 +93,12 @@ struct mso_CustomShape
 #define MSO_I | (sal_Int32)0x80000000
 
 sal_Bool			SortFilledObjectsToBackByDefault( MSO_SPT eSpType );
-sal_Bool			IsCustomShapeFilledByDefault( MSO_SPT eSpType );
-sal_Int16			GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType );
+SVX_DLLPUBLIC sal_Bool			IsCustomShapeFilledByDefault( MSO_SPT eSpType );
+SVX_DLLPUBLIC sal_Int16			GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType );
 
 // #i28269# 
-sal_Bool			IsCustomShapeStrokedByDefault( MSO_SPT eSpType );
+SVX_DLLPUBLIC sal_Bool			IsCustomShapeStrokedByDefault( MSO_SPT eSpType );
 
-const mso_CustomShape*	GetCustomShapeContent( MSO_SPT eSpType );
+SVX_DLLPUBLIC const mso_CustomShape*	GetCustomShapeContent( MSO_SPT eSpType );
 
 #endif
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
index a42a05b233..a24f11ebf0 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
@@ -33,12 +33,10 @@
 #include <svx/msdffdef.hxx>
 #include <rtl/ustring.hxx>
 
-class EnhancedCustomShapeTypeNames
+namespace EnhancedCustomShapeTypeNames
 {
-    public :
-
-    static MSO_SPT Get( const rtl::OUString& );
-    static rtl::OUString Get( const MSO_SPT );
-};
+    SVX_DLLPUBLIC MSO_SPT Get( const rtl::OUString& );
+    SVX_DLLPUBLIC rtl::OUString Get( const MSO_SPT );
+}
 
 #endif
diff --git a/svx/source/customshapes/makefile.mk b/svx/source/customshapes/makefile.mk
index a81910b830..9940a9bb21 100644
--- a/svx/source/customshapes/makefile.mk
+++ b/svx/source/customshapes/makefile.mk
@@ -32,6 +32,7 @@
 PRJ=..$/..
 PRJNAME=svx
 TARGET=customshapes
+LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings ----------------------------------
@@ -50,16 +51,23 @@ NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
 
 # --- Files -------------------------------------
 
-SLOFILES=	$(SLO)$/EnhancedCustomShapeEngine.obj			\
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
             $(SLO)$/EnhancedCustomShapeTypeNames.obj		\
             $(SLO)$/EnhancedCustomShapeGeometry.obj			\
             $(SLO)$/EnhancedCustomShape2d.obj				\
+            $(SLO)$/EnhancedCustomShapeFunctionParser.obj
+
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+            $(SLO)$/EnhancedCustomShapeEngine.obj			\
             $(SLO)$/EnhancedCustomShape3d.obj				\
             $(SLO)$/EnhancedCustomShapeFontWork.obj			\
             $(SLO)$/EnhancedCustomShapeHandle.obj			\
-            $(SLO)$/EnhancedCustomShapeFunctionParser.obj	\
             $(SLO)$/tbxcustomshapes.obj
 
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index 04865246a9..c54081365a 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/makefile.mk
@@ -31,6 +31,7 @@
 PRJ=..$/..
 PRJNAME=svx
 TARGET=dialogs
+LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -76,9 +77,28 @@ SRC1FILES =  \
 
 SRS2NAME=drawdlgs
 SRC2FILES =  \
-        sdstring.src \
+        sdstring.src
 
-SLOFILES= \
+LIB1TARGET=$(SLB)$/$(TARGET)-core.lib
+
+LIB1OBJFILES= \
+        $(SLO)$/dialmgr.obj\
+        $(SLO)$/dlgutil.obj \
+        $(SLO)$/framelink.obj\
+        $(SLO)$/hangulhanja.obj \
+        $(SLO)$/hyphen.obj \
+        $(SLO)$/impgrf.obj \
+        $(SLO)$/langbox.obj \
+        $(SLO)$/opengrf.obj \
+        $(SLO)$/simptabl.obj \
+        $(SLO)$/splwrap.obj \
+        $(SLO)$/svxdlg.obj \
+        $(SLO)$/stddlg.obj \
+        $(SLO)$/thesdlg.obj
+
+LIB2TARGET=$(SLB)$/$(TARGET).lib
+
+LIB2OBJFILES= \
         $(SLO)$/charmap.obj \
         $(SLO)$/checklbx.obj \
         $(SLO)$/connctrl.obj \
@@ -86,31 +106,23 @@ SLOFILES= \
         $(SLO)$/ctredlin.obj \
         $(SLO)$/databaseregistrationui.obj \
         $(SLO)$/dialcontrol.obj \
-        $(SLO)$/dialmgr.obj\
         $(SLO)$/dlgctl3d.obj \
         $(SLO)$/dlgctrl.obj \
-        $(SLO)$/dlgutil.obj \
         $(SLO)$/docrecovery.obj \
         $(SLO)$/fntctrl.obj \
         $(SLO)$/fontlb.obj \
         $(SLO)$/fontwork.obj \
-        $(SLO)$/framelink.obj\
         $(SLO)$/framelinkarray.obj \
         $(SLO)$/frmdirlbox.obj \
         $(SLO)$/frmsel.obj \
         $(SLO)$/graphctl.obj \
         $(SLO)$/grfflt.obj \
-        $(SLO)$/hangulhanja.obj \
         $(SLO)$/hdft.obj \
         $(SLO)$/hyperdlg.obj \
-        $(SLO)$/hyphen.obj \
         $(SLO)$/hyprlink.obj \
         $(SLO)$/imapdlg.obj \
         $(SLO)$/imapwnd.obj \
-        $(SLO)$/impgrf.obj \
-        $(SLO)$/langbox.obj \
         $(SLO)$/measctrl.obj \
-        $(SLO)$/opengrf.obj \
         $(SLO)$/orienthelper.obj \
         $(SLO)$/pagectrl.obj \
         $(SLO)$/paraprev.obj \
@@ -122,21 +134,16 @@ SLOFILES= \
         $(SLO)$/rlrcitem.obj \
         $(SLO)$/rubydialog.obj \
         $(SLO)$/rulritem.obj \
-        $(SLO)$/simptabl.obj \
         $(SLO)$/SpellDialogChildWindow.obj \
-        $(SLO)$/splwrap.obj \
         $(SLO)$/srchctrl.obj \
         $(SLO)$/srchdlg.obj \
-        $(SLO)$/stddlg.obj \
         $(SLO)$/strarray.obj \
         $(SLO)$/svxbmpnumvalueset.obj\
         $(SLO)$/svxbox.obj \
-        $(SLO)$/svxdlg.obj \
         $(SLO)$/svxgrahicitem.obj \
         $(SLO)$/svxruler.obj \
         $(SLO)$/swframeexample.obj \
         $(SLO)$/swframeposstrings.obj \
-        $(SLO)$/thesdlg.obj \
         $(SLO)$/txencbox.obj \
         $(SLO)$/txenctab.obj \
         $(SLO)$/wrapfield.obj \
@@ -144,15 +151,17 @@ SLOFILES= \
         $(SLO)$/_contdlg.obj
 
 .IF "$(GUI)"=="UNX"
-SLOFILES +=    $(SLO)$/sendreportunx.obj
+LIB2OBJFILES +=    $(SLO)$/sendreportunx.obj
 .ELSE
 .IF "$(GUI)"=="WNT"
-SLOFILES +=	$(SLO)$/sendreportw32.obj
+LIB2OBJFILES +=	$(SLO)$/sendreportw32.obj
 .ELSE
-SLOFILES +=	$(SLO)$/sendreportgen.obj
+LIB2OBJFILES +=	$(SLO)$/sendreportgen.obj
 .ENDIF
 .ENDIF
 
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx
index 0f42cbd26f..3dd18bcd6b 100644
--- a/svx/source/editeng/editeng.cxx
+++ b/svx/source/editeng/editeng.cxx
@@ -86,11 +86,9 @@
 #include <vcl/help.hxx>
 #include <svx/xpoly.hxx>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-#ifndef _COM_SUN_STAR_I18N_XINPUTSEQUENCECHECKER_HPP_
 #include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
-#endif
 
-#include <srchdlg.hxx>
+#include <sfx2/srchdefs.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
 #include <svx/frmdiritem.hxx>
@@ -99,18 +97,11 @@
 
 // Spaeter -> TOOLS\STRING.H (fuer Grep: WS_TARGET)
 
-//using namespace ::rtl;
-//using namespace ::utl;
 using namespace ::com::sun::star;
-//using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::uno;
-//using namespace ::com::sun::star::lang;
-//using namespace ::com::sun::star::beans;
-//using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::linguistic2;
 
 
-
 DBG_NAME( EditEngine )
 DBG_NAMEEX( EditView )
 
diff --git a/svx/source/editeng/eertfpar.cxx b/svx/source/editeng/eertfpar.cxx
index b4e504b829..65c1b6c516 100644
--- a/svx/source/editeng/eertfpar.cxx
+++ b/svx/source/editeng/eertfpar.cxx
@@ -43,6 +43,19 @@
 
 #include <svtools/rtftoken.h>
 
+// alle Werte auf default; wird nach einlesen der Bitmap aufgerufen !
+void SvxRTFPictureType::ResetValues()
+{	// setze alle Werte RTF-Defaults
+    eStyle = RTF_BITMAP;
+    nMode = HEX_MODE;
+    nType = nGoalWidth = nGoalHeight = 0;
+    nWidth = nHeight = nWidthBytes = 0;
+    uPicLen = 0;
+    nBitsPerPixel = nPlanes = 1;
+    nScalX = nScalY = 100;		// Skalierung in Prozent
+    nCropT = nCropB = nCropL = nCropR = 0;
+}
+
 ImportInfo::ImportInfo( ImportState eSt, SvParser* pPrsrs, const ESelection& rSel )
     : aSelection( rSel )
 {
diff --git a/svx/source/engine3d/makefile.mk b/svx/source/engine3d/makefile.mk
index 4c03f949e9..bb590bd76c 100644
--- a/svx/source/engine3d/makefile.mk
+++ b/svx/source/engine3d/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..$/..
 
 PRJNAME=svx
 TARGET=engine3d
+LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -42,7 +43,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES= \
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
         $(SLO)$/e3dsceneupdater.obj \
         $(SLO)$/helperminimaldepth3d.obj	\
         $(SLO)$/helperhittest3d.obj			\
@@ -57,16 +59,21 @@ SLOFILES= \
         $(SLO)$/svx3ditems.obj	\
         $(SLO)$/deflt3d.obj		\
         $(SLO)$/e3dundo.obj     \
-        $(SLO)$/volume3d.obj	\
-        $(SLO)$/viewpt3d.obj	\
         $(SLO)$/viewpt3d2.obj	\
         $(SLO)$/camera3d.obj	\
         $(SLO)$/objfac3d.obj 	\
         $(SLO)$/dragmt3d.obj	\
         $(SLO)$/view3d.obj		\
-        $(SLO)$/view3d1.obj     \
+        $(SLO)$/view3d1.obj
+
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+        $(SLO)$/volume3d.obj	\
+        $(SLO)$/viewpt3d.obj	\
         $(SLO)$/float3d.obj
 
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+
 #disable optimizer for MSCompiler and ICC
 .IF "$(COM)"=="ICC" || "$(COM)"=="MSC"
 NOOPTFILES=\
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index bfc819f113..04a2b30b40 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -61,7 +61,6 @@ namespace svx
     using namespace ::com::sun::star::sdbcx;
     using namespace ::com::sun::star::container;
     using namespace ::com::sun::star::datatransfer;
-    using namespace ::svxform;
     using namespace ::comphelper;
 
     //====================================================================
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index d9e67ac2b2..d30ba00e27 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -60,7 +60,6 @@ namespace svx
     using namespace ::com::sun::star::sdbcx;
     using namespace ::com::sun::star::container;
     using namespace ::com::sun::star::datatransfer;
-    using namespace ::svxform;
     using namespace ::comphelper;
 
     //====================================================================
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index b499e494a6..649a9f4fa1 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1919,7 +1919,7 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
 
     sal_Bool bVoid = !Value.hasValue();
 
-    if ( 0 == PropertyName.compareToAscii( FM_PROP_TEXTLINECOLOR ) )
+    if ( 0 == PropertyName.compareTo( FM_PROP_TEXTLINECOLOR ) )
     {
         ::Color aTextLineColor( bVoid ? COL_TRANSPARENT : ::comphelper::getINT32( Value ) );
         if (bVoid)
@@ -1953,21 +1953,21 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
         if (isDesignMode())
             pGrid->Invalidate();
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_FONTEMPHASISMARK ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_FONTEMPHASISMARK ) )
     {
         Font aGridFont = pGrid->GetControlFont();
         sal_Int16 nValue = ::comphelper::getINT16(Value);
         aGridFont.SetEmphasisMark( nValue );
         pGrid->SetControlFont( aGridFont );
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_FONTRELIEF ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_FONTRELIEF ) )
     {
         Font aGridFont = pGrid->GetControlFont();
         sal_Int16 nValue = ::comphelper::getINT16(Value);
         aGridFont.SetRelief( (FontRelief)nValue );
         pGrid->SetControlFont( aGridFont );
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_HELPURL ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_HELPURL ) )
     {
         String sHelpURL(::comphelper::getString(Value));
         String sPattern;
@@ -1978,11 +1978,11 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
             pGrid->SetHelpId(sID.ToInt32());
         }
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_DISPLAYSYNCHRON ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) )
     {
         pGrid->setDisplaySynchron(::comphelper::getBOOL(Value));
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_CURSORCOLOR ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_CURSORCOLOR ) )
     {
         if (bVoid)
             pGrid->SetCursorColor(COL_TRANSPARENT);
@@ -1991,13 +1991,13 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
         if (isDesignMode())
             pGrid->Invalidate();
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_ALWAYSSHOWCURSOR ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_ALWAYSSHOWCURSOR ) )
     {
         pGrid->EnablePermanentCursor(::comphelper::getBOOL(Value));
         if (isDesignMode())
             pGrid->Invalidate();
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_FONT ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_FONT ) )
     {
         if ( bVoid )
             pGrid->SetControlFont( Font() );
@@ -2031,7 +2031,7 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
             }
         }
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_BACKGROUNDCOLOR ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_BACKGROUNDCOLOR ) )
     {
         if ( bVoid )
         {
@@ -2044,7 +2044,7 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
             pGrid->SetControlBackground( aColor );
         }
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_TEXTCOLOR ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_TEXTCOLOR ) )
     {
         if ( bVoid )
         {
@@ -2057,7 +2057,7 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
             pGrid->SetControlForeground( aColor );
         }
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_ROWHEIGHT ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_ROWHEIGHT ) )
     {
         sal_Int32 nLogHeight(0);
         if (Value >>= nLogHeight)
@@ -2070,17 +2070,17 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
         else if (bVoid)
             pGrid->SetDataRowHeight(0);
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_HASNAVIGATION ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_HASNAVIGATION ) )
     {
         if (Value.getValueType() == ::getBooleanCppuType())
             pGrid->EnableNavigationBar(*(sal_Bool*)Value.getValue());
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_RECORDMARKER ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_RECORDMARKER ) )
     {
         if (Value.getValueType() == ::getBooleanCppuType())
             pGrid->EnableHandle(*(sal_Bool*)Value.getValue());
     }
-    else if ( 0 == PropertyName.compareToAscii( FM_PROP_ENABLED ) )
+    else if ( 0 == PropertyName.compareTo( FM_PROP_ENABLED ) )
     {
         if (Value.getValueType() == ::getBooleanCppuType())
         {
@@ -2134,37 +2134,37 @@ Any FmXGridPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( Run
         FmGridControl* pGrid = (FmGridControl*) GetWindow();
         Window* pDataWindow  = &pGrid->GetDataWindow();
 
-        if ( 0 == _rPropertyName.compareToAscii( FM_PROP_NAME ) )
+        if ( 0 == _rPropertyName.compareTo( FM_PROP_NAME ) )
         {
             Font aFont = pDataWindow->GetControlFont();
             aProp <<= ImplCreateFontDescriptor( aFont );
         }
-        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_TEXTCOLOR ) )
+        else if ( 0 == _rPropertyName.compareTo( FM_PROP_TEXTCOLOR ) )
         {
             aProp <<= (sal_Int32)pDataWindow->GetControlForeground().GetColor();
         }
-        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_BACKGROUNDCOLOR ) )
+        else if ( 0 == _rPropertyName.compareTo( FM_PROP_BACKGROUNDCOLOR ) )
         {
             aProp <<= (sal_Int32)pDataWindow->GetControlBackground().GetColor();
         }
-        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_ROWHEIGHT ) )
+        else if ( 0 == _rPropertyName.compareTo( FM_PROP_ROWHEIGHT ) )
         {
             sal_Int32 nPixelHeight = pGrid->GetDataRowHeight();
             // take the zoom factor into account
             nPixelHeight = pGrid->CalcReverseZoom(nPixelHeight);
             aProp <<= (sal_Int32)pGrid->PixelToLogic(Point(0,nPixelHeight),MAP_10TH_MM).Y();
         }
-        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_HASNAVIGATION ) )
+        else if ( 0 == _rPropertyName.compareTo( FM_PROP_HASNAVIGATION ) )
         {
             sal_Bool bHasNavBar = pGrid->HasNavigationBar();
             aProp <<= (sal_Bool)bHasNavBar;
         }
-        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_RECORDMARKER ) )
+        else if ( 0 == _rPropertyName.compareTo( FM_PROP_RECORDMARKER ) )
         {
             sal_Bool bHasHandle = pGrid->HasHandle();
             aProp <<= (sal_Bool)bHasHandle;
         }
-        else if ( 0 == _rPropertyName.compareToAscii( FM_PROP_ENABLED ) )
+        else if ( 0 == _rPropertyName.compareTo( FM_PROP_ENABLED ) )
         {
             aProp <<= (sal_Bool)pDataWindow->IsEnabled();
         }
@@ -2948,7 +2948,7 @@ IMPL_LINK(FmXGridPeer, OnExecuteGridSlot, void*, pSlot)
             if (m_pDispatchers[i].is())
             {
                 // commit any changes done so far, if it's not the undoRecord URL
-                if ( 0 == pUrls->Complete.compareToAscii( FMURL_RECORD_UNDO ) || commit() )
+                if ( 0 == pUrls->Complete.compareTo( FMURL_RECORD_UNDO ) || commit() )
                     m_pDispatchers[i]->dispatch(*pUrls, Sequence< PropertyValue>());
 
                 return 1;	// handled
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 4878340204..0442a5e1e8 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -651,10 +651,10 @@ void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(R
 
     Reference< XPropertySet > xSourceProps( _rEvent.Source, UNO_QUERY );
 
-    if  (   _rEvent.PropertyName.equalsAscii( FM_PROP_VALUE )
-        ||  _rEvent.PropertyName.equalsAscii( FM_PROP_STATE )
-        ||  _rEvent.PropertyName.equalsAscii( FM_PROP_TEXT )
-        ||  _rEvent.PropertyName.equalsAscii( FM_PROP_EFFECTIVE_VALUE )
+    if  (   _rEvent.PropertyName.equals( FM_PROP_VALUE )
+        ||  _rEvent.PropertyName.equals( FM_PROP_STATE )
+        ||  _rEvent.PropertyName.equals( FM_PROP_TEXT )
+        ||  _rEvent.PropertyName.equals( FM_PROP_EFFECTIVE_VALUE )
         )
     {   // it was one of the known "value" properties
         if ( !isValuePropertyLocked() )
@@ -662,11 +662,11 @@ void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(R
             implValuePropertyChanged( );
         }
     }
-    else if ( _rEvent.PropertyName.equalsAscii( FM_PROP_READONLY ) )
+    else if ( _rEvent.PropertyName.equals( FM_PROP_READONLY ) )
     {
         implAdjustReadOnly( xSourceProps );
     }
-    else if ( _rEvent.PropertyName.equalsAscii( FM_PROP_ENABLED ) )
+    else if ( _rEvent.PropertyName.equals( FM_PROP_ENABLED ) )
     {
         implAdjustEnabled( xSourceProps );
     }
@@ -2429,7 +2429,7 @@ DbComboBox::DbComboBox(DbGridColumn& _rColumn)
 //------------------------------------------------------------------------------
 void DbComboBox::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( RuntimeException )
 {
-    if ( _rEvent.PropertyName.equalsAscii( FM_PROP_STRINGITEMLIST ) )
+    if ( _rEvent.PropertyName.equals( FM_PROP_STRINGITEMLIST ) )
     {
         SetList(_rEvent.NewValue);
     }
@@ -2558,7 +2558,7 @@ DbListBox::DbListBox(DbGridColumn& _rColumn)
 //------------------------------------------------------------------------------
 void DbListBox::_propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw( RuntimeException )
 {
-    if ( _rEvent.PropertyName.equalsAscii( FM_PROP_STRINGITEMLIST ) )
+    if ( _rEvent.PropertyName.equals( FM_PROP_STRINGITEMLIST ) )
     {
         SetList(_rEvent.NewValue);
     }
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index 2fc232f55b..561be8ab69 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -36,23 +36,6 @@
 #include "fmservs.hxx"
 #include "fmtools.hxx"
 
-namespace svxform
-{
-
-    IMPLEMENT_CONSTASCII_USTRING(FM_COL_TEXTFIELD, "TextField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COL_COMBOBOX, "ComboBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COL_CHECKBOX, "CheckBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COL_TIMEFIELD, "TimeField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COL_DATEFIELD, "DateField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COL_NUMERICFIELD, "NumericField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COL_CURRENCYFIELD, "CurrencyField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COL_PATTERNFIELD, "PatternField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COL_LISTBOX, "ListBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COL_FORMATTEDFIELD, "FormattedField");
-
-}   // namespace svxform
-using namespace ::svxform;
-
 //------------------------------------------------------------------------------
 const ::comphelper::StringSequence& getColumnTypes()
 {
@@ -81,7 +64,7 @@ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
     const ::rtl::OUString aCompatibleModelPrefix = ::rtl::OUString::createFromAscii("stardiv.one.form.component.");
 
     sal_Int32 nTypeId = -1;
-    if (aModelName == ::svxform::FM_COMPONENT_EDIT)
+    if (aModelName == FM_COMPONENT_EDIT)
         nTypeId = TYPE_TEXTFIELD;
     else
     {
diff --git a/svx/source/fmcomp/makefile.mk b/svx/source/fmcomp/makefile.mk
index a2387ef180..1e86308f9c 100644
--- a/svx/source/fmcomp/makefile.mk
+++ b/svx/source/fmcomp/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..$/..
 
 PRJNAME=svx
 TARGET=fmcomp
+LIBTARGET=NO
 
 ENABLE_EXCEPTIONS=TRUE
 
@@ -48,25 +49,20 @@ SRC1FILES= \
     gridctrl.src	\
     showcols.src
 
-#SLOFILES= \
-#	$(SLO)$/dbaexchange.obj	\
-#	$(SLO)$/gridcols.obj	\
-#	$(SLO)$/gridctrl.obj	\
-#	$(SLO)$/gridcell.obj	\
-#	$(SLO)$/fmgridcl.obj	\
-#	$(SLO)$/fmgridif.obj	\
-#	$(SLO)$/trace.obj
-
-SLOFILES= \
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
     $(SLO)$/dbaexchange.obj	\
-    $(SLO)$/dbaobjectex.obj	\
     $(SLO)$/gridcols.obj	\
     $(SLO)$/gridctrl.obj	\
     $(SLO)$/gridcell.obj	\
     $(SLO)$/fmgridcl.obj	\
     $(SLO)$/fmgridif.obj	\
-    $(SLO)$/trace.obj		\
+    $(SLO)$/trace.obj       \
     $(SLO)$/xmlexchg.obj
 
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+    $(SLO)$/dbaobjectex.obj
+
 .INCLUDE :  target.mk
 
diff --git a/svx/source/form/fmprop.cxx b/svx/source/form/fmprop.cxx
deleted file mode 100644
index e1a4beb7f1..0000000000
--- a/svx/source/form/fmprop.cxx
+++ /dev/null
@@ -1,195 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: fmprop.cxx,v $
- * $Revision: 1.22 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifndef _SVX_FMPROP_HRC
-#include "fmprop.hrc"
-#endif
-#include "fmstatic.hxx"
-
-#include <set>
-
-namespace svxform
-{
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_NAME,"Name");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CLASSID,"ClassId");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ROWCOUNT,"RowCount");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ROWCOUNTFINAL,"IsRowCountFinal");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_FETCHSIZE,"FetchSize");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_VALUE,"Value");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_TEXT,"Text");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_LABEL,"Label");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CANINSERT,"CanInsert");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CANUPDATE,"CanUpdate");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CANDELETE,"CanDelete");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_NAVIGATION,"NavigationBarMode");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_HASNAVIGATION,"HasNavigationBar");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CYCLE,"Cycle");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CONTROLSOURCE,"DataField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ENABLED,"Enabled");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_READONLY,"ReadOnly");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ISREADONLY,"IsReadOnly");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_FILTER,"Filter");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_AUTOINCREMENT,"IsAutoIncrement");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DATAENTRY,"DataEntry");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_WIDTH,"Width");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_SEARCHABLE,"IsSearchable");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_MULTILINE,"MultiLine");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_TARGET_URL,"TargetURL");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DEFAULTCONTROL,"DefaultControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_MAXTEXTLEN,"MaxTextLen");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_EDITMASK,"EditMask");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_SPIN,"Spin");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DATE,"Date");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_TIME,"Time");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_STATE,"State");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_TRISTATE,"TriState");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_STRINGITEMLIST,"StringItemList");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DEFAULT_TEXT,"DefaultText");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DEFAULTCHECKED,"DefaultState");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_FORMATKEY,"FormatKey");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_FORMATSSUPPLIER,"FormatsSupplier");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_LISTSOURCETYPE,"ListSourceType");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_LISTSOURCE,"ListSource");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_SELECT_SEQ,"SelectedItems");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_VALUE_SEQ,"ValueItemList");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DEFAULT_SELECT_SEQ,"DefaultSelection");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ALIGN,"Align");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DEFAULT_DATE,"DefaultDate");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DEFAULT_TIME,"DefaultTime");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DEFAULT_VALUE,"DefaultValue");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DECIMAL_ACCURACY,"DecimalAccuracy");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CURSORSOURCE,"DataSelection");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CURSORSOURCETYPE,"DataSelectionType");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_FIELDTYPE,"Type");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_REFVALUE,"RefValue");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_VALUEMIN,"ValueMin");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_VALUEMAX,"ValueMax");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_STRICTFORMAT,"StrictFormat");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_LITERALMASK,"LiteralMask");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_VALUESTEP,"ValueStep");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_SHOWTHOUSANDSEP,"ShowThousandsSeparator");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CURRENCYSYMBOL,"CurrencySymbol");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DATEFORMAT,"DateFormat");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DATEMIN,"DateMin");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DATEMAX,"DateMax");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DATE_SHOW_CENTURY,"DateShowCentury");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_TIMEFORMAT, "TimeFormat");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_TIMEMIN, "TimeMin");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_TIMEMAX,"TimeMax");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_LINECOUNT,"LineCount");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_BOUNDCOLUMN, "BoundColumn");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_FONT,"FontDescriptor");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_BACKGROUNDCOLOR,"BackgroundColor");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_TEXTCOLOR,"TextColor");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_BORDER,"Border");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DROPDOWN,"Dropdown");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ROWHEIGHT,"RowHeight");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_HELPTEXT, "HelpText");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_HELPURL, "HelpURL");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_RECORDMARKER, "HasRecordMarker");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_BOUNDFIELD, "BoundField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_VALUE, "EffectiveValue");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_DEFAULT, "EffectiveDefault");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_MIN, "EffectiveMin");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_MAX, "EffectiveMax");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_HIDDEN, "Hidden");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_FILTERPROPOSAL, "UseFilterValueProposal");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_FIELDSOURCE, "FieldSource");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_TABLENAME, "TableName");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_FILTERSUPPLIER, "FilterSupplier");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CURRENTFILTER, "CurrentFilter");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_SELECTED_FIELDS, "SelectedFields");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_SELECTED_TABLES, "SelectedTables");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_THREADSAFE, "ThreadSafe");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ISFILTERAPPLIED, "IsFilterApplied");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CONTROLLABEL, "LabelControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CURSORCOLOR, "CursorColor");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ALWAYSSHOWCURSOR, "AlwaysShowCursor");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DISPLAYSYNCHRON, "DisplayIsSynchron");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ISMODIFIED, "IsModified");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ISNEW, "IsNew");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_PRIVILEGES, "Privileges");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_COMMAND,"Command");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_COMMANDTYPE,"CommandType");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_RESULTSET_CONCURRENCY, "ResultSetConcurrency");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_INSERTONLY, "IgnoreResult");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_RESULTSET_TYPE, "ResultSetType");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ESCAPE_PROCESSING, "EscapeProcessing");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_APPLYFILTER, "ApplyFilter");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ISNULLABLE, "IsNullable");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ACTIVECOMMAND, "ActiveCommand");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ISCURRENCY, "IsCurrency");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_URL, "URL");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_ACTIVE_CONNECTION, "ActiveConnection");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_SORT, "Order");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_DATASOURCE, "DataSourceName");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_REALNAME,"RealName");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_CONTROLSOURCEPROPERTY,"DataFieldProperty");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_TEXTLINECOLOR, "TextLineColor");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_FONTEMPHASISMARK, "FontEmphasisMark");
-    IMPLEMENT_CONSTASCII_USTRING(FM_PROP_FONTRELIEF, "FontRelief");
-
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_SCROLLVALUE_MIN,             "ScrollValueMin"            );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_SCROLLVALUE_MAX,             "ScrollValueMax"            );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_DEFAULT_SCROLLVALUE,         "DefaultScrollValue"        );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_LINEINCREMENT,               "LineIncrement"             );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_BLOCKINCREMENT,              "BlockIncrement"            );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_ORIENTATION,                 "Orientation"               );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_REPEAT,                      "Repeat"                    );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_REPEATDELAY,                 "RepeatDelay"               );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_SYMBOLCOLOR,                 "SymbolColor"               );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_VISIBILESIZE,                "VisibleSize"               );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_SPINVALUE_MIN,               "SpinValueMin"              );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_SPINVALUE_MAX,               "SpinValueMax"              );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_DEFAULT_SPINVALUE,           "DefaultSpinValue"          );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_SPININCREMENT,               "SpinIncrement"             );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_LINEENDFORMAT,               "LineEndFormat"             );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_TOGGLE,                      "Toggle"                    );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_FOCUSONCLICK,                "FocusOnClick"              );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_HIDEINACTIVESELECTION,       "HideInactiveSelection"     );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_VISUALEFFECT,                "VisualEffect"              );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_BORDERCOLOR,                 "BorderColor"               );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_DYNAMIC_CONTROL_BORDER,      "DynamicControlBorder"      );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_CONTROL_BORDER_COLOR_FOCUS,  "ControlBorderColorOnFocus" );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_CONTROL_BORDER_COLOR_MOUSE,  "ControlBorderColorOnHover" );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_CONTROL_BORDER_COLOR_INVALID,"ControlBorderColorOnInvalid" );
-
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_BUTTON_TYPE, "ButtonType" );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_FORM_OPERATIONS, "FormOperations" );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_INPUT_REQUIRED, "InputRequired" );
-
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_WRITING_MODE, "WritingMode" );
-    IMPLEMENT_CONSTASCII_USTRING( FM_PROP_MOUSE_WHEEL_BEHAVIOR, "MouseWheelBehavior" );
-
-}	// namespace svxform
-
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index cd62117010..d41886c844 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -31,76 +31,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <com/sun/star/container/XSet.hpp>
-#include "fmstatic.hxx"
 #include <cppuhelper/factory.hxx>
 #include <comphelper/processfactory.hxx>
-
-namespace svxform
-{
-
-    // -----------------------
-    // service names for compatibility
-    // -----------------------
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_EDIT,"stardiv.one.form.component.Edit");			// compatibility
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_TEXTFIELD,"stardiv.one.form.component.TextField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_LISTBOX,"stardiv.one.form.component.ListBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_COMBOBOX,"stardiv.one.form.component.ComboBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_RADIOBUTTON,"stardiv.one.form.component.RadioButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_GROUPBOX,"stardiv.one.form.component.GroupBox");		// compatibility
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_FIXEDTEXT,"stardiv.one.form.component.FixedText");		// compatibility
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_COMMANDBUTTON,"stardiv.one.form.component.CommandButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_CHECKBOX,"stardiv.one.form.component.CheckBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_GRID,"stardiv.one.form.component.Grid");			// compatibility
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_GRIDCONTROL,"stardiv.one.form.component.GridControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_IMAGEBUTTON,"stardiv.one.form.component.ImageButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_FILECONTROL,"stardiv.one.form.component.FileControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_TIMEFIELD,"stardiv.one.form.component.TimeField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_DATEFIELD,"stardiv.one.form.component.DateField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_NUMERICFIELD,"stardiv.one.form.component.NumericField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_CURRENCYFIELD,"stardiv.one.form.component.CurrencyField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_PATTERNFIELD,"stardiv.one.form.component.PatternField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_HIDDEN,"stardiv.one.form.component.Hidden");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_HIDDENCONTROL,"stardiv.one.form.component.HiddenControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_IMAGECONTROL,"stardiv.one.form.component.ImageControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_COMPONENT_FORMATTEDFIELD,"stardiv.one.form.component.FormattedField");
-
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_GRID,"stardiv.one.form.control.Grid");					// compatibility
-    IMPLEMENT_CONSTASCII_USTRING(FM_CONTROL_GRIDCONTROL,"stardiv.one.form.control.GridControl");
-
-    // -----------------------
-    // new (sun) service names
-    // -----------------------
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_FORM,"com.sun.star.form.component.Form");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_TEXTFIELD,"com.sun.star.form.component.TextField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_LISTBOX,"com.sun.star.form.component.ListBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_COMBOBOX,"com.sun.star.form.component.ComboBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_RADIOBUTTON,"com.sun.star.form.component.RadioButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_GROUPBOX,"com.sun.star.form.component.GroupBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_FIXEDTEXT,"com.sun.star.form.component.FixedText");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_COMMANDBUTTON,"com.sun.star.form.component.CommandButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_CHECKBOX,"com.sun.star.form.component.CheckBox");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_GRIDCONTROL,"com.sun.star.form.component.GridControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_IMAGEBUTTON,"com.sun.star.form.component.ImageButton");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_FILECONTROL,"com.sun.star.form.component.FileControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_TIMEFIELD,"com.sun.star.form.component.TimeField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_DATEFIELD,"com.sun.star.form.component.DateField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_NUMERICFIELD,"com.sun.star.form.component.NumericField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_CURRENCYFIELD,"com.sun.star.form.component.CurrencyField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_PATTERNFIELD,"com.sun.star.form.component.PatternField");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_HIDDENCONTROL,"com.sun.star.form.component.HiddenControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_IMAGECONTROL,"com.sun.star.form.component.DatabaseImageControl");
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_COMPONENT_FORMATTEDFIELD,"com.sun.star.form.component.FormattedField");
-    IMPLEMENT_CONSTASCII_USTRING( FM_SUN_COMPONENT_SCROLLBAR,    "com.sun.star.form.component.ScrollBar"         );
-    IMPLEMENT_CONSTASCII_USTRING( FM_SUN_COMPONENT_SPINBUTTON,   "com.sun.star.form.component.SpinButton"        );
-    IMPLEMENT_CONSTASCII_USTRING( FM_SUN_COMPONENT_NAVIGATIONBAR,"com.sun.star.form.component.NavigationToolBar" );
-
-    IMPLEMENT_CONSTASCII_USTRING(FM_SUN_CONTROL_GRIDCONTROL,"com.sun.star.form.control.GridControl");
-
-    IMPLEMENT_CONSTASCII_USTRING(FM_NUMBER_FORMATTER,"com.sun.star.util.NumberFormatter");
-    IMPLEMENT_CONSTASCII_USTRING(FM_FORM_CONTROLLER,"com.sun.star.form.FormController");
-    IMPLEMENT_CONSTASCII_USTRING(SRV_SDB_CONNECTION,"com.sun.star.sdb.Connection");
-    IMPLEMENT_CONSTASCII_USTRING(SRV_SDB_INTERACTION_HANDLER,"com.sun.star.sdb.InteractionHandler");
-}	// namespace svxform
+#include "fmservs.hxx"
 
 // ------------------------------------------------------------------------
 #define DECL_SERVICE(ImplName)						\
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 8211bc1afd..7555b3d30d 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -94,7 +94,6 @@ namespace svx
     using namespace ::com::sun::star::util;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::container;
-    using namespace ::svxform;
 
     //====================================================================
     typedef USHORT WhichId;
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 652c868c69..9be98fd4b1 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -100,7 +100,6 @@
 #include <connectivity/dbtools.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
-#include "fmstatic.hxx"
 #include <comphelper/extract.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/dbexception.hxx>
@@ -109,14 +108,6 @@
 #include <algorithm>
 #include <rtl/logfile.hxx>
 
-namespace svxform
-{
-
-    IMPLEMENT_CONSTASCII_USTRING(DATA_MODE,"DataMode");
-    IMPLEMENT_CONSTASCII_USTRING(FILTER_MODE,"FilterMode");
-
-}	// namespace svxform
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 827fbb1280..bc8b334d55 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -459,7 +459,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
             return;
 
         // if it's a "default value" property of a control model, set the according "value" property
-        static const sal_Char* pDefaultValueProperties[] = {
+        static ::rtl::OUString pDefaultValueProperties[] = {
             FM_PROP_DEFAULT_TEXT, FM_PROP_DEFAULTCHECKED, FM_PROP_DEFAULT_DATE, FM_PROP_DEFAULT_TIME,
             FM_PROP_DEFAULT_VALUE, FM_PROP_DEFAULT_SELECT_SEQ, FM_PROP_EFFECTIVE_DEFAULT
         };
@@ -472,7 +472,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
             "FmXUndoEnvironment::propertyChange: inconsistence!");
         for (sal_Int32 i=0; i<nDefaultValueProps; ++i)
         {
-            if (0 == evt.PropertyName.compareToAscii(pDefaultValueProperties[i]))
+            if (0 == evt.PropertyName.compareTo(pDefaultValueProperties[i]))
             {
                 try
                 {
diff --git a/svx/source/form/fmurl.cxx b/svx/source/form/fmurl.cxx
deleted file mode 100644
index dc81ed7a2d..0000000000
--- a/svx/source/form/fmurl.cxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: fmurl.cxx,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include "fmurl.hxx"
-
-
-namespace svxform
-{
-
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_FORMSLOTS_PREFIX,   ".uno:FormController/");
-
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_FORM_POSITION,      ".uno:FormController/positionForm"  );
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_FORM_RECORDCOUNT,   ".uno:FormController/RecordCount"  );
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_RECORD_MOVEFIRST,   ".uno:FormController/moveToFirst"  );
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_RECORD_MOVEPREV,    ".uno:FormController/moveToPrev"   );
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_RECORD_MOVENEXT,    ".uno:FormController/moveToNext"   );
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_RECORD_MOVELAST,    ".uno:FormController/moveToLast"   );
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_RECORD_MOVETONEW,   ".uno:FormController/moveToNew"    );
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_RECORD_UNDO,        ".uno:FormController/undoRecord"   );
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_RECORD_SAVE,        ".uno:FormController/saveRecord"   );
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_RECORD_DELETE,      ".uno:FormController/deleteRecord" );
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_FORM_REFRESH,       ".uno:FormController/refreshForm"  );
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_FORM_REFRESH_CURRENT_CONTROL,
-                                                            ".uno:FormController/refreshCurrentControl"  );
-
-    IMPLEMENT_CONSTASCII_USTRING( FMURL_FORM_SORT_UP,      ".uno:FormController/sortUp"       );
-    IMPLEMENT_CONSTASCII_USTRING( FMURL_FORM_SORT_DOWN,    ".uno:FormController/sortDown"     );
-    IMPLEMENT_CONSTASCII_USTRING( FMURL_FORM_SORT,         ".uno:FormController/sort"         );
-    IMPLEMENT_CONSTASCII_USTRING( FMURL_FORM_AUTO_FILTER,  ".uno:FormController/autoFilter"   );
-    IMPLEMENT_CONSTASCII_USTRING( FMURL_FORM_FILTER,       ".uno:FormController/filter"       );
-    IMPLEMENT_CONSTASCII_USTRING( FMURL_FORM_APPLY_FILTER, ".uno:FormController/applyFilter"  );
-    IMPLEMENT_CONSTASCII_USTRING( FMURL_FORM_REMOVE_FILTER,".uno:FormController/removeFilterOrder" );
-
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_CONFIRM_DELETION,".uno:FormSlots/ConfirmDeletion");
-
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_COMPONENT_FORMGRIDVIEW,".component:DB/FormGridView");
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_GRIDVIEW_CLEARVIEW,".uno:FormSlots/ClearView");
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_GRIDVIEW_ADDCOLUMN,".uno:FormSlots/AddGridColumn");
-    IMPLEMENT_CONSTASCII_USTRING(FMURL_GRIDVIEW_ATTACHTOFORM,".uno:FormSlots/AttachToForm");
-
-    IMPLEMENT_CONSTASCII_USTRING(FMARG_ATTACHTO_MASTERFORM,"MasterForm");
-    IMPLEMENT_CONSTASCII_USTRING(FMARG_ADDCOL_COLUMNTYPE,"ColumnType");
-    IMPLEMENT_CONSTASCII_USTRING(FMARG_ADDCOL_COLUMNPOS,"ColumnPosition");
-
-}	// namespace svxform
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index e3f2a48efc..69a2fb308e 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -57,7 +57,6 @@ namespace svx
 {
 //........................................................................
 
-    using namespace ::svxform;
     /** === begin UNO using === **/
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::lang::XMultiServiceFactory;
diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk
index 3d405edc00..b649be94d1 100644
--- a/svx/source/form/makefile.mk
+++ b/svx/source/form/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..$/..
 
 PRJNAME=svx
 TARGET=form
+LIBTARGET=NO
 
 ENABLE_EXCEPTIONS=TRUE
 
@@ -53,7 +54,8 @@ SRC1FILES= \
     formshell.src   \
     datanavi.src
 
-SLOFILES = \
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
     $(SLO)$/formtoolbars.obj \
     $(SLO)$/fmdocumentclassification.obj \
     $(SLO)$/fmcontrolbordermanager.obj \
@@ -61,7 +63,6 @@ SLOFILES = \
     $(SLO)$/fmtextcontroldialogs.obj \
     $(SLO)$/fmtextcontrolfeature.obj \
     $(SLO)$/fmtextcontrolshell.obj \
-    $(SLO)$/dbcharsethelper.obj			\
     $(SLO)$/ParseContext.obj			\
     $(SLO)$/typeconversionclient.obj    \
     $(SLO)$/confirmdelete.obj      \
@@ -69,9 +70,7 @@ SLOFILES = \
     $(SLO)$/sqlparserclient.obj      \
     $(SLO)$/dataaccessdescriptor.obj      \
     $(SLO)$/fmpage.obj      \
-    $(SLO)$/fmPropBrw.obj			\
     $(SLO)$/fmundo.obj  	\
-    $(SLO)$/fmprop.obj      \
     $(SLO)$/fmmodel.obj		\
     $(SLO)$/navigatortree.obj      \
     $(SLO)$/navigatortreemodel.obj      \
@@ -81,21 +80,14 @@ SLOFILES = \
     $(SLO)$/fmvwimp.obj     \
     $(SLO)$/fmdpage.obj		\
     $(SLO)$/fmitems.obj  	\
-    $(SLO)$/tbxform.obj     \
     $(SLO)$/fmobj.obj      	\
     $(SLO)$/fmdmod.obj		\
-    $(SLO)$/fmobjfac.obj	\
-    $(SLO)$/fmsrccfg.obj	\
     $(SLO)$/fmservs.obj     \
     $(SLO)$/typemap.obj		\
     $(SLO)$/fmexch.obj      \
-    $(SLO)$/tabwin.obj      \
-    $(SLO)$/fmurl.obj		\
-    $(SLO)$/filtnav.obj		\
     $(SLO)$/fmtools.obj     \
     $(SLO)$/fmshimp.obj     \
     $(SLO)$/fmshell.obj     \
-    $(SLO)$/fmsrcimp.obj	\
     $(SLO)$/fmview.obj		\
     $(SLO)$/sdbdatacolumn.obj \
     $(SLO)$/formcontrolling.obj \
@@ -105,13 +97,22 @@ SLOFILES = \
     $(SLO)$/datalistener.obj \
     $(SLO)$/fmscriptingenv.obj \
     $(SLO)$/stringlistresource.obj \
-    $(SLO)$/databaselocationinput.obj \
     $(SLO)$/delayedevent.obj \
     $(SLO)$/formcontrolfactory.obj
 
-.IF "$(OS)$(CPU)"=="SOLARISI"
-NOOPTFILES=$(SLO)$/fmprop.obj
-.ENDIF
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+    $(SLO)$/dbcharsethelper.obj			\
+    $(SLO)$/fmPropBrw.obj			\
+    $(SLO)$/tbxform.obj     \
+    $(SLO)$/fmobjfac.obj	\
+    $(SLO)$/fmsrccfg.obj	\
+    $(SLO)$/tabwin.obj      \
+    $(SLO)$/filtnav.obj		\
+    $(SLO)$/fmsrcimp.obj	\
+    $(SLO)$/databaselocationinput.obj
+
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
 
 # --- Targets ----------------------------------
 
diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk
index 703f730433..ae1f36e5f7 100644
--- a/svx/source/gengal/makefile.mk
+++ b/svx/source/gengal/makefile.mk
@@ -66,7 +66,7 @@ APP1STDLIBS=$(TOOLSLIB) 		\
             $(SALLIB)		\
             $(VCLLIB)			\
             $(UCBHELPERLIB)		\
-            $(SVXLIB)
+            $(SVXCORELIB)
 
 #.IF "$(COM)"=="GCC"
 #ADDOPTFILES=$(OBJ)$/gengal.obj
diff --git a/svx/source/inc/AccessibleStringWrap.hxx b/svx/source/inc/AccessibleStringWrap.hxx
index dba73dbb70..0d4e5c42e9 100644
--- a/svx/source/inc/AccessibleStringWrap.hxx
+++ b/svx/source/inc/AccessibleStringWrap.hxx
@@ -34,6 +34,8 @@
 #include <sal/types.h>
 #include <tools/string.hxx>
 
+#include <svx/svxdllapi.h>
+
 class OutputDevice;
 class SvxFont;
 class Rectangle;
@@ -49,10 +51,10 @@ class AccessibleStringWrap
 {
 public:
 
-    AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText );
+    SVX_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText );
 
-    sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect );
-    sal_Int32 GetIndexAtPoint( const Point& rPoint );
+    SVX_DLLPUBLIC sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect );
+    SVX_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint );
 
 private:
     
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index a61182189f..269db25f47 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -307,10 +307,10 @@ namespace svxform
     };
 
     //========================================================================
-    class DataNavigatorManager : public SfxChildWindow
+    class SVX_DLLPUBLIC DataNavigatorManager : public SfxChildWindow
     {
     public:
-        DataNavigatorManager( Window* pParent, sal_uInt16 nId,
+        SVX_DLLPRIVATE DataNavigatorManager( Window* pParent, sal_uInt16 nId,
                               SfxBindings* pBindings, SfxChildWinInfo* pInfo );
         SFX_DECL_CHILDWINDOW( DataNavigatorManager );
     };
diff --git a/svx/source/inc/dbtoolsclient.hxx b/svx/source/inc/dbtoolsclient.hxx
index 1e979315ec..262b791e80 100644
--- a/svx/source/inc/dbtoolsclient.hxx
+++ b/svx/source/inc/dbtoolsclient.hxx
@@ -36,6 +36,7 @@
 #include <osl/module.h>
 #include <tools/solar.h>
 #include <unotools/sharedunocomponent.hxx>
+#include <svx/svxdllapi.h>
 
 //........................................................................
 namespace svxform
@@ -50,7 +51,7 @@ namespace svxform
     /** base class for classes which want to use dbtools features with load-on-call
         of the dbtools lib.
     */
-    class ODbtoolsClient
+    class SVX_DLLPUBLIC ODbtoolsClient
     {
     private:
         static	::osl::Mutex	s_aMutex;
@@ -82,7 +83,7 @@ namespace svxform
     //====================================================================
     //= OStaticDataAccessTools
     //====================================================================
-    class OStaticDataAccessTools : public ODbtoolsClient
+    class SVX_DLLPUBLIC OStaticDataAccessTools : public ODbtoolsClient
     {
     protected:
         mutable ::rtl::Reference< ::connectivity::simple::IDataAccessTools >	m_xDataAccessTools;
@@ -93,7 +94,7 @@ namespace svxform
     public:
         OStaticDataAccessTools();
 
-        const ::rtl::Reference< ::connectivity::simple::IDataAccessTools >& getDataAccessTools() const { return m_xDataAccessTools; }
+        SVX_DLLPRIVATE const ::rtl::Reference< ::connectivity::simple::IDataAccessTools >& getDataAccessTools() const { return m_xDataAccessTools; }
 
         // ------------------------------------------------
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats(
@@ -102,13 +103,13 @@ namespace svxform
         ) const;
 
         // ------------------------------------------------
-        sal_Int32 getDefaultNumberFormat(
+        SVX_DLLPRIVATE sal_Int32 getDefaultNumberFormat(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xColumn,
             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _xTypes,									 
             const ::com::sun::star::lang::Locale& _rLocale );
 
         // ------------------------------------------------
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback(
+        SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback(
             const ::rtl::OUString& _rDataSourceName,
             const ::rtl::OUString& _rUser,
             const ::rtl::OUString& _rPwd,
@@ -130,26 +131,26 @@ namespace svxform
                 const SAL_THROW ( (::com::sun::star::uno::RuntimeException) );
 
         // ------------------------------------------------
-        void TransferFormComponentProperties(
+        SVX_DLLPRIVATE void TransferFormComponentProperties(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxOld,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxNew,
             const ::com::sun::star::lang::Locale& _rLocale
         ) const;
 
         // ------------------------------------------------
-        ::rtl::OUString quoteName(
+        SVX_DLLPRIVATE ::rtl::OUString quoteName(
             const ::rtl::OUString& _rQuote,
             const ::rtl::OUString& _rName
         ) const;
 
         // ------------------------------------------------
-        ::rtl::OUString composeTableNameForSelect(
+        SVX_DLLPRIVATE ::rtl::OUString composeTableNameForSelect(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable
         ) const;
 
         // ------------------------------------------------
-        ::com::sun::star::sdb::SQLContext prependContextInfo(
+        SVX_DLLPRIVATE ::com::sun::star::sdb::SQLContext prependContextInfo(
             ::com::sun::star::sdbc::SQLException& _rException,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
             const ::rtl::OUString& _rContextDescription,
@@ -157,7 +158,7 @@ namespace svxform
         ) const;
 
         // ------------------------------------------------
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource(
+        SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource(
                 const ::rtl::OUString& _rsRegisteredName,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory
             ) const;
@@ -166,22 +167,22 @@ namespace svxform
         /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
             @param		_rxCursorSet	the property set
         */
-        sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+        SVX_DLLPRIVATE sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
 
         // ------------------------------------------------
         /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE
             @param		_rxCursorSet	the property set
         */
-        sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+        SVX_DLLPRIVATE sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
 
         // ------------------------------------------------
         /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE
             @param		_rxCursorSet	the property set
         */
-        sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
+        SVX_DLLPRIVATE sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
 
         // ------------------------------------------------
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
+        SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
             getFieldsByCommandDescriptor(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                 const sal_Int32 _nCommandType,
@@ -200,13 +201,13 @@ namespace svxform
             )	SAL_THROW( ( ) );
 
         // ------------------------------------------------
-        bool isEmbeddedInDatabase(
+        SVX_DLLPRIVATE bool isEmbeddedInDatabase(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent,
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxActualConnection
         );
 
         // ------------------------------------------------
-        bool isEmbeddedInDatabase(
+        SVX_DLLPRIVATE bool isEmbeddedInDatabase(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent
         );
     };
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 13998e3beb..c84d8d5ae5 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -43,13 +43,8 @@
 #include <vcl/image.hxx>
 #include <svtools/svtreebx.hxx>
 
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
-
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 #include <vcl/dockwin.hxx>
 #include "fmtools.hxx"
 #include "fmexch.hxx"
diff --git a/svx/source/inc/fmctrler.hxx b/svx/source/inc/fmctrler.hxx
index 6407ca78fd..7c127a2adf 100644
--- a/svx/source/inc/fmctrler.hxx
+++ b/svx/source/inc/fmctrler.hxx
@@ -273,7 +273,7 @@ public:
 // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
     static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
-    static FmXFormController* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent );
+    SVX_DLLPUBLIC static FmXFormController* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent );
 
 // XDispatch
     virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& _rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgs ) throw (::com::sun::star::uno::RuntimeException);
@@ -462,7 +462,7 @@ public:
         --m_nCurrentFilterPosition;
     }
 
-    void setCurrentFilterPosition(sal_Int32 nPos);
+    SVX_DLLPUBLIC void setCurrentFilterPosition(sal_Int32 nPos);
     sal_Int32 getCurrentFilterPosition() const {return m_nCurrentFilterPosition;}
 
 protected:
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 1f6db8abea..410addcf31 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -36,6 +36,8 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <tools/link.hxx>
 
+#include <svx/svxdllapi.h>
+
 class FmFormShell;
 class FmFormPage;
 class SvLBoxEntry;
@@ -63,7 +65,7 @@ namespace svxform
     //====================================================================
     //= OLocalExchange
     //====================================================================
-    class OLocalExchange : public TransferableHelper
+    class SVX_DLLPUBLIC OLocalExchange : public TransferableHelper
     {
     private:
         Link				m_aClipboardListener;
@@ -110,7 +112,7 @@ namespace svxform
     //= OLocalExchangeHelper
     //====================================================================
     /// a helper for navigator windows (SvTreeListBox'es) which allow DnD within themself
-    class OLocalExchangeHelper
+    class SVX_DLLPUBLIC OLocalExchangeHelper
     {
     protected:
         Window*				m_pDragSource;
@@ -130,13 +132,13 @@ namespace svxform
         inline	sal_Bool	isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); }
         inline  void        clear() { if ( isDataExchangeActive() ) m_pTransferable->clear(); }
 
-        void		setClipboardListener( const Link& _rListener ) { if ( m_pTransferable ) m_pTransferable->setClipboardListener( _rListener ); }
+        SVX_DLLPRIVATE void		setClipboardListener( const Link& _rListener ) { if ( m_pTransferable ) m_pTransferable->setClipboardListener( _rListener ); }
 
     protected:
-        virtual OLocalExchange* createExchange() const = 0;
+        SVX_DLLPRIVATE virtual OLocalExchange* createExchange() const = 0;
 
     protected:
-        void implReset();
+        SVX_DLLPRIVATE void implReset();
     };
 
     //====================================================================
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index ba49c7b897..bb008a0727 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -595,10 +595,10 @@ namespace svxform
     };
 
     //========================================================================
-    class NavigatorFrameManager : public SfxChildWindow
+    class SVX_DLLPUBLIC NavigatorFrameManager : public SfxChildWindow
     {
     public:
-        NavigatorFrameManager( Window *pParent, sal_uInt16 nId, SfxBindings *pBindings,
+        SVX_DLLPRIVATE NavigatorFrameManager( Window *pParent, sal_uInt16 nId, SfxBindings *pBindings,
                           SfxChildWinInfo *pInfo );
         SFX_DECL_CHILDWINDOW( NavigatorFrameManager );
     };
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 65ad3778fc..3dd15fc1cd 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -62,8 +62,8 @@ class FmFormObj: public SdrUnoObj
                             // only to be used for comparison with the current ref device!
 
 public:
-    FmFormObj(const ::rtl::OUString& rModelName,sal_Int32 _nType);
-    FmFormObj(sal_Int32 _nType);
+    SVX_DLLPUBLIC FmFormObj(const ::rtl::OUString& rModelName,sal_Int32 _nType);
+    SVX_DLLPUBLIC FmFormObj(sal_Int32 _nType);
 
     TYPEINFO();
 
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 070ddf33b5..651232c68c 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -154,8 +154,7 @@ public:
 
     /** returns an object mapping from control models to drawing shapes.
     */
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XMap >
-        getControlToShapeMap();
+    SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XMap > getControlToShapeMap();
 
 private:
     /** validates whether <member>xCurrentForm</member> is still valid and to be used
diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc
index ba11d50fcc..a981cc65c4 100644
--- a/svx/source/inc/fmprop.hrc
+++ b/svx/source/inc/fmprop.hrc
@@ -30,9 +30,6 @@
 #ifndef _SVX_FMPROP_HRC
 #define _SVX_FMPROP_HRC
 
-#ifndef _FM_STATIC_HXX_
-#include "fmstatic.hxx"
-#endif
 // PropertyId's, welche eine Zuordnung zu einen PropertyName haben, das koennten
 // auch in Zukunft WhichIds sein -> Itemset
 #define FM_ATTR_START			0
@@ -40,151 +37,145 @@
 #define FM_ATTR_FILTER          ( FM_ATTR_START + 1 )
 #define FM_ATTR_FORM_OPERATIONS ( FM_ATTR_START + 2 )
 
-
-namespace svxform
-{
-    DECLARE_CONSTASCII_USTRING(FM_PROP_NAME);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_CLASSID);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ALIGN);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ROWCOUNT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ROWCOUNTFINAL);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_FETCHSIZE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_VALUE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_VALUEMIN);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_VALUEMAX);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_VALUESTEP);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_TEXT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_LABEL);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_NAVIGATION);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_CYCLE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_CONTROLSOURCE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ENABLED);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_SPIN);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_READONLY);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_FILTER);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_AUTOINCREMENT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_WIDTH);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_SEARCHABLE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_MULTILINE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_TARGET_URL);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DEFAULTCONTROL);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_MAXTEXTLEN);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DATE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_TIME);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_STATE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_TRISTATE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_STRINGITEMLIST);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DEFAULT_TEXT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DEFAULTCHECKED);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DEFAULT_DATE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DEFAULT_TIME);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DEFAULT_VALUE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_FORMATKEY);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_FORMATSSUPPLIER);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_LISTSOURCETYPE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_LISTSOURCE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_SELECT_SEQ);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_VALUE_SEQ);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DEFAULT_SELECT_SEQ);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DECIMAL_ACCURACY);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_EDITMASK);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ISREADONLY);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_FIELDTYPE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_REFVALUE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_STRICTFORMAT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DATASOURCE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_LITERALMASK);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_SHOWTHOUSANDSEP);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_CURRENCYSYMBOL);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DATEFORMAT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DATEMIN);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DATEMAX);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DATE_SHOW_CENTURY);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_TIMEFORMAT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_TIMEMIN);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_TIMEMAX);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_LINECOUNT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_BOUNDCOLUMN);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_HASNAVIGATION);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_FONT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_BACKGROUNDCOLOR);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_TEXTCOLOR);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_BORDER);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DROPDOWN);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ROWHEIGHT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_HELPTEXT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_HELPURL);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_RECORDMARKER);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_BOUNDFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_VALUE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_DEFAULT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_MIN);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_EFFECTIVE_MAX);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_HIDDEN);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_FILTERPROPOSAL);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_FIELDSOURCE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_TABLENAME);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_FILTERSUPPLIER);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_CURRENTFILTER);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_SELECTED_FIELDS);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_SELECTED_TABLES);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_THREADSAFE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_CONTROLLABEL);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_CURSORCOLOR);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ALWAYSSHOWCURSOR);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_DISPLAYSYNCHRON);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ISMODIFIED);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ISNEW);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_PRIVILEGES);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_COMMAND);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_COMMANDTYPE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_RESULTSET_CONCURRENCY);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_INSERTONLY);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_RESULTSET_TYPE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ESCAPE_PROCESSING);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_APPLYFILTER);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ISNULLABLE);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ACTIVECOMMAND);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ISCURRENCY);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_URL);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_ACTIVE_CONNECTION);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_SORT);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_CONTROLSOURCEPROPERTY);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_REALNAME);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_TEXTLINECOLOR);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_FONTEMPHASISMARK);
-    DECLARE_CONSTASCII_USTRING(FM_PROP_FONTRELIEF);
-    DECLARE_CONSTASCII_USTRING( FM_PROP_SCROLLVALUE_MIN );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_SCROLLVALUE_MAX );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_DEFAULT_SCROLLVALUE );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_LINEINCREMENT );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_BLOCKINCREMENT );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_ORIENTATION );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_REPEAT );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_REPEATDELAY );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_SYMBOLCOLOR );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_VISIBILESIZE );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_SPINVALUE_MIN );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_SPINVALUE_MAX );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_DEFAULT_SPINVALUE );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_SPININCREMENT );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_LINEENDFORMAT );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_TOGGLE );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_FOCUSONCLICK );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_HIDEINACTIVESELECTION );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_VISUALEFFECT );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_BORDERCOLOR );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_DYNAMIC_CONTROL_BORDER );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_CONTROL_BORDER_COLOR_FOCUS );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_CONTROL_BORDER_COLOR_MOUSE );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_CONTROL_BORDER_COLOR_INVALID );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_BUTTON_TYPE );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_FORM_OPERATIONS );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_INPUT_REQUIRED );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_WRITING_MODE );
-    DECLARE_CONSTASCII_USTRING( FM_PROP_MOUSE_WHEEL_BEHAVIOR );
-
-}	// namespace svxform
+#define FM_PROP_NAME                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) )
+#define FM_PROP_CLASSID                      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassId" ) )
+#define FM_PROP_ALIGN                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Align" ) )
+#define FM_PROP_ROWCOUNT                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowCount" ) )
+#define FM_PROP_ROWCOUNTFINAL                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" ) )
+#define FM_PROP_FETCHSIZE                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FetchSize" ) )
+#define FM_PROP_VALUE                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value" ) )
+#define FM_PROP_VALUEMIN                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ValueMin" ) )
+#define FM_PROP_VALUEMAX                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ValueMax" ) )
+#define FM_PROP_VALUESTEP                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ValueStep" ) )
+#define FM_PROP_TEXT                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ) )
+#define FM_PROP_LABEL                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" ) )
+#define FM_PROP_NAVIGATION                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationBarMode" ) )
+#define FM_PROP_CYCLE                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cycle" ) )
+#define FM_PROP_CONTROLSOURCE                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataField" ) )
+#define FM_PROP_ENABLED                      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) )
+#define FM_PROP_SPIN                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Spin" ) )
+#define FM_PROP_READONLY                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" ) )
+#define FM_PROP_FILTER                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Filter" ) )
+#define FM_PROP_AUTOINCREMENT                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAutoIncrement" ) )
+#define FM_PROP_WIDTH                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) )
+#define FM_PROP_SEARCHABLE                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsSearchable" ) )
+#define FM_PROP_MULTILINE                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) )
+#define FM_PROP_TARGET_URL                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ) )
+#define FM_PROP_DEFAULTCONTROL               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultControl" ) )
+#define FM_PROP_MAXTEXTLEN                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) )
+#define FM_PROP_DATE                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Date" ) )
+#define FM_PROP_TIME                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Time" ) )
+#define FM_PROP_STATE                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "State" ) )
+#define FM_PROP_TRISTATE                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TriState" ) )
+#define FM_PROP_STRINGITEMLIST               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StringItemList" ) )
+#define FM_PROP_DEFAULT_TEXT                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultText" ) )
+#define FM_PROP_DEFAULTCHECKED               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultState" ) )
+#define FM_PROP_DEFAULT_DATE                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultDate" ) )
+#define FM_PROP_DEFAULT_TIME                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultTime" ) )
+#define FM_PROP_DEFAULT_VALUE                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultValue" ) )
+#define FM_PROP_FORMATKEY                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormatKey" ) )
+#define FM_PROP_FORMATSSUPPLIER              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormatsSupplier" ) )
+#define FM_PROP_LISTSOURCETYPE               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListSourceType" ) )
+#define FM_PROP_LISTSOURCE                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListSource" ) )
+#define FM_PROP_SELECT_SEQ                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" ) )
+#define FM_PROP_VALUE_SEQ                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ValueItemList" ) )
+#define FM_PROP_DEFAULT_SELECT_SEQ           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultSelection" ) )
+#define FM_PROP_DECIMAL_ACCURACY             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DecimalAccuracy" ) )
+#define FM_PROP_EDITMASK                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EditMask" ) )
+#define FM_PROP_ISREADONLY                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) )
+#define FM_PROP_FIELDTYPE                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) )
+#define FM_PROP_REFVALUE                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RefValue" ) )
+#define FM_PROP_STRICTFORMAT                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StrictFormat" ) )
+#define FM_PROP_DATASOURCE                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" ) )
+#define FM_PROP_LITERALMASK                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LiteralMask" ) )
+#define FM_PROP_SHOWTHOUSANDSEP              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ShowThousandsSeparator" ) )
+#define FM_PROP_CURRENCYSYMBOL               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CurrencySymbol" ) )
+#define FM_PROP_DATEFORMAT                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateFormat" ) )
+#define FM_PROP_DATEMIN                      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateMin" ) )
+#define FM_PROP_DATEMAX                      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateMax" ) )
+#define FM_PROP_DATE_SHOW_CENTURY            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateShowCentury" ) )
+#define FM_PROP_TIMEFORMAT                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TimeFormat" ) )
+#define FM_PROP_TIMEMIN                      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TimeMin" ) )
+#define FM_PROP_TIMEMAX                      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TimeMax" ) )
+#define FM_PROP_LINECOUNT                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineCount" ) )
+#define FM_PROP_BOUNDCOLUMN                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BoundColumn" ) )
+#define FM_PROP_HASNAVIGATION                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasNavigationBar" ) )
+#define FM_PROP_FONT                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontDescriptor" ) )
+#define FM_PROP_BACKGROUNDCOLOR              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BackgroundColor" ) )
+#define FM_PROP_TEXTCOLOR                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextColor" ) )
+#define FM_PROP_BORDER                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Border" ) )
+#define FM_PROP_DROPDOWN                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Dropdown" ) )
+#define FM_PROP_ROWHEIGHT                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeight" ) )
+#define FM_PROP_HELPTEXT                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) )
+#define FM_PROP_HELPURL                      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) )
+#define FM_PROP_RECORDMARKER                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasRecordMarker" ) )
+#define FM_PROP_BOUNDFIELD                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BoundField" ) )
+#define FM_PROP_EFFECTIVE_VALUE              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EffectiveValue" ) )
+#define FM_PROP_EFFECTIVE_DEFAULT            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EffectiveDefault" ) )
+#define FM_PROP_EFFECTIVE_MIN                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EffectiveMin" ) )
+#define FM_PROP_EFFECTIVE_MAX                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EffectiveMax" ) )
+#define FM_PROP_HIDDEN                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Hidden" ) )
+#define FM_PROP_FILTERPROPOSAL               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseFilterValueProposal" ) )
+#define FM_PROP_FIELDSOURCE                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FieldSource" ) )
+#define FM_PROP_TABLENAME                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TableName" ) )
+#define FM_PROP_FILTERSUPPLIER               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterSupplier" ) )
+#define FM_PROP_CURRENTFILTER                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CurrentFilter" ) )
+#define FM_PROP_SELECTED_FIELDS              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedFields" ) )
+#define FM_PROP_SELECTED_TABLES              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedTables" ) )
+#define FM_PROP_THREADSAFE                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ThreadSafe" ) )
+#define FM_PROP_CONTROLLABEL                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LabelControl" ) )
+#define FM_PROP_CURSORCOLOR                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CursorColor" ) )
+#define FM_PROP_ALWAYSSHOWCURSOR             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AlwaysShowCursor" ) )
+#define FM_PROP_DISPLAYSYNCHRON              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisplayIsSynchron" ) )
+#define FM_PROP_ISMODIFIED                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsModified" ) )
+#define FM_PROP_ISNEW                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsNew" ) )
+#define FM_PROP_PRIVILEGES                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Privileges" ) )
+#define FM_PROP_COMMAND                      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Command" ) )
+#define FM_PROP_COMMANDTYPE                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandType" ) )
+#define FM_PROP_RESULTSET_CONCURRENCY        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResultSetConcurrency" ) )
+#define FM_PROP_INSERTONLY                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IgnoreResult" ) )
+#define FM_PROP_RESULTSET_TYPE               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResultSetType" ) )
+#define FM_PROP_ESCAPE_PROCESSING            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EscapeProcessing" ) )
+#define FM_PROP_APPLYFILTER                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" ) )
+#define FM_PROP_ISNULLABLE                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsNullable" ) )
+#define FM_PROP_ACTIVECOMMAND                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveCommand" ) )
+#define FM_PROP_ISCURRENCY                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsCurrency" ) )
+#define FM_PROP_URL                          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) )
+#define FM_PROP_ACTIVE_CONNECTION            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) )
+#define FM_PROP_SORT                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Order" ) )
+#define FM_PROP_CONTROLSOURCEPROPERTY        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataFieldProperty" ) )
+#define FM_PROP_REALNAME                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RealName" ) )
+#define FM_PROP_TEXTLINECOLOR                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextLineColor" ) )
+#define FM_PROP_FONTEMPHASISMARK             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontEmphasisMark" ) )
+#define FM_PROP_FONTRELIEF                   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontRelief" ) )
+#define FM_PROP_SCROLLVALUE_MIN              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMin" ) )
+#define FM_PROP_SCROLLVALUE_MAX              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMax" ) )
+#define FM_PROP_DEFAULT_SCROLLVALUE          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultScrollValue" ) )
+#define FM_PROP_LINEINCREMENT                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineIncrement" ) )
+#define FM_PROP_BLOCKINCREMENT               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BlockIncrement" ) )
+#define FM_PROP_ORIENTATION                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Orientation" ) )
+#define FM_PROP_REPEAT                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Repeat" ) )
+#define FM_PROP_REPEATDELAY                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RepeatDelay" ) )
+#define FM_PROP_SYMBOLCOLOR                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SymbolColor" ) )
+#define FM_PROP_VISIBILESIZE                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VisibleSize" ) )
+#define FM_PROP_SPINVALUE_MIN                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMin" ) )
+#define FM_PROP_SPINVALUE_MAX                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMax" ) )
+#define FM_PROP_DEFAULT_SPINVALUE            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultSpinValue" ) )
+#define FM_PROP_SPININCREMENT                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinIncrement" ) )
+#define FM_PROP_LINEENDFORMAT                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineEndFormat" ) )
+#define FM_PROP_TOGGLE                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Toggle" ) )
+#define FM_PROP_FOCUSONCLICK                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FocusOnClick" ) )
+#define FM_PROP_HIDEINACTIVESELECTION        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HideInactiveSelection" ) )
+#define FM_PROP_VISUALEFFECT                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VisualEffect" ) )
+#define FM_PROP_BORDERCOLOR                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BorderColor" ) )
+#define FM_PROP_DYNAMIC_CONTROL_BORDER       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DynamicControlBorder" ) )
+#define FM_PROP_CONTROL_BORDER_COLOR_FOCUS   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlBorderColorOnFocus" ) )
+#define FM_PROP_CONTROL_BORDER_COLOR_MOUSE   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlBorderColorOnHover" ) )
+#define FM_PROP_CONTROL_BORDER_COLOR_INVALID rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlBorderColorOnInvalid" ) )
+#define FM_PROP_BUTTON_TYPE                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ) )
+#define FM_PROP_FORM_OPERATIONS              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormOperations" ) )
+#define FM_PROP_INPUT_REQUIRED               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InputRequired" ) )
+#define FM_PROP_WRITING_MODE                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WritingMode" ) )
+#define FM_PROP_MOUSE_WHEEL_BEHAVIOR         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MouseWheelBehavior" ) )
 
 #endif // _SVX_FMPROP_HRC
-
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index 2e3d30cf0e..165630eab8 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -30,76 +30,64 @@
 #ifndef _SVX_FMSERVS_HXX
 #define _SVX_FMSERVS_HXX
 
-#include "fmstatic.hxx"
+#include <svx/svxdllapi.h>
+
+#define FM_NUMBER_FORMATTER             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.NumberFormatter" ) )
+#define FM_COMPONENT_EDIT               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Edit" ) )
+#define FM_COMPONENT_TEXTFIELD          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.TextField" ) )
+#define FM_COMPONENT_LISTBOX            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ListBox" ) )
+#define FM_COMPONENT_COMBOBOX           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ComboBox" ) )
+#define FM_COMPONENT_RADIOBUTTON        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.RadioButton" ) )
+#define FM_COMPONENT_GROUPBOX           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.GroupBox" ) )
+#define FM_COMPONENT_FIXEDTEXT          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FixedText" ) )
+#define FM_COMPONENT_COMMANDBUTTON      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CommandButton" ) )
+#define FM_COMPONENT_CHECKBOX           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CheckBox" ) )
+#define FM_COMPONENT_GRID               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Grid" ) )
+#define FM_COMPONENT_GRIDCONTROL        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.GridControl" ) )
+#define FM_COMPONENT_IMAGEBUTTON        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ImageButton" ) )
+#define FM_COMPONENT_FILECONTROL        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FileControl" ) )
+#define FM_COMPONENT_TIMEFIELD          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.TimeField" ) )
+#define FM_COMPONENT_DATEFIELD          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.DateField" ) )
+#define FM_COMPONENT_NUMERICFIELD       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.NumericField" ) )
+#define FM_COMPONENT_CURRENCYFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CurrencyField" ) )
+#define FM_COMPONENT_PATTERNFIELD       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.PatternField" ) )
+#define FM_COMPONENT_FORMATTEDFIELD     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FormattedField" ) )
+#define FM_COMPONENT_HIDDEN             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Hidden" ) )
+#define FM_COMPONENT_HIDDENCONTROL      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.HiddenControl" ) )
+#define FM_COMPONENT_IMAGECONTROL       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ImageControl" ) )
+#define FM_CONTROL_GRID                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.control.Grid" ) )
+#define FM_CONTROL_GRIDCONTROL          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.control.GridControl" ) )
+#define FM_FORM_CONTROLLER              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) )
+#define SRV_SDB_CONNECTION              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.Connection" ) )
+#define SRV_SDB_INTERACTION_HANDLER     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.InteractionHandler" ) )
+#define FM_SUN_COMPONENT_FORM           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.Form" ) )
+#define FM_SUN_COMPONENT_TEXTFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TextField" ) )
+#define FM_SUN_COMPONENT_LISTBOX        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ) )
+#define FM_SUN_COMPONENT_COMBOBOX       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ) )
+#define FM_SUN_COMPONENT_RADIOBUTTON    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ) )
+#define FM_SUN_COMPONENT_GROUPBOX       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.GroupBox" ) )
+#define FM_SUN_COMPONENT_FIXEDTEXT      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FixedText" ) )
+#define FM_SUN_COMPONENT_COMMANDBUTTON  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CommandButton" ) )
+#define FM_SUN_COMPONENT_CHECKBOX       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CheckBox" ) )
+#define FM_SUN_COMPONENT_GRIDCONTROL    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.GridControl" ) )
+#define FM_SUN_COMPONENT_IMAGEBUTTON    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ImageButton" ) )
+#define FM_SUN_COMPONENT_FILECONTROL    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FileControl" ) )
+#define FM_SUN_COMPONENT_TIMEFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TimeField" ) )
+#define FM_SUN_COMPONENT_DATEFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DateField" ) )
+#define FM_SUN_COMPONENT_NUMERICFIELD   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.NumericField" ) )
+#define FM_SUN_COMPONENT_CURRENCYFIELD  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CurrencyField" ) )
+#define FM_SUN_COMPONENT_PATTERNFIELD   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.PatternField" ) )
+#define FM_SUN_COMPONENT_HIDDENCONTROL  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.HiddenControl" ) )
+#define FM_SUN_COMPONENT_IMAGECONTROL   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DatabaseImageControl" ) )
+#define FM_SUN_COMPONENT_FORMATTEDFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FormattedField" ) )
+#define FM_SUN_COMPONENT_SCROLLBAR      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ScrollBar" ) )
+#define FM_SUN_COMPONENT_SPINBUTTON     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.SpinButton" ) )
+#define FM_SUN_COMPONENT_NAVIGATIONBAR  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.NavigationToolBar" ) )
+#define FM_SUN_CONTROL_GRIDCONTROL      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.GridControl" ) )
 
 namespace svxform
 {
-
-    DECLARE_CONSTASCII_USTRING(FM_NUMBER_FORMATTER);
-
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_EDIT);		// alter service name (5.0)
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_TEXTFIELD);
-
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_LISTBOX);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_COMBOBOX);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_RADIOBUTTON);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_GROUPBOX);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_FIXEDTEXT);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_COMMANDBUTTON);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_CHECKBOX);
-
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_GRID);		// alter service name (5.0)
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_GRIDCONTROL);
-
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_IMAGEBUTTON);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_FILECONTROL);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_TIMEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_DATEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_NUMERICFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_CURRENCYFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_PATTERNFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_FORMATTEDFIELD);
-
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_HIDDEN);	// alter service name (5.0)
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_HIDDENCONTROL);
-
-    DECLARE_CONSTASCII_USTRING(FM_COMPONENT_IMAGECONTROL);
-
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_GRID);
-    DECLARE_CONSTASCII_USTRING(FM_CONTROL_GRIDCONTROL);
-
-    DECLARE_CONSTASCII_USTRING(FM_FORM_CONTROLLER);
-    DECLARE_CONSTASCII_USTRING(SRV_SDB_CONNECTION);
-    DECLARE_CONSTASCII_USTRING(SRV_SDB_INTERACTION_HANDLER);
-
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_FORM);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_TEXTFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_LISTBOX);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_COMBOBOX);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_RADIOBUTTON);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_GROUPBOX);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_FIXEDTEXT);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_COMMANDBUTTON);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_CHECKBOX);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_GRIDCONTROL);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_IMAGEBUTTON);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_FILECONTROL);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_TIMEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_DATEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_NUMERICFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_CURRENCYFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_PATTERNFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_HIDDENCONTROL);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_IMAGECONTROL);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_FORMATTEDFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_SCROLLBAR);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_SPINBUTTON);
-    DECLARE_CONSTASCII_USTRING(FM_SUN_COMPONENT_NAVIGATIONBAR);
-
-    DECLARE_CONSTASCII_USTRING(FM_SUN_CONTROL_GRIDCONTROL);
-
-    void ImplSmartRegisterUnoServices();
-
+    SVX_DLLPUBLIC void ImplSmartRegisterUnoServices();
 }	// namespace svxform
 
 #endif // _SVX_FMSERVS_HXX
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 481acade50..350bf26a5f 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -422,7 +422,7 @@ public:
 
     /** retrieves the current selection
     */
-    void    getCurrentSelection( InterfaceBag& /* [out] */ _rSelection ) const;
+    SVX_DLLPUBLIC void    getCurrentSelection( InterfaceBag& /* [out] */ _rSelection ) const;
 
     /** sets a new current selection as indicated by a mark list
         @return
@@ -631,7 +631,7 @@ public:
 
 // ========================================================================
 SV_DECL_PTRARR_DEL(StatusForwarderArray, SfxStatusForwarder*, 16, 0)
-class SAL_DLLPRIVATE ControlConversionMenuController : public SfxMenuControl
+class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl
 {
 protected:
     StatusForwarderArray	m_aStatusForwarders;
@@ -639,11 +639,11 @@ protected:
     PopupMenu*				m_pConversionMenu;
 
 public:
-    ControlConversionMenuController(sal_uInt16 nId, Menu& rMenu, SfxBindings& rBindings);
-    virtual ~ControlConversionMenuController();
+    SVX_DLLPRIVATE ControlConversionMenuController(sal_uInt16 nId, Menu& rMenu, SfxBindings& rBindings);
+    SVX_DLLPRIVATE virtual ~ControlConversionMenuController();
     SFX_DECL_MENU_CONTROL();
 
-    virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState);
+    SVX_DLLPRIVATE virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState);
 };
 
 //==================================================================
diff --git a/svx/source/inc/fmstatic.hxx b/svx/source/inc/fmstatic.hxx
deleted file mode 100644
index f34bf276af..0000000000
--- a/svx/source/inc/fmstatic.hxx
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: fmstatic.hxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _FM_STATIC_HXX_
-#define _FM_STATIC_HXX_
-#include <tools/string.hxx>
-
-struct ConstAsciiString
-{
-    const sal_Char*	ascii;
-    sal_Int32		length;
-
-    inline	operator const ::rtl::OUString () const;
-    inline	operator const sal_Char* () const { return ascii; }
-
-    inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength);
-    inline ~ConstAsciiString();
-
-private:
-    mutable ::rtl::OUString*	ustring;
-};
-
-//------------------------------------------------------------
-inline ConstAsciiString::ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength)
-    :ascii(_pAsciiZeroTerminated)
-    ,length(_nLength)
-    ,ustring(NULL)
-{
-}
-
-//------------------------------------------------------------
-inline ConstAsciiString::~ConstAsciiString()
-{
-    delete ustring;
-    ustring = NULL;
-}
-
-//------------------------------------------------------------
-inline ConstAsciiString::operator const ::rtl::OUString () const
-{
-    if (!ustring)
-        ustring = new ::rtl::OUString(ascii, length, RTL_TEXTENCODING_ASCII_US);
-    return *ustring;
-}
-
-#define DECLARE_CONSTASCII_USTRING(name)	\
-    extern ConstAsciiString name
-
-#define IMPLEMENT_CONSTASCII_USTRING(name, asciivalue)	\
-    ConstAsciiString name(asciivalue, sizeof(asciivalue) - 1)
-
-
-#endif // _FM_STATIC_HXX_
-
diff --git a/svx/source/inc/fmtools.hxx b/svx/source/inc/fmtools.hxx
index 3da2c92116..3c71698f06 100644
--- a/svx/source/inc/fmtools.hxx
+++ b/svx/source/inc/fmtools.hxx
@@ -96,7 +96,8 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/component.hxx>
-#include "fmstatic.hxx"
+
+#include <svx/svxdllapi.h>
 
 #include <set>
 
@@ -109,19 +110,12 @@ class Window;
 // display info about a simple ::com::sun::star::sdbc::SQLException
 void displayException(const ::com::sun::star::sdbc::SQLException&, Window* _pParent = NULL);
 void displayException(const ::com::sun::star::sdbc::SQLWarning&, Window* _pParent = NULL);
-void displayException(const ::com::sun::star::sdb::SQLContext&, Window* _pParent = NULL);
+SVX_DLLPUBLIC void displayException(const ::com::sun::star::sdb::SQLContext&, Window* _pParent = NULL);
 void displayException(const ::com::sun::star::sdb::SQLErrorEvent&, Window* _pParent = NULL);
 void displayException(const ::com::sun::star::uno::Any&, Window* _pParent = NULL);
 
-// StringConversion
-namespace svxform
-{
-    // modes for the XModeSelector
-    DECLARE_CONSTASCII_USTRING(DATA_MODE);
-    DECLARE_CONSTASCII_USTRING(FILTER_MODE);
-
-}	// namespace svxform
-
+#define DATA_MODE   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) )
+#define FILTER_MODE rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) )
 
 // Kopieren von Persistenten Objecten
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> cloneUsingProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>& _xObj);
@@ -139,7 +133,7 @@ String getFormComponentAccessPath(const ::com::sun::star::uno::Reference< ::com:
 
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> getXModel(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xIface);
 
-::rtl::OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel);
+SVX_DLLPUBLIC ::rtl::OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel);
 
 // ===================================================================================================
 // = class CursorWrapper - eine Hilfsklasse, die parallel mit je einem ::com::sun::star::uno::Reference<XDatabaseUpdateCursor>,
@@ -159,7 +153,7 @@ public:
     // Construction/Destruction
     CursorWrapper() { }
     CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, sal_Bool bUseCloned = sal_False);
-    CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned = sal_False);
+    SVX_DLLPUBLIC CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned = sal_False);
         // bei bUseCloned == sal_True wird der Cursor ueber das XCloneable-Interface (dass er besitzen muss) gedoubled und
         // erst dann benutzt
 
diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index 6333e8be9f..9513fa1841 100644
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
@@ -31,46 +31,33 @@
 #ifndef _SVX_FMURL_HXX
 #define _SVX_FMURL_HXX
 
-#include "fmstatic.hxx"
-
-namespace svxform
-{
-
-    DECLARE_CONSTASCII_USTRING(FMURL_FORMSLOTS_PREFIX);
-
-    DECLARE_CONSTASCII_USTRING(FMURL_FORM_POSITION);
-    DECLARE_CONSTASCII_USTRING(FMURL_FORM_RECORDCOUNT);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_MOVEFIRST);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_MOVEPREV);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_MOVENEXT);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_MOVELAST);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_MOVETONEW);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_UNDO);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_SAVE);
-    DECLARE_CONSTASCII_USTRING(FMURL_RECORD_DELETE);
-    DECLARE_CONSTASCII_USTRING(FMURL_FORM_REFRESH);
-    DECLARE_CONSTASCII_USTRING(FMURL_FORM_REFRESH_CURRENT_CONTROL);
-
-    DECLARE_CONSTASCII_USTRING(FMURL_FORM_SORT_UP);
-    DECLARE_CONSTASCII_USTRING(FMURL_FORM_SORT_DOWN);
-    DECLARE_CONSTASCII_USTRING(FMURL_FORM_SORT);
-    DECLARE_CONSTASCII_USTRING(FMURL_FORM_AUTO_FILTER);
-    DECLARE_CONSTASCII_USTRING(FMURL_FORM_FILTER);
-    DECLARE_CONSTASCII_USTRING(FMURL_FORM_APPLY_FILTER);
-    DECLARE_CONSTASCII_USTRING(FMURL_FORM_REMOVE_FILTER);
-
-    DECLARE_CONSTASCII_USTRING(FMURL_CONFIRM_DELETION);
-
-    DECLARE_CONSTASCII_USTRING(FMURL_COMPONENT_FORMGRIDVIEW);
-    DECLARE_CONSTASCII_USTRING(FMURL_GRIDVIEW_CLEARVIEW);
-    DECLARE_CONSTASCII_USTRING(FMURL_GRIDVIEW_ADDCOLUMN);
-    DECLARE_CONSTASCII_USTRING(FMURL_GRIDVIEW_ATTACHTOFORM);
-
-    DECLARE_CONSTASCII_USTRING(FMARG_ATTACHTO_MASTERFORM);
-    DECLARE_CONSTASCII_USTRING(FMARG_ADDCOL_COLUMNTYPE);
-    DECLARE_CONSTASCII_USTRING(FMARG_ADDCOL_COLUMNPOS);
-
-}	// namespace svxform
+#define FMURL_FORMSLOTS_PREFIX             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/" ) )
+#define FMURL_FORM_POSITION                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/positionForm" ) )
+#define FMURL_FORM_RECORDCOUNT             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/RecordCount" ) )
+#define FMURL_RECORD_MOVEFIRST             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToFirst" ) )
+#define FMURL_RECORD_MOVEPREV              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToPrev" ) )
+#define FMURL_RECORD_MOVENEXT              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToNext" ) )
+#define FMURL_RECORD_MOVELAST              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToLast" ) )
+#define FMURL_RECORD_MOVETONEW             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToNew" ) )
+#define FMURL_RECORD_UNDO                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/undoRecord" ) )
+#define FMURL_RECORD_SAVE                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/saveRecord" ) )
+#define FMURL_RECORD_DELETE                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/deleteRecord" ) )
+#define FMURL_FORM_REFRESH                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/refreshForm" ) )
+#define FMURL_FORM_REFRESH_CURRENT_CONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/refreshCurrentControl" ) )
+#define FMURL_FORM_SORT_UP                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sortUp" ) )
+#define FMURL_FORM_SORT_DOWN               rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sortDown" ) )
+#define FMURL_FORM_SORT                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sort" ) )
+#define FMURL_FORM_AUTO_FILTER             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/autoFilter" ) )
+#define FMURL_FORM_FILTER                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/filter" ) )
+#define FMURL_FORM_APPLY_FILTER            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/applyFilter" ) )
+#define FMURL_FORM_REMOVE_FILTER           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/removeFilterOrder" ) )
+#define FMURL_CONFIRM_DELETION             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/ConfirmDeletion" ) )
+#define FMURL_COMPONENT_FORMGRIDVIEW       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".component:DB/FormGridView" ) )
+#define FMURL_GRIDVIEW_CLEARVIEW           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/ClearView" ) )
+#define FMURL_GRIDVIEW_ADDCOLUMN           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/AddGridColumn" ) )
+#define FMURL_GRIDVIEW_ATTACHTOFORM        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/AttachToForm" ) )
+#define FMARG_ATTACHTO_MASTERFORM          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MasterForm" ) )
+#define FMARG_ADDCOL_COLUMNTYPE            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnType" ) )
+#define FMARG_ADDCOL_COLUMNPOS             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnPosition" ) )
 
 #endif // _SVX_FMURL_HXX
-
diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx
index a833ff1273..2083e2baa8 100644
--- a/svx/source/inc/formtoolbars.hxx
+++ b/svx/source/inc/formtoolbars.hxx
@@ -31,14 +31,13 @@
 #ifndef SVX_SOURCE_INC_FORMTOOLBARS_HXX
 #define SVX_SOURCE_INC_FORMTOOLBARS_HXX
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 #include "fmdocumentclassification.hxx"
 #include <com/sun/star/frame/XLayoutManager.hpp>
 
 #include <tools/solar.h>
 
+#include <svx/svxdllapi.h>
+
 //........................................................................
 namespace svxform
 {
@@ -58,7 +57,7 @@ namespace svxform
             @param _rxFrame
                 the frame to analyze
         */
-        FormToolboxes(
+        SVX_DLLPUBLIC FormToolboxes(
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
         );
 
@@ -66,16 +65,16 @@ namespace svxform
         /** retrieves the URI for the toolbox associated with the given slot, depending
             on the type of our document
         */
-        ::rtl::OUString
+        SVX_DLLPUBLIC ::rtl::OUString
                 getToolboxResourceName( USHORT _nSlotId ) const;
 
         /** toggles the toolbox associated with the given slot
         */
-        void    toggleToolbox( USHORT _nSlotId ) const;
+        SVX_DLLPUBLIC void    toggleToolbox( USHORT _nSlotId ) const;
 
         /** determines whether the toolbox associated with the given slot is currently visible
         */
-        bool    isToolboxVisible( USHORT _nSlotId ) const;
+        SVX_DLLPUBLIC bool    isToolboxVisible( USHORT _nSlotId ) const;
 
         /** ensures that a given toolbox is visible
         */
diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx
index a8fb271abe..9b7930837e 100644
--- a/svx/source/inc/gridcols.hxx
+++ b/svx/source/inc/gridcols.hxx
@@ -30,25 +30,20 @@
 #ifndef _SVX_GRIDCOLS_HXX
 #define _SVX_GRIDCOLS_HXX
 
-#include "fmstatic.hxx"
+#include <sal/types.h>
 
-namespace svxform
-{
-
-    // list of possible controls
-    DECLARE_CONSTASCII_USTRING(FM_COL_TEXTFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_CHECKBOX);
-    DECLARE_CONSTASCII_USTRING(FM_COL_COMBOBOX);
-    DECLARE_CONSTASCII_USTRING(FM_COL_LISTBOX);
-    DECLARE_CONSTASCII_USTRING(FM_COL_NUMERICFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_DATEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_TIMEFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_CURRENCYFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_PATTERNFIELD);
-    DECLARE_CONSTASCII_USTRING(FM_COL_FORMATTEDFIELD);
-
-}	// namespace svxform
+namespace rtl { class OUString; }
 
+#define FM_COL_TEXTFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextField" ) )
+#define FM_COL_COMBOBOX       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboBox" ) )
+#define FM_COL_CHECKBOX       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CheckBox" ) )
+#define FM_COL_TIMEFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TimeField" ) )
+#define FM_COL_DATEFIELD      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateField" ) )
+#define FM_COL_NUMERICFIELD   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumericField" ) )
+#define FM_COL_CURRENCYFIELD  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CurrencyField" ) )
+#define FM_COL_PATTERNFIELD   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PatternField" ) )
+#define FM_COL_LISTBOX        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ) )
+#define FM_COL_FORMATTEDFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormattedField" ) )
 
 // column type ids
 #define TYPE_CHECKBOX		0
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index 398c638c73..61e0e951bd 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -43,7 +43,7 @@ namespace svxform
     //====================================================================
     //= OSQLParserClient
     //====================================================================
-    class OSQLParserClient : public ODbtoolsClient
+    class SVX_DLLPUBLIC OSQLParserClient : public ODbtoolsClient
                             ,public ::svxform::OParseContextClient
     {
     private:
diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx
index 3db48e105d..8fb8ff9db2 100644
--- a/svx/source/inc/stringlistresource.hxx
+++ b/svx/source/inc/stringlistresource.hxx
@@ -31,11 +31,10 @@
 #ifndef SVX_STRINGLISTRESOURCE_HXX
 #define SVX_STRINGLISTRESOURCE_HXX
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
 #include <tools/rc.hxx>
 
+#include <svx/svxdllapi.h>
+
 #include <memory>
 
 //........................................................................
@@ -52,8 +51,8 @@ namespace svx
     class StringListResource : public Resource
     {
     public:
-        StringListResource( const ResId& _rResId );
-        ~StringListResource();
+        SVX_DLLPUBLIC StringListResource( const ResId& _rResId );
+        SVX_DLLPUBLIC ~StringListResource();
 
         inline void get( ::std::vector< String >& _rStrings )
         {
diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx
index e4cfa57359..c4e3cf0287 100644
--- a/svx/source/inc/unogalthemeprovider.hxx
+++ b/svx/source/inc/unogalthemeprovider.hxx
@@ -36,6 +36,8 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/gallery/XGalleryThemeProvider.hpp>
 
+#include <svx/svxdllapi.h>
+
 class Gallery;
 
 namespace unogallery {
@@ -60,8 +62,8 @@ public:
     GalleryThemeProvider();
     ~GalleryThemeProvider();
     
-    static ::rtl::OUString getImplementationName_Static() throw();
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
+    SVX_DLLPUBLIC static ::rtl::OUString getImplementationName_Static() throw();
+    SVX_DLLPUBLIC static ::com::sun::star::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
     
 protected:
 
diff --git a/svx/source/inc/unopolyhelper.hxx b/svx/source/inc/unopolyhelper.hxx
index 431b40cea2..e912d02ad4 100644
--- a/svx/source/inc/unopolyhelper.hxx
+++ b/svx/source/inc/unopolyhelper.hxx
@@ -33,6 +33,8 @@
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
+#include <svx/svxdllapi.h>
+
 namespace com { namespace sun { namespace star { namespace drawing {
     struct PolyPolygonBezierCoords;
 } } } }
@@ -48,7 +50,7 @@ basegfx::B2DPolyPolygon SvxConvertPolyPolygonBezierToB2DPolyPolygon( const com::
 
 /** convert a B2DPolyPolygon to a drawing::PolyPolygonBezierCoords
 */
-void SvxConvertB2DPolyPolygonToPolyPolygonBezier( const basegfx::B2DPolyPolygon& rPolyPoly, com::sun::star::drawing::PolyPolygonBezierCoords& rRetval );
+SVX_DLLPUBLIC void SvxConvertB2DPolyPolygonToPolyPolygonBezier( const basegfx::B2DPolyPolygon& rPolyPoly, com::sun::star::drawing::PolyPolygonBezierCoords& rRetval );
 
 
 #endif
diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk
index c6cae54647..ef4bf0b001 100644
--- a/svx/source/items/makefile.mk
+++ b/svx/source/items/makefile.mk
@@ -38,6 +38,7 @@ PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
 
 PRJNAME=svx
 TARGET=items
+LIBTARGET=NO
 
 # --- Settings -----------------------------------------------------
 
@@ -51,41 +52,45 @@ SRC1FILES =  \
         svxerr.src		\
         svxitems.src
 
-SLOFILES=	\
-        $(SLO)$/ofaitem.obj \
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
         $(SLO)$/writingmodeitem.obj \
         $(SLO)$/frmitems.obj \
         $(SLO)$/paraitem.obj \
         $(SLO)$/textitem.obj \
-        $(SLO)$/postattr.obj	\
         $(SLO)$/flditem.obj \
-        $(SLO)$/hlnkitem.obj \
         $(SLO)$/svxfont.obj \
-        $(SLO)$/pageitem.obj	\
-                $(SLO)$/viewlayoutitem.obj    \
-                $(SLO)$/paperinf.obj    \
+        $(SLO)$/paperinf.obj    \
         $(SLO)$/drawitem.obj	\
-        $(SLO)$/algitem.obj \
         $(SLO)$/itemtype.obj	\
-        $(SLO)$/rotmodit.obj \
-        $(SLO)$/numinf.obj	\
-        $(SLO)$/svxerr.obj	\
-        $(SLO)$/numfmtsh.obj	\
-        $(SLO)$/zoomitem.obj \
         $(SLO)$/chrtitem.obj	\
         $(SLO)$/bulitem.obj \
         $(SLO)$/e3ditem.obj \
         $(SLO)$/numitem.obj \
         $(SLO)$/grfitem.obj \
         $(SLO)$/clipfmtitem.obj \
-        $(SLO)$/svxempty.obj \
         $(SLO)$/xmlcnitm.obj \
         $(SLO)$/customshapeitem.obj \
-        $(SLO)$/charhiddenitem.obj \
+        $(SLO)$/charhiddenitem.obj
+
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+        $(SLO)$/ofaitem.obj \
+        $(SLO)$/postattr.obj	\
+        $(SLO)$/hlnkitem.obj \
+        $(SLO)$/pageitem.obj	\
+                $(SLO)$/viewlayoutitem.obj    \
+        $(SLO)$/algitem.obj \
+        $(SLO)$/rotmodit.obj \
+        $(SLO)$/numinf.obj	\
+        $(SLO)$/svxerr.obj	\
+        $(SLO)$/numfmtsh.obj	\
+        $(SLO)$/zoomitem.obj \
+        $(SLO)$/svxempty.obj \
         $(SLO)$/SmartTagItem.obj \
         $(SLO)$/zoomslideritem.obj \
 
-
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
 
 EXCEPTIONSFILES= \
         $(SLO)$/paraitem.obj \
diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx
index 32e8b9f617..8460558e67 100644
--- a/svx/source/items/textitem.cxx
+++ b/svx/source/items/textitem.cxx
@@ -485,6 +485,13 @@ SfxItemPresentation SvxFontItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
+//------------------------------------------------------------------------
+
+void SvxFontItem::EnableStoreUnicodeNames( BOOL bEnable )
+{
+    bEnableStoreUnicodeNames = bEnable;
+}
+
 // class SvxPostureItem --------------------------------------------------
 
 SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const USHORT nId ) :
diff --git a/svx/source/msfilter/escherex.cxx b/svx/source/msfilter/escherex.cxx
index 4eeeda8171..d21aa84a2d 100644
--- a/svx/source/msfilter/escherex.cxx
+++ b/svx/source/msfilter/escherex.cxx
@@ -156,14 +156,6 @@ EscherExClientAnchor_Base::~EscherExClientAnchor_Base()
 
 // ---------------------------------------------------------------------------------------------
 
-struct EscherPropSortStruct
-{
-    sal_uInt8*	pBuf;
-    sal_uInt32	nPropSize;
-    sal_uInt32	nPropValue;
-    sal_uInt16	nPropId;
-};
-
 void EscherPropertyContainer::ImplInit()
 {
     nSortCount = 0;
@@ -275,21 +267,40 @@ void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, sal_Bool bBlib, sal_uI
     }
 }
 
-sal_Bool EscherPropertyContainer::GetOpt( sal_uInt16 nPropId, sal_uInt32& nPropValue ) const
+sal_Bool EscherPropertyContainer::GetOpt( sal_uInt16 nPropId, sal_uInt32& rPropValue ) const
+{
+    EscherPropSortStruct aPropStruct;
+    
+    if ( GetOpt( nPropId, aPropStruct ) )
+    {
+        rPropValue = aPropStruct.nPropValue;
+        return sal_True;
+    }
+    return sal_False;
+}
+
+sal_Bool EscherPropertyContainer::GetOpt( sal_uInt16 nPropId, EscherPropSortStruct& rPropValue ) const
 {
-    sal_Bool bRetValue = sal_False;
     for( sal_uInt32 i = 0; i < nSortCount; i++ )
     {
         if ( ( pSortStruct[ i ].nPropId &~0xc000 ) == ( nPropId &~0xc000 ) )
         {
-            nPropValue = pSortStruct[ i ].nPropValue;
-            bRetValue = sal_True;
-            break;
+            rPropValue = pSortStruct[ i ];
+            return sal_True;
         }
     }
-    return bRetValue;
+    return sal_False;
 }
 
+EscherProperties EscherPropertyContainer::GetOpts() const
+{
+    EscherProperties aVector;
+
+    for ( sal_uInt32 i = 0; i < nSortCount; ++i )
+        aVector.push_back( pSortStruct[ i ] );
+
+    return aVector;
+}
 
 extern "C" int __LOADONCALLAPI EscherPropSortFunc( const void* p1, const void* p2 )
 {
@@ -715,7 +726,7 @@ void EscherPropertyContainer::CreateTextProperties(
         AddOpt( ESCHER_Prop_lTxid, nTextId );
 }
 
-static sal_Bool GetLineArrow( const sal_Bool bLineStart,
+sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
         ESCHER_LineEnd& reLineEnd, sal_Int32& rnArrowLength, sal_Int32& rnArrowWidth )
 {
@@ -2084,6 +2095,68 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape,
     }
 }
 
+sal_Bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape )
+{
+    sal_Bool bIsDefaultObject = sal_False;
+    if ( pCustoShape )
+    {
+    if (   pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_EQUATIONS )
+           && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_VIEWBOX )
+           && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_PATH )
+           && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_GLUEPOINTS )
+           && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_SEGMENTS )
+           && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_STRETCHX )
+           && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_STRETCHY )
+//					&& pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_HANDLES )
+           && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_TEXTFRAMES ) )
+        bIsDefaultObject = sal_True;
+    }
+
+    return bIsDefaultObject;
+}
+
+void EscherPropertyContainer::LookForPolarHandles( const MSO_SPT eShapeType, sal_Int32& nAdjustmentsWhichNeedsToBeConverted )
+{
+    const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eShapeType );
+    if ( pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles )
+    {
+    sal_Int32 k, nkCount = pDefCustomShape->nHandles;
+    const SvxMSDffHandle* pData = pDefCustomShape->pHandles;
+    for ( k = 0; k < nkCount; k++, pData++ )
+    {
+        if ( pData->nFlags & MSDFF_HANDLE_FLAGS_POLAR )
+        {
+        if ( ( pData->nPositionY >= 0x256 ) || ( pData->nPositionY <= 0x107 ) )
+            nAdjustmentsWhichNeedsToBeConverted |= ( 1 << k );
+        }
+    }
+    }
+}
+
+sal_Bool EscherPropertyContainer::GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue )
+{
+    if ( rkProp.State != beans::PropertyState_DIRECT_VALUE )
+    return FALSE;
+
+    sal_Bool bUseFixedFloat = ( nAdjustmentsWhichNeedsToBeConverted & ( 1 << nIndex ) ) != 0;
+    if ( rkProp.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
+    {
+    double fValue;
+    rkProp.Value >>= fValue;
+    if ( bUseFixedFloat )
+        fValue *= 65536.0;
+    nValue = (sal_Int32)fValue;
+    }
+    else
+    {
+    rkProp.Value >>= nValue;
+    if ( bUseFixedFloat )
+        nValue <<= 16;
+    }
+
+    return TRUE;
+}
+
 void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeType, const uno::Reference< drawing::XShape > & rXShape )
 {
     uno::Reference< beans::XPropertySet > aXPropSet( rXShape, uno::UNO_QUERY );
@@ -2108,22 +2181,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
             sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
             uno::Sequence< beans::PropertyValues > aHandlesPropSeq;
             sal_Bool bPredefinedHandlesUsed = sal_True;
-
-
-            sal_Bool bIsDefaultObject = sal_False;
-            if ( pCustoShape )
-            {
-                if (   pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_EQUATIONS )
-                    && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_VIEWBOX )
-                    && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_PATH )
-                    && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_GLUEPOINTS )
-                    && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_SEGMENTS )
-                    && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_STRETCHX )
-                    && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_STRETCHY )
-//					&& pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_HANDLES )
-                    && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_TEXTFRAMES ) )
-                    bIsDefaultObject = sal_True;
-            }
+            sal_Bool bIsDefaultObject = IsDefaultObject( pCustoShape );
 
             // convert property "Equations" into std::vector< EnhancedCustomShapeEquationEquation >
             std::vector< EnhancedCustomShapeEquation >	aEquations;
@@ -3185,46 +3243,12 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                 if ( pAdjustmentValuesProp->Value >>= aAdjustmentSeq )
                 {
                     if ( bPredefinedHandlesUsed )
-                    {
-                        const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eShapeType );
-                        if ( pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles )
-                        {
-                            sal_Int32 k, nkCount = pDefCustomShape->nHandles;
-                            const SvxMSDffHandle* pData = pDefCustomShape->pHandles;
-                            for ( k = 0; k < nkCount; k++, pData++ )
-                            {
-                                if ( pData->nFlags & MSDFF_HANDLE_FLAGS_POLAR )
-                                {
-                                    if ( ( pData->nPositionY >= 0x256 ) || ( pData->nPositionY <= 0x107 ) )
-                                        nAdjustmentsWhichNeedsToBeConverted |= ( 1 << k );
-                                }
-                            }
-                        }
-                    }
+                        LookForPolarHandles( eShapeType, nAdjustmentsWhichNeedsToBeConverted );
+
                     sal_Int32 k, nValue = 0, nAdjustmentValues = aAdjustmentSeq.getLength();
                     for ( k = 0; k < nAdjustmentValues; k++ )
-                    {
-                        const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp = aAdjustmentSeq[ k ];
-                        if ( rkProp.State == beans::PropertyState_DIRECT_VALUE )
-                        {
-                            sal_Bool bUseFixedFloat = ( nAdjustmentsWhichNeedsToBeConverted & ( 1 << k ) ) != 0;
-                            if ( rkProp.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
-                            {
-                                double fValue;
-                                rkProp.Value >>= fValue;
-                                if ( bUseFixedFloat )
-                                    fValue *= 65536.0;
-                                nValue = (sal_Int32)fValue;
-                            }
-                            else
-                            {
-                                rkProp.Value >>= nValue;
-                                if ( bUseFixedFloat )
-                                    nValue <<= 16;
-                            }
+                        if( GetAdjustmentValue( aAdjustmentSeq[ k ], k, nAdjustmentsWhichNeedsToBeConverted, nValue ) )
                             AddOpt( (sal_uInt16)( DFF_Prop_adjustValue + k ), (sal_uInt32)nValue );
-                        }
-                    }
                 }
             }
         }
@@ -3923,30 +3947,6 @@ struct EscherConnectorRule
     sal_uInt32	ncptiB;			// Connection site Index of shape B
 };
 
-struct EscherConnectorListEntry
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape	>	mXConnector;
-    ::com::sun::star::awt::Point			maPointA;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape	>	mXConnectToA;
-    ::com::sun::star::awt::Point			maPointB;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape	>	mXConnectToB;
-
-    sal_uInt32		GetConnectorRule( sal_Bool bFirst );
-
-                    EscherConnectorListEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rC,
-                                        const ::com::sun::star::awt::Point& rPA,
-                                        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rSA ,
-                                        const ::com::sun::star::awt::Point& rPB,
-                                        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rSB ) :
-                                            mXConnector	( rC ),
-                                            maPointA	( rPA ),
-                                            mXConnectToA( rSA ),
-                                            maPointB	( rPB ),
-                                            mXConnectToB( rSB ) {}
-
-    sal_uInt32		GetClosestPoint( const Polygon& rPoly, const ::com::sun::star::awt::Point& rP );
-};
-
 struct EscherShapeListEntry
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape	>	aXShape;
@@ -4650,6 +4650,17 @@ void EscherEx::AddAtom( UINT32 nAtomSize, UINT16 nRecType, int nRecVersion, int
 
 // ---------------------------------------------------------------------------------------------
 
+void EscherEx::AddChildAnchor( const Rectangle& rRect )
+{
+    AddAtom( 16, ESCHER_ChildAnchor );
+    GetStream() << (INT32)rRect.Left()
+                << (INT32)rRect.Top()
+                << (INT32)rRect.Right()
+                << (INT32)rRect.Bottom();
+}
+
+// ---------------------------------------------------------------------------------------------
+
 void EscherEx::AddClientAnchor( const Rectangle& rRect )
 {
     AddAtom( 8, ESCHER_ClientAnchor );
@@ -4699,15 +4710,10 @@ UINT32 EscherEx::EnterGroup( const String& rShapeName, const Rectangle* pBoundRe
         if( rShapeName.Len() > 0 )
             aPropOpt.AddOpt( ESCHER_Prop_wzName, rShapeName );
 
-        aPropOpt.Commit( *mpOutStrm );
+        Commit( aPropOpt, aRect );
         if ( mnGroupLevel > 1 )
-        {
-            AddAtom( 16, ESCHER_ChildAnchor );
-            *mpOutStrm	<< (INT32)aRect.Left()
-                        << (INT32)aRect.Top()
-                           << (INT32)aRect.Right()
-                        << (INT32)aRect.Bottom();
-        }
+            AddChildAnchor( aRect );
+
         EscherExHostAppData* pAppData = mpImplEscherExSdr->ImplGetHostData();
         if( pAppData )
         {
@@ -4805,6 +4811,13 @@ UINT32 EscherEx::GetShapeID()
 
 // ---------------------------------------------------------------------------------------------
 
+void EscherEx::Commit( EscherPropertyContainer& rProps, const Rectangle& )
+{
+    rProps.Commit( GetStream() );
+}
+
+// ---------------------------------------------------------------------------------------------
+
 UINT32 EscherEx::GetColor( const UINT32 nSOColor, BOOL bSwap )
 {
     if ( bSwap )
diff --git a/svx/source/msfilter/eschesdo.cxx b/svx/source/msfilter/eschesdo.cxx
index 319cb2d43d..86a1bd131b 100644
--- a/svx/source/msfilter/eschesdo.cxx
+++ b/svx/source/msfilter/eschesdo.cxx
@@ -736,16 +736,10 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         if( rObj.GetAngle() )
             ImplFlipBoundingBox( rObj, aPropOpt );
 
-        aPropOpt.Commit( mpEscherEx->GetStream() );
+        mpEscherEx->Commit( aPropOpt, rObj.GetRect() );
         if( mpEscherEx->GetGroupLevel() > 1 )
-        {
-            mpEscherEx->AddAtom( 16, ESCHER_ChildAnchor );
-            const Rectangle& rRect = rObj.GetRect();
-            mpEscherEx->GetStream() << (INT32)rRect.Left()
-                                    << (INT32)rRect.Top()
-                                       << (INT32)rRect.Right()
-                                    << (INT32)rRect.Bottom();
-        }
+            mpEscherEx->AddChildAnchor( rObj.GetRect() );
+
         if ( mpHostAppData )
         {	//! with AdditionalText the App has to control whether these are written or not
             mpHostAppData->WriteClientAnchor( *mpEscherEx, rObj.GetRect() );
@@ -839,15 +833,10 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj,
                                             rObj.GetRect() );
         }
         rObj.SetAngle( nAngle );
-        aPropOpt.Commit( mpEscherEx->GetStream() );
+        mpEscherEx->Commit( aPropOpt, rObj.GetRect() );
 
         // write the childanchor
-        mpEscherEx->AddAtom( 16, ESCHER_ChildAnchor );
-        const Rectangle& rRect = rObj.GetRect();
-        mpEscherEx->GetStream() << (INT32)rRect.Left()
-                                << (INT32)rRect.Top()
-                                   << (INT32)rRect.Right()
-                                << (INT32)rRect.Bottom();
+        mpEscherEx->AddChildAnchor( rObj.GetRect() );
 
 #if defined EES_WRITE_EPP
         // ClientAnchor
diff --git a/svx/source/msfilter/makefile.mk b/svx/source/msfilter/makefile.mk
index 85c120f88d..adbe8b1048 100644
--- a/svx/source/msfilter/makefile.mk
+++ b/svx/source/msfilter/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..$/..
 
 PRJNAME=svx
 TARGET=msfilter
+LIBTARGET=NO
 AUTOSEG=true
 
 # --- Settings -----------------------------------------------------
@@ -42,7 +43,8 @@ AUTOSEG=true
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=\
+LIB1TARGET= $(SLB)$/$(TARGET)-msfilter.lib
+LIB1OBJFILES= \
     $(SLO)$/countryid.obj	\
     $(SLO)$/escherex.obj	\
     $(SLO)$/eschesdo.obj    \
@@ -54,6 +56,12 @@ SLOFILES=\
     $(SLO)$/mscodec.obj		\
     $(SLO)$/msfiltertracer.obj
 
+LIB2TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB2OBJFILES= \
+    $(SLO)$/svxmsbas2.obj
+
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+
 EXCEPTIONSFILES= \
     $(SLO)$/eschesdo.obj	\
     $(SLO)$/escherex.obj	\
diff --git a/svx/source/msfilter/svxmsbas.cxx b/svx/source/msfilter/svxmsbas.cxx
index 4dd3446f61..a2448c8727 100644
--- a/svx/source/msfilter/svxmsbas.cxx
+++ b/svx/source/msfilter/svxmsbas.cxx
@@ -403,53 +403,4 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
     return bRet;
 }
 
-ULONG SvxImportMSVBasic::SaveOrDelMSVBAStorage( BOOL bSaveInto,
-                                                const String& rStorageName )
-{
-    ULONG nRet = ERRCODE_NONE;
-    uno::Reference < embed::XStorage > xSrcRoot( rDocSh.GetStorage() );
-    String aDstStgName( GetMSBasicStorageName() );
-    SotStorageRef xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, aDstStgName,
-                                STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL ) );
-    if( xVBAStg.Is() && !xVBAStg->GetError() )
-    {
-        xVBAStg = 0;
-        if( bSaveInto )
-        {
-            BasicManager *pBasicMan = rDocSh.GetBasicManager();
-            if( pBasicMan && pBasicMan->IsBasicModified() )
-                nRet = ERRCODE_SVX_MODIFIED_VBASIC_STORAGE;
-
-            SotStorageRef xSrc = SotStorage::OpenOLEStorage( xSrcRoot, aDstStgName, STREAM_STD_READ );
-            SotStorageRef xDst = xRoot->OpenSotStorage( rStorageName, STREAM_READWRITE | STREAM_TRUNC );
-            xSrc->CopyTo( xDst );
-            xDst->Commit();
-            ErrCode nError = xDst->GetError();
-            if ( nError == ERRCODE_NONE )
-                nError = xSrc->GetError();
-            if ( nError != ERRCODE_NONE )
-                xRoot->SetError( nError );
-        }
-    }
-
-    return nRet;
-}
-
-// check if the MS-VBA-Storage exists in the RootStorage of the DocShell.
-// If it exists, then return the WarningId for losing the information.
-ULONG SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocSh)
-{
-    uno::Reference < embed::XStorage > xSrcRoot( rDocSh.GetStorage() );
-    SvStorageRef xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, GetMSBasicStorageName(),
-                    STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL ));
-    return ( xVBAStg.Is() && !xVBAStg->GetError() )
-                    ? ERRCODE_SVX_VBASIC_STORAGE_EXIST
-                    : ERRCODE_NONE;
-}
-
-String SvxImportMSVBasic::GetMSBasicStorageName()
-{
-    return String( RTL_CONSTASCII_USTRINGPARAM( "_MS_VBA_Macros" ) );
-}
-
 /* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svx/source/msfilter/svxmsbas2.cxx b/svx/source/msfilter/svxmsbas2.cxx
new file mode 100644
index 0000000000..afd772bbd7
--- /dev/null
+++ b/svx/source/msfilter/svxmsbas2.cxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svxmsbas.cxx,v $
+ * $Revision: 1.24 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svx.hxx"
+
+#include <basic/basmgr.hxx>
+#include <sfx2/objsh.hxx>
+#include <svxerr.hxx>
+#include <svxmsbas.hxx>
+
+using namespace com::sun::star;
+
+ULONG SvxImportMSVBasic::SaveOrDelMSVBAStorage( BOOL bSaveInto,
+                                                const String& rStorageName )
+{
+    ULONG nRet = ERRCODE_NONE;
+    uno::Reference < embed::XStorage > xSrcRoot( rDocSh.GetStorage() );
+    String aDstStgName( GetMSBasicStorageName() );
+    SotStorageRef xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, aDstStgName,
+                                STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL ) );
+    if( xVBAStg.Is() && !xVBAStg->GetError() )
+    {
+        xVBAStg = 0;
+        if( bSaveInto )
+        {
+            BasicManager *pBasicMan = rDocSh.GetBasicManager();
+            if( pBasicMan && pBasicMan->IsBasicModified() )
+                nRet = ERRCODE_SVX_MODIFIED_VBASIC_STORAGE;
+
+            SotStorageRef xSrc = SotStorage::OpenOLEStorage( xSrcRoot, aDstStgName, STREAM_STD_READ );
+            SotStorageRef xDst = xRoot->OpenSotStorage( rStorageName, STREAM_READWRITE | STREAM_TRUNC );
+            xSrc->CopyTo( xDst );
+            xDst->Commit();
+            ErrCode nError = xDst->GetError();
+            if ( nError == ERRCODE_NONE )
+                nError = xSrc->GetError();
+            if ( nError != ERRCODE_NONE )
+                xRoot->SetError( nError );
+        }
+    }
+
+    return nRet;
+}
+
+// check if the MS-VBA-Storage exists in the RootStorage of the DocShell.
+// If it exists, then return the WarningId for losing the information.
+ULONG SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocSh)
+{
+    uno::Reference < embed::XStorage > xSrcRoot( rDocSh.GetStorage() );
+    SvStorageRef xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, GetMSBasicStorageName(),
+                    STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL ));
+    return ( xVBAStg.Is() && !xVBAStg->GetError() )
+                    ? ERRCODE_SVX_VBASIC_STORAGE_EXIST
+                    : ERRCODE_NONE;
+}
+
+String SvxImportMSVBasic::GetMSBasicStorageName()
+{
+    return String( RTL_CONSTASCII_USTRINGPARAM( "_MS_VBA_Macros" ) );
+}
diff --git a/svx/source/options/makefile.mk b/svx/source/options/makefile.mk
index c4828b81f3..d68703983e 100644
--- a/svx/source/options/makefile.mk
+++ b/svx/source/options/makefile.mk
@@ -36,6 +36,7 @@ PROJECTPCHSOURCE=$(PRJ)$/util\svxpch
 
 PRJNAME=svx
 TARGET=options
+LIBTARGET=NO
 
 # --- Settings -----------------------------------------------------
 
@@ -62,39 +63,23 @@ SRC1FILES=\
     optchart.src    \
     optimprove.src
 
-#EXCEPTIONSFILES=\
-#	$(SLO)$/optasian.obj		\
-#	$(SLO)$/optlingu.obj		\
-#	$(SLO)$/optaccessibility.obj	\
-#	$(SLO)$/optsave.obj		\
-#	$(SLO)$/optpath.obj
-
-#SLOFILES=\
-#	$(EXCEPTIONSFILES)	\
-#	$(SLO)$/asiancfg.obj	\
-#	$(SLO)$/htmlcfg.obj	\
-#	$(SLO)$/optcolor.obj    \
-#	$(SLO)$/optjsearch.obj  \
-#	$(SLO)$/optitems.obj	\
-#	$(SLO)$/optgenrl.obj	\
-#	$(SLO)$/adritem.obj	\
-#	$(SLO)$/optgrid.obj	\
-#	$(SLO)$/optinet2.obj	\
-#	$(SLO)$/optextbr.obj    \
-#	$(SLO)$/srchcfg.obj	\
-#	$(SLO)$/optctl.obj
-
 EXCEPTIONSFILES=\
     $(SLO)$/optlingu.obj
 
-SLOFILES=\
-    $(EXCEPTIONSFILES)	\
-    $(SLO)$/asiancfg.obj    \
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
+    $(SLO)$/asiancfg.obj
+
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+    $(SLO)$/optlingu.obj \
     $(SLO)$/htmlcfg.obj \
     $(SLO)$/optitems.obj    \
     $(SLO)$/optgrid.obj \
     $(SLO)$/srchcfg.obj
 
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk
index 28eeb84e29..e777ad70d3 100644
--- a/svx/source/svdraw/makefile.mk
+++ b/svx/source/svdraw/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..$/..
 
 PRJNAME=svx
 TARGET=svdraw
+LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -42,11 +43,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=\
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
          $(SLO)$/svdxcgv.obj		 \
          $(SLO)$/svdmodel.obj		\
          $(SLO)$/svdpage.obj         \
-         $(SLO)$/svdoimp.obj         \
          $(SLO)$/svdobj.obj          \
          $(SLO)$/svdedtv1.obj        \
          $(SLO)$/svdcrtv.obj         \
@@ -59,7 +60,6 @@ SLOFILES=\
          $(SLO)$/svdotextdecomposition.obj		\
          $(SLO)$/svdotextpathdecomposition.obj	\
          $(SLO)$/svdouno.obj         \
-         $(SLO)$/svdfppt.obj         \
          $(SLO)$/svdpagv.obj		 \
          $(SLO)$/svddrgmt.obj        \
          $(SLO)$/svdpntv.obj         \
@@ -96,7 +96,6 @@ SLOFILES=\
          $(SLO)$/svdglev.obj         \
          $(SLO)$/svdglue.obj         \
          $(SLO)$/svdhlpln.obj        \
-         $(SLO)$/svdibrow.obj        \
          $(SLO)$/svditer.obj         \
          $(SLO)$/svdlayer.obj        \
          $(SLO)$/svdmark.obj         \
@@ -106,18 +105,29 @@ SLOFILES=\
          $(SLO)$/sdrpagewindow.obj         \
          $(SLO)$/sdrpaintwindow.obj         \
          $(SLO)$/svdpoev.obj         \
-         $(SLO)$/svdscrol.obj        \
          $(SLO)$/svdtrans.obj        \
          $(SLO)$/svdundo.obj         \
          $(SLO)$/svdviter.obj        \
          $(SLO)$/clonelist.obj		 \
-         $(SLO)$/ActionDescriptionProvider.obj \
          $(SLO)$/svdedtv.obj         \
          $(SLO)$/selectioncontroller.obj \
          $(SLO)$/polypolygoneditor.obj \
-         $(SLO)$/svdomedia.obj			\
+         $(SLO)$/svdibrow.obj        \
+         $(SLO)$/svdomedia.obj
+
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+         $(SLO)$/svdoimp.obj         \
+         $(SLO)$/svdscrol.obj        \
+         $(SLO)$/ActionDescriptionProvider.obj \
          $(SLO)$/impgrfll.obj
 
+LIB3TARGET= $(SLB)$/$(TARGET)-msfilter.lib
+LIB3OBJFILES= \
+         $(SLO)$/svdfppt.obj         \
+
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) $(LIB3OBJFILES)
+
 SRS1NAME=svdstr
 SRC1FILES= svdstr.src
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index e568e7ea93..991582d84b 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1882,6 +1882,11 @@ uno::Reference< uno::XInterface > SdrModel::getUnoModel()
     return mxUnoModel;
 }
 
+void SdrModel::setUnoModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xModel )
+{
+    mxUnoModel = xModel;
+}
+
 uno::Reference< uno::XInterface > SdrModel::createUnoModel()
 {
     DBG_ERROR( "SdrModel::createUnoModel() - base implementation should not be called!" );
diff --git a/svx/source/svrtf/makefile.mk b/svx/source/svrtf/makefile.mk
index 8dbbd79a82..950036034d 100644
--- a/svx/source/svrtf/makefile.mk
+++ b/svx/source/svrtf/makefile.mk
@@ -36,6 +36,7 @@ PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
 
 PRJNAME=svx
 TARGET=svxrtf
+LIBTARGET=NO
 AUTOSEG=true
 
 # --- Settings -----------------------------------------------------
@@ -48,11 +49,17 @@ AUTOSEG=true
 EXCEPTIONSFILES= \
         $(SLO)$/svxrtf.obj
 
-SLOFILES =	\
-        $(SLO)$/rtfgrf.obj  \
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
         $(SLO)$/rtfitem.obj \
         $(SLO)$/svxrtf.obj
 
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+        $(SLO)$/rtfgrf.obj
+
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+
 # ==========================================================================
 
 .INCLUDE :  target.mk
diff --git a/svx/source/svrtf/rtfgrf.cxx b/svx/source/svrtf/rtfgrf.cxx
index a3b6e44c19..c387fdf7e9 100644
--- a/svx/source/svrtf/rtfgrf.cxx
+++ b/svx/source/svrtf/rtfgrf.cxx
@@ -559,17 +559,4 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
     return bValidBmp;
 }
 
-    // alle Werte auf default; wird nach einlesen der Bitmap aufgerufen !
-void SvxRTFPictureType::ResetValues()
-{	// setze alle Werte RTF-Defaults
-    eStyle = RTF_BITMAP;
-    nMode = HEX_MODE;
-    nType = nGoalWidth = nGoalHeight = 0;
-    nWidth = nHeight = nWidthBytes = 0;
-    uPicLen = 0;
-    nBitsPerPixel = nPlanes = 1;
-    nScalX = nScalY = 100;		// Skalierung in Prozent
-    nCropT = nCropB = nCropL = nCropR = 0;
-}
-
 /* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 7079471e84..3be83626fe 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -58,7 +58,7 @@ namespace sdr { namespace table {
 
 // -----------------------------------------------------------------------------
 
-class Cell :	public SdrText,
+class SVX_DLLPUBLIC Cell :	public SdrText,
                 public SvxUnoTextBase,
                 public ::com::sun::star::table::XMergeableCell,
                 public ::com::sun::star::awt::XLayoutConstrains,
@@ -68,156 +68,156 @@ class Cell :	public SdrText,
     friend class CellUndo;
 
 public:
-    static rtl::Reference< Cell > create( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject );
+    SVX_DLLPRIVATE static rtl::Reference< Cell > create( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject );
 
     // private
-    void dispose();
+    SVX_DLLPRIVATE void dispose();
 
     // SdrTextShape proxy
     bool IsTextEditActive();
-    bool hasText() const;
+    SVX_DLLPRIVATE bool hasText() const;
 
-    void cloneFrom( const CellRef& rCell );
+    SVX_DLLPRIVATE void cloneFrom( const CellRef& rCell );
 
-    void setCellRect( ::Rectangle& rCellRect ) { maCellRect = rCellRect; }
-    const ::Rectangle& getCellRect() const { return maCellRect; }
-    ::Rectangle& getCellRect() { return maCellRect; }
+    SVX_DLLPRIVATE void setCellRect( ::Rectangle& rCellRect ) { maCellRect = rCellRect; }
+    SVX_DLLPRIVATE const ::Rectangle& getCellRect() const { return maCellRect; }
+    SVX_DLLPRIVATE ::Rectangle& getCellRect() { return maCellRect; }
 
     OutlinerParaObject* GetEditOutlinerParaObject() const;
-    void SetStyleSheet( SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr );
-    virtual SfxStyleSheet* GetStyleSheet() const;
+    SVX_DLLPRIVATE void SetStyleSheet( SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr );
+    SVX_DLLPRIVATE virtual SfxStyleSheet* GetStyleSheet() const;
     SfxStyleSheetPool* GetStyleSheetPool() const;
-    virtual const Rectangle& GetCurrentBoundRect() const;
-    virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const;
+    SVX_DLLPRIVATE virtual const Rectangle& GetCurrentBoundRect() const;
+    SVX_DLLPRIVATE virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const;
 
-    virtual const SfxItemSet& GetItemSet() const;
-    void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems);
+    SVX_DLLPRIVATE virtual const SfxItemSet& GetItemSet() const;
+    SVX_DLLPRIVATE void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems);
     void SetMergedItem(const SfxPoolItem& rItem);
 
-    sal_Int32 getMinimumWidth();
-    sal_Int32 getMinimumHeight();
+    SVX_DLLPRIVATE sal_Int32 getMinimumWidth();
+    SVX_DLLPRIVATE sal_Int32 getMinimumHeight();
 
-    long GetTextLeftDistance() const;
-    long GetTextRightDistance() const;
-    long GetTextUpperDistance() const;
-    long GetTextLowerDistance() const;
+    SVX_DLLPRIVATE long GetTextLeftDistance() const;
+    SVX_DLLPRIVATE long GetTextRightDistance() const;
+    SVX_DLLPRIVATE long GetTextUpperDistance() const;
+    SVX_DLLPRIVATE long GetTextLowerDistance() const;
 
-    SdrTextVertAdjust GetTextVerticalAdjust() const;
+    SVX_DLLPRIVATE SdrTextVertAdjust GetTextVerticalAdjust() const;
     SdrTextHorzAdjust GetTextHorizontalAdjust() const;
 
-    virtual void SetModel(SdrModel* pNewModel);
+    SVX_DLLPRIVATE virtual void SetModel(SdrModel* pNewModel);
 
-    void merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan );
-    void mergeContent( const CellRef& xSourceCell );
-    void replaceContentAndFormating( const CellRef& xSourceCell );
+    SVX_DLLPRIVATE void merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan );
+    SVX_DLLPRIVATE void mergeContent( const CellRef& xSourceCell );
+    SVX_DLLPRIVATE void replaceContentAndFormating( const CellRef& xSourceCell );
 
-    void setMerged();
+    SVX_DLLPRIVATE void setMerged();
 
     // XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& Type ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire() throw ();
-    virtual void SAL_CALL release() throw ();
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& Type ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL acquire() throw ();
+    SVX_DLLPRIVATE virtual void SAL_CALL release() throw ();
 
     // XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XLayoutConstrains
-    virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw (::com::sun::star::uno::RuntimeException);
 
     // XMergeableCell
-    virtual ::sal_Int32 SAL_CALL getRowSpan() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Int32 SAL_CALL getColumnSpan() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL isMerged() throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getRowSpan() throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColumnSpan() throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::sal_Bool SAL_CALL isMerged() throw (::com::sun::star::uno::RuntimeException);
 
     // XCell
-    virtual ::rtl::OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) throw (::com::sun::star::uno::RuntimeException);
-    virtual double SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setValue( double nValue ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::table::CellContentType SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getError() throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::rtl::OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual double SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL setValue( double nValue ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::table::CellContentType SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual sal_Int32 SAL_CALL getError() throw (::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::beans::XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XMultiPropertySet
-    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::beans::XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XMultiPropertyStates
-    virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XFastPropertySet
-    virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XText
-    virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, ::sal_Bool bAbsorb ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, ::sal_Bool bAbsorb ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
 
     // XSimpleText
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, ::sal_Bool bAbsorb ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, ::sal_Int16 nControlCharacter, ::sal_Bool bAbsorb ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, ::sal_Bool bAbsorb ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, ::sal_Int16 nControlCharacter, ::sal_Bool bAbsorb ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     // XTextRange
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getString(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::rtl::OUString SAL_CALL getString(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw (::com::sun::star::uno::RuntimeException);
 
     // XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject );
+    SVX_DLLPRIVATE virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject );
 
-    void	AddUndo();
+    SVX_DLLPRIVATE void	AddUndo();
 
     using SvxUnoTextRangeBase::setPropertyValue;
     using SvxUnoTextRangeBase::getPropertyValue;
 
-    sdr::properties::TextProperties* CloneProperties( SdrObject& rNewObj, Cell& rNewCell );
+    SVX_DLLPRIVATE sdr::properties::TextProperties* CloneProperties( SdrObject& rNewObj, Cell& rNewCell );
 
-    static sdr::properties::TextProperties* CloneProperties( sdr::properties::TextProperties* pProperties, SdrObject& rNewObj, Cell& rNewCell );
+    SVX_DLLPRIVATE static sdr::properties::TextProperties* CloneProperties( sdr::properties::TextProperties* pProperties, SdrObject& rNewObj, Cell& rNewCell );
 
-    void notifyModified();
+    SVX_DLLPRIVATE void notifyModified();
 
 protected:
-    virtual const SfxItemSet& GetObjectItemSet();
-    virtual void SetObjectItem(const SfxPoolItem& rItem);
+    SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet();
+    SVX_DLLPRIVATE virtual void SetObjectItem(const SfxPoolItem& rItem);
 
-    ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap );
+    SVX_DLLPRIVATE ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap );
 
 private:
-    Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw();
-    virtual ~Cell() throw();
+    SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw();
+    SVX_DLLPRIVATE virtual ~Cell() throw();
 
     const SvxItemPropertySet* mpPropSet;
 
diff --git a/svx/source/table/makefile.mk b/svx/source/table/makefile.mk
index 8789cd4da8..ae0dc5eb68 100644
--- a/svx/source/table/makefile.mk
+++ b/svx/source/table/makefile.mk
@@ -36,6 +36,7 @@ PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
 
 PRJNAME=svx
 TARGET=table
+LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE;
 
 # --- Settings -----------------------------------------------------
@@ -45,9 +46,9 @@ ENABLE_EXCEPTIONS=TRUE;
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=	\
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
         $(SLO)$/propertyset.obj\
-        $(SLO)$/celleditsource.obj\
         $(SLO)$/cell.obj\
         $(SLO)$/cellrange.obj\
         $(SLO)$/cellcursor.obj\
@@ -61,13 +62,19 @@ SLOFILES=	\
         $(SLO)$/tablelayouter.obj\
         $(SLO)$/tablehandles.obj\
         $(SLO)$/tablecontroller.obj\
-        $(SLO)$/tabledesign.obj\
-        $(SLO)$/tableundo.obj\
-        $(SLO)$/accessibletableshape.obj\
+        $(SLO)$/tableundo.obj
+
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+        $(SLO)$/celleditsource.obj \
+        $(SLO)$/tabledesign.obj \
+        $(SLO)$/accessibletableshape.obj \
         $(SLO)$/accessiblecell.obj \
         $(SLO)$/tablertfexporter.obj \
         $(SLO)$/tablertfimporter.obj
 
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+
 SRS1NAME=table
 SRC1FILES= table.src
 
diff --git a/svx/source/table/tablecontroller.hxx b/svx/source/table/tablecontroller.hxx
index 41cbcd9b53..b4eecf0902 100644
--- a/svx/source/table/tablecontroller.hxx
+++ b/svx/source/table/tablecontroller.hxx
@@ -51,97 +51,97 @@ const sal_Int16 SELTYPE_NONE = 0;
 const sal_Int16 SELTYPE_MOUSE = 1;
 const sal_Int16 SELTYPE_KEYS = 2;
 
-class SvxTableController: public sdr::SelectionController
+class SVX_DLLPUBLIC SvxTableController: public sdr::SelectionController
 {
 public:
-    SvxTableController( SdrObjEditView* pView, const SdrObject* pObj );
-    virtual ~SvxTableController();
+    SVX_DLLPRIVATE SvxTableController( SdrObjEditView* pView, const SdrObject* pObj );
+    SVX_DLLPRIVATE virtual ~SvxTableController();
 
-    virtual bool onKeyInput(const KeyEvent& rKEvt, Window* pWin);
-    virtual bool onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
-    virtual bool onMouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
-    virtual bool onMouseMove(const MouseEvent& rMEvt, Window* pWin);
+    SVX_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, Window* pWin);
+    SVX_DLLPRIVATE virtual bool onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
+    SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
+    SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, Window* pWin);
 
-    virtual bool DeleteMarked();
+    SVX_DLLPRIVATE virtual bool DeleteMarked();
 
-    virtual void onSelectionHasChanged();
+    SVX_DLLPRIVATE virtual void onSelectionHasChanged();
 
-    virtual void GetState( SfxItemSet& rSet );
-    virtual void Execute( SfxRequest& rReq );
+    SVX_DLLPRIVATE virtual void GetState( SfxItemSet& rSet );
+    SVX_DLLPRIVATE virtual void Execute( SfxRequest& rReq );
 
-    virtual bool GetStyleSheet( SfxStyleSheet* &rpStyleSheet ) const;
-    virtual bool SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr );
+    SVX_DLLPRIVATE virtual bool GetStyleSheet( SfxStyleSheet* &rpStyleSheet ) const;
+    SVX_DLLPRIVATE virtual bool SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr );
 
     // slots
-    void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = 0 );
-    void onDelete( sal_uInt16 nSId );
-    void onSelect( sal_uInt16 nSId );
-    void onFormatTable( SfxRequest& rReq );
-    void MergeMarkedCells();
-    void SplitMarkedCells();
-    void DistributeColumns();
-    void DistributeRows();
-    void SetVertical( sal_uInt16 nSId );
+    SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = 0 );
+    SVX_DLLPRIVATE void onDelete( sal_uInt16 nSId );
+    SVX_DLLPRIVATE void onSelect( sal_uInt16 nSId );
+    SVX_DLLPRIVATE void onFormatTable( SfxRequest& rReq );
+    SVX_DLLPRIVATE void MergeMarkedCells();
+    SVX_DLLPRIVATE void SplitMarkedCells();
+    SVX_DLLPRIVATE void DistributeColumns();
+    SVX_DLLPRIVATE void DistributeRows();
+    SVX_DLLPRIVATE void SetVertical( sal_uInt16 nSId );
 
-    static rtl::Reference< sdr::SelectionController > create( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController );
+    SVX_DLLPRIVATE static rtl::Reference< sdr::SelectionController > create( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController );
 
-    void MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
-    void SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bReplaceAll);
+    SVX_DLLPRIVATE void MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
+    SVX_DLLPRIVATE void SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bReplaceAll);
 
-    virtual bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const;
-    virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll);
+    SVX_DLLPRIVATE virtual bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const;
+    SVX_DLLPRIVATE virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll);
 
-    virtual bool GetMarkedObjModel( SdrPage* pNewPage );
-    virtual bool PasteObjModel( const SdrModel& rModel );
+    SVX_DLLPRIVATE virtual bool GetMarkedObjModel( SdrPage* pNewPage );
+    SVX_DLLPRIVATE virtual bool PasteObjModel( const SdrModel& rModel );
 
-    bool hasSelectedCells() const { return mbCellSelectionMode || mpView->IsTextEdit(); }
+    SVX_DLLPRIVATE bool hasSelectedCells() const { return mbCellSelectionMode || mpView->IsTextEdit(); }
 
     void getSelectedCells( CellPos& rFirstPos, CellPos& rLastPos );
     void setSelectedCells( const CellPos& rFirstPos, const CellPos& rLastPos );
     void clearSelection();
     void selectAll();
 
-    void onTableModified();
+    SVX_DLLPRIVATE void onTableModified();
 
 private:
     SvxTableController(SvxTableController &); // not defined
     void operator =(SvxTableController &); // not defined
 
     // internals
-    void ApplyBorderAttr( const SfxItemSet& rAttr );
-    void UpdateTableShape();
+    SVX_DLLPRIVATE void ApplyBorderAttr( const SfxItemSet& rAttr );
+    SVX_DLLPRIVATE void UpdateTableShape();
 
-    void SetTableStyle( const SfxItemSet* pArgs );
-    void SetTableStyleSettings( const SfxItemSet* pArgs );
+    SVX_DLLPRIVATE void SetTableStyle( const SfxItemSet* pArgs );
+    SVX_DLLPRIVATE void SetTableStyleSettings( const SfxItemSet* pArgs );
 
-    bool PasteObject( SdrTableObj* pPasteTableObj );
+    SVX_DLLPRIVATE bool PasteObject( SdrTableObj* pPasteTableObj );
 
-    bool checkTableObject();
-    bool updateTableObject();
-    const CellPos& getSelectionStart();
-    void setSelectionStart( const CellPos& rPos );
-    const CellPos& getSelectionEnd();
-    ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellCursor > getSelectionCursor();
-    void checkCell( CellPos& rPos );
+    SVX_DLLPRIVATE bool checkTableObject();
+    SVX_DLLPRIVATE bool updateTableObject();
+    SVX_DLLPRIVATE const CellPos& getSelectionStart();
+    SVX_DLLPRIVATE void setSelectionStart( const CellPos& rPos );
+    SVX_DLLPRIVATE const CellPos& getSelectionEnd();
+    SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellCursor > getSelectionCursor();
+    SVX_DLLPRIVATE void checkCell( CellPos& rPos );
 
-    void MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow );
+    SVX_DLLPRIVATE void MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow );
 
-    void EditCell( const CellPos& rPos, ::Window* pWindow, const ::com::sun::star::awt::MouseEvent* pMouseEvent = 0, sal_uInt16 nAction = 0 );
-    bool StopTextEdit();
+    SVX_DLLPRIVATE void EditCell( const CellPos& rPos, ::Window* pWindow, const ::com::sun::star::awt::MouseEvent* pMouseEvent = 0, sal_uInt16 nAction = 0 );
+    SVX_DLLPRIVATE bool StopTextEdit();
 
-    void DeleteTable();
+    SVX_DLLPRIVATE void DeleteTable();
 
-    sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, Window* pWindow );
-    bool executeAction( sal_uInt16 nAction, bool bSelect, Window* pWindow );
-    void gotoCell( const CellPos& rCell, bool bSelect, Window* pWindow, sal_uInt16 nAction = 0 );
+    SVX_DLLPRIVATE sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, Window* pWindow );
+    SVX_DLLPRIVATE bool executeAction( sal_uInt16 nAction, bool bSelect, Window* pWindow );
+    SVX_DLLPRIVATE void gotoCell( const CellPos& rCell, bool bSelect, Window* pWindow, sal_uInt16 nAction = 0 );
 
-    void StartSelection( const CellPos& rPos );
-    void UpdateSelection( const CellPos& rPos );
-    void RemoveSelection();
-    void updateSelectionOverlay();
-    void destroySelectionOverlay();
+    SVX_DLLPRIVATE void StartSelection( const CellPos& rPos );
+    SVX_DLLPRIVATE void UpdateSelection( const CellPos& rPos );
+    SVX_DLLPRIVATE void RemoveSelection();
+    SVX_DLLPRIVATE void updateSelectionOverlay();
+    SVX_DLLPRIVATE void destroySelectionOverlay();
 
-    void findMergeOrigin( CellPos& rPos );
+    SVX_DLLPRIVATE void findMergeOrigin( CellPos& rPos );
 
     DECL_LINK( UpdateHdl, void * );
 
diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk
index 02bbd865d4..9bca3b9798 100644
--- a/svx/source/tbxctrls/makefile.mk
+++ b/svx/source/tbxctrls/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..$/..
 
 PRJNAME=svx
 TARGET=tbxctrls
+LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -42,10 +43,17 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=	\
-        $(SLO)$/formatpaintbrushctrl.obj\
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
         $(SLO)$/fontworkgallery.obj\
         $(SLO)$/extrusioncontrols.obj \
+        $(SLO)$/tbcontrl.obj	\
+        $(SLO)$/toolbarmenu.obj \
+        $(SLO)$/tbxcolorupdate.obj
+
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+        $(SLO)$/formatpaintbrushctrl.obj\
         $(SLO)$/colrctrl.obj	\
         $(SLO)$/fillctrl.obj	\
         $(SLO)$/grafctrl.obj	\
@@ -53,16 +61,15 @@ SLOFILES=	\
         $(SLO)$/layctrl.obj		\
         $(SLO)$/lboxctrl.obj	\
         $(SLO)$/linectrl.obj	\
-        $(SLO)$/tbcontrl.obj	\
         $(SLO)$/tbxalign.obj	\
         $(SLO)$/tbxdrctl.obj    \
         $(SLO)$/verttexttbxctrl.obj \
-        $(SLO)$/toolbarmenu.obj \
         $(SLO)$/subtoolboxcontrol.obj \
         $(SLO)$/tbxcolor.obj \
-        $(SLO)$/tbxcolorupdate.obj \
         $(SLO)$/tbunocontroller.obj
 
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+
 SRS1NAME=$(TARGET)
 SRC1FILES = \
         fontworkgallery.src		\
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 956dfcaecb..691d23ab43 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -201,13 +201,13 @@ namespace svx
         SdrModel*			mpDoc;
     };
 
-    Reference< XInterface > SAL_CALL GraphicExporter_createInstance(const Reference< XMultiServiceFactory > & )
+    SVX_DLLPUBLIC Reference< XInterface > SAL_CALL GraphicExporter_createInstance(const Reference< XMultiServiceFactory > & )
         throw( Exception )
     {
         return (XWeak*)new GraphicExporter();
     }
 
-    Sequence< OUString > SAL_CALL GraphicExporter_getSupportedServiceNames()
+    SVX_DLLPUBLIC Sequence< OUString > SAL_CALL GraphicExporter_getSupportedServiceNames()
         throw()
     {
         Sequence< OUString > aSupportedServiceNames( 1 );
@@ -215,7 +215,7 @@ namespace svx
         return aSupportedServiceNames;
     }
 
-    OUString SAL_CALL GraphicExporter_getImplementationName()
+    SVX_DLLPUBLIC OUString SAL_CALL GraphicExporter_getImplementationName()
         throw()
     {
         return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Draw.GraphicExporter" ) );
diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx
index 1c83eff327..5a755af937 100644
--- a/svx/source/unodraw/UnoGraphicExporter.hxx
+++ b/svx/source/unodraw/UnoGraphicExporter.hxx
@@ -35,9 +35,9 @@
 
 namespace svx
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GraphicExporter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception );
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GraphicExporter_getSupportedServiceNames() throw();
-    ::rtl::OUString SAL_CALL GraphicExporter_getImplementationName() throw();
+    SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GraphicExporter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception );
+    SVX_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GraphicExporter_getSupportedServiceNames() throw();
+    SVX_DLLPUBLIC ::rtl::OUString SAL_CALL GraphicExporter_getImplementationName() throw();
 }
 
 #endif
diff --git a/svx/source/unodraw/makefile.mk b/svx/source/unodraw/makefile.mk
index 9b71d644f3..4b8ecb093d 100644
--- a/svx/source/unodraw/makefile.mk
+++ b/svx/source/unodraw/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..$/..
 
 PRJNAME=svx
 TARGET=unodraw
+LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -42,21 +43,18 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =	\
-        $(SLO)$/UnoNamespaceMap.obj \
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
         $(SLO)$/UnoGraphicExporter.obj \
-        $(SLO)$/unopool.obj \
         $(SLO)$/XPropertyTable.obj \
         $(SLO)$/UnoNameItemTable.obj \
         $(SLO)$/unoshape.obj	\
         $(SLO)$/unoipset.obj	\
-        $(SLO)$/unoctabl.obj	\
         $(SLO)$/unoshap2.obj	\
         $(SLO)$/unoshap3.obj	\
         $(SLO)$/unoshap4.obj	\
         $(SLO)$/unopage.obj		\
         $(SLO)$/unoshtxt.obj	\
-        $(SLO)$/unoshcol.obj	\
         $(SLO)$/unoprov.obj		\
         $(SLO)$/unomod.obj      \
         $(SLO)$/unonrule.obj	\
@@ -69,10 +67,19 @@ SLOFILES =	\
         $(SLO)$/unomtabl.obj	\
         $(SLO)$/unodtabl.obj	\
         $(SLO)$/gluepts.obj     \
-        $(SLO)$/recoveryui.obj	\
         $(SLO)$/tableshape.obj  \
         $(SLO)$/shapepropertynotifier.obj
 
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+        $(SLO)$/UnoNamespaceMap.obj \
+        $(SLO)$/unopool.obj \
+        $(SLO)$/unoctabl.obj	\
+        $(SLO)$/unoshcol.obj	\
+        $(SLO)$/recoveryui.obj
+
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+
 SRS1NAME=unodraw
 SRC1FILES =  \
         unodraw.src
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 1f5a375d9c..88e4d0a16c 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -65,6 +65,7 @@
 #include "shapeimpl.hxx"
 #include "svx/unoshprp.hxx"
 #include <svx/svdoashp.hxx>
+#include "unopolyhelper.hxx"
 
 // #i29181#
 #include "svdviter.hxx"
diff --git a/svx/source/unoedit/makefile.mk b/svx/source/unoedit/makefile.mk
index e808dbe027..802ded5aa7 100644
--- a/svx/source/unoedit/makefile.mk
+++ b/svx/source/unoedit/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..$/..
 
 PRJNAME=svx
 TARGET=unoedit
+LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -42,13 +43,10 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =	\
-        $(SLO)$/UnoForbiddenCharsTable.obj \
+LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
+LIB1OBJFILES= \
         $(SLO)$/unoedsrc.obj	\
         $(SLO)$/unoedhlp.obj	\
-        $(SLO)$/unopracc.obj	\
-        $(SLO)$/unoedprx.obj	\
-        $(SLO)$/unoviwed.obj	\
         $(SLO)$/unoviwou.obj	\
         $(SLO)$/unofored.obj	\
         $(SLO)$/unoforou.obj	\
@@ -56,6 +54,15 @@ SLOFILES =	\
         $(SLO)$/unotext2.obj	\
         $(SLO)$/unofield.obj
 
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES= \
+        $(SLO)$/UnoForbiddenCharsTable.obj \
+        $(SLO)$/unopracc.obj	\
+        $(SLO)$/unoedprx.obj	\
+        $(SLO)$/unoviwed.obj
+
+SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/svx/source/unogallery/makefile.mk b/svx/source/unogallery/makefile.mk
index a63b79bb6f..a699208f4f 100755
--- a/svx/source/unogallery/makefile.mk
+++ b/svx/source/unogallery/makefile.mk
@@ -38,14 +38,10 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
-CXXFILES=	\
-            unogalthemeprovider.cxx		\
-            unogaltheme.cxx				\
-            unogalitem.cxx				
-
 SLOFILES=	\
             $(SLO)$/unogalthemeprovider.obj	\
             $(SLO)$/unogaltheme.obj			\
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index f014431c86..f96d569b75 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -92,7 +92,7 @@ GalleryThemeProvider::~GalleryThemeProvider()
 
 // ------------------------------------------------------------------------------
     
-::rtl::OUString GalleryThemeProvider::getImplementationName_Static()
+SVX_DLLPUBLIC ::rtl::OUString GalleryThemeProvider::getImplementationName_Static()
     throw()
 {
     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.gallery.GalleryThemeProvider" ) );
@@ -100,7 +100,7 @@ GalleryThemeProvider::~GalleryThemeProvider()
 
 // ------------------------------------------------------------------------------
 
-uno::Sequence< ::rtl::OUString > GalleryThemeProvider::getSupportedServiceNames_Static()
+SVX_DLLPUBLIC uno::Sequence< ::rtl::OUString > GalleryThemeProvider::getSupportedServiceNames_Static()
     throw()
 {
     uno::Sequence< ::rtl::OUString > aSeq( 1 );
author	Release Engineers <releng@openoffice.org>	2009-08-25 11:00:47 +0000
committer	Release Engineers <releng@openoffice.org>	2009-08-25 11:00:47 +0000
commit	683075355577530673bfee031ed79ce1cbfd77b7 (patch)
tree	85e80c888c4d38201acfcfb06c89ed438e75686b /svx/source
parent	cfdf021edce4f9a451b78c30424e1d7680aa6fea (diff)