Resolves: #i121420# merge sidebar feature

(cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5)

Conflicts:
	chart2/source/controller/dialogs/dlg_View3D.cxx
	chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
	chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
	chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
	chart2/source/controller/inc/ViewElementListProvider.hxx
	chart2/source/controller/inc/dlg_View3D.hxx
	chart2/source/controller/main/ShapeController.cxx
	chart2/source/inc/chartview/DrawModelWrapper.hxx
	chart2/source/view/main/DrawModelWrapper.cxx
	cui/source/inc/border.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/inc/cuitabline.hxx
	cui/source/inc/sdrcelldlg.hxx
	cui/source/inc/treeopt.hxx
	cui/source/options/optchart.cxx
	cui/source/options/optchart.hxx
	cui/source/options/optcolor.cxx
	cui/source/options/treeopt.cxx
	cui/source/tabpages/backgrnd.cxx
	cui/source/tabpages/border.cxx
	cui/source/tabpages/chardlg.cxx
	cui/source/tabpages/numpages.cxx
	cui/source/tabpages/tpcolor.cxx
	cui/source/tabpages/tplneend.cxx
	editeng/inc/editeng/outliner.hxx
	extensions/source/propctrlr/standardcontrol.cxx
	framework/source/register/registerservices.cxx
	offapi/com/sun/star/ui/makefile.mk
	officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
	officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
	officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
	postprocess/packregistry/makefile.mk
	reportdesign/source/ui/dlg/Condition.cxx
	reportdesign/source/ui/misc/UITools.cxx
	sc/inc/document.hxx
	sc/inc/helpids.h
	sc/inc/sc.hrc
	sc/prj/build.lst
	sc/sdi/scalc.sdi
	sc/source/core/data/documen9.cxx
	sc/source/core/data/drwlayer.cxx
	sc/source/ui/app/scdll.cxx
	sc/source/ui/app/typemap.cxx
	sc/source/ui/dbgui/scendlg.cxx
	sc/source/ui/docshell/docsh2.cxx
	sc/source/ui/docshell/docsh4.cxx
	sc/source/ui/drawfunc/chartsh.cxx
	sc/source/ui/drawfunc/drawsh.cxx
	sc/source/ui/drawfunc/drawsh2.cxx
	sc/source/ui/drawfunc/drawsh4.cxx
	sc/source/ui/drawfunc/drformsh.cxx
	sc/source/ui/drawfunc/drtxtob.cxx
	sc/source/ui/drawfunc/drtxtob1.cxx
	sc/source/ui/drawfunc/drtxtob2.cxx
	sc/source/ui/drawfunc/graphsh.cxx
	sc/source/ui/drawfunc/oleobjsh.cxx
	sc/source/ui/inc/chartsh.hxx
	sc/source/ui/inc/formatsh.hxx
	sc/source/ui/miscdlgs/tabbgcolordlg.cxx
	sc/source/ui/navipi/navipi.cxx
	sc/source/ui/optdlg/opredlin.cxx
	sc/source/ui/optdlg/tpview.cxx
	sc/source/ui/sidebar/makefile.mk
	sc/source/ui/view/auditsh.cxx
	sc/source/ui/view/cellsh.cxx
	sc/source/ui/view/editsh.cxx
	sc/source/ui/view/formatsh.cxx
	sc/source/ui/view/pivotsh.cxx
	sc/source/ui/view/tabvwsh.cxx
	sc/util/makefile.mk
	sd/inc/sdabstdlg.hxx
	sd/prj/build.lst
	sd/sdi/ToolPanelViewShell.sdi
	sd/sdi/makefile.mk
	sd/source/ui/accessibility/makefile.mk
	sd/source/ui/animations/CustomAnimationDialog.cxx
	sd/source/ui/dlg/PaneChildWindows.cxx
	sd/source/ui/dlg/PaneShells.cxx
	sd/source/ui/dlg/copydlg.cxx
	sd/source/ui/dlg/navigatr.cxx
	sd/source/ui/dlg/sddlgfact.cxx
	sd/source/ui/dlg/sddlgfact.hxx
	sd/source/ui/docshell/docshel3.cxx
	sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
	sd/source/ui/framework/factories/TaskPanelFactory.cxx
	sd/source/ui/framework/factories/TaskPanelFactory.hxx
	sd/source/ui/framework/factories/ViewShellWrapper.cxx
	sd/source/ui/framework/factories/makefile.mk
	sd/source/ui/framework/module/ImpressModule.cxx
	sd/source/ui/framework/module/ToolPanelModule.cxx
	sd/source/ui/framework/tools/FrameworkHelper.cxx
	sd/source/ui/func/fuolbull.cxx
	sd/source/ui/inc/DrawViewShell.hxx
	sd/source/ui/inc/PaneChildWindows.hxx
	sd/source/ui/inc/celltempl.hxx
	sd/source/ui/inc/copydlg.hxx
	sd/source/ui/inc/dlgpage.hxx
	sd/source/ui/inc/framework/FrameworkHelper.hxx
	sd/source/ui/inc/prltempl.hxx
	sd/source/ui/inc/tabtempl.hxx
	sd/source/ui/inc/taskpane/ILayoutableWindow.hxx
	sd/source/ui/inc/taskpane/PanelId.hxx
	sd/source/ui/inc/tpaction.hxx
	sd/source/ui/sidebar/AllMasterPagesSelector.cxx
	sd/source/ui/sidebar/AllMasterPagesSelector.hxx
	sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
	sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
	sd/source/ui/sidebar/DocumentHelper.cxx
	sd/source/ui/sidebar/DocumentHelper.hxx
	sd/source/ui/sidebar/LayoutMenu.cxx
	sd/source/ui/sidebar/LayoutMenu.hxx
	sd/source/ui/sidebar/MasterPageContainer.cxx
	sd/source/ui/sidebar/MasterPageContainer.hxx
	sd/source/ui/sidebar/MasterPageContainerFiller.cxx
	sd/source/ui/sidebar/MasterPageContainerFiller.hxx
	sd/source/ui/sidebar/MasterPageContainerProviders.cxx
	sd/source/ui/sidebar/MasterPageContainerProviders.hxx
	sd/source/ui/sidebar/MasterPageContainerQueue.cxx
	sd/source/ui/sidebar/MasterPageContainerQueue.hxx
	sd/source/ui/sidebar/MasterPageDescriptor.cxx
	sd/source/ui/sidebar/MasterPageDescriptor.hxx
	sd/source/ui/sidebar/MasterPageObserver.cxx
	sd/source/ui/sidebar/MasterPagesSelector.cxx
	sd/source/ui/sidebar/MasterPagesSelector.hxx
	sd/source/ui/sidebar/PreviewValueSet.cxx
	sd/source/ui/sidebar/PreviewValueSet.hxx
	sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
	sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
	sd/source/ui/sidebar/SidebarShellManager.cxx
	sd/source/ui/sidebar/SlideTransitionPanel.hxx
	sd/source/ui/sidebar/makefile.mk
	sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
	sd/source/ui/table/TableDesignPane.hxx
	sd/source/ui/toolpanel/ControlContainer.cxx
	sd/source/ui/toolpanel/ControlContainerDescriptor.hxx
	sd/source/ui/toolpanel/MethodGuard.hxx
	sd/source/ui/toolpanel/ScrollPanel.cxx
	sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx
	sd/source/ui/toolpanel/SubToolPanel.cxx
	sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
	sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
	sd/source/ui/toolpanel/TitleBar.cxx
	sd/source/ui/toolpanel/TitledControl.cxx
	sd/source/ui/toolpanel/ToolPanel.cxx
	sd/source/ui/toolpanel/ToolPanel.hxx
	sd/source/ui/toolpanel/ToolPanelFactory.cxx
	sd/source/ui/toolpanel/ToolPanelUIElement.cxx
	sd/source/ui/toolpanel/ToolPanelUIElement.hxx
	sd/source/ui/toolpanel/ToolPanelViewShell.cxx
	sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx
	sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
	sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
	sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx
	sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx
	sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
	sd/source/ui/toolpanel/controls/TableDesignPanel.cxx
	sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
	sd/source/ui/unoidl/UnoDocumentSettings.cxx
	sd/source/ui/view/ViewShellBase.cxx
	sd/source/ui/view/drtxtob.cxx
	sd/source/ui/view/drviews3.cxx
	sd/source/ui/view/drviews7.cxx
	sd/source/ui/view/drviewsa.cxx
	sd/source/ui/view/drviewsf.cxx
	sd/source/ui/view/outlnvsh.cxx
	sd/source/ui/view/sdview.cxx
	sd/source/ui/view/viewshel.cxx
	sd/uiconfig/sdraw/menubar/menubar.xml
	sd/util/makefile.mk
	sfx2/Package_inc.mk
	sfx2/inc/sfx2/sfx.hrc
	sfx2/inc/sfx2/sfxsids.hrc
	sfx2/source/control/bindings.cxx
	sfx2/source/dialog/templdlg.cxx
	sfx2/source/inc/templdgi.hxx
	svx/AllLangResTarget_svx.mk
	svx/Package_inc.mk
	svx/inc/svx/XPropertyTable.hxx
	svx/inc/svx/bmpmask.hxx
	svx/inc/svx/colrctrl.hxx
	svx/inc/svx/dialogs.hrc
	svx/inc/svx/dlgctrl.hxx
	svx/inc/svx/dlgutil.hxx
	svx/inc/svx/drawitem.hxx
	svx/inc/svx/fontwork.hxx
	svx/inc/svx/galbrws.hxx
	svx/inc/svx/sdr/table/tablecontroller.hxx
	svx/inc/svx/svdmodel.hxx
	svx/inc/svx/svdstr.hrc
	svx/inc/svx/svxids.hrc
	svx/inc/svx/svxitems.hrc
	svx/inc/svx/xattr.hxx
	svx/inc/svx/xflgrit.hxx
	svx/inc/svx/xflhtit.hxx
	svx/inc/svx/xit.hxx
	svx/inc/svx/xlineit.hxx
	svx/inc/svx/xlndsit.hxx
	svx/inc/svx/xlnedit.hxx
	svx/inc/svx/xlnstit.hxx
	svx/inc/svx/xtable.hxx
	svx/sdi/svx.sdi
	svx/source/dialog/_bmpmask.cxx
	svx/source/dialog/dialcontrol.cxx
	svx/source/dialog/dlgctrl.cxx
	svx/source/dialog/dlgutil.cxx
	svx/source/dialog/fontwork.cxx
	svx/source/gallery2/galbrws.cxx
	svx/source/gallery2/galbrws1.cxx
	svx/source/gallery2/gallery1.cxx
	svx/source/items/drawitem.cxx
	svx/source/items/svxitems.src
	svx/source/sdr/attribute/sdrformtextattribute.cxx
	svx/source/sidebar/ColorPanel.hxx
	svx/source/sidebar/EmptyPanel.hrc
	svx/source/sidebar/EmptyPanel.hxx
	svx/source/sidebar/gallery/GalleryPanel.hxx
	svx/source/svdraw/svdedtv1.cxx
	svx/source/svdraw/svdmodel.cxx
	svx/source/svdraw/svdogrp.cxx
	svx/source/svdraw/svdstr.src
	svx/source/tbxctrls/tbcontrl.cxx
	svx/source/unodraw/XPropertyTable.cxx
	svx/source/unodraw/unoctabl.cxx
	svx/source/xoutdev/XPropertyEntry.cxx
	svx/source/xoutdev/xattr.cxx
	svx/source/xoutdev/xattr2.cxx
	svx/source/xoutdev/xtabbtmp.cxx
	svx/source/xoutdev/xtabcolr.cxx
	svx/source/xoutdev/xtabdash.cxx
	svx/source/xoutdev/xtabgrdt.cxx
	svx/source/xoutdev/xtabhtch.cxx
	svx/source/xoutdev/xtable.cxx
	svx/source/xoutdev/xtablend.cxx
	svx/util/svx.component
	sw/inc/cmdid.h
	sw/inc/docsh.hxx
	sw/inc/editsh.hxx
	sw/inc/helpid.h
	sw/inc/rcid.hrc
	sw/inc/swabstdlg.hxx
	sw/inc/swcommands.h
	sw/sdi/swriter.sdi
	sw/source/core/doc/docdesc.cxx
	sw/source/core/draw/drawdoc.cxx
	sw/source/ui/app/docsh2.cxx
	sw/source/ui/app/docshdrw.cxx
	sw/source/ui/app/docshini.cxx
	sw/source/ui/app/docst.cxx
	sw/source/ui/config/optpage.cxx
	sw/source/ui/dialog/swdlgfact.cxx
	sw/source/ui/dialog/swdlgfact.hxx
	sw/source/ui/fmtui/tmpdlg.cxx
	sw/source/ui/inc/tmpdlg.hxx
	sw/source/ui/misc/pggrid.cxx
	sw/source/ui/shells/annotsh.cxx
	sw/source/ui/shells/basesh.cxx
	sw/source/ui/shells/beziersh.cxx
	sw/source/ui/shells/drawdlg.cxx
	sw/source/ui/shells/drawsh.cxx
	sw/source/ui/shells/drformsh.cxx
	sw/source/ui/shells/drwbassh.cxx
	sw/source/ui/shells/drwtxtex.cxx
	sw/source/ui/shells/drwtxtsh.cxx
	sw/source/ui/shells/frmsh.cxx
	sw/source/ui/shells/grfsh.cxx
	sw/source/ui/shells/olesh.cxx
	sw/source/ui/shells/tabsh.cxx
	sw/source/ui/shells/textsh.cxx
	sw/source/ui/shells/textsh1.cxx
	sw/source/ui/shells/txtnum.cxx
	sw/source/ui/uiview/viewtab.cxx
	sw/source/ui/uno/unofreg.cxx
	sw/source/ui/utlui/navipi.cxx
	sw/util/sw.component
	vcl/inc/vcl/split.hxx
	vcl/inc/vcl/window.hxx
	vcl/inc/window.h
	vcl/source/window/split.cxx
	vcl/source/window/window.cxx
	vcl/source/window/window4.cxx

Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e

