cws tl79: merge with DEV300_m83

28 files changed, 590 insertions, 547 deletions

diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/extrusioncontrols.hxx
deleted file mode 100644
index 4560c7463bc9..000000000000
--- a/svx/inc/extrusioncontrols.hxx
+++ /dev/null
@@ -1,390 +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 _SVX_EXTRUSION_CONTROLS_HXX
-#define _SVX_EXTRUSION_CONTROLS_HXX
-
-#include <svtools/valueset.hxx>
-#include <svl/lstner.hxx>
-#include <sfx2/tbxctrl.hxx>
-#include <svtools/svtreebx.hxx>
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#include <vcl/dialog.hxx>
-#include <vcl/field.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
-#include "svx/svxdllapi.h"
-
-class SfxBindings;
-class ToolbarMenu;
-class SfxStatusForwarder;
-
-//========================================================================
-
-namespace svx
-{
-class ToolboxButtonColorUpdater;
-
-class ExtrusionDirectionWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-
-private:
-    ToolbarMenu*        mpMenu;
-    ValueSet*           mpDirectionSet;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    SfxStatusForwarder* mpDirectionForewarder;
-    SfxStatusForwarder* mpProjectionForewarder;
-
-    Image       maImgDirection[9];
-    Image       maImgDirectionH[9];
-
-    Image       maImgPerspective;
-    Image       maImgPerspectiveH;
-    Image       maImgParallel;
-    Image       maImgParallelH;
-
-    bool        mbPopupMode;
-
-    DECL_LINK( SelectHdl, void * );
-    void            FillValueSet();
-
-    void implSetDirection( sal_Int32 nSkew, bool bEnabled = true );
-    void implSetProjection( sal_Int32 nProjection, bool bEnabled = true );
-    void implInit();
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    ExtrusionDirectionWindow( USHORT nId,
-                              const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    ExtrusionDirectionWindow( USHORT nId,
-                              const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                              Window* pParentWindow );
-    ~ExtrusionDirectionWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-//========================================================================
-
-class SVX_DLLPUBLIC ExtrusionDirectionControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionDirectionControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~ExtrusionDirectionControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//========================================================================
-
-class ExtrusionDepthWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-
-private:
-    ToolbarMenu* mpMenu;
-
-    Image maImgDepth0;
-    Image maImgDepth1;
-    Image maImgDepth2;
-    Image maImgDepth3;
-    Image maImgDepth4;
-    Image maImgDepthInfinity;
-
-    Image maImgDepth0h;
-    Image maImgDepth1h;
-    Image maImgDepth2h;
-    Image maImgDepth3h;
-    Image maImgDepth4h;
-    Image maImgDepthInfinityh;
-
-    SfxStatusForwarder* mpDepthForewarder;
-    SfxStatusForwarder* mpMetricForewarder;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    bool        mbPopupMode;
-    FieldUnit   meUnit;
-    double      mfDepth;
-    bool        mbEnabled;
-
-    DECL_LINK( SelectHdl, void * );
-
-    void    implFillStrings( FieldUnit eUnit );
-    void    implSetDepth( double fDepth, bool bEnabled );
-    void    implInit();
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    ExtrusionDepthWindow( USHORT nId,
-                          const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    ExtrusionDepthWindow( USHORT nId,
-                          const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                          Window* pParentWindow );
-    ~ExtrusionDepthWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-//========================================================================
-
-class SVX_DLLPUBLIC ExtrusionDepthControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionDepthControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~ExtrusionDepthControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//========================================================================
-
-class ExtrusionLightingWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-
-private:
-    ToolbarMenu* mpMenu;
-    ValueSet*    mpLightingSet;
-
-    Image maImgLightingOff[9];
-    Image maImgLightingOn[9];
-    Image maImgLightingPreview[9];
-
-    Image maImgLightingOffh[9];
-    Image maImgLightingOnh[9];
-    Image maImgLightingPreviewh[9];
-
-    Image maImgBright;
-    Image maImgNormal;
-    Image maImgDim;
-    Image maImgBrighth;
-    Image maImgNormalh;
-    Image maImgDimh;
-
-    SfxStatusForwarder* mpLightingDirectionForewarder;
-    SfxStatusForwarder* mpLightingIntensityForewarder;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    bool    mbPopupMode;
-    int     mnLevel;
-    bool    mbLevelEnabled;
-    int     mnDirection;
-    bool    mbDirectionEnabled;
-
-    void    implSetIntensity( int nLevel, bool bEnabled );
-    void    implSetDirection( int nDirection, bool bEnabled );
-    void    implInit();
-
-    DECL_LINK( SelectHdl, void * );
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    ExtrusionLightingWindow( USHORT nId,
-                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    ExtrusionLightingWindow( USHORT nId,
-                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                             Window* pParentWindow );
-    ~ExtrusionLightingWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-//========================================================================
-
-class SVX_DLLPUBLIC ExtrusionLightingControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionLightingControl( USHORT nSlotid, USHORT nId, ToolBox& rTbx );
-    ~ExtrusionLightingControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//========================================================================
-
-class ExtrusionSurfaceWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-private:
-    ToolbarMenu* mpMenu;
-
-    Image maImgSurface1;
-    Image maImgSurface2;
-    Image maImgSurface3;
-    Image maImgSurface4;
-    Image maImgSurface1h;
-    Image maImgSurface2h;
-    Image maImgSurface3h;
-    Image maImgSurface4h;
-
-    SfxStatusForwarder* mpSurfaceForewarder;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    bool        mbPopupMode;
-
-    DECL_LINK( SelectHdl, void * );
-
-    void    implSetSurface( int nSurface, bool bEnabled );
-    void    implInit();
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    ExtrusionSurfaceWindow( USHORT nId,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    ExtrusionSurfaceWindow( USHORT nId,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                            Window* pParentWindow );
-    ~ExtrusionSurfaceWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-//========================================================================
-
-class SVX_DLLPUBLIC ExtrusionSurfaceControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionSurfaceControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~ExtrusionSurfaceControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//========================================================================
-
-class SVX_DLLPUBLIC ExtrusionColorControl : public SfxToolBoxControl
-{
-private:
-    ToolboxButtonColorUpdater*  mpBtnUpdater;
-
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionColorControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~ExtrusionColorControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//========================================================================
-
-class ExtrusionDepthDialog : public ModalDialog
-{
-    FixedText           maFLDepth;
-    MetricField         maMtrDepth;
-    OKButton            maOKButton;
-    CancelButton        maCancelButton;
-    HelpButton          maHelpButton;
-
-    FieldUnit           meDefaultUnit;
-
-public:
-    ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit eDefaultUnit );
-    ~ExtrusionDepthDialog();
-
-    double getDepth() const;
-};
-
-}
-#endif
-
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
new file mode 100644
index 000000000000..600e646e8cb6
--- /dev/null
+++ b/svx/inc/extrusiondepthdialog.hxx
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * 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_EXTRUSIONDEPTHDIALOG_HXX
+#define _SVX_EXTRUSIONDEPTHDIALOG_HXX
+
+#include "svx/svxdllapi.h"
+
+#include <vcl/fixed.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/button.hxx>
+#include <vcl/field.hxx>
+
+namespace svx {
+
+class ExtrusionDepthDialog : public ModalDialog
+{
+    FixedText           maFLDepth;
+    MetricField         maMtrDepth;
+    OKButton            maOKButton;
+    CancelButton        maCancelButton;
+    HelpButton          maHelpButton;
+
+    FieldUnit           meDefaultUnit;
+
+public:
+    ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit eDefaultUnit );
+    ~ExtrusionDepthDialog();
+
+    double getDepth() const;
+};
+
+}
+
+#endif      // _SVX_EXTRUSIONDEPTHDIALOG_HXX
+
diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/fontworkgallery.hxx
index 9f6b1f9f4b2f..40ac3cef966a 100644
--- a/svx/inc/fontworkgallery.hxx
+++ b/svx/inc/fontworkgallery.hxx
@@ -29,16 +29,16 @@
 #ifndef _SVX_FONTWORK_GALLERY_DIALOG_HXX
 #define _SVX_FONTWORK_GALLERY_DIALOG_HXX
 
-#ifndef _FIXED_HXX //autogen
+#include "svx/svxdllapi.h"
+
 #include <vcl/fixed.hxx>
-#endif
-#include <svtools/valueset.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/dialog.hxx>
+#include <vcl/field.hxx>
+
+#include <svtools/valueset.hxx>
+
 #include <sfx2/tbxctrl.hxx>
-#include "svx/svxdllapi.h"
 
 #include <vector>
 
@@ -50,7 +50,6 @@ class SdrObject;
 class SdrModel;
 
 class SfxBindings;
-class ToolbarMenu;
 class SfxStatusForwarder;
 
 //------------------------------------------------------------------------
@@ -58,130 +57,6 @@ class SfxStatusForwarder;
 namespace svx
 {
 
-class FontWorkAlignmentWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-private:
-    ToolbarMenu* mpMenu;
-
-    Image maImgAlgin1;
-    Image maImgAlgin2;
-    Image maImgAlgin3;
-    Image maImgAlgin4;
-    Image maImgAlgin5;
-    Image maImgAlgin1h;
-    Image maImgAlgin2h;
-    Image maImgAlgin3h;
-    Image maImgAlgin4h;
-    Image maImgAlgin5h;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    bool        mbPopupMode;
-
-    DECL_LINK( SelectHdl, void * );
-
-    void    implSetAlignment( int nAlignmentMode, bool bEnabled );
-    void    implInit();
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    FontWorkAlignmentWindow( USHORT nId,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    FontWorkAlignmentWindow( USHORT nId,
-                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                             Window* pParentWindow );
-    ~FontWorkAlignmentWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-class SVX_DLLPUBLIC FontWorkAlignmentControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    FontWorkAlignmentControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~FontWorkAlignmentControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//------------------------------------------------------------------------
-
-class FontWorkCharacterSpacingWindow : public SfxPopupWindow
-{
-    using FloatingWindow::StateChanged;
-private:
-    ToolbarMenu* mpMenu;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
-
-    bool        mbPopupMode;
-
-    DECL_LINK( SelectHdl, void * );
-
-    void    implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled );
-    void    implSetKernCharacterPairs( sal_Bool bKernOnOff, bool bEnabled );
-    void    implInit();
-
-protected:
-    virtual BOOL    Close();
-    virtual void    PopupModeEnd();
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the line ends value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus (void);
-
-public:
-    FontWorkCharacterSpacingWindow( USHORT nId,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-    FontWorkCharacterSpacingWindow( USHORT nId,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                            Window* pParentWindow );
-    ~FontWorkCharacterSpacingWindow();
-
-    void            StartSelection();
-
-    virtual SfxPopupWindow* Clone() const;
-
-    virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void DataChanged( const DataChangedEvent& rDCEvt );
-};
-
-class SVX_DLLPUBLIC FontWorkCharacterSpacingControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    FontWorkCharacterSpacingControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
-    ~FontWorkCharacterSpacingControl();
-
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
-    virtual SfxPopupWindowType  GetPopupWindowType() const;
-    virtual SfxPopupWindow*     CreatePopupWindow();
-};
-
-//------------------------------------------------------------------------
-
 class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl
 {
     using SfxToolBoxControl::Select;
@@ -192,8 +67,6 @@ public:
     ~FontWorkShapeTypeControl();
 
     virtual void                Select( BOOL bMod1 = FALSE );
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
-                                              const SfxPoolItem* pState );
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
 };
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index e328a39a0707..be037a1ca3cc 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -1332,17 +1332,38 @@
             {\
                 MenuItem\
                 {\
-                    Identifier = SID_TRANSLITERATE_UPPER ; \
-                    Command = ".uno:ChangeCaseToUpper" ; \
-                    HelpID = SID_TRANSLITERATE_UPPER ; \
-                    Text [ en-US ] = "~Uppercase";\
+                    Identifier = SID_TRANSLITERATE_SENTENCE_CASE; \
+                    Command = ".uno:ChangeCaseToSentenceCase" ; \
+                    HelpID = SID_TRANSLITERATE_SENTENCE_CASE; \
+                    Text [ en-US ] = "~Sentence case";\
                 };\
                 MenuItem\
                 {\
                     Identifier = SID_TRANSLITERATE_LOWER; \
                     Command = ".uno:ChangeCaseToLower" ; \
                     HelpID = SID_TRANSLITERATE_LOWER; \
-                    Text [ en-US ] = "~Lowercase";\
+                    Text [ en-US ] = "~lowercase";\
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_TRANSLITERATE_UPPER ; \
+                    Command = ".uno:ChangeCaseToUpper" ; \
+                    HelpID = SID_TRANSLITERATE_UPPER ; \
+                    Text [ en-US ] = "~UPPERCASE";\
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_TRANSLITERATE_TITLE_CASE; \
+                    Command = ".uno:ChangeCaseToTitleCase" ; \
+                    HelpID = SID_TRANSLITERATE_TITLE_CASE; \
+                    Text [ en-US ] = "~Capitalize Every Word";\
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_TRANSLITERATE_TOGGLE_CASE; \
+                    Command = ".uno:ChangeCaseToToggleCase" ; \
+                    HelpID = SID_TRANSLITERATE_TOGGLE_CASE; \
+                    Text [ en-US ] = "~tOGGLE cASE";\
                 };\
                 MenuItem\
                 {\
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 6d9153818cde..1f6fe1538a85 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -278,6 +278,7 @@
 #define HID_SVX_SENDMENU_SIGNANDENCRYPT                             (HID_SVX_START + 245)
 #define HID_SVX_TP_APPEARANCE                                       (HID_SVX_START + 246)
 #define HID_SVX_TP_DESKTOP                                          (HID_SVX_START + 247)
+#define HID_CT_THES_ALTERNATIVES                                    (HID_SVX_START + 248)
 
 // please adjust ACT_SVX_HID_END2 below if you add entries here!
 
@@ -285,7 +286,7 @@
 // Overrun check ---------------------------------------------------------
 // -----------------------------------------------------------------------
 
-#define ACT_SVX_HID_END     (HID_SVX_START+247)
+#define ACT_SVX_HID_END     (HID_SVX_START+248)
 #if ACT_SVX_HID_END > HID_SVX_END
 #error Resource-Ueberlauf in #line, #file
 #endif
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svdstr.hrc
index f1c19b4e0895..f1bc8cfdae19 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svdstr.hrc
@@ -674,7 +674,7 @@
 #define SIP_SA_CIRCRESERVE1                 (SIP_Begin + 177)
 #define SIP_SA_CIRCRESERVE2                 (SIP_Begin + 178)
 #define SIP_SA_CIRCRESERVE3                 (SIP_Begin + 179)
-//BFS01#define  SIP_SDRATTRSET_CIRC                 (SIP_Begin + 180)
+#define SIP_SA_OBJVISIBLE                   (SIP_Begin + 180)
 #define SIP_SA_OBJMOVEPROTECT               (SIP_Begin + 181)
 #define SIP_SA_OBJSIZEPROTECT               (SIP_Begin + 182)
 #define SIP_SA_OBJPRINTABLE                 (SIP_Begin + 183)
diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx
index 034b6372f6f1..3702b643e17e 100644
--- a/svx/inc/svx/SpellDialogChildWindow.hxx
+++ b/svx/inc/svx/SpellDialogChildWindow.hxx
@@ -69,15 +69,19 @@ protected:
         @return
             returns an empty vector if no error could be found
     */
-    virtual SpellPortions GetNextWrongSentence (void) = 0;
+    virtual SpellPortions GetNextWrongSentence (bool bRecheck) = 0;
 
     /** This abstract method applies the changes made in the spelling dialog
      to the document.
      The dialog always updates its settings when it gets the focus. The document
      can rely on the fact that the methods ApplyChangedSentence() is called for the
      position that the last GetNextWrongSentence() returned.
+     If 'bRecheck' is set to true then the same sentence should be rechecked once from
+     the start. This should be used too find errors that the user has introduced by
+     manual changes in the edit field, and in order to not miss the still following errors
+     in that sentence.
     */
-    virtual void ApplyChangedSentence(const SpellPortions& rChanged) = 0;
+    virtual void ApplyChangedSentence(const SpellPortions& rChanged, bool bRecheck ) = 0;
     /** This methods determines whether the application supports AutoCorrection
      */
     virtual bool HasAutoCorrection();
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index d193652b57fc..d193652b57fc 100644..100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/svx/inc/svx/extrusioncolorcontrol.hxx
new file mode 100644
index 000000000000..ff4a53e65a41
--- /dev/null
+++ b/svx/inc/svx/extrusioncolorcontrol.hxx
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * 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_EXTRUSIONCOLORCONTROL_HXX
+#define _SVX_EXTRUSIONCOLORCONTROL_HXX
+
+#include <sfx2/tbxctrl.hxx>
+#include "svx/svxdllapi.h"
+#include "svx/tbxcolorupdate.hxx"
+
+namespace svx {
+
+class SVX_DLLPUBLIC ExtrusionColorControl : public SfxToolBoxControl
+{
+private:
+    ToolboxButtonColorUpdater*  mpBtnUpdater;
+
+public:
+    SFX_DECL_TOOLBOX_CONTROL();
+    ExtrusionColorControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    ~ExtrusionColorControl();
+
+    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+                                              const SfxPoolItem* pState );
+    virtual SfxPopupWindowType  GetPopupWindowType() const;
+    virtual SfxPopupWindow*     CreatePopupWindow();
+};
+
+}
+
+#endif      // _SVX_EXTRUSIONCOLORCONTROL_HXX
+
diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx
index 0688beec65b3..f37eeab8c5e6 100644
--- a/svx/inc/svx/fmshell.hxx
+++ b/svx/inc/svx/fmshell.hxx
@@ -60,6 +60,11 @@ namespace com { namespace sun { namespace star { namespace form {
     }
 } } } }
 
+namespace svx
+{
+    class ISdrObjectFilter;
+}
+
 //========================================================================
 class SVX_DLLPUBLIC FmDesignModeChangedHint : public SfxHint
 {
@@ -146,11 +151,28 @@ public:
         const OutputDevice& _rDevice,
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _out_rxControl
     ) const;
+
     ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController(
         const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm,
         const SdrView& _rView,
         const OutputDevice& _rDevice
     ) const;
+
+    /** puts the focus into the document window, if current a form control has the focus. Otherwise, moves the focus
+        to the control belonging to the given SdrUnoObj.
+    */
+    void    ToggleControlFocus(
+        const SdrUnoObj& i_rNextCandidate,
+        const SdrView& i_rView,
+              OutputDevice& i_rDevice
+    ) const;
+
+    ::std::auto_ptr< ::svx::ISdrObjectFilter >
+            CreateFocusableControlFilter(
+                const SdrView& i_rView,
+                const OutputDevice& i_rDevice
+            ) const;
+
     sal_Bool    IsDesignMode() const { return m_bDesignMode; }
     void        SetDesignMode( sal_Bool _bDesignMode );
 
diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx
index 36fa180fa348..b39f46e85d14 100644
--- a/svx/inc/svx/fmtools.hxx
+++ b/svx/inc/svx/fmtools.hxx
@@ -76,6 +76,7 @@
 #include <comphelper/uno3.hxx>
 #include <comphelper/stl_types.hxx>
 #include <cppuhelper/implbase1.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <set>
 
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 6334137bc221..445d986b2c5e 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -29,6 +29,8 @@
 
 #include <tools/list.hxx>
 #include <com/sun/star/sdbc/XRowSet.hpp>
+#include <com/sun/star/sdbc/XRowSetListener.hpp>
+#include <com/sun/star/sdb/XRowsChangeListener.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/Date.hpp>
@@ -247,6 +249,8 @@ private:
     // For that reason we have to listen to some properties of our data source.
     ::comphelper::OPropertyChangeMultiplexer*       m_pDataSourcePropMultiplexer;
     FmXGridSourcePropListener*                      m_pDataSourcePropListener;
+    ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowsChangeListener>
+                                                    m_xRowSetListener; // get notification when rows were changed
 
     void*                                           m_pFieldListeners;
         // property listeners for field values
@@ -523,15 +527,20 @@ public:
     void                        setGridListener( FmGridListener* _pListener ) { m_pGridListener = _pListener; }
 
     // helper class to grant access to selected methods from within the DbCellControl class
-    struct GrantCellControlAccess
+    struct GrantControlAccess
     {
         friend class DbCellControl;
+        friend class RowSetEventListener;
     protected:
-        GrantCellControlAccess() { }
+        GrantControlAccess() { }
     };
 
     /// called when a controller needs to be re-initialized
-    void refreshController(sal_uInt16 _nColId, GrantCellControlAccess _aAccess);
+    void refreshController(sal_uInt16 _nColId, GrantControlAccess _aAccess);
+
+    CursorWrapper* GetSeekCursor(GrantControlAccess /*_aAccess*/) const    { return m_pSeekCursor; }
+    const DbGridRowRef& GetSeekRow(GrantControlAccess /*_aAccess*/) const  { return m_xSeekRow;    }
+    void  SetSeekPos(sal_Int32 nPos,GrantControlAccess /*_aAccess*/) {m_nSeekPos = nPos;}
 
     /**
         @return
@@ -586,6 +595,7 @@ protected:
     const DbGridRowRef& GetPaintRow() const { return m_xPaintRow;   }
     CursorWrapper* GetSeekCursor() const    { return m_pSeekCursor; }
 
+
     void ConnectToFields();
     void DisconnectFromFields();
 
diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
index aa52efd03c41..1fbf0b6add3d 100644
--- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
@@ -47,13 +47,16 @@ namespace sdr
             sal_uInt16                              mnCenterX;
             sal_uInt16                              mnCenterY;
 
+            // optional transparency
+            double mfAlpha;
+
             virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
 
         public:
             OverlayBitmapEx(
                 const basegfx::B2DPoint& rBasePos,
                 const BitmapEx& rBitmapEx,
-                sal_uInt16 nCenX = 0, sal_uInt16 nCenY = 0);
+                sal_uInt16 nCenX = 0, sal_uInt16 nCenY = 0, double fAlpha = 0.0 );
             virtual ~OverlayBitmapEx();
 
             const BitmapEx& getBitmapEx() const { return maBitmapEx; }
diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx
index 8325d2a57fa1..612f2ab927ec 100644
--- a/svx/inc/svx/sdrmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx
@@ -89,8 +89,6 @@ namespace sdr
         // operators
         sal_Bool operator==(const MasterPageDescriptor& rCandidate) const;
         sal_Bool operator!=(const MasterPageDescriptor& rCandidate) const;
-
-        const SfxItemSet& getCorrectFillAttributes() const;
     };
 } // end of namespace sdr
 
diff --git a/svx/inc/svx/sdrobjectfilter.hxx b/svx/inc/svx/sdrobjectfilter.hxx
new file mode 100644
index 000000000000..55eda09c99af
--- /dev/null
+++ b/svx/inc/svx/sdrobjectfilter.hxx
@@ -0,0 +1,58 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* 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 SDROBJECTFILTER_HXX
+#define SDROBJECTFILTER_HXX
+
+#include "svx/svxdllapi.h"
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+class SdrObject;
+
+//........................................................................
+namespace svx
+{
+//........................................................................
+
+    //====================================================================
+    //= SdrObjectFilter
+    //====================================================================
+    /** specifies a boolean predicate on the set of all SdrObjects - vulgo a filter.
+    */
+    class SVX_DLLPUBLIC SAL_NO_VTABLE ISdrObjectFilter
+    {
+    public:
+        virtual bool    includeObject( const SdrObject& i_rObject ) const = 0;
+
+        virtual         ~ISdrObjectFilter() = 0;
+    };
+
+//........................................................................
+} // namespace svx
+//........................................................................
+
+#endif // SDROBJECTFILTER_HXX
diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx
index a758e9c1dba7..a9e5d175680c 100644
--- a/svx/inc/svx/svddef.hxx
+++ b/svx/inc/svx/svddef.hxx
@@ -203,7 +203,8 @@
 #define SDRATTR_TRANSFORMREF2X      (SDRATTR_NOTPERSIST_FIRST+32)  /*   1212  long,   def=0     */
 #define SDRATTR_TRANSFORMREF2Y      (SDRATTR_NOTPERSIST_FIRST+33)  /*   1213  long,   def=0     */
 #define SDRATTR_TEXTDIRECTION       (SDRATTR_NOTPERSIST_FIRST+34)  /*   1214 V4+++  long,   def=0     */
-#define SDRATTR_NOTPERSIST_LAST     (SDRATTR_TEXTDIRECTION)  /* 1228 V4+++*/ /* 1213*/  /*  1085 */ /*  1040 */ /*  1123 */ /* Pool V1: 1065 */
+#define SDRATTR_OBJVISIBLE          (SDRATTR_NOTPERSIST_FIRST+35)
+#define SDRATTR_NOTPERSIST_LAST     (SDRATTR_OBJVISIBLE)           /*   1228 V4+++*/ /* 1213*/  /*  1085 */ /*  1040 */ /*  1123 */ /* Pool V1: 1065 */
 // kein SetItem hierfuer
 
 #define SDRATTR_GRAF_FIRST          (SDRATTR_NOTPERSIST_LAST+1)     /*  1229 V4+++*/
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index d4b4d5d3369e..f96b650d2be4 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -55,6 +55,7 @@ class SdrHdlList;
 class SdrMarkView;
 class SdrObject;
 class SdrPageView;
+class MouseEvent;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -184,6 +185,9 @@ protected:
     // cleanup marker if one exists
     void GetRidOfIAObject();
 
+private:
+    bool                        mbMouseOver;    // is true if the mouse is over this handle
+
 protected:
     ::sdr::overlay::OverlayObject* CreateOverlayObject(
         const basegfx::B2DPoint& rPos,
@@ -241,6 +245,16 @@ public:
     virtual BOOL IsFocusHdl() const;
 
     void SetMoveOutside( bool bMoveOutside );
+
+    /** is called when the mouse enters the area of this handle. If the handle changes his
+        visualisation during mouse over it must override this method and call Touch(). */
+    virtual void onMouseEnter(const MouseEvent& rMEvt);
+
+    /** is called when the mouse leaves the area of this handle. If the handle changes his
+        visualisation during mouse over it must override this method and call Touch(). */
+    virtual void onMouseLeave();
+
+    bool isMouseOver() const;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index eecbc1f2c4f3..fc136b8e5a3c 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -169,6 +169,7 @@ protected:
     virtual void SetMarkRects();                                             // Rects an den PageViews
     virtual void CheckMarked();                                              // MarkList nach Del und Lock Layer durchsuchen...
     virtual void AddDragModeHdl(SdrDragMode eMode);
+    virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
 
     // add custom handles (used by other apps, e.g. AnchorPos)
     virtual void AddCustomHdl();
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 7acc69ab5b9f..40cc992e96d9 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -283,6 +283,7 @@ public:
     BOOL                        bSizProt;
     BOOL                        bNoPrint;
     BOOL                        bClosedObj;
+    bool                        mbVisible;
     SdrLayerID                  mnLayerID;
 
 public:
@@ -469,10 +470,10 @@ protected:
     unsigned                    bGrouped : 1;   // Member eines GroupObjektes?
 
     // Die folgende Flags werden gestreamt
-    unsigned                    bMovProt : 1; // Position geschuetzt
-    unsigned                    bSizProt : 1; // Groesse geschuetzt
-    unsigned                    bNoPrint : 1; // Nicht drucken
-
+    unsigned                    bMovProt : 1; // If true, the position is protected
+    unsigned                    bSizProt : 1; // If true, the size is protected
+    unsigned                    bNoPrint : 1; // If true, the object is not printed.
+    unsigned                    mbVisible : 1; // If false, the object is not visible on screen (but maybe on printer, depending on bNoprint
     // Wenn bEmptyPresObj TRUE ist, handelt es sich um ein
     // Praesentationsobjekt, dem noch kein Inhalt zugewiesen
     // wurde. Default ist das Flag auf FALSE. Die Verwaltung
@@ -810,6 +811,14 @@ public:
     virtual void SetLogicRect(const Rectangle& rRect);
     virtual void NbcSetLogicRect(const Rectangle& rRect);
 
+    /** the defaul is to set the logic rect to the given rectangle rMaxRect. If the shape
+        has an intrinsic aspect ratio it may set the logic rect so the aspect
+        ratio is kept but still inside the rectangle rMaxRect.
+
+        If bShrinkOnly is set to true, the size of the current logic rect will not
+        be changed if it is smaller than the given rectangle rMaxRect. */
+    virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
+
     // Drehwinkel und Shear
     virtual long GetRotateAngle() const;
     virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const;
@@ -1012,6 +1021,8 @@ public:
     sal_Bool IsResizeProtect() const { return bSizProt; }
     void SetPrintable(sal_Bool bPrn);
     sal_Bool IsPrintable() const { return !bNoPrint; }
+    void SetVisible(sal_Bool bVisible);
+    sal_Bool IsVisible() const { return mbVisible; }
     void SetEmptyPresObj(sal_Bool bEpt) { bEmptyPresObj=bEpt; }
     sal_Bool IsEmptyPresObj() const { return bEmptyPresObj; }
     void SetNotVisibleAsMaster(sal_Bool bFlg) { bNotVisibleAsMaster=bFlg; }
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 89e2d35c9220..23d9204ca891 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -202,7 +202,7 @@ public:
 
     virtual SdrObject*      DoConvertToPolyObj(BOOL bBezier) const;
 
-    void                    AdjustToMaxRect( const Rectangle& rMaxRect, BOOL bShrinkOnly );
+    virtual void            AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx
index b572bb989451..5b0980d8bb30 100644
--- a/svx/inc/svx/svdomedia.hxx
+++ b/svx/inc/svx/svdomedia.hxx
@@ -63,6 +63,8 @@ public:
 
         virtual void                operator=(const SdrObject& rObj);
 
+        virtual void                AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
+
 public:
 
         void                        setURL( const ::rtl::OUString& rURL );
diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx
index a40b33c3ad18..02044f0dbc25 100644
--- a/svx/inc/svx/svdotable.hxx
+++ b/svx/inc/svx/svdotable.hxx
@@ -234,6 +234,7 @@ public:
 
     virtual const Rectangle& GetLogicRect() const;
     virtual void NbcSetLogicRect(const Rectangle& rRect);
+    virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
 
     virtual sal_uInt32 GetSnapPointCount() const;
     virtual Point GetSnapPoint(sal_uInt32 i) const;
diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index 29cf17ec9180..c601fddef181 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -376,7 +376,6 @@ private:
 public:
     // construct/destruct
     SdrPageProperties(SdrPage& rSdrPage);
-    SdrPageProperties(const SdrPageProperties& rCandidate);
     virtual ~SdrPageProperties();
 
     // Notify(...) from baseclass SfxListener
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 780da532ddb0..1cdfc9fb2b9e 100755
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -385,6 +385,7 @@
 #define FN_INSERT_HARD_SPACE    (FN_INSERT + 44)    /* hard space */
 #define FN_INSERT_HARDHYPHEN    (FN_INSERT + 85)   /* hyphen withou break*/
 
+//!! be aware to not overwrite something that is used in sw/inc/cmdid.h already !!
 #define FN_FORMAT               (SID_SW_START +  400)
 #define FN_SET_JUSTIFY_PARA     (FN_FORMAT + 21)
 #define FN_FORMAT_RESET         (FN_FORMAT + 69)
@@ -709,6 +710,7 @@
 #define SID_ATTR_TEXT_FITTOSIZE                         ( SID_SVX_START + 367 )
 #define SID_ATTR_BRUSH_ROW                              ( SID_SVX_START + 368 )
 #define SID_OPTFILTER_MSOFFICE                          ( SID_SVX_START + 369 )
+//#define SID_TASKPANE                                    ( SID_SVX_START + 370 )   -> sfxsids.hrc
 #define SID_IMAP                                        ( SID_SVX_START + 371 )
 #define SID_IMAP_DLG                                    ( SID_SVX_START + 372 )
 #define SID_IMAP_SELECT                                 ( SID_SVX_START + 373 )
@@ -1032,7 +1034,7 @@
 #define SID_DSBROWSER_EXPLORER                          ( SID_SVX_START + 764 )
 #define SID_FM_CREATE_FIELDCONTROL                      ( SID_SVX_START + 765 )
 #define SID_FM_DATACCESS_DESCRIPTOR                     ( SID_SVX_START + 766 )
-#define SID_FM_GRABCONTROLFOCUS                         ( SID_SVX_START + 767 )
+#define SID_FM_TOGGLECONTROLFOCUS                       ( SID_SVX_START + 767 )
 #define SID_FM_SCROLLBAR                                ( SID_SVX_START + 768 )
 #define SID_FM_SPINBUTTON                               ( SID_SVX_START + 769 )
 #define SID_FM_CONVERTTO_SCROLLBAR                      ( SID_SVX_START + 770 )
@@ -1244,6 +1246,7 @@
 #define SID_TABLE_STYLE_SETTINGS                        (SID_SVX_START+1089)
 #define SID_CHAR_DLG_PREVIEW_STRING                     (SID_SVX_START+1090)
 #define SID_RECHECK_DOCUMENT                            (SID_SVX_START+1091)
+
 #define SID_OBJECT_MIRROR                               (SID_SVX_START+1093)
 
 #define SID_DELETE_POSTIT                               (SID_SVX_START+1094)
@@ -1255,8 +1258,12 @@
 #define SID_DELETEALLBYAUTHOR_POSTIT                    (SID_SVX_START+1100)
 #define SID_INSERT_POSTIT                               (SID_SVX_START+1101)
 
+#define SID_TRANSLITERATE_SENTENCE_CASE                 (SID_SVX_START+1102)
+#define SID_TRANSLITERATE_TITLE_CASE                    (SID_SVX_START+1103)
+#define SID_TRANSLITERATE_TOGGLE_CASE                   (SID_SVX_START+1104)
+
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE                               SID_INSERT_POSTIT + 1
+#define SID_SVX_FIRSTFREE                               (SID_TRANSLITERATE_TOGGLE_CASE + 1)
 
 // --------------------------------------------------------------------------
 // Overflow check for slot IDs
diff --git a/svx/inc/svx/sxopitm.hxx b/svx/inc/svx/sxopitm.hxx
index 947660e71cc0..dd402c3a0915 100644
--- a/svx/inc/svx/sxopitm.hxx
+++ b/svx/inc/svx/sxopitm.hxx
@@ -39,4 +39,10 @@ public:
     SdrObjPrintableItem(SvStream& rIn): SdrYesNoItem(SDRATTR_OBJPRINTABLE,rIn) {}
 };
 
+class SdrObjVisibleItem: public SdrYesNoItem {
+public:
+    SdrObjVisibleItem(bool bOn=true): SdrYesNoItem(SDRATTR_OBJVISIBLE,bOn) {}
+    SdrObjVisibleItem(SvStream& rIn): SdrYesNoItem(SDRATTR_OBJVISIBLE,rIn) {}
+};
+
 #endif
diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx
index 27196079db07..fcf86488f7a3 100755..100644
--- a/svx/inc/svx/unoshprp.hxx
+++ b/svx/inc/svx/unoshprp.hxx
@@ -325,6 +325,7 @@
     { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT),  SDRATTR_OBJMOVEPROTECT          , &::getBooleanCppuType(),                      0,  0}, \
     { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_NAME),         SDRATTR_OBJECTNAME              , &::getCppuType((const ::rtl::OUString*)0),    0,  0}, \
     { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE),    SDRATTR_OBJPRINTABLE            , &::getBooleanCppuType(),                      0,  0}, \
