99 files changed, 1230 insertions, 229 deletions

diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 38f6daffee19..d1038641c841 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -36,7 +36,7 @@
 #include <svtools/transfer.hxx>
 #include <svl/lstner.hxx>
 #include <svtools/miscopt.hxx>
-#include "galbrws.hxx"
+#include "svx/galbrws.hxx"
 
 // ----------------------
 // - GalleryBrowserMode -
diff --git a/svx/inc/globlac.hrc b/svx/inc/globlac.hrc
deleted file mode 100644
index f72d4c1d31a8..000000000000
--- a/svx/inc/globlac.hrc
+++ /dev/null
@@ -1,223 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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 _GLOBALACC_SRC
-#define _GLOBALACC_SRC
-
-#define ACC_CODE( Id, c, bSh, bM1, bM2 ) \
-                    AcceleratorItem { Identifier = Id; \
-                            Key = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; };
-
-#define ACC_FUNC( Id, f ) \
-                AcceleratorItem { Identifier = Id; \
-                    Key = KeyCode { Function = f ; }; };
-
-#define ACC_KEY( language, c, bSh, bM1, bM2 ) \
-                    Key[ language ] = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; };
-
-#define ACC_DEF_KEY( c, bSh, bM1, bM2 ) \
-                    Key = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; };
-
-
-#define AI_HELPINDEX                ACC_CODE( SID_HELPINDEX, KEY_F1, FALSE, TRUE, FALSE )
-
-#define AI_ATTR_CHAR                ACC_CODE( SID_ATTR_CHAR, KEY_F2, FALSE, FALSE, FALSE )
-// new shortcut F9 for starting slide-show (see #73417#)
-#define AI_PRESENTATION             ACC_CODE( SID_PRESENTATION, KEY_F9, FALSE, FALSE, FALSE )
-// formerly used shortcut Ctrl-F2.  Still used (in sd) for compatibility
-#define AI_PRESENTATION_COMPAT      ACC_CODE( SID_PRESENTATION, KEY_F2, FALSE, TRUE, FALSE )
-#define AI_ENTER_GROUP              ACC_CODE( SID_ENTER_GROUP, KEY_F3, FALSE, FALSE, FALSE )
-#define AI_COPYOBJECTS              ACC_CODE( SID_COPYOBJECTS, KEY_F3, TRUE, FALSE, FALSE )
-#define AI_LEAVE_GROUP              ACC_CODE( SID_LEAVE_GROUP, KEY_F3, FALSE, TRUE, FALSE )
-#define AI_ATTR_TRANSFORM           ACC_CODE( SID_ATTR_TRANSFORM, KEY_F4, FALSE, FALSE, FALSE )
-#define AI_NAVIGATOR                ACC_CODE( SID_NAVIGATOR, KEY_F5, FALSE, FALSE, FALSE )
-#define AI_SPELLING                 ACC_CODE( SID_SPELL_DIALOG, KEY_F7, FALSE, FALSE, FALSE )
-#define AI_THESAURUS                ACC_CODE( SID_THESAURUS, KEY_F7, FALSE, TRUE, FALSE )
-#define AI_BEZIER_EDIT              ACC_CODE( SID_BEZIER_EDIT, KEY_F8, FALSE, FALSE, FALSE )
-#define AI_ATTR_TEXT_FITTOSIZE      ACC_CODE( SID_ATTR_TEXT_FITTOSIZE, KEY_F8, TRUE, TRUE, FALSE )
-#define AI_STYLE_DESIGNER           ACC_CODE( SID_STYLE_DESIGNER, KEY_F11, FALSE, FALSE, FALSE )
-#define AI_OUTLINEMODE              ACC_CODE( SID_OUTLINEMODE, KEY_F12, FALSE, FALSE, FALSE )
-#define AI_DRAWINGMODE              ACC_CODE( SID_DRAWINGMODE, KEY_F12, FALSE, TRUE, FALSE )
-
-#define AI_ATTR_PARA_LINESPACE_10   ACC_CODE( SID_ATTR_PARA_LINESPACE_10, KEY_1, FALSE, TRUE, FALSE )
-#define AI_ATTR_PARA_LINESPACE_20   ACC_CODE( SID_ATTR_PARA_LINESPACE_20, KEY_2, FALSE, TRUE, FALSE )
-#define AI_ATTR_PARA_LINESPACE_15   ACC_CODE( SID_ATTR_PARA_LINESPACE_15, KEY_5, FALSE, TRUE, FALSE )
-#define AI_SHOW_ITEMBROWSER         ACC_CODE( SID_SHOW_ITEMBROWSER, KEY_9, TRUE, TRUE, TRUE )
-
-#define AI_ATTR_PARA_ADJUST_BLOCK   AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_BLOCK;\
-                                        ACC_DEF_KEY(        KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,       KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,       KEY_J, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_PARA_ADJUST_CENTER  AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_CENTER;\
-                                        ACC_DEF_KEY(        KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_C, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_J, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_WEIGHT         AcceleratorItem { Identifier = SID_ATTR_CHAR_WEIGHT;\
-                                        ACC_DEF_KEY(        KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_N, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da ,       KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,       KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru,        KEY_B, FALSE, TRUE, FALSE ) };
-
-#define AI_SEARCH_DLG               AcceleratorItem { Identifier = SID_SEARCH_DLG;\
-                                        ACC_DEF_KEY(        KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_F, FALSE, TRUE, FALSE ) };
-
-#define AI_GROUP                    ACC_CODE( SID_GROUP, KEY_G, TRUE, TRUE, FALSE )
-#define AI_UNGROUP                  ACC_CODE( SID_UNGROUP, KEY_G, TRUE, TRUE, TRUE )
-
-// Weitersuchen ...
-#define AI_SET_SUPER_SCRIPT         AcceleratorItem { Identifier = SID_SET_SUPER_SCRIPT;\
-                                        ACC_DEF_KEY(        KEY_P, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( de ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_P, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_H, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_POSTURE        AcceleratorItem { Identifier = SID_ATTR_CHAR_POSTURE;\
-                                        ACC_DEF_KEY(        KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da ,       KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,       KEY_I, FALSE, TRUE, FALSE ) };
-
-#define AI_COMBINE                  ACC_CODE( SID_COMBINE, KEY_K, TRUE, TRUE, FALSE )
-#define AI_DISMANTLE                ACC_CODE( SID_DISMANTLE, KEY_K, TRUE, TRUE, TRUE )
-#define AI_ATTR_PARA_ADJUST_LEFT    AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_LEFT;\
-                                        ACC_DEF_KEY(        KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_G, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_L, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_PARA_ADJUST_RIGHT   AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_RIGHT;\
-                                        ACC_DEF_KEY(        KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_D, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_D, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_R, FALSE, TRUE, FALSE ) };
-
-#define AI_SET_SUB_SCRIPT           AcceleratorItem { Identifier = SID_SET_SUB_SCRIPT;\
-                                        ACC_DEF_KEY(        KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY(    de ,        KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_P, TRUE,  TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_UNDERLINE      AcceleratorItem { Identifier = SID_ATTR_CHAR_UNDERLINE;\
-                                        ACC_DEF_KEY(        KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,           KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,    KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl ,       KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da,        KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl,        KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,       KEY_U, FALSE, TRUE, FALSE ) };
-
-#define AI_STYLE_CATALOG            ACC_CODE( SID_STYLE_CATALOG, KEY_F11, FALSE, TRUE, FALSE )
-#define AI_WIN_FULLSCREEN           ACC_CODE( SID_WIN_FULLSCREEN, KEY_J, TRUE, TRUE, FALSE )
-
-#define AI_FOCUSURLBOX              ACC_CODE( SID_FOCUSURLBOX, KEY_O, TRUE, TRUE, FALSE )
-#define AI_SELECTALL                ACC_CODE( SID_SELECTALL, KEY_A, FALSE, TRUE, FALSE )
-
-// Anordnung
-#define AI_FRAME_TO_TOP             ACC_CODE( SID_FRAME_TO_TOP, KEY_ADD, TRUE, TRUE, FALSE )
-#define AI_MOREFRONT                ACC_CODE( SID_MOREFRONT, KEY_ADD, FALSE, TRUE, FALSE )
-#define AI_FRAME_TO_BOTTOM          ACC_CODE( SID_FRAME_TO_BOTTOM, KEY_SUBTRACT, TRUE, TRUE, FALSE )
-#define AI_MOREBACK                 ACC_CODE( SID_MOREBACK, KEY_SUBTRACT, FALSE, TRUE, FALSE )
-
-// sonstige Acceleratoren
-#define AI_NEWDOC                   ACC_CODE( SID_NEWDOC, KEY_N, TRUE, TRUE, FALSE )
-#define AI_NEWDOCDIRECT             ACC_CODE( SID_NEWDOCDIRECT, KEY_N, FALSE, TRUE, FALSE )
-#define AI_OPENDOC                  ACC_CODE( SID_OPENDOC, KEY_O, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_OPENDOC, KEY_OPEN, FALSE, FALSE, FALSE )
-#define AI_CLOSEWIN                 ACC_CODE( SID_CLOSEWIN, KEY_W, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_CLOSEWIN, KEY_F4, FALSE, TRUE, FALSE )
-#define AI_SAVEDOC                  ACC_CODE( SID_SAVEDOC, KEY_S, FALSE, TRUE, FALSE )
-#define AI_PRINTDOC                 ACC_CODE( SID_PRINTDOC, KEY_P, FALSE, TRUE, FALSE )
-#define AI_QUITAPP                  ACC_CODE( SID_QUITAPP, KEY_Q, FALSE, TRUE, FALSE )
-#define AI_CUT                      ACC_CODE( SID_CUT, KEY_X, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_CUT, KEY_DELETE, TRUE, FALSE, FALSE ) \
-                                    ACC_CODE( SID_CUT, KEY_CUT, FALSE, FALSE, FALSE )
-#define AI_COPY                     ACC_CODE( SID_COPY, KEY_C, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_COPY, KEY_INSERT, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_COPY, KEY_COPY, FALSE, FALSE, FALSE )
-#define AI_PASTE                    ACC_CODE( SID_PASTE, KEY_V, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_PASTE, KEY_INSERT, TRUE, FALSE, FALSE ) \
-                                    ACC_CODE( SID_PASTE, KEY_PASTE, FALSE, FALSE, FALSE )
-#define AI_UNDO                     ACC_CODE( SID_UNDO, KEY_Z, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_UNDO, KEY_BACKSPACE, FALSE, FALSE, TRUE ) \
-                                    ACC_CODE( SID_UNDO, KEY_UNDO, FALSE, FALSE, FALSE )
-#define AI_REDO                     ACC_CODE( SID_REDO, KEY_Y, FALSE, TRUE, FALSE )
-#define AI_REPEAT                   ACC_CODE( SID_REPEAT, KEY_REPEAT, FALSE, FALSE, FALSE )
-#define AI_DELETE                   ACC_CODE( SID_DELETE, KEY_DELETE, FALSE, FALSE, FALSE )
-
-#endif // _GLOBLACC_SRC
-
-
-
-
diff --git a/svx/inc/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx
index 5b6e0ab9ab35..5b6e0ab9ab35 100644
--- a/svx/inc/ActionDescriptionProvider.hxx
+++ b/svx/inc/svx/ActionDescriptionProvider.hxx
diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx
index 501b350eef05..501b350eef05 100644
--- a/svx/inc/DescriptionGenerator.hxx
+++ b/svx/inc/svx/DescriptionGenerator.hxx
diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx
new file mode 100644
index 000000000000..00df4b04f389
--- /dev/null
+++ b/svx/inc/svx/EnhancedCustomShape2d.hxx
@@ -0,0 +1,209 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 _ENHANCEDCUSTOMSHAPE2D_HXX
+#define _ENHANCEDCUSTOMSHAPE2D_HXX
+
+#include <svx/msdffdef.hxx>
+#include <svx/sdasitm.hxx>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/beans/PropertyValues.hpp>
+#include <com/sun/star/awt/Point.hpp>
+#include <svl/itemset.hxx>
+#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
+#include <svx/EnhancedCustomShapeFunctionParser.hxx>
+
+#include <boost/shared_ptr.hpp>
+#include <vector>
+
+#define DFF_CUSTOMSHAPE_FLIP_V      1
+#define DFF_CUSTOMSHAPE_FLIP_H      2
+#define DFF_CUSTOMSHAPE_EXCH            4
+
+class SdrModel;
+class SdrObject;
+class SfxItemSet;
+struct SvxMSDffVertPair;
+struct SvxMSDffCalculationData;
+struct SvxMSDffTextRectangles;
+class SvxMSDffAdjustmentHandle;
+
+#define HANDLE_FLAGS_MIRRORED_X             0x0001
+#define HANDLE_FLAGS_MIRRORED_Y             0x0002
+#define HANDLE_FLAGS_SWITCHED               0x0004
+#define HANDLE_FLAGS_POLAR                  0x0008
+#define HANDLE_FLAGS_MAP                    0x0010
+#define HANDLE_FLAGS_RANGE_X_MINIMUM        0x0020
+#define HANDLE_FLAGS_RANGE_X_MAXIMUM        0x0040
+#define HANDLE_FLAGS_RANGE_Y_MINIMUM        0x0080
+#define HANDLE_FLAGS_RANGE_Y_MAXIMUM        0x0100
+#define HANDLE_FLAGS_RADIUS_RANGE_MINIMUM   0x0200
+#define HANDLE_FLAGS_RADIUS_RANGE_MAXIMUM   0x0400
+
+// MSDFF_HANDLE_FLAGS_RANGE_Y seems to be not defined in
+// escher, but we are using it internally in to differentiate
+// between X_RANGE and Y_RANGE
+
+class SdrPathObj;
+
+class EnhancedCustomShape2d : public SfxItemSet
+{
+        SdrObject*                  pCustomShapeObj;
+        MSO_SPT                     eSpType;
+
+        sal_Int32                   nCoordLeft;
+        sal_Int32                   nCoordTop;
+        sal_Int32                   nCoordWidth;
+        sal_Int32                   nCoordHeight;
+        Rectangle                   aLogicRect;
+
+        double                      fXScale;
+        double                      fYScale;
+        double                      fXRatio;
+        double                      fYRatio;
+
+        sal_Int32                   nXRef;
+        sal_Int32                   nYRef;
+        sal_uInt32                  nFlags;
+        sal_uInt32                  nColorData;
+
+        /*
+
+        */
+        com::sun::star::uno::Sequence< rtl::OUString >                                                  seqEquations;
+        std::vector< ::boost::shared_ptr< EnhancedCustomShape::ExpressionNode > >                       vNodesSharedPtr;
+
+
+        com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment >            seqSegments;
+        com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair>       seqCoordinates;
+        com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame >          seqTextFrames;
+        com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair>       seqGluePoints;
+        com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue >    seqAdjustmentValues;
+        com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues >                          seqHandles;
+
+        sal_Bool                    bTextFlow       : 1;
+        sal_Bool                    bFilled         : 1;
+        sal_Bool                    bStroked        : 1;
+
+        sal_Bool                    bFlipH;
+        sal_Bool                    bFlipV;
+        sal_Int32                   nRotateAngle;
+
+        sal_Bool                    SetAdjustValueAsDouble( const double& rValue, const sal_Int32 nIndex );
+        sal_Int32                   GetLuminanceChange( sal_uInt32 nIndex ) const;
+        Color                       GetColorData( const Color& rFillColor, sal_uInt32 nIndex ) const;
+        void                        AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rCustomShapeSet,
+                                                  sal_uInt32& nColorIndex, sal_uInt32 nColorCount);
+        sal_Bool                    GetParameter( double& rParameterReturnValue,  const com::sun::star::drawing::EnhancedCustomShapeParameter&,
+                                                    const sal_Bool bReplaceGeoWidth, const sal_Bool bReplaceGeoHeight ) const;
+        Point                       GetPoint( const com::sun::star::drawing::EnhancedCustomShapeParameterPair&,
+                                                    const sal_Bool bScale = sal_True, const sal_Bool bReplaceGeoSize = sal_False ) const;
+
+        void                        CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegmentInd, std::vector< SdrPathObj* >& rObjectList,
+                                                                                                sal_Bool bLineGeometryNeededOnly, sal_Bool bSortFilledObjectsToBack );
+        SdrObject*                  CreatePathObj( sal_Bool bLineGeometryNeededOnly );
+        const sal_Int32*            ApplyShapeAttributes( const SdrCustomShapeGeometryItem& rItem );
+
+    public :
+
+        struct Handle
+        {
+            sal_uInt32  nFlags;
+
+            sal_Bool    bMirroredX;
+            sal_Bool    bMirroredY;
+            sal_Bool    bSwitched;
+
+            com::sun::star::drawing::EnhancedCustomShapeParameterPair   aPosition;
+            com::sun::star::drawing::EnhancedCustomShapeParameterPair   aPolar;
+
+            com::sun::star::drawing::EnhancedCustomShapeParameter       aRadiusRangeMinimum;
+            com::sun::star::drawing::EnhancedCustomShapeParameter       aRadiusRangeMaximum;
+            com::sun::star::drawing::EnhancedCustomShapeParameter       aXRangeMinimum;
+            com::sun::star::drawing::EnhancedCustomShapeParameter       aXRangeMaximum;
+            com::sun::star::drawing::EnhancedCustomShapeParameter       aYRangeMinimum;
+            com::sun::star::drawing::EnhancedCustomShapeParameter       aYRangeMaximum;
+        };
+
+        sal_Bool                    IsFlipVert() { return bFlipV; };
+        sal_Bool                    IsFlipHorz() { return bFlipH; };
+        sal_Int32                   GetRotateAngle() { return nRotateAngle; };
+
+        SVX_DLLPUBLIC SdrObject*                    CreateLineGeometry();
+        SVX_DLLPUBLIC SdrObject*                    CreateObject( sal_Bool bLineGeometryNeededOnly );
+        SVX_DLLPUBLIC void                      ApplyGluePoints( SdrObject* pObj );
+        SVX_DLLPUBLIC Rectangle                 GetTextRect() const;
+
+        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 );
+
+        SVX_DLLPUBLIC EnhancedCustomShape2d( SdrObject* pSdrObjCustomShape );
+        SVX_DLLPUBLIC ~EnhancedCustomShape2d();
+
+        enum EnumFunc
+        {
+            ENUM_FUNC_PI,
+            ENUM_FUNC_LEFT,
+            ENUM_FUNC_TOP,
+            ENUM_FUNC_RIGHT,
+            ENUM_FUNC_BOTTOM,
+            ENUM_FUNC_XSTRETCH,
+            ENUM_FUNC_YSTRETCH,
+            ENUM_FUNC_HASSTROKE,
+            ENUM_FUNC_HASFILL,
+            ENUM_FUNC_WIDTH,
+            ENUM_FUNC_HEIGHT,
+            ENUM_FUNC_LOGWIDTH,
+            ENUM_FUNC_LOGHEIGHT
+        };
+        double                      GetEnumFunc( const EnumFunc eVal ) const;
+
+        double                      GetAdjustValueAsDouble( const sal_Int32 nIndex ) const;
+        double                      GetEquationValueAsDouble( const sal_Int32 nIndex ) const;
+        sal_Int32                   GetAdjustValueAsInteger( const sal_Int32 nIndex, const sal_Int32 nDefault = 0 ) const;
+
+        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 );
+        SVX_DLLPUBLIC static void                   SetEnhancedCustomShapeParameter( com::sun::star::drawing::EnhancedCustomShapeParameter&
+                                        rParameter, const sal_Int32 nValue );
+        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 );
+        static void                 SwapStartAndEndArrow( SdrObject* pObj );
+};
+#endif
+
diff --git a/svx/inc/svx/EnhancedCustomShapeGeometry.hxx b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
new file mode 100644
index 000000000000..2ee9824ce547
--- /dev/null
+++ b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
@@ -0,0 +1,101 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 _ENHANCEDCUSTOMSHAPEGEOMETRY_HXX
+#define _ENHANCEDCUSTOMSHAPEGEOMETRY_HXX
+
+#include <sal/types.h>
+#include <svx/msdffdef.hxx>
+
+struct SvxMSDffVertPair
+{
+    sal_Int32   nValA;
+    sal_Int32   nValB;
+};
+struct SvxMSDffCalculationData
+{
+    sal_uInt16  nFlags;
+    sal_Int16   nVal[ 3 ];
+};
+struct SvxMSDffTextRectangles
+{
+    SvxMSDffVertPair    nPairA;
+    SvxMSDffVertPair    nPairB;
+};
+
+#define MSDFF_HANDLE_FLAGS_MIRRORED_X                   0x0001
+#define MSDFF_HANDLE_FLAGS_MIRRORED_Y                   0x0002
+#define MSDFF_HANDLE_FLAGS_SWITCHED                     0x0004
+#define MSDFF_HANDLE_FLAGS_POLAR                        0x0008
+#define MSDFF_HANDLE_FLAGS_MAP                          0x0010
+#define MSDFF_HANDLE_FLAGS_RANGE                        0x0020
+#define MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL       0x0080
+#define MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL       0x0100
+#define MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL       0x0200
+#define MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL       0x0400
+#define MSDFF_HANDLE_FLAGS_CENTER_X_IS_SPECIAL          0x0800
+#define MSDFF_HANDLE_FLAGS_CENTER_Y_IS_SPECIAL          0x1000
+#define MSDFF_HANDLE_FLAGS_RADIUS_RANGE                 0x2000
+
+struct SvxMSDffHandle
+{
+    sal_uInt32  nFlags;
+    sal_Int32   nPositionX, nPositionY, nCenterX, nCenterY, nRangeXMin, nRangeXMax, nRangeYMin, nRangeYMax;
+};
+struct mso_CustomShape
+{
+    SvxMSDffVertPair*                       pVertices;
+    sal_uInt32                              nVertices;
+    sal_uInt16*                             pElements;
+    sal_uInt32                              nElements;
+    SvxMSDffCalculationData*                pCalculation;
+    sal_uInt32                              nCalculation;
+    sal_Int32*                              pDefData;
+    SvxMSDffTextRectangles*                 pTextRect;
+    sal_uInt32                              nTextRect;
+    sal_Int32                               nCoordWidth;
+    sal_Int32                               nCoordHeight;
+    sal_Int32                               nXRef;
+    sal_Int32                               nYRef;
+    SvxMSDffVertPair*                       pGluePoints;
+    sal_uInt32                              nGluePoints;
+    SvxMSDffHandle*                         pHandles;
+    sal_uInt32                              nHandles;
+};
+
+#define MSO_I | (sal_Int32)0x80000000
+
+sal_Bool            SortFilledObjectsToBackByDefault( MSO_SPT eSpType );
+SVX_DLLPUBLIC sal_Bool          IsCustomShapeFilledByDefault( MSO_SPT eSpType );
+SVX_DLLPUBLIC sal_Int16         GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType );
+
+// #i28269#
+SVX_DLLPUBLIC sal_Bool          IsCustomShapeStrokedByDefault( MSO_SPT eSpType );
+
+SVX_DLLPUBLIC const mso_CustomShape*    GetCustomShapeContent( MSO_SPT eSpType );
+
+#endif
diff --git a/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
new file mode 100644
index 000000000000..054af2e3af41
--- /dev/null
+++ b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
@@ -0,0 +1,39 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 _ENHANCED_CUSTOMSHAPE_TYPE_NAMES_HXX
+#define _ENHANCED_CUSTOMSHAPE_TYPE_NAMES_HXX
+#include <svx/msdffdef.hxx>
+#include <rtl/ustring.hxx>
+
+namespace EnhancedCustomShapeTypeNames
+{
+    SVX_DLLPUBLIC MSO_SPT Get( const rtl::OUString& );
+    SVX_DLLPUBLIC rtl::OUString Get( const MSO_SPT );
+}
+
+#endif
diff --git a/svx/inc/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx
index 6b0ec247a39e..6b0ec247a39e 100644
--- a/svx/inc/ParseContext.hxx
+++ b/svx/inc/svx/ParseContext.hxx
diff --git a/svx/inc/UnoNamespaceMap.hxx b/svx/inc/svx/UnoNamespaceMap.hxx
index 7e3a1be005b8..7e3a1be005b8 100644
--- a/svx/inc/UnoNamespaceMap.hxx
+++ b/svx/inc/svx/UnoNamespaceMap.hxx
diff --git a/svx/inc/XPropertyTable.hxx b/svx/inc/svx/XPropertyTable.hxx
index 59ca1e1e086a..59ca1e1e086a 100644
--- a/svx/inc/XPropertyTable.hxx
+++ b/svx/inc/svx/XPropertyTable.hxx
diff --git a/svx/inc/anchorid.hxx b/svx/inc/svx/anchorid.hxx
index 976d0dc504c6..976d0dc504c6 100644
--- a/svx/inc/anchorid.hxx
+++ b/svx/inc/svx/anchorid.hxx
diff --git a/svx/inc/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx
index 1cb9c2068f01..1cb9c2068f01 100644
--- a/svx/inc/chrtitem.hxx
+++ b/svx/inc/svx/chrtitem.hxx
diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx
index 22480ab1e728..22480ab1e728 100644
--- a/svx/inc/clipboardctl.hxx
+++ b/svx/inc/svx/clipboardctl.hxx
diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx
index 74687d56d38b..74687d56d38b 100644
--- a/svx/inc/clipfmtitem.hxx
+++ b/svx/inc/svx/clipfmtitem.hxx
diff --git a/svx/inc/connctrl.hxx b/svx/inc/svx/connctrl.hxx
index 468fffcc43b7..468fffcc43b7 100644
--- a/svx/inc/connctrl.hxx
+++ b/svx/inc/svx/connctrl.hxx
diff --git a/svx/inc/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx
index 123e5af7d5a8..123e5af7d5a8 100644
--- a/svx/inc/databaseregistrationui.hxx
+++ b/svx/inc/svx/databaseregistrationui.hxx
diff --git a/svx/inc/dbexch.hrc b/svx/inc/svx/dbexch.hrc
index faa2274987cd..faa2274987cd 100644
--- a/svx/inc/dbexch.hrc
+++ b/svx/inc/svx/dbexch.hrc
diff --git a/svx/inc/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx
index 3b63ac1f4b4d..3b63ac1f4b4d 100644
--- a/svx/inc/dialcontrol.hxx
+++ b/svx/inc/svx/dialcontrol.hxx
diff --git a/svx/inc/dlgutil.hxx b/svx/inc/svx/dlgutil.hxx
index 9f0d5190daed..9f0d5190daed 100644
--- a/svx/inc/dlgutil.hxx
+++ b/svx/inc/svx/dlgutil.hxx
diff --git a/svx/inc/drawitem.hxx b/svx/inc/svx/drawitem.hxx
index 9bfdb5cfd87a..9bfdb5cfd87a 100644
--- a/svx/inc/drawitem.hxx
+++ b/svx/inc/svx/drawitem.hxx
diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/svx/extrusioncontrols.hxx
index 4560c7463bc9..4560c7463bc9 100644
--- a/svx/inc/extrusioncontrols.hxx
+++ b/svx/inc/svx/extrusioncontrols.hxx
diff --git a/svx/inc/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx
index 43fd292ddb36..43fd292ddb36 100644
--- a/svx/inc/flagsdef.hxx
+++ b/svx/inc/svx/flagsdef.hxx
diff --git a/svx/inc/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx
index 886db3280d60..886db3280d60 100644
--- a/svx/inc/fmgridif.hxx
+++ b/svx/inc/svx/fmgridif.hxx
diff --git a/svx/inc/fmobjfac.hxx b/svx/inc/svx/fmobjfac.hxx
index 7d10ea2ab7b4..7d10ea2ab7b4 100644
--- a/svx/inc/fmobjfac.hxx
+++ b/svx/inc/svx/fmobjfac.hxx
diff --git a/svx/inc/svx/fmresids.hrc b/svx/inc/svx/fmresids.hrc
new file mode 100644
index 000000000000..f6843801e522
--- /dev/null
+++ b/svx/inc/svx/fmresids.hrc
@@ -0,0 +1,264 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 _SVX_FMRESIDS_HRC
+#define _SVX_FMRESIDS_HRC
+
+// include     -----------------------------------------------------------
+#include <svl/solar.hrc>
+
+// unnamed ressources -------------------------------------------------------
+// sub ressources .....................
+
+// ImageList-Id's -----------------------------------------------------------
+#define RID_SVXIMGLIST_FMEXPL                       (RID_FORMS_START + 0)
+#define RID_SVXIMGLIST_FMEXPL_HC                    (RID_FORMS_START + 2)
+
+// Image-Id's -----------------------------------------------------------
+//#define SID_FMSLOTS_START                          (SID_SVX_START + 592)  -> svxids.hrc
+#define RID_SVXIMG_FORM                             SID_FM_CONFIG
+#define RID_SVXIMG_CONTROL                          SID_CHOOSE_CONTROLS
+#define RID_SVXIMG_COLLAPSEDNODE                    (RID_FORMS_START + 2)
+#define RID_SVXIMG_EXPANDEDNODE                     (RID_FORMS_START + 3)
+#define RID_SVXIMG_BUTTON                           SID_FM_PUSHBUTTON
+#define RID_SVXIMG_RADIOBUTTON                      SID_FM_RADIOBUTTON
+#define RID_SVXIMG_CHECKBOX                         SID_FM_CHECKBOX
+#define RID_SVXIMG_FIXEDTEXT                        SID_FM_FIXEDTEXT
+#define RID_SVXIMG_GROUPBOX                         SID_FM_GROUPBOX
+#define RID_SVXIMG_EDIT                             SID_FM_EDIT
+#define RID_SVXIMG_LISTBOX                          SID_FM_LISTBOX
+#define RID_SVXIMG_COMBOBOX                         SID_FM_COMBOBOX
+#define RID_SVXIMG_FORMS                            (RID_FORMS_START +13)
+#define RID_SVXIMG_IMAGEBUTTON                      SID_FM_IMAGEBUTTON
+#define RID_SVXIMG_IMAGECONTROL                     SID_FM_IMAGECONTROL
+#define RID_SVXIMG_FILECONTROL                      SID_FM_FILECONTROL
+#define RID_SVXIMG_DATEFIELD                        SID_FM_DATEFIELD
+#define RID_SVXIMG_TIMEFIELD                        SID_FM_TIMEFIELD
+#define RID_SVXIMG_NUMERICFIELD                     SID_FM_NUMERICFIELD
+#define RID_SVXIMG_CURRENCYFIELD                    SID_FM_CURRENCYFIELD
+#define RID_SVXIMG_PATTERNFIELD                     SID_FM_PATTERNFIELD
+#define RID_SVXIMG_HIDDEN                           (RID_FORMS_START +22)
+#define RID_SVXIMG_GRID                             SID_FM_DBGRID
+#define RID_SVXIMG_FORMATTEDFIELD                   SID_FM_FORMATTEDFIELD
+#define RID_SVXIMG_FILTER                           SID_FM_FILTERCRIT
+#define RID_SVXIMG_DATE_N_TIME_FIELDS               SID_FM_TWOFIELDS_DATE_N_TIME
+#define RID_SVXIMG_FIELD                            (RID_FORMS_START +27)
+#define RID_SVXIMG_SCROLLBAR                        SID_FM_SCROLLBAR
+#define RID_SVXIMG_SPINBUTTON                       SID_FM_SPINBUTTON
+#define RID_SVXIMG_NAVIGATIONBAR                    SID_FM_NAVIGATIONBAR
+
+// Dialog-Id's -----------------------------------------------------------
+#define RID_SVXTBX_FORM                             (RID_FORMS_START + 1)
+#define TBX_FORM                                    (RID_FORMS_START + 2)
+#define RID_SVXDLG_ADD_TABLE                        (RID_FORMS_START + 3)
+#define RID_SVXDLG_TAB_ORDER                        (RID_FORMS_START + 4)
+#define RID_SVXDLG_SETFORM                          (RID_FORMS_START + 5)
+#define RID_SVX_FMEXPLORER                          (RID_FORMS_START + 6)
+#define RID_SVXDLG_ADD_DATAITEM                     (RID_FORMS_START + 12)
+#define RID_SVXDLG_ADD_CONDITION                    (RID_FORMS_START + 13)
+#define RID_SVXDLG_NAMESPACE_ITEM                   (RID_FORMS_START + 14)
+#define RID_SVXDLG_MANAGE_NAMESPACE                 (RID_FORMS_START + 15)
+#define RID_SVXDLG_ADD_SUBMISSION                   (RID_FORMS_START + 16)
+#define RID_SVXDLG_ADD_MODEL                        (RID_FORMS_START + 17)
+#define RID_SVXDLG_ADD_INSTANCE                     (RID_FORMS_START + 18)
+#define RID_SVXWIN_DATANAVIGATOR                    (RID_FORMS_START + 19)
+#define RID_SVX_XFORMS_TABPAGES                     (RID_FORMS_START + 20)
+
+// Toolbars ------------------------------------------------------------
+#define RID_SVXTBX_FORM_NAVIGATION                  (RID_FORMS_START +  1)
+#define RID_SVXTBX_FORM_FILTER                      (RID_FORMS_START +  2)
+#define RID_SVXTBX_TEXT_CONTROL_ATTRIBUTES          (RID_FORMS_START +  3)
+#define RID_SVXTBX_CONTROLS                         (RID_FORMS_START +  4)
+#define RID_SVXTBX_MORECONTROLS                     (RID_FORMS_START +  5)
+#define RID_SVXTBX_FORMDESIGN                       (RID_FORMS_START +  6)
+
+// Menu-Id's -----------------------------------------------------------
+#define RID_FMEXPLORER_POPUPMENU                    (RID_FORMS_START + 0)
+#define RID_SVXMNU_ROWS                             (RID_FORMS_START + 1)
+#define RID_SVXMNU_COLS                             (RID_FORMS_START + 2)
+#define RID_SVXMNU_CELL                             (RID_FORMS_START + 3)
+#define RID_FMSHELL_CONVERSIONMENU                  (RID_FORMS_START + 4)
+#define RID_FM_FILTER_MENU                          (RID_FORMS_START + 5)
+#define RID_FM_TEXTATTRIBUTE_MENU                   (RID_FORMS_START + 6)
+#define MENU_FM_TEXTATTRIBITES_STYLE                (RID_FORMS_START + 7)
+#define MENU_FM_TEXTATTRIBITES_ALIGNMENT            (RID_FORMS_START + 8)
+#define MENU_FM_TEXTATTRIBITES_SPACING              (RID_FORMS_START + 9)
+#define RID_MENU_DATANAVIGATOR                      (RID_FORMS_START + 10)
+
+// QueryBox-Id's -----------------------------------------------------------
+#define RID_QRY_SAVEMODIFIED                        (RID_FORMS_START + 1)
+#define RID_QRY_REMOVE_MODEL                        (RID_FORMS_START + 2)
+#define RID_QRY_REMOVE_INSTANCE                     (RID_FORMS_START + 3)
+#define RID_QRY_REMOVE_ELEMENT                      (RID_FORMS_START + 4)
+#define RID_QRY_REMOVE_ATTRIBUTE                    (RID_FORMS_START + 5)
+#define RID_QRY_LINK_WARNING                        (RID_FORMS_START + 6)
+#define RID_QRY_REMOVE_SUBMISSION                   (RID_FORMS_START + 7)
+#define RID_QRY_REMOVE_BINDING                      (RID_FORMS_START + 8)
+
+// ErrorBox-Id's -----------------------------------------------------------
+#define RID_ERR_INVALID_XMLNAME                     (RID_FORMS_START + 1)
+#define RID_ERR_INVALID_XMLPREFIX                   (RID_FORMS_START + 2)
+#define RID_ERR_DOUBLE_MODELNAME                    (RID_FORMS_START + 3)
+#define RID_ERR_EMPTY_SUBMISSIONNAME                (RID_FORMS_START + 4)
+
+// String-Id's -----------------------------------------------------------
+#define RID_STR_FORMSHELL                           (RID_FORMS_START +  10)
+#define RID_STR_STDFORMNAME                         (RID_FORMS_START +  11)
+#define RID_STR_REC_TEXT                            (RID_FORMS_START +  12)
+#define RID_STR_REC_FROM_TEXT                       (RID_FORMS_START +  13)
+#define RID_STR_UNDO_PROPERTY                       (RID_FORMS_START +  14)
+#define RID_STR_UNDO_CONTAINER_INSERT               (RID_FORMS_START +  15)
+#define RID_STR_UNDO_CONTAINER_REMOVE               (RID_FORMS_START +  16)
+#define RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE      (RID_FORMS_START +  27)
+#define RID_STR_UNDO_CONTAINER_REPLACE              (RID_FORMS_START +  28)
+#define RID_STR_UNDO_TABORDER                       (RID_FORMS_START +  29)
+#define RID_STR_UNDO_DELETE_LOGICAL                 (RID_FORMS_START +  30)
+#define RID_STR_UNDO_MODEL_REPLACE                  (RID_FORMS_START +  31)
+#define RID_STR_NAVIGATIONBAR                       (RID_FORMS_START +  32)
+#define RID_STR_DEFAULT_CONTROL                     (RID_FORMS_START +  33)
+#define RID_STR_FORM                                (RID_FORMS_START +  36)
+#define RID_STR_FIELDSELECTION                      (RID_FORMS_START +  37)
+#define RID_STR_NO_PROPERTIES                       (RID_FORMS_START +  38)
+#define RID_STR_PROPERTIES_CONTROL                  (RID_FORMS_START +  39)
+#define RID_STR_PROPERTIES_FORM                     (RID_FORMS_START +  40)
+#define RID_STR_FMEXPLORER                          (RID_FORMS_START +  41)
+#define RID_STR_FORMS                               (RID_FORMS_START +  42)
+#define RID_STR_WRITEERROR                          (RID_FORMS_START +  43)
+#define RID_STR_DELETECONFIRM_RECORD                (RID_FORMS_START +  44)
+#define RID_STR_DELETECONFIRM                       (RID_FORMS_START +  45)
+#define RID_STR_GROUPBOX                            (RID_FORMS_START +  46)
+#define RID_STR_NAVIGATION                          (RID_FORMS_START +  47)
+#define RID_STR_COLUMN                              (RID_FORMS_START +  48)
+#define RID_STR_DATE                                (RID_FORMS_START +  49)
+#define RID_STR_TIME                                (RID_FORMS_START +  50)
+#define RID_STR_PROPTITLE_NAVBAR                    (RID_FORMS_START +  51)
+#define RID_STR_PROPTITLE_PUSHBUTTON                (RID_FORMS_START +  52)
+#define RID_STR_PROPTITLE_RADIOBUTTON               (RID_FORMS_START +  53)
+#define RID_STR_PROPTITLE_CHECKBOX                  (RID_FORMS_START +  54)
+#define RID_STR_PROPTITLE_FIXEDTEXT                 (RID_FORMS_START +  55)
+#define RID_STR_PROPTITLE_GROUPBOX                  (RID_FORMS_START +  56)
+#define RID_STR_PROPTITLE_EDIT                      (RID_FORMS_START +  57)
+#define RID_STR_PROPTITLE_LISTBOX                   (RID_FORMS_START +  58)
+#define RID_STR_PROPTITLE_COMBOBOX                  (RID_FORMS_START +  59)
+#define RID_STR_PROPTITLE_IMAGEBUTTON               (RID_FORMS_START +  60)
+#define RID_STR_PROPTITLE_IMAGECONTROL              (RID_FORMS_START +  61)
+#define RID_STR_PROPTITLE_FILECONTROL               (RID_FORMS_START +  62)
+#define RID_STR_PROPTITLE_DATEFIELD                 (RID_FORMS_START +  63)
+#define RID_STR_PROPTITLE_TIMEFIELD                 (RID_FORMS_START +  64)
+#define RID_STR_PROPTITLE_NUMERICFIELD              (RID_FORMS_START +  65)
+#define RID_STR_PROPTITLE_CURRENCYFIELD             (RID_FORMS_START +  66)
+#define RID_STR_PROPTITLE_PATTERNFIELD              (RID_FORMS_START +  67)
+#define RID_STR_PROPTITLE_DBGRID                    (RID_FORMS_START +  68)
+#define RID_STR_PROPTITLE_MULTISELECT               (RID_FORMS_START +  69)
+#define RID_STR_DELETECONFIRM_RECORDS               (RID_FORMS_START +  70)
+#define RID_STR_CONTROL                             (RID_FORMS_START +  71)
+#define RID_STR_POSTFIX_DATE                        (RID_FORMS_START +  72)
+#define RID_STR_POSTFIX_TIME                        (RID_FORMS_START +  73)
+#define RID_STR_NODATACONTROLS                      (RID_FORMS_START +  77)
+#define RID_STR_FILTER_NAVIGATOR                    (RID_FORMS_START +  78)
+#define RID_STR_FILTER_FILTER_FOR                   (RID_FORMS_START +  79)
+#define RID_STR_FILTER_FILTER_OR                    (RID_FORMS_START +  80)
+#define RID_STR_PROPTITLE_FORMATTED                 (RID_FORMS_START +  81)
+#define RID_STR_SYNTAXERROR                         (RID_FORMS_START +  82)
+    // FREE
+#define RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY      (RID_FORMS_START +  84)
+#define RID_STR_AUTOFIELD                           (RID_FORMS_START +  89)
+#define RID_STR_SVT_SQL_SYNTAX_ERROR                (RID_FORMS_START +  90)
+#define RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE        (RID_FORMS_START +  91)
+#define RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE        (RID_FORMS_START +  92)
+#define RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE      (RID_FORMS_START +  93)
+#define RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID         (RID_FORMS_START +  94)
+#define RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID  (RID_FORMS_START +  95)
+#define RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID        (RID_FORMS_START +  96)
+#define RID_STR_SVT_SQL_SYNTAX_TABLE                (RID_FORMS_START +  97)
+#define RID_STR_SVT_SQL_SYNTAX_COLUMN               (RID_FORMS_START +  98)
+#define RID_STR_PROPTITLE_SCROLLBAR                 (RID_FORMS_START +  99)
+#define RID_STR_PROPTITLE_SPINBUTTON                (RID_FORMS_START + 100)
+#define RID_STR_PROPTITLE_HIDDEN                    (RID_FORMS_START + 101)
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+#define RID_STR_DATANAVIGATOR                       (RID_FORMS_START + 124)
+#define RID_STR_DATANAV_SUBM_PARENT                 (RID_FORMS_START + 125)
+#define RID_STR_DATANAV_SUBM_ID                     (RID_FORMS_START + 126)
+#define RID_STR_DATANAV_SUBM_ACTION                 (RID_FORMS_START + 127)
+#define RID_STR_DATANAV_SUBM_METHOD                 (RID_FORMS_START + 128)
+#define RID_STR_DATANAV_SUBM_REF                    (RID_FORMS_START + 129)
+#define RID_STR_DATANAV_SUBM_BIND                   (RID_FORMS_START + 130)
+#define RID_STR_DATANAV_SUBM_REPLACE                (RID_FORMS_START + 131)
+#define RID_STR_DATANAV_ADD_ELEMENT                 (RID_FORMS_START + 132)
+#define RID_STR_DATANAV_EDIT_ELEMENT                (RID_FORMS_START + 133)
+#define RID_STR_DATANAV_REMOVE_ELEMENT              (RID_FORMS_START + 134)
+#define RID_STR_DATANAV_ADD_ATTRIBUTE               (RID_FORMS_START + 135)
+#define RID_STR_DATANAV_EDIT_ATTRIBUTE              (RID_FORMS_START + 136)
+#define RID_STR_DATANAV_REMOVE_ATTRIBUTE            (RID_FORMS_START + 137)
+#define RID_STR_DATANAV_ADD_BINDING                 (RID_FORMS_START + 138)
+#define RID_STR_DATANAV_EDIT_BINDING                (RID_FORMS_START + 139)
+#define RID_STR_DATANAV_REMOVE_BINDING              (RID_FORMS_START + 140)
+#define RID_STR_DATANAV_ADD_SUBMISSION              (RID_FORMS_START + 141)
+#define RID_STR_DATANAV_EDIT_SUBMISSION             (RID_FORMS_START + 142)
+#define RID_STR_DATANAV_REMOVE_SUBMISSION           (RID_FORMS_START + 143)
+#define RID_STR_DATANAV_LINKWARN_BUTTON             (RID_FORMS_START + 144)
+#define RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY       (RID_FORMS_START + 145)
+#define RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS         (RID_FORMS_START + 146)
+#define RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS         (RID_FORMS_START + 147)
+#define RID_STR_READONLY_VIEW                       (RID_FORMS_START + 148)
+#define RID_STR_ALREADYEXISTOVERWRITE               (RID_FORMS_START + 149)
+#define RID_STR_OBJECT_LABEL                        (RID_FORMS_START + 150)
+
+// Error-String-Id's -----------------------------------------------------------
+#define RID_ERR_START                               (RID_FORMS_START + 600)
+#define RID_ERR_CONTEXT_ADDFORM                     (RID_ERR_START + 0)
+#define RID_ERR_DUPLICATE_NAME                      (RID_ERR_START + 1)
+#define RID_ERR_FIELDREQUIRED                       (RID_ERR_START + 2)
+#define RID_ERR_NO_ELEMENT                          (RID_ERR_START + 4)
+
+// untyped resources  ----------------------------------------------------------
+
+#define RID_RSC_TABWIN_PREFIX                       ( RID_FORMS_START +  0 )
+#define RID_RSC_SQL_INTERNATIONAL                   ( RID_FORMS_START +  1 )
+
+#endif          // _FM_FMPAGE_HXX
+
diff --git a/svx/inc/svx/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx
new file mode 100644
index 000000000000..3705f32b7494
--- /dev/null
+++ b/svx/inc/svx/fmsrccfg.hxx
@@ -0,0 +1,156 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 _FMSRCCF_HXX_
+#define _FMSRCCF_HXX_
+
+#include <tools/string.hxx>
+#include <unotools/configvaluecontainer.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include "svx/svxdllapi.h"
+
+// ===================================================================================================
+
+#define MATCHING_ANYWHERE       0
+#define MATCHING_BEGINNING      1
+#define MATCHING_END            2
+#define MATCHING_WHOLETEXT      3
+
+// diese Konstanten duerfen NICHT einfach geaendert werden, da der SearchDialog aus den Einstellungen seiner ListBox
+// keine Umrechnungen vornimmt, sondern die einfach in die entsprechenden Methoden der SearchEngine steckt
+// (wenn man also die Konstanten oder die Reihenfolge der Listbox-Eintraege im Dialog aendert, muss das jeweils andere
+// angepasst werden)
+
+
+//........................................................................
+namespace svxform
+{
+//........................................................................
+
+    // ===================================================================================================
+    // = struct FmSearchParams - Parameter einer Suche
+    // ===================================================================================================
+
+    struct SVX_DLLPUBLIC FmSearchParams
+    {
+    protected:
+        sal_Int32       nTransliterationFlags;
+            // they're way too sensitive for direct access ....
+
+    public:
+        // no bit fields at all (want to pass the addresses to the OConfigurationValueContainer)
+        ::com::sun::star::uno::Sequence< ::rtl::OUString >
+                        aHistory;
+        ::rtl::OUString sSingleSearchField;
+
+        sal_Int16       nSearchForType;
+        sal_Int16       nPosition;
+        sal_Int16       nLevOther;
+        sal_Int16       nLevShorter;
+        sal_Int16       nLevLonger;
+        sal_Bool        bLevRelaxed;
+
+        sal_Bool        bAllFields;
+        sal_Bool        bUseFormatter;
+        sal_Bool        bBackwards;
+        sal_Bool        bWildcard;
+        sal_Bool        bRegular;
+        sal_Bool        bApproxSearch;
+            // the last three are mutually exclusive
+
+        sal_Bool        bSoundsLikeCJK;
+
+        // ......................................
+        FmSearchParams();
+
+        sal_Bool    isIgnoreWidthCJK( ) const;
+        void        setIgnoreWidthCJK( sal_Bool _bIgnore );
+
+        sal_Int32   getTransliterationFlags( ) const { return nTransliterationFlags; }
+        void        setTransliterationFlags( sal_Int32 _nFlags ) { nTransliterationFlags = _nFlags; }
+
+        sal_Bool    isCaseSensitive( ) const;
+        void        setCaseSensitive( sal_Bool _bCase );
+    };
+
+    // ===================================================================================================
+    // = class FmSearchConfigItem - ein ConfigItem, dass sich Suchparameter merkt
+    // ===================================================================================================
+
+    class SVX_DLLPUBLIC FmSearchConfigItem
+                :protected  FmSearchParams
+                ,public     ::utl::OConfigurationValueContainer
+                // order matters!
+    {
+    private:
+        ::osl::Mutex    m_aMutex;
+
+        // wrapper properties:
+        // some of the members of FmSearchParams are must be translated to be stored in the configuration
+        ::rtl::OUString     m_sSearchForType;
+        ::rtl::OUString     m_sSearchPosition;
+
+        sal_Bool            m_bIsMatchCase;
+        sal_Bool            m_bIsMatchFullHalfWidthForms;
+        sal_Bool            m_bIsMatchHiraganaKatakana;
+        sal_Bool            m_bIsMatchContractions;
+        sal_Bool            m_bIsMatchMinusDashCho_on;
+        sal_Bool            m_bIsMatchRepeatCharMarks;
+        sal_Bool            m_bIsMatchVariantFormKanji;
+        sal_Bool            m_bIsMatchOldKanaForms;
+        sal_Bool            m_bIsMatch_DiZi_DuZu;
+        sal_Bool            m_bIsMatch_BaVa_HaFa;
+        sal_Bool            m_bIsMatch_TsiThiChi_DhiZi;
+        sal_Bool            m_bIsMatch_HyuIyu_ByuVyu;
+        sal_Bool            m_bIsMatch_SeShe_ZeJe;
+        sal_Bool            m_bIsMatch_IaIya;
+        sal_Bool            m_bIsMatch_KiKu;
+        sal_Bool            m_bIsIgnorePunctuation;
+        sal_Bool            m_bIsIgnoreWhitespace;
+        sal_Bool            m_bIsIgnoreProlongedSoundMark;
+        sal_Bool            m_bIsIgnoreMiddleDot;
+
+    public:
+        FmSearchConfigItem();
+        ~FmSearchConfigItem();
+
+        const FmSearchParams&   getParams( ) const;
+        void                    setParams( const FmSearchParams& _rParams );
+
+    private:
+        SVX_DLLPRIVATE void implTranslateFromConfig( );
+        SVX_DLLPRIVATE void implTranslateToConfig( );
+    };
+
+//........................................................................
+}   // namespace svxform
+//........................................................................
+
+// ===================================================================================================
+
+#endif // _FMSRCCF_HXX_
+
diff --git a/svx/inc/svx/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx
new file mode 100644
index 000000000000..e620c34bdd4a
--- /dev/null
+++ b/svx/inc/svx/fmsrcimp.hxx
@@ -0,0 +1,409 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 _FMSRCIMP_HXX
+#define _FMSRCIMP_HXX
+
+#include <svx/fmtools.hxx>
+#include "svx/svxdllapi.h"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/awt/XCheckBox.hpp>
+#include <com/sun/star/awt/XListBox.hpp>
+#include <com/sun/star/awt/XTextComponent.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/util/XNumberFormatter.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/stl_types.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <osl/mutex.hxx>
+#include <unotools/charclass.hxx>
+#include <unotools/collatorwrapper.hxx>
+#include <vos/thread.hxx>
+
+#ifndef _SVSTDARR_ULONGS
+#define _SVSTDARR_ULONGS
+#include <svl/svstdarr.hxx>
+#endif
+
+// ===================================================================================================
+// Hilfsstrukturen
+
+SV_DECL_OBJARR(SvInt32Array, sal_Int32, 16, 16)
+
+// ===================================================================================================
+// = class FmSearchThread - wie der Name schon sagt
+// ===================================================================================================
+
+class FmSearchEngine;
+class FmSearchThread : public ::vos::OThread
+{
+    FmSearchEngine*     m_pEngine;
+    Link                m_aTerminationHdl;
+
+    virtual void SAL_CALL run();
+    virtual void SAL_CALL onTerminated();
+
+public:
+    FmSearchThread(FmSearchEngine* pEngine) : m_pEngine(pEngine) { }
+    void setTerminationHandler(Link aHdl) { m_aTerminationHdl = aHdl; }
+};
+
+// ===================================================================================================
+// = struct FmSearchProgress - diese Struktur bekommt der Owner der SearchEngine fuer Status-Updates
+// = (und am Ende der Suche)
+// ===================================================================================================
+
+struct FmSearchProgress
+{
+    enum STATE { STATE_PROGRESS, STATE_PROGRESS_COUNTING, STATE_CANCELED, STATE_SUCCESSFULL, STATE_NOTHINGFOUND, STATE_ERROR };
+        // (Bewegung auf neuen Datensatz; Fortschritt beim Zaehlen von Datensaetzen; abgebrochen; Datensatz gefunden;
+        // nichts gefunden, irgendein nicht zu handelnder Fehler)
+    STATE   aSearchState;
+
+    // aktueller Datensatz - immer gueltig (ist zum Beispiel bei Abbrechen auch fuer das Weitersuchen interesant)
+    sal_uInt32  nCurrentRecord;
+    // Ueberlauf - nur gueltig bei STATE_PROGRESS
+    sal_Bool    bOverflow;
+
+    // die Position des Such-Cursors - bei STATE_SUCCESSFULL, STATE_CANCELED und STATE_NOTHING_FOUND gueltig
+    ::com::sun::star::uno::Any  aBookmark;
+    // das Feld, in dem der Text gefunden wurde - bei STATE_SUCCESSFULL gueltig
+    sal_Int32   nFieldIndex;
+};
+
+// ===================================================================================================
+// = class FmRecordCountListener - Hilfsklasse fuer FmSearchEngine, lauscht an einem Cursor und teilt
+// =                                Aenderungem im RecordCount mit
+// ===================================================================================================
+
+class FmRecordCountListener : public ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener>
+{
+// Atribute
+    Link            m_lnkWhoWantsToKnow;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xListening;
+
+// Attribut-Zugriff
+public:
+    Link SetPropChangeHandler(const Link& lnk);
+
+// Oprationen
+public:
+    FmRecordCountListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& dbcCursor);
+        // the set has to support the sdb::ResultSet service
+    virtual ~FmRecordCountListener();
+
+    //  DECLARE_UNO3_AGG_DEFAULTS(FmPropertyListener, UsrObject);
+    //  virtual sal_Bool queryInterface(::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rOut);
+
+// ::com::sun::star::lang::XEventListener
+    virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException);
+
+// ::com::sun::star::beans::XPropertyChangeListener
+    virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException);
+
+    void DisConnect();
+
+private:
+    void NotifyCurrentCount();
+
+};
+
+// ===================================================================================================
+// = class FmSearchEngine - Impl-Klasse fuer FmSearchDialog
+// ===================================================================================================
+
+namespace svxform {
+    // We have three possible control types we may search in, determined by the supported interfaces : ::com::sun::star::awt::XTextComponent, ::com::sun::star::awt::XListBox, ::com::sun::star::awt::XCheckBox.
+    // While searching we don't want to do this distinction for every control in every round. So we need some helpers.
+    class ControlTextWrapper
+    {
+        // attributes
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   m_xControl;
+        // attribute access
+    public:
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  getControl() const{ return m_xControl; }
+    public:
+        ControlTextWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xControl) { m_xControl = _xControl; }
+        virtual ~ControlTextWrapper() { }
+
+        virtual ::rtl::OUString getCurrentText() const = 0;
+    };
+    class SimpleTextWrapper : public ControlTextWrapper
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >  m_xText;
+    public:
+        SimpleTextWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& _xText);
+        virtual ::rtl::OUString getCurrentText() const;
+    };
+    class ListBoxWrapper : public ControlTextWrapper
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox >  m_xBox;
+    public:
+        ListBoxWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox >& _xBox);
+        virtual ::rtl::OUString getCurrentText() const;
+    };
+    class CheckBoxWrapper : public ControlTextWrapper
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox >  m_xBox;
+    public:
+        CheckBoxWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox >& _xBox);
+        virtual ::rtl::OUString getCurrentText() const;
+    };
+}
+
+enum FMSEARCH_MODE { SM_BRUTE, SM_ALLOWSCHEDULE, SM_USETHREAD };
+
+DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>, InterfaceArray);
+
+class SVX_DLLPUBLIC FmSearchEngine
+{
+    friend class FmSearchThread;
+
+    enum SEARCH_RESULT { SR_FOUND, SR_NOTFOUND, SR_ERROR, SR_CANCELED };
+    enum SEARCHFOR_TYPE { SEARCHFOR_STRING, SEARCHFOR_NULL, SEARCHFOR_NOTNULL };
+
+    // zugrundeliegende Daten
+    CursorWrapper           m_xSearchCursor;
+    SvInt32Array            m_arrFieldMapping;
+        // da der Iterator durchaus mehr Spalten haben kann, als ich eigentlich verwalte (in meiner Feld-Listbox),
+        // muss ich mir hier ein Mapping dieser ::com::sun::star::form-Schluessel auf die Indizies der entsprechenden Spalten im Iterator halten
+
+    // der Formatter
+    ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >  m_xFormatSupplier;
+    ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >        m_xFormatter;
+
+    CharClass               m_aCharacterClassficator;
+    CollatorWrapper         m_aStringCompare;
+
+    // die Sammlung aller interesanten Felder (bzw. ihre ::com::sun::star::data::XDatabaseVariant-Interfaces und ihre FormatKeys)
+    struct FieldInfo
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >          xContents;
+        sal_uInt32              nFormatKey;
+        sal_Bool                bDoubleHandling;
+    };
+
+    DECLARE_STL_VECTOR(FieldInfo, FieldCollection);
+    FieldCollection             m_arrUsedFields;
+    sal_Int32                   m_nCurrentFieldIndex;   // der letzte Parameter von RebuildUsedFields, ermoeglicht mir Checks in FormatField
+
+    DECLARE_STL_VECTOR(svxform::ControlTextWrapper*, ControlTextSuppliers);
+    ControlTextSuppliers    m_aControlTexts;
+
+    sal_Bool                m_bUsingTextComponents;
+    CursorWrapper           m_xOriginalIterator;
+    CursorWrapper           m_xClonedIterator;
+
+    // Daten fuer Entscheidung, in welchem Feld ich ein "Found" akzeptiere
+    ::com::sun::star::uno::Any  m_aPreviousLocBookmark;             // Position, an der ich zuletzt fuendig war
+    FieldCollectionIterator     m_iterPreviousLocField;             // dito Feld
+
+    // Kommunikation mit dem Thread, der die eigentliche Suche durchfuehrt
+    ::rtl::OUString             m_strSearchExpression;              // Hinrichtung
+    SEARCHFOR_TYPE      m_eSearchForType;                   // dito
+    SEARCH_RESULT       m_srResult;                         // Rueckrichtung
+
+    // der Link, dem ich Fortschritte und Ergebnisse mitteile
+    Link                m_aProgressHandler;
+    sal_Bool            m_bSearchingCurrently : 1;      // laeuft gerade eine (asynchrone) Suche ?
+    sal_Bool            m_bCancelAsynchRequest : 1;     // soll abgebrochen werden ?
+    ::osl::Mutex        m_aCancelAsynchAccess;          // Zugriff auf m_bCancelAsynchRequest (eigentlich nur bei
+                                                        // m_eMode == SM_USETHREAD interesant)
+    FMSEARCH_MODE   m_eMode;        //CHINA001  FmSearchDialog::SEARCH_MODE m_eMode;                // der aktuelle Modus
+    // der aktuelle Modus
+
+    // Parameter fuer die Suche
+    sal_Bool    m_bFormatter : 1;       // Feldformatierung benutzen
+    sal_Bool    m_bForward : 1;         // Richtung
+    sal_Bool    m_bWildcard : 1;        // Platzhalter-Suche ?
+    sal_Bool    m_bRegular : 1;         // regulaerer Ausdruck
+    sal_Bool    m_bLevenshtein : 1;     // Levenshtein-Suche
+    sal_Bool    m_bTransliteration : 1; // Levenshtein-Suche
+
+    sal_Bool    m_bLevRelaxed : 1;      // Parameter fuer Levenshtein-Suche
+    sal_uInt16  m_nLevOther;
+    sal_uInt16  m_nLevShorter;
+    sal_uInt16  m_nLevLonger;
+
+    sal_uInt16  m_nPosition;            // wenn nicht regulaer oder lev, dann einer der MATCHING_...-Werte
+
+    sal_Int32   m_nTransliterationFlags;
+
+// -------------
+// Memberzugriff
+private:
+    SVX_DLLPRIVATE sal_Bool CancelRequested();      // liefert eine durch m_aCancelAsynchAccess gesicherte Auswertung von m_bCancelAsynchRequest
+
+public:
+    void        SetCaseSensitive(sal_Bool bSet);
+    sal_Bool    GetCaseSensitive() const;
+
+    void        SetFormatterUsing(sal_Bool bSet);   // das ist etwas umfangreicher, deshalb kein hier inline ....
+    sal_Bool    GetFormatterUsing() const           { return m_bFormatter; }
+
+    void        SetDirection(sal_Bool bForward)     { m_bForward = bForward; }
+    sal_Bool    GetDirection() const                { return m_bForward; }
+
+    void        SetWildcard(sal_Bool bSet)          { m_bWildcard = bSet; }
+    sal_Bool    GetWildcard() const                 { return m_bWildcard; }
+
+    void        SetRegular(sal_Bool bSet)           { m_bRegular = bSet; }
+    sal_Bool    GetRegular() const                  { return m_bRegular; }
+
+    void        SetLevenshtein(sal_Bool bSet)       { m_bLevenshtein = bSet; }
+    sal_Bool    GetLevenshtein() const              { return m_bLevenshtein; }
+
+    void        SetIgnoreWidthCJK(sal_Bool bSet);
+    sal_Bool    GetIgnoreWidthCJK() const;
+
+    void        SetTransliteration(sal_Bool bSet)   { m_bTransliteration = bSet; }
+    sal_Bool    GetTransliteration() const          { return m_bTransliteration; }
+
+    void        SetLevRelaxed(sal_Bool bSet)        { m_bLevRelaxed = bSet; }
+    sal_Bool    GetLevRelaxed() const               { return m_bLevRelaxed; }
+    void        SetLevOther(sal_uInt16 nHowMuch)    { m_nLevOther = nHowMuch; }
+    sal_uInt16  GetLevOther() const                 { return m_nLevOther; }
+    void        SetLevShorter(sal_uInt16 nHowMuch)  { m_nLevShorter = nHowMuch; }
+    sal_uInt16  GetLevShorter() const               { return m_nLevShorter; }
+    void        SetLevLonger(sal_uInt16 nHowMuch)   { m_nLevLonger = nHowMuch; }
+    sal_uInt16  GetLevLonger() const                { return m_nLevLonger; }
+        // die ganzen Lev-Werte werden nur bei  m_bLevenshtein==sal_True beachtet
+
+    void        SetTransliterationFlags(sal_Int32 _nFlags)  { m_nTransliterationFlags = _nFlags; }
+    sal_Int32   GetTransliterationFlags() const             { return m_nTransliterationFlags; }
+
+    void    SetPosition(sal_uInt16 nValue)      { m_nPosition = nValue; }
+    sal_uInt16  GetPosition() const             { return m_nPosition; }
+        // Position wird bei m_bWildCard==sal_True nicht beachtet
+
+    FMSEARCH_MODE GetSearchMode() const { return m_eMode; }
+
+public:
+    /** zwei Constructoren, beide analog zu denen des FmSearchDialog, Erklaerung siehe also dort ....
+        xCursor muss jeweils den ::com::sun::star::data::DatabaseCursor-Service implementieren.
+        wenn eMode == SM_USETHREAD, sollte ein ProgressHandler gesetzt sein, da dann die Ergebnisuebermittlung ueber diesen
+        Handler erfolgt.
+        Ist eMode != SM_USETHREAD, kehren SearchNext und StarOver nicht zurueck, bevor die Suche (erfolgreich oder nicht) beendet
+        wurde, dann kann man das Ergebnis danach abfragen. Ist zusaetzlich der ProgressHandler gesetzt, wird dieser fuer jeden neuen
+        Datensatz sowie am Ende der Suche aufgerufen.
+    */
+    FmSearchEngine(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor,
+        const ::rtl::OUString& strVisibleFields,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xFormat,
+        FMSEARCH_MODE eMode);//CHINA001 FmSearchDialog::SEARCH_MODE eMode);
+    FmSearchEngine(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor,
+        const ::rtl::OUString& strVisibleFields,
+        const InterfaceArray& arrFields,
+        FMSEARCH_MODE eMode); //CHINA001 FmSearchDialog::SEARCH_MODE eMode);
+
+    virtual ~FmSearchEngine();
+
+    /** der Link wird fuer jeden Datensatz und nach Beendigung der Suche aufgerufen, Parameter ist ein Zeiger auf
+        eine FmSearchProgress-Struktur
+        der Handler sollte auf jeden Fall Thread-sicher sein
+    */
+    void SetProgressHandler(Link aHdl) { m_aProgressHandler = aHdl; }
+
+    /// das naechste Vorkommen suchen (Werte fuer nDirection siehe DIRECTION_*-defines)
+    void SearchNext(const ::rtl::OUString& strExpression);
+    /// analogous, search for "NULL" (_bSearchForNull==sal_True) or "not NULL"
+    void SearchNextSpecial(sal_Bool _bSearchForNull);
+    /// das naechste Vorkommen suchen, abhaengig von nDirection wird dabei am Anfang oder am Ende neu begonnen
+    void StartOver(const ::rtl::OUString& strExpression);
+    /// analogous, search for "NULL" (_bSearchForNull==sal_True) or "not NULL"
+    void StartOverSpecial(sal_Bool _bSearchForNull);
+    /// die Angaben ueber letzte Fundstelle invalidieren
+    void InvalidatePreviousLoc();
+
+    /** baut m_arrUsedFields neu auf (nFieldIndex==-1 bedeutet alle Felder, ansonsten gibt es den Feldindex an)
+        wenn bForce nicht gesetzt ist, passiert bei nFieldIndex == m_nCurrentFieldIndex nichts
+        (ruft InvalidatePreviousLoc auf)
+    */
+    void RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce = sal_False);
+    ::rtl::OUString FormatField(sal_Int32 nWhich);
+
+    /// kehrt sofort zurueck; nachdem wirklich abgebrochen wurde, wird der ProgressHandler mit STATE_CANCELED aufgerufen
+    void CancelSearch();
+
+    /** nur gueltig, wenn nicht gerade eine (asynchrone) Suche laeuft, die naechste Suche wird dann auf dem neuen Iterator
+        mit den neuen Parametern durchgefuehrt
+    */
+    sal_Bool SwitchToContext(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const ::rtl::OUString& strVisibleFields, const InterfaceArray& arrFields,
+        sal_Int32 nFieldIndex);
+
+protected:
+    void Init(const ::rtl::OUString& strVisibleFields);
+
+    void SearchNextImpl();
+        // diese Impl-Methode laeuft im SearchThread
+
+    // start a thread-search (or call SearchNextImpl directly, depending on the search mode)
+    void ImplStartNextSearch();
+
+private:
+    SVX_DLLPRIVATE void clearControlTexts();
+    SVX_DLLPRIVATE void fillControlTexts(const InterfaceArray& arrFields);
+
+    // three methods implementing a complete search loop (null/not null, wildcard, SearchText)
+    // (they all have some code in common, but with this solution we have do do a distinction only once per search (before
+    // starting the loop), not in every loop step
+    SVX_DLLPRIVATE SEARCH_RESULT SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop,
+        const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
+    SVX_DLLPRIVATE SEARCH_RESULT SearchWildcard(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop,
+        const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
+    SVX_DLLPRIVATE SEARCH_RESULT SearchRegularApprox(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos, FieldCollectionIterator& iterFieldLoop,
+        const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
+
+    SVX_DLLPRIVATE void PropagateProgress(sal_Bool _bDontPropagateOverflow);
+        // ruft den ProgressHandler mit STATE_PROGRESS und der aktuellen Position des SearchIterators auf
+
+    // helpers, die ich mehrmals brauche
+    SVX_DLLPRIVATE sal_Bool MoveCursor();
+        // bewegt m_xSearchIterator unter Beachtung von Richtung/Ueberlauf Cursor
+    SVX_DLLPRIVATE sal_Bool MoveField(sal_Int32& nPos, FieldCollectionIterator& iter, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
+        // bewegt den Iterator unter Beachtung von Richtung/Ueberlauf Iterator/Ueberlauf Cursor
+    SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xAllFields, sal_Int32 nField);
+        // baut eine FieldInfo zum Feld Nummer nField (in xAllFields) auf und fuegt sie zu m_arrUsedFields hinzu
+        // xAllFields muss den DatabaseRecord-Service unterstuetzen
+    SVX_DLLPRIVATE ::rtl::OUString FormatField(const FieldInfo& rField);
+        // formatiert das Feld mit dem NumberFormatter
+
+    SVX_DLLPRIVATE sal_Bool HasPreviousLoc() { return m_aPreviousLocBookmark.hasValue(); }
+
+    DECL_LINK(OnSearchTerminated, FmSearchThread*);
+        // wird vom SuchThread benutzt, nach Rueckkehr aus diesem Handler loescht sich der Thread selber
+    DECL_LINK(OnNewRecordCount, void*);
+};
+
+#endif // _FMSRCIMP_HXX
+
diff --git a/svx/inc/fontlb.hxx b/svx/inc/svx/fontlb.hxx
index 813b01ba390f..813b01ba390f 100644
--- a/svx/inc/fontlb.hxx
+++ b/svx/inc/svx/fontlb.hxx
diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx
index 9f6b1f9f4b2f..9f6b1f9f4b2f 100644
--- a/svx/inc/fontworkgallery.hxx
+++ b/svx/inc/svx/fontworkgallery.hxx
diff --git a/svx/inc/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx
index b380e051daf8..b380e051daf8 100644
--- a/svx/inc/formatpaintbrushctrl.hxx
+++ b/svx/inc/svx/formatpaintbrushctrl.hxx
diff --git a/svx/inc/galbrws.hxx b/svx/inc/svx/galbrws.hxx
index f54901db543d..f54901db543d 100644
--- a/svx/inc/galbrws.hxx
+++ b/svx/inc/svx/galbrws.hxx
diff --git a/svx/inc/galctrl.hxx b/svx/inc/svx/galctrl.hxx
index 3acf53dbeddb..3acf53dbeddb 100644
--- a/svx/inc/galctrl.hxx
+++ b/svx/inc/svx/galctrl.hxx
diff --git a/svx/inc/gallery.hxx b/svx/inc/svx/gallery.hxx
index 68a5c68539f1..68a5c68539f1 100644
--- a/svx/inc/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
diff --git a/svx/inc/galtheme.hxx b/svx/inc/svx/galtheme.hxx
index aa77bba25d26..aa77bba25d26 100644
--- a/svx/inc/galtheme.hxx
+++ b/svx/inc/svx/galtheme.hxx
diff --git a/svx/inc/globl3d.hxx b/svx/inc/svx/globl3d.hxx
index 1560f96dc1f5..1560f96dc1f5 100644
--- a/svx/inc/globl3d.hxx
+++ b/svx/inc/svx/globl3d.hxx
diff --git a/svx/inc/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx
index 0c68f73f48f6..0c68f73f48f6 100644
--- a/svx/inc/grafctrl.hxx
+++ b/svx/inc/svx/grafctrl.hxx
diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx
index b9540e8845ca..b9540e8845ca 100644
--- a/svx/inc/hlnkitem.hxx
+++ b/svx/inc/svx/hlnkitem.hxx
diff --git a/svx/inc/htmlmode.hxx b/svx/inc/svx/htmlmode.hxx
index a1c5bf0cdf11..a1c5bf0cdf11 100644
--- a/svx/inc/htmlmode.hxx
+++ b/svx/inc/svx/htmlmode.hxx
diff --git a/svx/inc/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx
index fc129763e63f..fc129763e63f 100644
--- a/svx/inc/hyperdlg.hxx
+++ b/svx/inc/svx/hyperdlg.hxx
diff --git a/svx/inc/svx/hyprlink.hxx b/svx/inc/svx/hyprlink.hxx
new file mode 100644
index 000000000000..0a5af0afae82
--- /dev/null
+++ b/svx/inc/svx/hyprlink.hxx
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 _SVX_DLG_HYPERLINK_HXX
+#define _SVX_DLG_HYPERLINK_HXX
+
+#include <sfx2/childwin.hxx>
+#include "svx/svxdllapi.h"
+
+// class SvxHyperlinkDialogWrapper ---------------------------------------
+class SVX_DLLPUBLIC SvxHyperlinkDlgWrapper : public SfxChildWindow
+{
+public:
+    SvxHyperlinkDlgWrapper( Window*pParent, USHORT nId,
+                            SfxBindings* pBindings, SfxChildWinInfo* pInfo );
+    SFX_DECL_CHILDWINDOW(SvxHyperlinkDlgWrapper);
+};
+#endif // _SVX_DLG_HYPERLINK_HXX
+
+
diff --git a/svx/inc/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx
index d1a6961453a5..d1a6961453a5 100644
--- a/svx/inc/imapdlg.hxx
+++ b/svx/inc/svx/imapdlg.hxx
diff --git a/svx/inc/insctrl.hxx b/svx/inc/svx/insctrl.hxx
index e7fa02c70d91..e7fa02c70d91 100644
--- a/svx/inc/insctrl.hxx
+++ b/svx/inc/svx/insctrl.hxx
diff --git a/svx/inc/layctrl.hxx b/svx/inc/svx/layctrl.hxx
index 1bbdc714b7c9..1bbdc714b7c9 100644
--- a/svx/inc/layctrl.hxx
+++ b/svx/inc/svx/layctrl.hxx
diff --git a/svx/inc/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx
index 36c82c64f44b..36c82c64f44b 100644
--- a/svx/inc/lboxctrl.hxx
+++ b/svx/inc/svx/lboxctrl.hxx
diff --git a/svx/inc/linectrl.hxx b/svx/inc/svx/linectrl.hxx
index 43c96f128671..43c96f128671 100644
--- a/svx/inc/linectrl.hxx
+++ b/svx/inc/svx/linectrl.hxx
diff --git a/svx/inc/measctrl.hxx b/svx/inc/svx/measctrl.hxx
index d45dc134cf19..d45dc134cf19 100644
--- a/svx/inc/measctrl.hxx
+++ b/svx/inc/svx/measctrl.hxx
diff --git a/svx/inc/modctrl.hxx b/svx/inc/svx/modctrl.hxx
index fd9e085c826e..fd9e085c826e 100644
--- a/svx/inc/modctrl.hxx
+++ b/svx/inc/svx/modctrl.hxx
diff --git a/svx/inc/numvset.hxx b/svx/inc/svx/numvset.hxx
index d174e1d6fba5..d174e1d6fba5 100644
--- a/svx/inc/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
diff --git a/svx/inc/objfac3d.hxx b/svx/inc/svx/objfac3d.hxx
index 6ce30853f441..6ce30853f441 100644
--- a/svx/inc/objfac3d.hxx
+++ b/svx/inc/svx/objfac3d.hxx
diff --git a/svx/inc/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx
index 50f18ccb9ed9..50f18ccb9ed9 100644
--- a/svx/inc/ofaitem.hxx
+++ b/svx/inc/svx/ofaitem.hxx
diff --git a/svx/inc/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx
index 50520aac0204..50520aac0204 100644
--- a/svx/inc/optgenrl.hxx
+++ b/svx/inc/svx/optgenrl.hxx
diff --git a/svx/inc/optgrid.hxx b/svx/inc/svx/optgrid.hxx
index 6dd2a5f9371d..6dd2a5f9371d 100644
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/svx/optgrid.hxx
diff --git a/svx/inc/orienthelper.hxx b/svx/inc/svx/orienthelper.hxx
index 7508740b62d6..7508740b62d6 100644
--- a/svx/inc/orienthelper.hxx
+++ b/svx/inc/svx/orienthelper.hxx
diff --git a/svx/inc/passwd.hxx b/svx/inc/svx/passwd.hxx
index 9a6b14f0144a..9a6b14f0144a 100644
--- a/svx/inc/passwd.hxx
+++ b/svx/inc/svx/passwd.hxx
diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx
index 646575ac4e0c..646575ac4e0c 100644
--- a/svx/inc/pfiledlg.hxx
+++ b/svx/inc/svx/pfiledlg.hxx
diff --git a/svx/inc/postattr.hxx b/svx/inc/svx/postattr.hxx
index 840312cf0c46..840312cf0c46 100644
--- a/svx/inc/postattr.hxx
+++ b/svx/inc/svx/postattr.hxx
diff --git a/svx/inc/prtqry.hxx b/svx/inc/svx/prtqry.hxx
index ce7ae239215f..ce7ae239215f 100644
--- a/svx/inc/prtqry.hxx
+++ b/svx/inc/svx/prtqry.hxx
diff --git a/svx/inc/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx
index 54ec2788521f..54ec2788521f 100644
--- a/svx/inc/pszctrl.hxx
+++ b/svx/inc/svx/pszctrl.hxx
diff --git a/svx/inc/relfld.hxx b/svx/inc/svx/relfld.hxx
index 02d9ca20a5d3..02d9ca20a5d3 100644
--- a/svx/inc/relfld.hxx
+++ b/svx/inc/svx/relfld.hxx
diff --git a/svx/inc/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx
index 8177713e6013..8177713e6013 100644
--- a/svx/inc/rotmodit.hxx
+++ b/svx/inc/svx/rotmodit.hxx
diff --git a/svx/inc/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx
index e8deecfed145..e8deecfed145 100644
--- a/svx/inc/rubydialog.hxx
+++ b/svx/inc/svx/rubydialog.hxx
diff --git a/svx/inc/rulritem.hxx b/svx/inc/svx/rulritem.hxx
index f6b81e1eedb8..f6b81e1eedb8 100644
--- a/svx/inc/rulritem.hxx
+++ b/svx/inc/svx/rulritem.hxx
diff --git a/svx/inc/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx
index fef8c2e604d0..fef8c2e604d0 100644
--- a/svx/inc/sdrpaintwindow.hxx
+++ b/svx/inc/svx/sdrpaintwindow.hxx
diff --git a/svx/inc/selctrl.hxx b/svx/inc/svx/selctrl.hxx
index 5d7fac4f4a5e..5d7fac4f4a5e 100644
--- a/svx/inc/selctrl.hxx
+++ b/svx/inc/svx/selctrl.hxx
diff --git a/svx/inc/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index 29aec84fae24..0253f61a7785 100644
--- a/svx/inc/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -118,7 +118,7 @@ public:
 // class SvxSearchDialog -------------------------------------------------
 
 /*
-    {k:\svx\prototyp\dialog\srchdlg.hxx}
+    {k:\svx\prototyp\dialog\svx/srchdlg.hxx}
 
     [Beschreibung]
     In diesem Modeless-Dialog werden die Attribute einer Suche eingestellt
diff --git a/svx/inc/svdglob.hxx b/svx/inc/svx/svdglob.hxx
index 588869ff9890..588869ff9890 100644
--- a/svx/inc/svdglob.hxx
+++ b/svx/inc/svx/svdglob.hxx
diff --git a/svx/inc/svditer.hxx b/svx/inc/svx/svditer.hxx
index 8ab6c32ea061..8ab6c32ea061 100644
--- a/svx/inc/svditer.hxx
+++ b/svx/inc/svx/svditer.hxx
diff --git a/svx/inc/srchitem.hxx b/svx/inc/svx/svditext.hxx
index fceb5f009953..b181b4046f9e 100644
--- a/svx/inc/srchitem.hxx
+++ b/svx/inc/svx/svditext.hxx
@@ -24,11 +24,14 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVX_SRCHITEM_HXX
-#define _SVX_SRCHITEM_HXX
 
-#include <svl/srchitem.hxx>
+#ifndef _SVDITEXT_HXX
+#define _SVDITEXT_HXX
 
-#endif
+// SvxItem-Mapping. Wird benoetigt um die SvxItem-Header erfolgreich zu includen
 
+#include <editeng/editdata.hxx>
+
+
+#endif  // _SVDITEXT_HXX
 
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svx/svdstr.hrc
index f1c19b4e0895..f1c19b4e0895 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svx/svdstr.hrc
diff --git a/svx/inc/svdviter.hxx b/svx/inc/svx/svdviter.hxx
index 884733bc2d84..884733bc2d84 100644
--- a/svx/inc/svdviter.hxx
+++ b/svx/inc/svx/svdviter.hxx
diff --git a/svx/inc/svimbase.hxx b/svx/inc/svx/svimbase.hxx
index 3d43e5fb9aac..3d43e5fb9aac 100644
--- a/svx/inc/svimbase.hxx
+++ b/svx/inc/svx/svimbase.hxx
diff --git a/svx/inc/svxerr.hxx b/svx/inc/svx/svxerr.hxx
index 0fd197f1a5f5..0fd197f1a5f5 100644
--- a/svx/inc/svxerr.hxx
+++ b/svx/inc/svx/svxerr.hxx
diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx
index fdd757b1a91b..fdd757b1a91b 100644
--- a/svx/inc/svxgrahicitem.hxx
+++ b/svx/inc/svx/svxgrahicitem.hxx
diff --git a/svx/inc/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx
index 843ff2a487af..843ff2a487af 100644
--- a/svx/inc/swframeexample.hxx
+++ b/svx/inc/svx/swframeexample.hxx
diff --git a/svx/inc/swframeposstrings.hxx b/svx/inc/svx/swframeposstrings.hxx
index 7ba005dc1e76..7ba005dc1e76 100644
--- a/svx/inc/swframeposstrings.hxx
+++ b/svx/inc/svx/swframeposstrings.hxx
diff --git a/svx/inc/swframevalidation.hxx b/svx/inc/svx/swframevalidation.hxx
index 600479718050..600479718050 100644
--- a/svx/inc/swframevalidation.hxx
+++ b/svx/inc/svx/swframevalidation.hxx
diff --git a/svx/inc/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx
index 669b03e87c73..669b03e87c73 100644
--- a/svx/inc/tbxalign.hxx
+++ b/svx/inc/svx/tbxalign.hxx
diff --git a/svx/inc/tbxcolor.hxx b/svx/inc/svx/tbxcolor.hxx
index 848c015c2995..848c015c2995 100644
--- a/svx/inc/tbxcolor.hxx
+++ b/svx/inc/svx/tbxcolor.hxx
diff --git a/svx/inc/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx
index 39bfc09cf8b1..39bfc09cf8b1 100644
--- a/svx/inc/tbxctl.hxx
+++ b/svx/inc/svx/tbxctl.hxx
diff --git a/svx/inc/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx
index 21aa3ea871ed..21aa3ea871ed 100644
--- a/svx/inc/tbxcustomshapes.hxx
+++ b/svx/inc/svx/tbxcustomshapes.hxx
diff --git a/svx/inc/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx
index 8f071f38792b..8f071f38792b 100644
--- a/svx/inc/tbxdraw.hxx
+++ b/svx/inc/svx/tbxdraw.hxx
diff --git a/svx/inc/txencbox.hxx b/svx/inc/svx/txencbox.hxx
index e24716f8c953..e24716f8c953 100644
--- a/svx/inc/txencbox.hxx
+++ b/svx/inc/svx/txencbox.hxx
diff --git a/svx/inc/txenctab.hxx b/svx/inc/svx/txenctab.hxx
index e04428717c53..e04428717c53 100644
--- a/svx/inc/txenctab.hxx
+++ b/svx/inc/svx/txenctab.hxx
diff --git a/svx/inc/unoapi.hxx b/svx/inc/svx/unoapi.hxx
index 6a990a8d1c70..6a990a8d1c70 100644
--- a/svx/inc/unoapi.hxx
+++ b/svx/inc/svx/unoapi.hxx
diff --git a/svx/inc/unofill.hxx b/svx/inc/svx/unofill.hxx
index 8c1a196b00d7..8c1a196b00d7 100644
--- a/svx/inc/unofill.hxx
+++ b/svx/inc/svx/unofill.hxx
diff --git a/svx/inc/unomaster.hxx b/svx/inc/svx/unomaster.hxx
index 06f716705233..06f716705233 100644
--- a/svx/inc/unomaster.hxx
+++ b/svx/inc/svx/unomaster.hxx
diff --git a/svx/inc/unopool.hxx b/svx/inc/svx/unopool.hxx
index c34105efb448..c34105efb448 100644
--- a/svx/inc/unopool.hxx
+++ b/svx/inc/svx/unopool.hxx
diff --git a/svx/inc/unoshcol.hxx b/svx/inc/svx/unoshcol.hxx
index 422f6fc24029..422f6fc24029 100644
--- a/svx/inc/unoshcol.hxx
+++ b/svx/inc/svx/unoshcol.hxx
diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx
index 8c350e31918b..8c350e31918b 100644
--- a/svx/inc/verttexttbxctrl.hxx
+++ b/svx/inc/svx/verttexttbxctrl.hxx
diff --git a/svx/inc/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx
index 1b4d745c55f8..1b4d745c55f8 100644
--- a/svx/inc/wrapfield.hxx
+++ b/svx/inc/svx/wrapfield.hxx
diff --git a/svx/inc/xattr.hxx b/svx/inc/svx/xattr.hxx
index 20035f7743e7..20035f7743e7 100644
--- a/svx/inc/xattr.hxx
+++ b/svx/inc/svx/xattr.hxx
diff --git a/svx/inc/xexch.hxx b/svx/inc/svx/xexch.hxx
index ff317f0a7541..ff317f0a7541 100644
--- a/svx/inc/xexch.hxx
+++ b/svx/inc/svx/xexch.hxx
diff --git a/svx/inc/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx
index 211e17ca1801..211e17ca1801 100644
--- a/svx/inc/xmleohlp.hxx
+++ b/svx/inc/svx/xmleohlp.hxx
diff --git a/svx/inc/xmlexchg.hxx b/svx/inc/svx/xmlexchg.hxx
index f4820e0eb6fe..f4820e0eb6fe 100644
--- a/svx/inc/xmlexchg.hxx
+++ b/svx/inc/svx/xmlexchg.hxx
diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx
index e17c78cd5ccb..e17c78cd5ccb 100644
--- a/svx/inc/xmlgrhlp.hxx
+++ b/svx/inc/svx/xmlgrhlp.hxx
diff --git a/svx/inc/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx
index aa1a38f183bd..aa1a38f183bd 100644
--- a/svx/inc/xmlsecctrl.hxx
+++ b/svx/inc/svx/xmlsecctrl.hxx
diff --git a/svx/inc/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx
index 726eb2f83d9c..726eb2f83d9c 100644
--- a/svx/inc/xoutbmp.hxx
+++ b/svx/inc/svx/xoutbmp.hxx
diff --git a/svx/inc/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx
index 7788bb1023f1..7788bb1023f1 100644
--- a/svx/inc/zoom_def.hxx
+++ b/svx/inc/svx/zoom_def.hxx
diff --git a/svx/inc/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx
index ea3ecdb33025..ea3ecdb33025 100644
--- a/svx/inc/zoomctrl.hxx
+++ b/svx/inc/svx/zoomctrl.hxx