Resolves: #i122194# Adapted license text in propertypanel.hrc

then renamed it to ResourceDefinitions.hrc

(cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b)

Conflicts:
	sfx2/Package_inc.mk
	sfx2/source/sidebar/SidebarChildWindow.cxx
	svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
	svx/source/sidebar/line/LinePropertyPanel.cxx
	svx/source/sidebar/possize/PosSizePropertyPanel.cxx
	sw/source/ui/sidebar/PagePropertyPanel.src
	sw/source/ui/sidebar/WrapPropertyPanel.src

Change-Id: Ie009056a78ab108556717a501399c83b477b3548

Resolves: #i122194# finally I got the correct file name

Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a

More merge changes for optional sidebar:
     revert toolpanel removal, restore and re-enable task pane
     remove apparently un-used SidebarFactory module
     add extra visibility annotation to ItemReceiverUpdate

7 files changed, 445 insertions, 11 deletions

diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index bf1727480388..a4a35c81364a 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -77,6 +77,8 @@ void FuArea::DoExecute( SfxRequest& rReq )
                         SID_ATTR_FILL_GRADIENT,
                         SID_ATTR_FILL_HATCH,
                         SID_ATTR_FILL_BITMAP,
+                        SID_ATTR_FILL_TRANSPARENCE,
+                        SID_ATTR_FILL_FLOATTRANSPARENCE,
                         0 };
 
         mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index c288767a55a6..0b2750e7eff7 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "fuchar.hxx"