+    { MAP_CHAR_LEN("Visible"),                      SDRATTR_OBJVISIBLE              , &::getBooleanCppuType(),                      0,  0}, \
     { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT),  SDRATTR_OBJSIZEPROTECT          , &::getBooleanCppuType(),                      0,  0},\
     { MAP_CHAR_LEN("UINameSingular"),               OWN_ATTR_UINAME_SINGULAR        , &::getCppuType((const ::rtl::OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY,   0}, \
     { MAP_CHAR_LEN("UINamePlural"),                 OWN_ATTR_UINAME_PLURAL          , &::getCppuType((const ::rtl::OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY,   0}, \
diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx
index fa7329a525e1..266dc917f33e 100644
--- a/svx/inc/tbunocontroller.hxx
+++ b/svx/inc/tbunocontroller.hxx
@@ -75,6 +75,7 @@ class FontHeightToolBoxControl : public svt::ToolboxController,
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException);
 
         void dispatchCommand( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs );
+        using svt::ToolboxController::dispatchCommand;
 
     private:
         SvxFontSizeBox_Impl*                  m_pBox;
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
new file mode 100644
index 000000000000..aec07042e1fc
--- /dev/null
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -0,0 +1,282 @@
+/*************************************************************************
+ *
+ * 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 __TBUNOSEARCHCONTROLLERS_HXX_
+#define __TBUNOSEARCHCONTROLLERS_HXX_
+
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/frame/DispatchDescriptor.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XDispatchHelper.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+
+#include <comphelper/sequenceasvector.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/weak.hxx>
+#include <svtools/toolboxcontroller.hxx>
+#include <vcl/combobox.hxx>
+#include <vcl/window.hxx>
+
+#include <map>
+
+namespace css = ::com::sun::star        ;
+namespace svx
+{
+
+class FindTextFieldControl : public ComboBox
+{
+public:
+    FindTextFieldControl( Window* pParent, WinBits nStyle,
+        css::uno::Reference< css::frame::XFrame >& xFrame,
+        css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
+    virtual ~FindTextFieldControl();
+
+    virtual void Modify();
+    virtual long PreNotify( NotifyEvent& rNEvt );
+
+    void InitControls_Impl();
+    void Remember_Impl(const String& rStr);
+
+private:
+
+    css::uno::Reference< css::frame::XFrame > m_xFrame;
+    css::uno::Reference< css::lang::XMultiServiceFactory > m_xServiceManager;
+    sal_Bool m_bToClearTextField;
+
+};
+
+class SearchToolbarControllersManager
+{
+public:
+
+    SearchToolbarControllersManager();
+    ~SearchToolbarControllersManager();
+
+    static SearchToolbarControllersManager* createControllersManager();
+
+    void registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL );
+    void freeController ( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL );
+    css::uno::Reference< css::frame::XStatusListener > findController( const css::uno::Reference< css::frame::XFrame >& xFrame, const ::rtl::OUString& sCommandURL );
+
+private:
+
+    static SearchToolbarControllersManager* m_pInstance;
+
+    typedef ::comphelper::SequenceAsVector< css::beans::PropertyValue > SearchToolbarControllersVec;
+    typedef ::std::map< css::uno::Reference< css::frame::XFrame >, SearchToolbarControllersVec > SearchToolbarControllersMap;
+    SearchToolbarControllersMap aSearchToolbarControllersMap;
+
+};
+
+class FindTextToolbarController : public svt::ToolboxController,
+                                  public css::lang::XServiceInfo
+{
+public:
+
+    FindTextToolbarController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager );
+    ~FindTextToolbarController();
+
+    // XInterface
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+    static ::rtl::OUString getImplementationName_Static() throw()
+    {
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svx.FindTextToolboxController" ));
+    }
+
+    static ::com::sun::star::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
+
+    // XComponent
+    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException );
+
+    // XInitialization
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException );
+
+    // XToolbarController
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException);
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException );
+
+    // XStatusListener
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException );
+
+    DECL_LINK(EditModifyHdl, void*);
+
+private:
+
+    FindTextFieldControl* m_pFindTextFieldControl;
+
+    USHORT m_nDownSearchId; // item position of findbar
+    USHORT m_nUpSearchId;   // item position of findbar
+
+};
+
+class DownSearchToolboxController : public svt::ToolboxController,
+                                    public css::lang::XServiceInfo
+{
+public:
+
+    DownSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager );
+    ~DownSearchToolboxController();
+
+    // XInterface
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+    static ::rtl::OUString getImplementationName_Static() throw()
+    {
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svx.DownSearchToolboxController" ));
+    }
+
+    static css::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
+
+    // XComponent
+    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException );
+
+    // XInitialization
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException );
+
+    // XToolbarController
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException);
+
+    // XStatusListener
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException );
+
+};
+
+class UpSearchToolboxController : public svt::ToolboxController,
+                                  public css::lang::XServiceInfo
+{
+public:
+
+    UpSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager );
+    ~UpSearchToolboxController();
+
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+    static ::rtl::OUString getImplementationName_Static() throw()
+    {
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svx.UpSearchToolboxController" ));
+    }
+
+    static css::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
+
+    // XComponent
+    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException );
+
+    // XInitialization
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException);
+
+    // XToolbarController
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException );
+
+    // XStatusListener
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException );
+
+};
+
+// protocol handler for "vnd.sun.star.findbar:*" URLs
+// The dispatch object will be used for shortcut commands for findbar
+class FindbarDispatcher : public css::lang::XServiceInfo,
+                          public css::lang::XInitialization,
+                          public css::frame::XDispatchProvider,
+                          public css::frame::XDispatch,
+                          public ::cppu::OWeakObject
+{
+public:
+
+    FindbarDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
+    virtual ~FindbarDispatcher();
+
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL acquire() throw();
+    virtual void SAL_CALL release() throw();
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+    static ::rtl::OUString getImplementationName_Static() throw()
+    {
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.Impl.FindbarDispatcher" ));
+    }
+
+    static css::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
+
+    // XInitialization
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException );
+
+    // XDispatchProvider
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const ::rtl::OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions    ) throw( css::uno::RuntimeException );
+
+    // XDispatch
+    virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException );
+
+private:
+
+    css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
+    css::uno::Reference< css::frame::XFrame > m_xFrame;
+
+};
+
+// createInstance
+css::uno::Reference< css::uno::XInterface > SAL_CALL FindTextToolbarController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr );
+css::uno::Reference< css::uno::XInterface > SAL_CALL DownSearchToolboxController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr );
+css::uno::Reference< css::uno::XInterface > SAL_CALL UpSearchToolboxController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr );
+css::uno::Reference< css::uno::XInterface > SAL_CALL FindbarDispatcher_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr );
+
+}
+
+#endif // __TBUNOSEARCHCONTROLLERS_HXX_