-
+#include <svx/dialogs.hrc>
 #include <sfx2/viewfrm.hxx>
 
 #include <editeng/editdata.hxx>
@@ -74,6 +74,10 @@ void FuChar::DoExecute( SfxRequest& rReq )
         SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0;
         if( pDlg )
         {
+            if (rReq.GetSlot() == SID_CHAR_DLG_EFFECT)
+            {
+                pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+            }
             sal_uInt16 nResult = pDlg->Execute();
 
             if( nResult == RET_OK )
@@ -97,9 +101,12 @@ void FuChar::DoExecute( SfxRequest& rReq )
                     SID_ATTR_CHAR_FONT,
                     SID_ATTR_CHAR_POSTURE,
                     SID_ATTR_CHAR_WEIGHT,
+                    SID_ATTR_CHAR_SHADOWED,
+                    SID_ATTR_CHAR_STRIKEOUT,
                     SID_ATTR_CHAR_UNDERLINE,
                     SID_ATTR_CHAR_FONTHEIGHT,
                     SID_ATTR_CHAR_COLOR,
+                    SID_ATTR_CHAR_KERNING,
                     SID_SET_SUPER_SCRIPT,
                     SID_SET_SUB_SCRIPT,
                     0 };
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 3e1d9d02ed7f..cd33f409ffa9 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -84,11 +84,16 @@ void FuLine::DoExecute( SfxRequest& rReq )
 
         // some attributes are changed, we have to update the listboxes in the objectbars
         static sal_uInt16 SidArray[] = {
-                        SID_ATTR_LINE_STYLE,
-                        SID_ATTR_LINE_DASH,
-                        SID_ATTR_LINE_WIDTH,
-                        SID_ATTR_LINE_COLOR,
-                        0 };
+            SID_ATTR_LINE_STYLE,                // ( SID_SVX_START + 169 )
+            SID_ATTR_LINE_DASH,                 // ( SID_SVX_START + 170 )
+            SID_ATTR_LINE_WIDTH,                // ( SID_SVX_START + 171 )
+            SID_ATTR_LINE_COLOR,                // ( SID_SVX_START + 172 )
+            SID_ATTR_LINE_START,                // ( SID_SVX_START + 173 )
+            SID_ATTR_LINE_END,                  // ( SID_SVX_START + 174 )
+            SID_ATTR_LINE_TRANSPARENCE,         // (SID_SVX_START+1107)
+            SID_ATTR_LINE_JOINT,                // (SID_SVX_START+1110)
+            SID_ATTR_LINE_CAP,                  // (SID_SVX_START+1111)
+            0 };
 
         mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
 
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index ae290329fbff..c029edabac7a 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -23,6 +23,9 @@
 #include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
 #include <sfx2/request.hxx>
+#include <editeng/numitem.hxx>
+#include "sdresid.hxx"
+#include "glob.hrc"
 
 #include <editeng/editdata.hxx>
 #include <svx/svxids.hrc>
@@ -32,7 +35,11 @@
 #include "Window.hxx"
 #include "drawdoc.hxx"
 #include "sdabstdlg.hxx"
-
+#include <svx/nbdtmg.hxx>
+#include <svx/nbdtmgfact.hxx>
+#include <svx/svdoutl.hxx>
+#include <boost/scoped_ptr.hpp>
+using namespace svx::sidebar;
 namespace sd {
 
 TYPEINIT1( FuOutlineBullet, FuPoor );
@@ -54,6 +61,16 @@ FunctionReference FuOutlineBullet::Create( ViewShell* pViewSh, ::sd::Window* pWi
 
 void FuOutlineBullet::DoExecute( SfxRequest& rReq )
 {
+    sal_uInt16 nSId = rReq.GetSlot();
+    if (nSId == FN_SVX_SET_BULLET){
+        SetCurrentBullet(rReq);
+        return;
+    }
+    else if (nSId == FN_SVX_SET_NUMBER){
+        SetCurrentNumbering(rReq);
+        return;
+    }
+
     const SfxItemSet* pArgs = rReq.GetArgs();
 
     if( !pArgs )
@@ -81,9 +98,7 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
 
                     OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
 
-                    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-                    std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
-                    SAL_WNODEPRECATED_DECLARATIONS_POP
+                    boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
 
                     if (mpView->ISA(OutlineView))
                     {
@@ -122,7 +137,391 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
 */
 }
 
+void FuOutlineBullet::SetCurrentNumbering(SfxRequest& rReq)
+{
+    if (!mpDoc || !mpView)
+        return;
+
+    SfxItemSet aEditAttr( mpDoc->GetPool() );
+    mpView->GetAttributes( aEditAttr );
+
+    SfxItemSet aNewAttr( mpViewShell->GetPool(),
+                             EE_ITEMS_START, EE_ITEMS_END );
+    aNewAttr.Put( aEditAttr, sal_False );
+
+    SfxItemSet aSetAttr( mpViewShell->GetPool(),
+                             EE_ITEMS_START, EE_ITEMS_END );
+
+    //Init bullet level in "Customize" tab page in bullet dialog in master page view
+    if( mpView && mpViewShell && mpViewShell->ISA(DrawViewShell)
+        && ((DrawViewShell *)mpViewShell)->GetEditMode() == EM_MASTERPAGE )
+    {
+        SdrObject* pObj = mpView->GetTextEditObject();
+        if( pObj && pObj->GetObjIdentifier() == OBJ_OUTLINETEXT )
+        {
+            sal_uInt16 nLevel = mpView->GetSelectionLevel();
+            if( nLevel != 0xFFFF )
+            {
+
+                SfxItemSet aStoreSet( aNewAttr );
+                aNewAttr.ClearItem();
+                //extend range
+                aNewAttr.MergeRange( SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL );
+                aNewAttr.Put( aStoreSet );
+                //put current level user selected
+                aNewAttr.Put( SfxUInt16Item( SID_PARAM_CUR_NUM_LEVEL, nLevel ) );
+            }
+        }
+    }
+    //End of add
+
+    sal_uInt16 nActNumLvl = (sal_uInt16)0xFFFF;
+    SvxNumRule* pNumRule = NULL;
+    const SfxPoolItem* pTmpItem=NULL;
+    sal_uInt32 nNumItemId = SID_ATTR_NUMBERING_RULE;
+
+    if(SFX_ITEM_SET == aNewAttr.GetItemState(SID_PARAM_CUR_NUM_LEVEL, sal_False, &pTmpItem))
+        nActNumLvl = ((const SfxUInt16Item*)pTmpItem)->GetValue();
+
+    pTmpItem=GetNumBulletItem(aNewAttr, nNumItemId);
+
+    if (pTmpItem)
+        pNumRule = new SvxNumRule(*((SvxNumBulletItem*)pTmpItem)->GetNumRule());
+
+    SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_NUMBER , sal_False );
+    if (pItem && pNumRule)
+    {
+        sal_uInt16 nIdx = pItem->GetValue();
+        // If the nIdx is (sal_uInt16)0xFFFF, means set bullet status to on/off
+        // And the bullet default status is 1.
+        bool bBulletSwitch = false;
+        sal_Bool isRemoveNum =false;
+        if( nIdx == (sal_uInt16)0xFFFF )
+        {
+            nIdx = 1;
+            bBulletSwitch = true;
+        }
+        if (nIdx == DEFAULT_NONE)
+        {
+            bBulletSwitch = false;
+            isRemoveNum = true;
+        }
+        nIdx--;
+
+        NBOTypeMgrBase* pNumbering = NBOutlineTypeMgrFact::CreateInstance(eNBOType::NUMBERING);
+        if ( pNumbering )
+        {
+            //Sym3_2508, set unit attribute to NB Manager
+            pNumbering->SetItems(&aNewAttr);
+            SvxNumRule aTmpRule( *pNumRule );
+            pNumbering->ApplyNumRule(aTmpRule,nIdx,nActNumLvl);
+            sal_uInt16 nMask = 1;
+            for(sal_uInt16 i = 0; i < pNumRule->GetLevelCount(); i++)
+            {
+                if(nActNumLvl & nMask)
+                {
+                    SvxNumberFormat aFmt(aTmpRule.GetLevel(i));
+                    pNumRule->SetLevel(i, aFmt);
+                }
+                nMask <<= 1 ;
+            }
+            aSetAttr.Put(SvxNumBulletItem( *pNumRule ), nNumItemId);
+            OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
+
+            boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
+
+            if (mpView->ISA(OutlineView))
+            {
+                pOLV = static_cast<OutlineView*>(mpView)
+                    ->GetViewByWindow(mpViewShell->GetActiveWindow());
+
+                aGuard.reset( new OutlineViewModelChangeGuard( static_cast<OutlineView&>(*mpView) ) );
+            }
+
+            SdrOutliner* pOwner = mpView->GetTextEditOutliner();
+            bool bMasterView = false;
+
+            DrawViewShell* pDrawViewShell = static_cast< DrawViewShell* >(mpViewShell);
+
+            if ( pOwner && pDrawViewShell && pDrawViewShell->GetEditMode() == EM_MASTERPAGE )
+                bMasterView = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
+
+            if( bMasterView )
+            {
+                pOwner->UndoActionStart( OLUNDO_ATTR );
+                pOLV->ToggleBullets( bBulletSwitch, sal_False, bMasterView, pNumRule,isRemoveNum);
+                mpView->SetAttributes(aSetAttr); //Modify for Sym2_3151
+                pOwner->UndoActionEnd( OLUNDO_ATTR );
+            }
+            else if( pOLV )
+                pOLV->ToggleBullets( bBulletSwitch, sal_False, bMasterView, pNumRule ,isRemoveNum);
+            else
+            {
+                sal_Bool bInMasterView = pDrawViewShell && pDrawViewShell->GetEditMode() == EM_MASTERPAGE;
+                SdrModel* pSdrModel = mpView->GetModel();
+                sal_Bool bModelUndoEnabled = pSdrModel ? pSdrModel->IsUndoEnabled() : sal_False;
+                if (bInMasterView && bModelUndoEnabled)
+                {
+                    pSdrModel->BegUndo();
+                }
+                mpView->ToggleMarkedObjectsBullets(bBulletSwitch, sal_False, bInMasterView, pNumRule,isRemoveNum);
+                if (bInMasterView)
+                {
+                    mpView->SetAttributes(aSetAttr);
+                }
+                if (bInMasterView && bModelUndoEnabled)
+                {
+                    pSdrModel->EndUndo();
+                }
+            }
+        }
+        //End
+    }
+    delete pNumRule;
+    rReq.Done();
+}
+
+void FuOutlineBullet::SetCurrentBullet(SfxRequest& rReq)
+{
+    if (!mpDoc || !mpView)
+        return;
+
+    SfxItemSet aEditAttr( mpDoc->GetPool() );
+    mpView->GetAttributes( aEditAttr );
+
+    SfxItemSet aNewAttr( mpViewShell->GetPool(),
+                             EE_ITEMS_START, EE_ITEMS_END );
+    aNewAttr.Put( aEditAttr, sal_False );
+
+    //Add for Sym2_3151, should add new attributes in an empty item set, then use this item set as parameter in SetAttributes()
+    SfxItemSet aSetAttr( mpViewShell->GetPool(),
+                             EE_ITEMS_START, EE_ITEMS_END );
+
+    //Init bullet level in "Customize" tab page in bullet dialog in master page view
+    if( mpView && mpViewShell && mpViewShell->ISA(DrawViewShell)
+        && ((DrawViewShell *)mpViewShell)->GetEditMode() == EM_MASTERPAGE )
+    {
+        SdrObject* pObj = mpView->GetTextEditObject();
+        if( pObj && pObj->GetObjIdentifier() == OBJ_OUTLINETEXT )
+        {
+            sal_uInt16 nLevel = mpView->GetSelectionLevel();
+            if( nLevel != 0xFFFF )
+            {
+                //aNewAttr.MergeRange( SID_ATTR_NUMBERING_RULE, SID_PARAM_CUR_NUM_LEVEL );
+                //aNewAttr.Put( SfxUInt16Item( SID_PARAM_CUR_NUM_LEVEL, nLevel ) );
+                //save the itemset value
+                SfxItemSet aStoreSet( aNewAttr );
+                aNewAttr.ClearItem();
+                //extend range
+                aNewAttr.MergeRange( SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL );
+                aNewAttr.Put( aStoreSet );
+                //put current level user selected
+                aNewAttr.Put( SfxUInt16Item( SID_PARAM_CUR_NUM_LEVEL, nLevel ) );
+            }
+        }
+    }
+    //End of add
+
+    sal_uInt16 nActNumLvl = (sal_uInt16)0xFFFF;
+    SvxNumRule* pNumRule = NULL;
+    const SfxPoolItem* pTmpItem=NULL;
+    sal_uInt32 nNumItemId = SID_ATTR_NUMBERING_RULE;
+
+    if(SFX_ITEM_SET == aNewAttr.GetItemState(SID_PARAM_CUR_NUM_LEVEL, sal_False, &pTmpItem))
+        nActNumLvl = ((const SfxUInt16Item*)pTmpItem)->GetValue();
+
+    pTmpItem=GetNumBulletItem(aNewAttr, nNumItemId);
+
+    if (pTmpItem)
+        pNumRule = new SvxNumRule(*((SvxNumBulletItem*)pTmpItem)->GetNumRule());
+
+    SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_BULLET , sal_False );
+    if (pItem && pNumRule)
+    {
+        sal_uInt16 nIdx = pItem->GetValue();
+        // If the nIdx is (sal_uInt16)0xFFFF, means set bullet status to on/off
+        // And the bullet default status is 2.
+        bool bBulletSwitch = false;
+        sal_Bool isRemoveNum =false;
+        if( nIdx == (sal_uInt16)0xFFFF )
+        {
+            nIdx = 1;
+            bBulletSwitch = true;
+        }
+        if (nIdx == DEFAULT_NONE)
+        {
+            bBulletSwitch = false;
+            isRemoveNum = true;
+        }
+
+        nIdx--;
+        //Modified for Numbering&Bullets Dialog UX Enh(Story 992) by chengjh,2011.8.7
+
+        NBOTypeMgrBase* pBullets = NBOutlineTypeMgrFact::CreateInstance(eNBOType::MIXBULLETS);
+        if ( pBullets )
+        {
+            //Sym3_2508, set unit attribute to NB Manager
+            pBullets->SetItems(&aNewAttr);
+            SvxNumRule aTmpRule( *pNumRule );
+            //Sym3_3423 Always apply the "." if wants a default numbering rule
+            if (bBulletSwitch==true && nIdx==0) //want to reset bullet
+            {
+                pBullets->ApplyNumRule(aTmpRule,nIdx,nActNumLvl,true);
+            }
+            else {
+                pBullets->ApplyNumRule(aTmpRule,nIdx,nActNumLvl);
+            }
+            sal_uInt16 nMask = 1;
+            for(sal_uInt16 i = 0; i < pNumRule->GetLevelCount(); i++)
+            {
+                if(nActNumLvl & nMask)
+                {
+                    SvxNumberFormat aFmt(aTmpRule.GetLevel(i));
+                    pNumRule->SetLevel(i, aFmt);
+                }
+                nMask <<= 1;
+            }
+            aSetAttr.Put(SvxNumBulletItem( *pNumRule ), nNumItemId);
+
+            OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
+
+            boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
+
+            if (mpView->ISA(OutlineView))
+            {
+                pOLV = static_cast<OutlineView*>(mpView)
+                    ->GetViewByWindow(mpViewShell->GetActiveWindow());
+
+                aGuard.reset( new OutlineViewModelChangeGuard( static_cast<OutlineView&>(*mpView) ) );
+            }
+
+            SdrOutliner* pOwner = mpView->GetTextEditOutliner();
+            bool bMasterView = false;
+
+            DrawViewShell* pDrawViewShell = static_cast< DrawViewShell* >(mpViewShell);
+
+            if ( pOwner && pDrawViewShell && pDrawViewShell->GetEditMode() == EM_MASTERPAGE )
+                bMasterView = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
+
+            if( bMasterView )
+            {
+                pOwner->UndoActionStart( OLUNDO_ATTR );
+                pOLV->ToggleBullets( bBulletSwitch, sal_True, bMasterView, pNumRule, isRemoveNum );
+                mpView->SetAttributes(aSetAttr); //Modify for Sym2_3151
+                pOwner->UndoActionEnd( OLUNDO_ATTR );
+            }
+            else if( pOLV )
+                pOLV->ToggleBullets( bBulletSwitch, sal_True, bMasterView, pNumRule, isRemoveNum );
+            else
+            {
+                sal_Bool bInMasterView = pDrawViewShell && pDrawViewShell->GetEditMode() == EM_MASTERPAGE;
+                SdrModel* pSdrModel = mpView->GetModel();
+                sal_Bool bModelUndoEnabled = pSdrModel ? pSdrModel->IsUndoEnabled() : sal_False;
+                if (bInMasterView && bModelUndoEnabled)
+                {
+                    pSdrModel->BegUndo();
+                }
+                mpView->ToggleMarkedObjectsBullets(bBulletSwitch, sal_True, bInMasterView, pNumRule, isRemoveNum );
+                if (bInMasterView)
+                {
+                    mpView->SetAttributes(aSetAttr);
+                }
+                if (bInMasterView && bModelUndoEnabled)
+                {
+                    pSdrModel->EndUndo();
+                }
+            }
+        }
+        //End
+    }
+    delete pNumRule;
+    rReq.Done();
+}
+
+const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt32& nNumItemId)
+{
+    //SvxNumBulletItem* pRetItem = NULL;
+    const SfxPoolItem* pTmpItem = NULL;
+
+    if(aNewAttr.GetItemState(nNumItemId, sal_False, &pTmpItem) == SFX_ITEM_SET)
+    {
+        return pTmpItem;
+    }
+    else
+    {
+        nNumItemId = aNewAttr.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
+        SfxItemState eState = aNewAttr.GetItemState(nNumItemId, sal_False, &pTmpItem);
+        if (eState == SFX_ITEM_SET)
+            return pTmpItem;
+        else
+        {
+            sal_Bool bOutliner = sal_False;
+            sal_Bool bTitle = sal_False;
+
+            if( mpView )
+            {
+                const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
+                const sal_uInt32 nCount = rMarkList.GetMarkCount();
+
+                for(sal_uInt32 nNum = 0; nNum < nCount; nNum++)
+                {
+                    SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj();
+                    if( pObj->GetObjInventor() == SdrInventor )
+                    {
+                        switch(pObj->GetObjIdentifier())
+                        {
+                        case OBJ_TITLETEXT:
+                            bTitle = sal_True;
+                            break;
+                        case OBJ_OUTLINETEXT:
+                            bOutliner = sal_True;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            const SvxNumBulletItem *pItem = NULL;
+            if(bOutliner)
+            {
+                SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
+                String aStyleName((SdResId((sal_uInt16)STR_LAYOUT_OUTLINE)));
+                aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " 1" ) );
+                SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
+                if( pFirstStyleSheet )
+                    pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, sal_False, (const SfxPoolItem**)&pItem);
+            }
+
+            if( pItem == NULL )
+                pItem = (SvxNumBulletItem*) aNewAttr.GetPool()->GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET);
+
+            //DBG_ASSERT( pItem, "Kein EE_PARA_NUMBULLET im Pool! [CL]" );
+
+            aNewAttr.Put(*pItem, EE_PARA_NUMBULLET);
+
+            if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET,sal_True) == SFX_ITEM_ON )
+            {
+                SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)aNewAttr.GetItem(EE_PARA_NUMBULLET,sal_True);
+                SvxNumRule* pLclRule = pBulletItem->GetNumRule();
+                if(pLclRule)
+                {
+                    SvxNumRule aNewRule( *pLclRule );
+                    aNewRule.SetFeatureFlag( NUM_NO_NUMBERS, sal_True );
+
+                    SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET );
+                    aNewAttr.Put(aNewItem);
+                }
+            }
 
+            SfxItemState eItemState = aNewAttr.GetItemState(nNumItemId, sal_False, &pTmpItem);
+            if (eItemState == SFX_ITEM_SET)
+                return pTmpItem;
+
+        }
+        //DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!")
+    }
+    return pTmpItem;
+}
 
 } // end of namespace sd
 
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index 250319e63e88..c1f259f4bfc4 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -51,9 +51,12 @@ static sal_uInt16 SidArray[] = {
                 SID_ATTR_CHAR_FONT,
                 SID_ATTR_CHAR_POSTURE,
                 SID_ATTR_CHAR_WEIGHT,
+                SID_ATTR_CHAR_SHADOWED,
+                SID_ATTR_CHAR_STRIKEOUT,
                 SID_ATTR_CHAR_UNDERLINE,
                 SID_ATTR_CHAR_FONTHEIGHT,
                 SID_ATTR_CHAR_COLOR,
+                SID_ATTR_CHAR_KERNING,
                 SID_OUTLINE_UP,
                 SID_OUTLINE_DOWN,
                 SID_OUTLINE_LEFT,
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index 0c903f2e1f2f..7a0056a5ca06 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -138,6 +138,8 @@ void FuParagraph::DoExecute( SfxRequest& rReq )
     // invalidate slots
     static sal_uInt16 SidArray[] = {
         SID_ATTR_TABSTOP,
+    SID_ATTR_PARA_LINESPACE,
+    SID_ATTR_PARA_ULSPACE,
         SID_ATTR_PARA_ADJUST_LEFT,
         SID_ATTR_PARA_ADJUST_RIGHT,
         SID_ATTR_PARA_ADJUST_CENTER,
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index a6c04a596925..6784daa67140 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -85,9 +85,12 @@ static sal_uInt16 SidArray[] = {
     SID_ATTR_CHAR_FONT,               //   10007
     SID_ATTR_CHAR_POSTURE,            //   10008
     SID_ATTR_CHAR_WEIGHT,             //   10009
+    SID_ATTR_CHAR_SHADOWED,     //10010
+    SID_ATTR_CHAR_STRIKEOUT,        //10013
     SID_ATTR_CHAR_UNDERLINE,          //   10014
     SID_ATTR_CHAR_FONTHEIGHT,         //   10015
     SID_ATTR_CHAR_COLOR,              //   10017
+    SID_ATTR_CHAR_KERNING,          //10018
     SID_ATTR_PARA_ADJUST_LEFT,        //   10028
     SID_ATTR_PARA_ADJUST_RIGHT,       //   10029
     SID_ATTR_PARA_ADJUST_CENTER,      //   10030
@@ -95,14 +98,26 @@ static sal_uInt16 SidArray[] = {
     SID_ATTR_PARA_LINESPACE_10,       //   10034
     SID_ATTR_PARA_LINESPACE_15,       //   10035
     SID_ATTR_PARA_LINESPACE_20,       //   10036
+    SID_ATTR_PARA_ULSPACE,         //   10042
     SID_ATTR_PARA_LRSPACE,            //   10043
+    SID_ATTR_TRANSFORM_POS_X, //  10088
+    SID_ATTR_TRANSFORM_POS_Y, //  10089
+    SID_ATTR_TRANSFORM_WIDTH, //  10090
+    SID_ATTR_TRANSFORM_HEIGHT,//  10091
+    SID_ATTR_TRANSFORM_ROT_X, //  10093
+    SID_ATTR_TRANSFORM_ROT_Y, //  10094
+    SID_ATTR_TRANSFORM_ANGLE, //  10095 //Added
     SID_OUTLINE_UP,                   //   10150
     SID_OUTLINE_DOWN,                 //   10151
     SID_OUTLINE_LEFT,                 //   10152
     SID_OUTLINE_RIGHT,                //   10153
+    SID_ATTR_TRANSFORM_PROTECT_POS,//  10236
+    SID_ATTR_TRANSFORM_PROTECT_SIZE,// 10237 //Added
     SID_FORMTEXT_STYLE,               //   10257
     SID_SET_SUPER_SCRIPT,             //   10294
     SID_SET_SUB_SCRIPT,               //   10295
+    SID_ATTR_TRANSFORM_AUTOWIDTH,//    10310
+    SID_ATTR_TRANSFORM_AUTOHEIGHT,//   10311 //Added
     SID_HYPERLINK_GETLINK,            //   10361
     SID_CHARMAP,                      //   10503
     SID_TEXTDIRECTION_LEFT_TO_RIGHT,  //   10907
@@ -1089,7 +1104,8 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag)
                         {
                             // Move cursor to end of text
                             ESelection aNewSelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND, EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND);
-                            pOLV->SetSelection(aNewSelection);
+                            if (pOLV != NULL)
+                                pOLV->SetSelection(aNewSelection);
                         }
                     }
                     else