openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zheng...@apache.org
Subject svn commit: r1463154 [6/6] - in /openoffice/branches/sidebar/main: editeng/inc/editeng/ editeng/source/outliner/ officecfg/registry/data/org/openoffice/Office/UI/ sc/sdi/ sc/source/ui/app/ sc/source/ui/docshell/ sc/source/ui/drawfunc/ sc/source/ui/view...
Date Mon, 01 Apr 2013 14:43:35 GMT
Added: openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx?rev=1463154&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx Mon Apr  1 14:43:34 2013
@@ -0,0 +1,288 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#ifndef SVX_SIDEBAR_PARA_PROPERTY_PAGE_HXX
+#define SVX_SIDEBAR_PARA_PROPERTY_PAGE_HXX
+
+#include <vcl/ctrl.hxx>
+#include <sfx2/sidebar/SidebarPanelBase.hxx>
+#include <sfx2/sidebar/ControllerItem.hxx>
+#include <sfx2/sidebar/IContextChangeReceiver.hxx>
+#include <editeng/lspcitem.hxx>
+#include <svtools/ctrlbox.hxx>
+#include <svx/tbxcolorupdate.hxx>
+#include <svx/relfld.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/fhgtitem.hxx>
+
+#include <com/sun/star/ui/XUIElement.hpp>
+
+#include <boost/scoped_ptr.hpp>
+
+#include <svx/sidebar/ColorPopup.hxx>
+#include <vcl/vclenum.hxx>
+#include <vcl/fixed.hxx>
+#include <svl/poolitem.hxx>
+#include <tools/fldunit.hxx>
+
+#include "ParaBulletsPopup.hxx"
+#include "ParanumberingPopup.hxx"
+#include "ParaLineSpacingPopup.hxx"
+
+class FloatingWindow;
+class ToolBox;
+
+namespace svx { namespace sidebar {
+
+class PopupControl;
+class PopupContainer;
+
+class ParaPropertyPanel
+    : public Control,
+      public ::sfx2::sidebar::IContextChangeReceiver,
+      public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
+{
+public:
+    static ParaPropertyPanel* Create (
+        Window* pParent,
+        const cssu::Reference<css::frame::XFrame>& rxFrame,
+        SfxBindings* pBindings);
+
+	virtual void DataChanged (const DataChangedEvent& rEvent);
+	SfxBindings* GetBindings();
+
+	virtual void HandleContextChange (
+	    const ::sfx2::sidebar::EnumContext aContext);
+
+	virtual void NotifyItemUpdate(
+	    const sal_uInt16 nSId,
+	    const SfxItemState eState,
+	    const SfxPoolItem* pState);
+
+	void ShowMenu (void);
+	sal_uInt16 GetBulletTypeIndex(){ return nBulletTypeIndex; }
+	void SetBulletTypeIndex(sal_uInt16 nInd){ nBulletTypeIndex = nInd; }
+	sal_uInt16 GetNumTypeIndex(){ return nNumTypeIndex; }
+	void SetNumTypeIndex(sal_uInt16 nInd){ nNumTypeIndex = nInd; }
+	//End
+	FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState );
+
+	void EndSpacingPopupMode (void);
+	void EndBulletsPopupMode (void);
+	void EndNumberingPopupMode (void);
+
+private:
+	/**********************************************************
+	 **
+	 ** UI controls
+	 **
+	***********************************************************/
+	//Alignment
+	::boost::scoped_ptr<Window> 			maAlignToolBoxBackground;
+	::boost::scoped_ptr<ToolBox>			maAlignToolBox;
+	::boost::scoped_ptr<Window> 			maTBxVertAlignBackground;
+	::boost::scoped_ptr<ToolBox>			maTBxVertAlign;
+	//NumBullet&Backcolor
+	::boost::scoped_ptr<Window> 			maTBxNumBulletBackground;
+	::boost::scoped_ptr<ToolBox>			maTBxNumBullet;
+	::boost::scoped_ptr<Window> 			maTBxBackColorBackground;
+	::boost::scoped_ptr<ToolBox>			maTBxBackColor;
+	//Paragraph spacing
+	::boost::scoped_ptr<FixedText>			maFTUL;
+	::boost::scoped_ptr<Window> 			maTbxUL_IncDecBackground;
+	::boost::scoped_ptr<ToolBox>			maTbxUL_IncDec;
+	::boost::scoped_ptr<SvxRelativeField>	maTopDist;
+	::boost::scoped_ptr<SvxRelativeField>	maBottomDist;
+	//Line spacing
+	::boost::scoped_ptr<Window> 			maLineSPTbxBackground;
+	::boost::scoped_ptr<ToolBox>			maLineSPTbx;
+	//Indent
+	::boost::scoped_ptr<FixedText>			maFTIndent;
+	::boost::scoped_ptr<Window> 			maTbxIndent_IncDecBackground;
+	::boost::scoped_ptr<ToolBox>			maTbxIndent_IncDec;
+	::boost::scoped_ptr<Window> 			maTbxProDemoteBackground;
+	::boost::scoped_ptr<ToolBox>			maTbxProDemote;
+	::boost::scoped_ptr<SvxRelativeField>	maLeftIndent;
+	::boost::scoped_ptr<SvxRelativeField>	maRightIndent;
+	::boost::scoped_ptr<SvxRelativeField>	maFLineIndent;
+	::boost::scoped_ptr<::svx::ToolboxButtonColorUpdater>	mpColorUpdater;	
+	
+	/**********************************************************
+	 **
+	 ** Resources
+	 **
+	***********************************************************/
+	FixedImage  maFISpace1;
+	FixedImage  maFISpace2;
+	FixedImage  maFIndent1;
+	FixedImage  maFIndent2;
+	FixedImage  maFIndent3;
+
+	Image  maSpace1;
+	Image  maSpace2;
+	Image  maSpace3;
+	Image  maIndent1;
+	Image  maIndent2;
+	Image  maIndent3;
+
+	Image  maLeftPara;
+	Image  maCentPara;
+	Image  maRightPara;
+	Image  maJusPara;
+
+	Image  maIndInc;
+	Image  maIndDec;
+	Image  maIndInc_BD;
+	Image  maIndDec_BD;
+	Image  maIndHang;
+	Image  maParInc;
+	Image  maParDec;
+
+	ImageList	maVertImageList;
+	ImageList	maVertImageListH;	
+	ImageList	maNumBImageList;
+	ImageList	maNumBImageListH;
+	ImageList	maNumBImageListRTL;	//sym2_7380
+	Image		maImgBackColorHigh;
+	Image		maImgBackColor;
+
+	/****************************************************************
+	**
+	** Data Member
+	**
+	*****************************************************************/
+	long				maTxtLeft;
+	//Line spacing
+	SvxLineSpacingItem	*mpLnSPItem; 
+	SfxItemState			meLnSpState;
+	bool					mbOutLineLeft;
+	bool					mbOutLineRight;
+	long					maUpper;
+	long					maLower;
+
+	sal_uInt16			nBulletTypeIndex;
+	sal_uInt16			nNumTypeIndex;
+	Color				maColor;
+	bool					mbColorAvailable;
+	FieldUnit						m_eMetricUnit;
+	FieldUnit						m_last_eMetricUnit;
+	SfxMapUnit                      m_eLRSpaceUnit;
+	SfxMapUnit                      m_eULSpaceUnit;
+	/****************************************************************
+	**
+	** Controll Itemb
+	**
+	*****************************************************************/
+
+	::sfx2::sidebar::ControllerItem  maLeftAlignControl;
+	::sfx2::sidebar::ControllerItem  maCenterAlignControl;
+	::sfx2::sidebar::ControllerItem  maRightAlignControl;
+	::sfx2::sidebar::ControllerItem  maJustifyAlignControl;
+	::sfx2::sidebar::ControllerItem  maLRSpaceControl;
+	//::sfx2::sidebar::ControllerItem  maLRSpaceControl2;
+	::sfx2::sidebar::ControllerItem  maLNSpaceControl;
+	::sfx2::sidebar::ControllerItem  maULSpaceControl;
+	//::sfx2::sidebar::ControllerItem  maULSpaceControl2;
+	::sfx2::sidebar::ControllerItem  maOutLineLeftControl;
+	::sfx2::sidebar::ControllerItem  maOutLineRightControl;
+	::sfx2::sidebar::ControllerItem  maDecIndentControl;
+	::sfx2::sidebar::ControllerItem  maIncIndentControl;
+	::sfx2::sidebar::ControllerItem  maVertTop;
+	::sfx2::sidebar::ControllerItem  maVertCenter;
+	::sfx2::sidebar::ControllerItem  maVertBottom;
+	::sfx2::sidebar::ControllerItem  maBulletOnOff;
+	::sfx2::sidebar::ControllerItem  maNumberOnOff;
+	::sfx2::sidebar::ControllerItem  maBackColorControl;
+	::sfx2::sidebar::ControllerItem  m_aMetricCtl;
+	::sfx2::sidebar::ControllerItem  maBulletNumRuleIndex;
+	::sfx2::sidebar::ControllerItem  maNumNumRuleIndex;
+
+    cssu::Reference<css::frame::XFrame> mxFrame;
+    ::sfx2::sidebar::EnumContext maContext;
+    SfxBindings* mpBindings;
+
+
+	ParaLineSpacingPopup maLineSpacePopup;
+	ParaBulletsPopup maBulletsPopup;
+	ParaNumberingPopup maNumberingPopup;
+	ColorPopup maBGColorPopup; 
+    
+    ParaPropertyPanel (
+        Window* pParent,
+        const cssu::Reference<css::frame::XFrame>& rxFrame,
+        SfxBindings* pBindings);
+	virtual ~ParaPropertyPanel (void);
+
+	void InitImageList(::boost::scoped_ptr<ToolBox>& rTbx, ImageList& rImglst, ImageList& rImgHlst);
+
+	DECL_LINK(AlignStyleModifyHdl_Impl, ToolBox*);
+	DECL_LINK(VertTbxSelectHandler, ToolBox*);
+	DECL_LINK(NumBTbxSelectHandler, ToolBox*);
+	DECL_LINK(ModifyIndentHdl_Impl, SvxRelativeField*);
+	DECL_LINK(ClickIndent_IncDec_Hdl_Impl, ToolBox*);
+	DECL_LINK(ClickProDemote_Hdl_Impl, ToolBox*);
+	DECL_LINK(ULSpaceHdl_Impl, SvxRelativeField*);
+	DECL_LINK(ClickUL_IncDec_Hdl_Impl, ToolBox*);
+	DECL_LINK(ImplPopupModeEndHdl, FloatingWindow* );
+
+	void VertStateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState);
+	void ParaBKGStateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState);
+	void StateChangedAlignmentImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+	void StateChangedIndentImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+	void StateChangedLnSPImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+	void StateChangedULImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+	void StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+	void StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+	//Sym3_1093. Add toggle state for numbering and bullet icons
+	void StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+	//Modified for Numbering&Bullets Dialog UX Enh(Story 992) by chengjh,2011.7.5
+	//Handing the transferred the num rule index data of the current selection
+	void StateChangeBulletNumRuleImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+	
+	void initial();
+	void ReSize(bool bSize);
+
+	
+	PopupControl* CreateLineSpacingControl (PopupContainer* pParent);
+	PopupControl* CreateBulletsPopupControl (PopupContainer* pParent);
+	PopupControl* CreateNumberingPopupControl (PopupContainer* pParent);
+	PopupControl* CreateBGColorPopupControl (PopupContainer* pParent);
+	DECL_LINK(ClickLineSPDropDownHdl_Impl, ToolBox*);
+	DECL_LINK(NumBTbxDDHandler, ToolBox*);
+	DECL_LINK(ToolBoxBackColorDDHandler, ToolBox *);
+
+	void SetupIcons (void);
+	void InitToolBoxAlign();
+	void InitToolBoxVertAlign();
+	void InitToolBoxIndent();
+	void InitToolBoxBGColor();
+	void InitToolBoxBulletsNumbering();
+	void InitToolBoxSpacing();
+	void InitToolBoxLineSpacing();
+
+	Color GetBGColor (void) const;
+	void SetBGColor (const String& rsColorName, const Color aColor);
+};
+
+} } // end of namespace ::svx::sidebar
+
+#endif
+

Propchange: openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
------------------------------------------------------------------------------
    svn:executable = *

Added: openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src?rev=1463154&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src Mon Apr  1 14:43:34 2013
@@ -0,0 +1,978 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#include "ParaPropertyPanel.hrc"
+#include <sfx2/sidebar/propertypanel.hrc>
+#include "helpid.hrc"
+
+#define MASKCOLOR	MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+
+#define SVX_PROPERTYPANEL_PARA_VERT_IDLIST \
+	IdList =			   \
+	{					   \
+		IID_VERT_TOP ;	   \
+		IID_VERT_CENTER ;   \
+		IID_VERT_BOTTOM ;   \
+	};					   \
+	IdCount = { 3 ; };
+
+#define SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST \
+	IdList =			   \
+	{					   \
+		IID_BULLET ;	   \
+		IID_NUMBER ;	   \
+	};					   \
+	IdCount = { 2 ; };
+
+//add by wj for sym2_7380	
+#define SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST_RTL \
+	IdList =			   \
+	{					   \
+		IID_BULLET ;	   \
+		IID_NUMBER ;	   \
+	};					   \
+	IdCount = { 2 ; };
+	
+Control RID_SIDEBAR_PARA_PANEL
+{
+	OutputSize = TRUE;
+	DialogControl = TRUE;
+	Border = FALSE;
+	Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, PARA_SECTIONPAGE_HEIGHT );
+	HelpID = HID_PROPERTYPANEL_PARA_SECTION ;
+	Text = "Paragraph";	
+
+	ToolBox TBX_HORIZONTALALIGNMENT
+	{
+        Pos = MAP_APPFONT ( TBX_HORI_ALIGN_X , TBX_HORI_ALIGN_Y );
+        Size = MAP_APPFONT ( ALIGNMENT_TBX_WIDTH*4 ,ALIGNMENT_TBX_HEIGHT);
+		SVLook = TRUE ;
+		Border = FALSE ;
+		HelpID = HID_PPROPERTYPANEL_PARA_TBX_HALIGN;
+		Text = "Horizontal Alignment";
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = BT_SUBSTLEFT ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_LEFT;
+				Text [ en-US ] = "Align Left" ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/AlignTextLeft_16x16.png";
+				};
+			};
+			ToolBoxItem
+			{
+				Identifier = BT_SUBSTCENTER ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_CENTER;
+				Text [ en-US ] = "Align Center" ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/AlignTextCenter_16x16.png";
+				};
+			};
+			ToolBoxItem
+			{
+				Identifier = BT_SUBSTRIGHT ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_RIGHT;
+				Text [ en-US ] = "Align Right" ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/AlignTextRight_16x16.png";
+				};
+			};
+			ToolBoxItem
+			{
+				Identifier = BT_SUBSTJUSTIFY ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_JUSTIFY;
+				Text [ en-US ] = "Align Justified" ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/AlignTextJustified_16x16.png";
+				};
+			};
+		};
+	};
+	ToolBox TBX_VERT_ALIGN
+	{
+		HelpID = HID_PPROPERTYPANEL_PARA_TBX_VALIGN;
+		SVLook = TRUE ;
+		Border = FALSE ;
+		Pos = MAP_APPFONT ( TBX_VERT_ALIGN_X,  TBX_VERT_ALIGN_Y ) ;
+		Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 3 ,  TOOLBOX_ITEM_HEIGHT) ;
+		TabStop = TRUE ;
+		Text = "Vertical Alignment";
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = IID_VERT_TOP ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_VALIGN_TOP;
+				Text [ en-US ] = "Align Top" ;
+			};
+			
+			ToolBoxItem
+			{
+				Identifier = IID_VERT_CENTER ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_VALIGN_CENTER;
+				Text [ en-US ] = "Align Center Vertically" ;
+			};
+			
+			ToolBoxItem
+			{
+				Identifier = IID_VERT_BOTTOM ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_VALIGN_BOT;
+				Text [ en-US ] = "Align Bottom" ;
+			};
+		};
+	};
+
+    ToolBox TBX_NUM_BULLET
+	{
+		HelpID = HID_PPROPERTYPANEL_PARA_TBX_NUM_BULLET;
+		Border = FALSE ;
+		Pos = MAP_APPFONT ( TBX_NUM_BULLET_X , TBX_NUM_BULLET_Y ) ;
+		Size = MAP_APPFONT ( TOOLBOX_ITEM_DD_WIDTH * 2 ,  TOOLBOX_ITEM_HEIGHT) ;
+		TabStop = TRUE ;
+		Text = "Bullets and Numbering";
+		ItemList =
+		{			
+			ToolBoxItem
+			{
+				Identifier = IID_BULLET ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_BULLET ;
+				Text [ en-US ] = "Bullets" ;
+				DropDown = TRUE ;
+			};			
+			ToolBoxItem
+			{
+				Identifier = IID_NUMBER ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_NUM ;
+				Text [ en-US ] = "Numbering" ;
+				DropDown = TRUE ;
+			};
+		};
+	};	
+	ToolBox TBX_BACK_COLOR
+	{
+		SVLook = TRUE ;
+		Pos = MAP_APPFONT (TBX_BACK_COLOR_X, TBX_BACK_COLOR_Y) ;
+		Size = MAP_APPFONT (TOOLBOX_WIDTH,TOOLBOX_HEIGHT ) ;
+		TabStop = TRUE ;
+		HelpID = HID_PPROPERTYPANEL_PARA_TBX_BACK_COLOR;
+		Text = "Paragraph Background Color" ;
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = TBI_BACK_COLOR ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_BACK_COLOR;
+				DropDown = TRUE ;
+				Text [ en-US ] = "Paragraph Background Color" ;
+			};
+		};
+	};
+	FixedText FT_SPACING
+	{
+	    Pos = MAP_APPFONT ( FT_PARA_SPACE_X, FT_PARA_SPACE_Y );
+        Size = MAP_APPFONT ( FT_PARA_INDENT_X - 7 - FT_PARA_SPACE_X, _FIXED_TEXT_HEIGHT) ;
+		Text [ en-US ] = "~Spacing:"; 
+	};
+	ToolBox TBX_UL_INC_DEC
+	{
+		Pos = MAP_APPFONT ( TBX_PARA_SPACE_INC_DEC_X,TBX_PARA_SPACE_INC_DEC_Y );
+		Size = MAP_APPFONT (ALIGNMENT_TBX_WIDTH*2,ALIGNMENT_TBX_HEIGHT);
+		SVLook = TRUE ;
+		Border = FALSE ;
+		HelpID = HID_PPROPERTYPANEL_PARA_TBX_INC_DEC ;
+		Text = "Spacing"; 
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = BT_TBX_UL_INC ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_INC ;
+				Text [ en-US ] = "Increase Spacing" ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/IncreaseSpace_16x16.png";
+				};
+			};
+			ToolBoxItem
+			{
+				Identifier = BT_TBX_UL_DEC ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_DEC ;
+				Text [ en-US ] = "Decrease Spacing" ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/DecreaseSpace_16x16.png";
+				};
+			};
+		};
+	};
+	MetricField MF_ABOVE_PARASPACING
+	{
+		HelpID = HID_POPUP_PS_ED_SBINDE_TOPDIST ;
+		Border = TRUE;
+		Pos = MAP_APPFONT ( MBX_TOP_DIST_X, MBX_TOP_DIST_Y );
+        	Size = MAP_APPFONT ( CONTROL_WIDTH -10 ,MBOX_HEIGHT ) ;
+        	QuickHelpText [ en-US ] = "Above Paragraph Spacing";
+        	TabStop = TRUE;
+		Repeat = TRUE;
+		Spin = TRUE;
+		Maximum = 999;
+		Unit = FUNIT_INCH;
+		Last = 999;
+		SpinSize = 1;
+
+	};
+	MetricField MF_BELOW_PARASPACING
+	{
+		Border = TRUE;
+		Pos = MAP_APPFONT ( MBX_BOT_DIST_X, MBX_BOT_DIST_Y );
+        Size = MAP_APPFONT ( CONTROL_WIDTH -10,MBOX_HEIGHT ) ;
+        QuickHelpText [ en-US ] = "Below Paragraph Spacing";
+        HelpID = HID_POPUP_PS_ED_SBINDE_BOTTOMDIST ;
+		Repeat = TRUE;
+		Spin = TRUE;
+		Maximum = 999;
+		Unit = FUNIT_INCH;
+		Last = 999;
+		SpinSize = 1;
+	};
+	FixedText FT_INDENT
+	{
+	    Pos = MAP_APPFONT ( FT_PARA_INDENT_X, FT_PARA_INDENT_Y );
+        Size = MAP_APPFONT ( _FIXED_TEXT_WIDTH + 50, _FIXED_TEXT_HEIGHT) ;
+		Text [ en-US ] = "~Indent:";
+	};
+	ToolBox TBX_INDENT_INC_DEC
+	{
+		Pos = MAP_APPFONT ( TBX_PARA_INDENT_INC_DEC_X, TBX_PARA_INDENT_INC_DEC_Y );
+		Size = MAP_APPFONT (ALIGNMENT_TBX_WIDTH*2,ALIGNMENT_TBX_HEIGHT);
+		SVLook = TRUE ;
+		Border = FALSE ;
+		HelpID = HID_PPROPERTYPANEL_PARA_TBX_INDENT_INC_DEC ;
+		Text = "Indent";
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = BT_TBX_INDENT_INC ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENT_INC ;
+				Text [ en-US ] = "Increase Indent" ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/Indent_16x16.png";
+				};
+			};
+			ToolBoxItem
+			{
+				Identifier = BT_TBX_INDENT_DEC ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENT_DEC ;
+				Text [ en-US ] = "Decrease Indent" ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/Outdent_16x16.png";
+				};
+			};
+			ToolBoxItem
+			{
+				Identifier = ID_HANGING_INDENT ;
+				Text [ en-US ] = "Switch to Hanging Indent" ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENT_HANG ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/Indent_Hanging.png";
+				};
+			};
+		};		
+	};
+	ToolBox TBX_INDENT_PRO_DEMOTE
+	{
+		Pos = MAP_APPFONT ( TBX_PARA_INDENT_INC_DEC_X, TBX_PARA_INDENT_INC_DEC_Y );
+		Size = MAP_APPFONT (ALIGNMENT_TBX_WIDTH*2,ALIGNMENT_TBX_HEIGHT);
+		SVLook = TRUE ;
+		Border = FALSE ;
+		HelpID = HID_PPROPERTYPANEL_PARA_TBX_INDENTP_INC_DEC ;
+		Text = "Indent";
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = BT_TBX_INDENT_PROMOTE ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENTP_INC ;
+				Text [ en-US ] = "Increase Indent" ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/Indent_16x16.png";
+				};
+			};
+			ToolBoxItem
+			{
+				Identifier = BT_TBX_INDENT_DEMOTE ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENTP_DEC ;
+				Text [ en-US ] = "Decrease Indent" ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/Outdent_16x16.png";
+				};
+			};
+			ToolBoxItem
+			{
+				Identifier = SD_HANGING_INDENT ;
+				Text [ en-US ] = "Switch to Hanging Indent" ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENTP_HANG ; 
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/Indent_Hanging.png";
+				};
+			};
+		};		
+	};
+	MetricField MF_BEFORE_INDENT
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( MBX_LEFT_DIST_X, MBX_LEFT_DIST_Y );
+        Size = MAP_APPFONT ( CONTROL_WIDTH - 10,MBOX_HEIGHT ) ;
+        QuickHelpText [ en-US ] = "Before Text Indent";
+        HelpID = HID_POPUP_INDENT_ED_INDENT_LEFTINDENT ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 9999 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_INCH;
+		Last = 9999 ;
+		SpinSize = 2 ;
+	};
+    MetricField MF_AFTER_INDENT
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( MBX_RIGHT_DIST_X, MBX_RIGHT_DIST_Y );
+        Size = MAP_APPFONT ( CONTROL_WIDTH -10 ,MBOX_HEIGHT ) ;
+        QuickHelpText [ en-US ] = "After Text Indent";
+        HelpID = HID_POPUP_INDENT_ED_INDENT_RIGHTINDENT ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 9999 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_INCH;
+		Last = 9999 ;
+		SpinSize = 2 ;
+	};
+    MetricField MF_FL_INDENT
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( MBX_FLINE_DIST_X, MBX_FLINE_DIST_Y );
+        Size = MAP_APPFONT ( CONTROL_WIDTH -10 ,MBOX_HEIGHT ) ;
+        QuickHelpText [ en-US ] = "First Line Indent";
+        HelpID = HID_POPUP_INDENT_ED_INDENT_FLINDENT ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Minimum = -9999;
+		Maximum = 9999 ;
+		DecimalDigits = 2;
+		Unit = FUNIT_INCH;
+		First = -9999;
+		Last = 9999 ;
+		SpinSize = 2 ;
+	};
+	ToolBox TBX_LINESP
+	{
+	    Pos = MAP_APPFONT ( TBX_LINE_SPACE_X, TBX_LINE_SPACE_Y);
+		SVLook = TRUE ;
+		Border = FALSE ;
+		Size = MAP_APPFONT (TOOLBOX_WIDTH, TOOLBOX_HEIGHT);
+		HelpID = HID_PPROPERTYPANEL_PARA_TBX_LINESP ;
+		Text = "Line Spacing" ;
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = BT_BTX_LINESP ;
+				HelpID = HID_PPROPERTYPANEL_PARA_TBI_LINESP ;
+				Text [ en-US ] = "Line Spacing" ;
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/lpsmall-spacing-1.png" ;
+				};
+				DropDown = TRUE;
+			};
+		};
+	};
+	FixedImage FI_INDENT1
+    {
+        Pos = MAP_APPFONT( IMG_SPACE_X, IMG_SPACE1_Y );
+        Size = MAP_APPFONT( IMAGE_SIZE, IMAGE_SIZE );
+    };
+    FixedImage FI_INDENT2
+    {
+        Pos = MAP_APPFONT( IMG_SPACE_X, IMG_SPACE2_Y );
+        Size = MAP_APPFONT( IMAGE_SIZE, IMAGE_SIZE );
+    };
+    FixedImage FI_INDENT3
+    {
+        Pos = MAP_APPFONT( IMG_INDENT_X, IMG_INDENT1_Y );
+        Size = MAP_APPFONT( IMAGE_SIZE, IMAGE_SIZE );
+    };
+    FixedImage FI_SPACE1
+    {
+        Pos = MAP_APPFONT( IMG_INDENT_X, IMG_INDENT2_Y );
+        Size = MAP_APPFONT( IMAGE_SIZE, IMAGE_SIZE );
+    };
+    FixedImage FI_SPACE2
+    {
+        Pos = MAP_APPFONT( IMG_INDENT_X, IMG_INDENT3_Y );
+        Size = MAP_APPFONT( IMAGE_SIZE, IMAGE_SIZE );
+    };
+	
+	ImageList IL_VERT_ALIGN
+	{
+        Prefix = "symphony/para_vert";
+		MaskColor = STD_MASKCOLOR ;
+        SVX_PROPERTYPANEL_PARA_VERT_IDLIST
+    };
+    ImageList ILH_VERT_ALIGN
+	{
+        Prefix = "symphony/para_verth";
+		MaskColor = STD_MASKCOLOR ;
+        SVX_PROPERTYPANEL_PARA_VERT_IDLIST
+    };
+    
+	ImageList IL_NUM_BULLET
+	{
+        Prefix = "symphony/para_numbullet";
+		MaskColor = STD_MASKCOLOR ;
+        SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST
+    };
+    ImageList ILH_NUM_BULLET
+	{
+        Prefix = "symphony/para_numbulleth";
+		MaskColor = STD_MASKCOLOR ;
+        SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST
+    };    
+    //for sym2_7380
+    ImageList IL_NUM_BULLET_RTL
+	{
+        Prefix = "symphony/para_numbullet_rtl";
+		MaskColor = STD_MASKCOLOR ;
+        SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST_RTL
+    };
+    //end
+    Image IMG_BACK_COLOR
+	{
+		ImageBitmap = Bitmap{File = "symphony/sc_backgroundcolor.bmp";};
+	};
+	Image IMG_BACK_COLOR_H
+	{
+		ImageBitmap = Bitmap{File = "symphony/sch_backgroundcolor.bmp";};
+	};	
+	Image IMG_SPACE1   
+	{
+	    ImageBitmap = Bitmap{File = "symphony/spacing1.png";};
+	};  
+	Image IMG_SPACE2   
+    {
+	    ImageBitmap = Bitmap{File = "symphony/spacing2.png";};
+	};    
+	Image IMG_SPACE3
+	{
+	    ImageBitmap = Bitmap{File = "symphony/spacing3.png";};
+	};  					
+    Image IMG_INDENT1 
+    {
+	    ImageBitmap = Bitmap{File = "symphony/Indent2.png";};
+	};       
+    Image IMG_INDENT2  
+    {
+	    ImageBitmap = Bitmap{File = "symphony/Indent3.png";};
+	};            
+    Image IMG_INDENT3
+    {
+	    ImageBitmap = Bitmap{File = "symphony/Indent4.png";};
+	};
+	Image IMG_LEFT_PARA
+    { 
+        ImageBitmap = Bitmap{File = "symphony/AlignTextLeft_16x16.png";};
+	};
+	Image IMG_CENTER_PARA 
+    {
+		ImageBitmap = Bitmap{File = "symphony/AlignTextCenter_16x16.png";};
+	};
+	Image IMG_RIGHT_PARA 
+    {
+		ImageBitmap = Bitmap{File = "symphony/AlignTextRight_16x16.png";};
+	};
+	Image IMG_JUSTIFY_PARA 
+    {
+	    ImageBitmap = Bitmap{File = "symphony/AlignTextJustified_16x16.png";};
+	};
+	Image IMG_INDENT_INC 
+    {
+	    ImageBitmap = Bitmap{File = "symphony/Indent_16x16.png";};
+	};
+	Image IMG_INDENT_DEC
+    {
+	    ImageBitmap = Bitmap{File = "symphony/Outdent_16x16.png";};
+	};
+	Image IMG_INDENT_INC_BD 
+    {
+	    ImageBitmap = Bitmap{File = "symphony/rte_Indent_16x16.png";};
+	};
+	Image IMG_INDENT_DEC_BD
+    {
+	    ImageBitmap = Bitmap{File = "symphony/rte_Outdent_16x16.png";};
+	};
+	Image IMG_INDENT_HANG
+    {
+	    ImageBitmap = Bitmap{File = "symphony/Indent_Hanging.png";};
+	};
+	Image IMG_PARA_INC 
+    {
+	    ImageBitmap = Bitmap{File = "symphony/IncreaseSpace_16x16.png";};
+	};
+	Image IMG_PARA_DEC
+    {
+	    ImageBitmap = Bitmap{File = "symphony/DecreaseSpace_16x16.png";};
+	};	
+};
+
+//===========================================Back color page==============================
+/*
+Control RID_POPUPPANEL_PARAPAGE_BACK_COLOR
+{
+	OutputSize = TRUE;
+	DialogControl = TRUE;
+	Border = FALSE;
+	
+	Size = MAP_APPFONT(  POPUP_COLOR_PICKER_WIDTH + POPUP_BORDER_WIDTH , POPUP_COLOR_PICKER_HEIGHT +POPUP_BORDER_HEIGHT );
+	
+	Control VS_FONT_COLOR
+	{
+		HelpID = HID_PPROPERTYPANEL_PARA_BACK_COLOR_VS ;
+	        Hide = TRUE ;
+	        Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
+	        Size = MAP_APPFONT (  POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT );
+		TabStop = TRUE ;
+		Text = "Color Picker";
+	};
+
+	String STR_NOFILL
+	{
+		Text [ en-US ] = "No Color";
+	};
+		
+};*/
+
+//===========================================Bullet popup page==============================
+Control RID_POPUPPANEL_PARAPAGE_BULLETS
+{
+	DialogControl = TRUE;
+	OutputSize = TRUE;
+	Border = FALSE;
+	
+	Size = MAP_APPFONT ( POPUP_WIDTH_BULLET , POPUP_HEIGHT_BULLET) ;
+	Control VS_VALUES
+	{
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_NB , POPUPPANEL_MARGIN_NB ) ;
+		Size = MAP_APPFONT ( VS_WIDTH_BULLET ,  VS_HEIGHT_BULLET) ;
+		HelpID = HID_POPUP_BULLET_VS_VALUES ;
+		TabStop = TRUE ;
+		Text = "Bullet";
+	};
+	PushButton CB_BULLET_MORE
+	{
+		Pos = MAP_APPFONT (CUST_MORE_BUTTON_X + POPUPPANEL_MARGIN_NB, VS_HEIGHT_BULLET + POPUPPANEL_MARGIN_NB * 2 ) ;
+		Size = MAP_APPFONT (POPUP_WIDTH_BULLET - 2*CUST_MORE_BUTTON_X - POPUPPANEL_MARGIN_NB*2, CUST_MORE_BUTTON_HEIGHT ) ;
+		HelpID = HID_POPUP_BULLET_CB_BULLET_MORE ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "~More Options";
+	};	
+    Bitmap	BMP_BULLET_MORE
+	{
+		File = "symphony/__morebutton.bmp";
+	};
+	Bitmap	BMP_BULLET_MORE_H
+	{
+		File = "symphony/__morebutton_h.bmp";
+	};	
+};
+
+String RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_0
+{
+    Text [en-US] = "large square bullets";
+};
+
+String RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_1
+{
+    Text [en-US] = "graphic bullets";
+};
+
+String RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_2
+{
+    Text [en-US] = "graphic bullets";
+};
+
+String RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_3
+{
+    Text [en-US] = "graphic bullets";
+};
+
+String RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_4
+{
+    Text [en-US] = "graphic bullets";
+};
+
+//===========================================Numbering popup page==============================
+Control RID_POPUPPANEL_PARAPAGE_NUMBERING
+{
+	SVLook = TRUE ;
+	DialogControl = TRUE;
+	OutputSize = TRUE;
+	Border = FALSE;
+	
+	Size = MAP_APPFONT ( POPUP_WIDTH_NUM , POPUP_HEIGHT_NUM) ;
+	Control VS_NUMBERING
+	{
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_NB, POPUPPANEL_MARGIN_NB ) ;
+		Size = MAP_APPFONT ( VS_WIDTH_NUM ,  VS_HEIGHT_NUM) ;
+		HelpID = HID_POPUP_NUM_VS_NUMBERING ;
+		TabStop = TRUE ;
+		Text = "Numbering";
+	};
+	PushButton CB_NUMBERING_MORE
+	{
+		Pos = MAP_APPFONT (CUST_MORE_BUTTON_X + POPUPPANEL_MARGIN_NB,  VS_HEIGHT_NUM + POPUPPANEL_MARGIN_NB * 2 ) ;
+		Size = MAP_APPFONT (POPUP_WIDTH_NUM - 2*CUST_MORE_BUTTON_X - POPUPPANEL_MARGIN_NB*2, CUST_MORE_BUTTON_HEIGHT ) ;
+		HelpID = HID_POPUP_NUM_CB_NUMBERING_MORE ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "~More Options";
+	};	
+    Bitmap	BMP_NUMERING_MORE
+	{
+		File = "symphony/__morebutton.bmp";
+	};
+	Bitmap	BMP_NUMERING_MORE_H
+	{
+		File = "symphony/__morebutton_h.bmp";
+	};	
+};
+
+//===========================================Line Space popup page==============================
+Control RID_POPUPPANEL_PARAPAGE_LINESPACING
+{
+	OutputSize = TRUE;
+	DialogControl = TRUE;
+	Border = FALSE;
+	
+	Size = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_SPACING_WIDTH, POPUP_PAGE_HEIGHT );
+	
+	Control LINE_SPACING
+	{
+		Pos = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL + OFFSET_Y ); 
+        Size = MAP_APPFONT ( VS_SPACING_WIDTH  , 17 * 5);
+		TabStop = TRUE ;
+		Text = "Line Spacing";
+	};
+	
+	FixedText FT_CUSTOM
+	{
+	    Pos = MAP_APPFONT ( POP_FT_CUSTOM_X, POP_FT_CUSTOM_Y );
+        Size = MAP_APPFONT ( _FIXED_TEXT_WIDTH + 50 , _FIXED_TEXT_HEIGHT) ;
+		Text [ en-US ] = "Custom:";
+	};
+    FixedText FT_LINE_SPACING
+	{
+	    Pos = MAP_APPFONT ( FT_1_X, FT_1_Y );
+        Size = MAP_APPFONT ( _FIXED_TEXT_WIDTH + 10, _FIXED_TEXT_HEIGHT) ;
+		Text [ en-US ] = "~Line Spacing:";
+	};
+
+	FixedText FT_OF
+	{
+	    Pos = MAP_APPFONT ( FT_2_X, FT_2_Y );
+        Size = MAP_APPFONT ( _FIXED_TEXT_WIDTH , _FIXED_TEXT_HEIGHT) ;
+		Text [ en-US ] = "~Of:";
+	};
+	
+	ListBox LB_LINE_SPACING
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( EDIT_1_X, EDIT_1_Y );
+        Size = MAP_APPFONT ( BD_WIDTH - POPUPPANEL_MARGIN_LARGE * 2,LISTBOX_HEIGHT ) ;
+		TabStop = TRUE ;
+		DropDown = TRUE ;
+		HelpID = HID_POPUP_LS_LB_LINE_SPACING ;
+        StringList [ en-US ] =
+        {
+			< "Single" ; Default ; > ;
+			< "1.5 Lines" ; Default ; > ;
+			< "Double" ; Default ; > ;
+            < "Proportional" ; Default ; > ;
+            < "At least" ; Default ; > ;
+            < "Leading" ; Default ; > ;
+            < "Fixed" ; Default ; > ;
+        };
+	};
+	MetricField ED_SBINDE_LINEDISTPERCENT
+	{
+		Disable = TRUE;
+		Border = TRUE;
+		Pos = MAP_APPFONT ( EDIT_2_X, EDIT_2_Y );
+        Size = MAP_APPFONT ( BD_WIDTH - POPUPPANEL_MARGIN_LARGE * 2,MBOX_HEIGHT ) ;
+        HelpID = HID_POPUP_LS_ED_SBINDE_LINEDISTPERCENT ;
+		Repeat = TRUE;
+		Spin = TRUE;
+		Minimum = 50;
+		Maximum = 200;
+		Value = 100;
+		StrictFormat = TRUE;
+		Unit = FUNIT_CUSTOM ;
+		CustomUnitText = "%";
+		First = 50;
+		Last = 200;
+		SpinSize = 1;
+	};
+	MetricField ED_SBINDE_LINEDISTPOINT
+	{
+		Disable = TRUE;
+		Border = TRUE;
+		Pos = MAP_APPFONT ( EDIT_2_X, EDIT_2_Y );
+        Size = MAP_APPFONT ( BD_WIDTH - POPUPPANEL_MARGIN_LARGE * 2, MBOX_HEIGHT ) ;
+        HelpID = HID_POPUP_LS_ED_SBINDE_LINEDISTPOINT ;
+		Repeat = TRUE;
+		Spin = TRUE;
+		Maximum = 9999;
+		DecimalDigits = 2;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_INCH;
+		Last = 9999;
+		SpinSize = 2;
+	};
+	Image IMG_SPACING1
+	{
+	    ImageBitmap = Bitmap{File = "symphony/lpspacing-1.png";};
+	};
+	Image IMG_SPACING115
+	{
+	    ImageBitmap = Bitmap{File = "symphony/lpspacing-1_15.png";};
+	};
+	Image IMG_SPACING15
+	{
+	    ImageBitmap = Bitmap{File = "symphony/lpspacing-1_5.png";};
+	};
+	Image IMG_SPACING2
+	{
+	    ImageBitmap = Bitmap{File = "symphony/lpspacing-2.png";};
+	};
+	Image IMG_SEL_SPACING1
+	{
+	    ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-1.png";};
+	};
+	Image IMG_SEL_SPACING115
+	{
+	    ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-1_15.png";};
+	};
+	Image IMG_SEL_SPACING15
+	{
+	    ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-1_5.png";};
+	};
+	Image IMG_SEL_SPACING2
+	{
+	    ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-2.png";};
+	};
+    Image IMG_CUSTOM
+	{
+		ImageBitmap = Bitmap{File = "symphony/last_custom_common.png";};
+	};
+	Image IMG_CUSTOM_GRAY
+	{
+		ImageBitmap = Bitmap{File = "symphony/last_custom_common_grey.png";};
+	};
+	String STR_LS_SINGLE
+    {
+        Text [ en-US ] = "Line spacing: Single";
+    };
+    String STR_LS_115
+    {
+        Text [ en-US ] = "Line spacing: 1.15 Lines";
+    };
+    String STR_LS_15
+    {
+        Text [ en-US ] = "Line spacing: 1.5 Lines";
+    };
+    String STR_LS_DOUBLE
+    {
+        Text [ en-US ] = "Line spacing: Double";
+    };
+    String STR_LSPACING
+    {
+        Text [ en-US ] = "Line spacing:";
+    };
+    String STR_LS_OF
+    {
+        Text [ en-US ] = "of:";
+    };
+    String STR_SPACING1
+    {
+        Text [ en-US ] = "Spacing: 1";
+    };
+    String STR_SPACING115
+    {
+        Text [ en-US ] = "Spacing: 1.15";
+    };
+    String STR_SPACING15
+    {
+        Text [ en-US ] = "Spacing: 1.5";
+    };
+    String STR_SPACING2
+    {
+        Text [ en-US ] = "Spacing: 2";
+    };
+    String STR_LCVALUE
+    {
+        Text [ en-US ] = "Last Custom Value";
+    };
+
+};
+
+
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_0
+{
+    Text [en-US] = "Dark Red Circle";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_1
+{
+    Text [en-US] = "Blue Ball";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_2
+{
+    Text [en-US] = "Green Ball";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_3
+{
+    Text [en-US] = "Black Square";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_4
+{
+    Text [en-US] = "Orange";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_5
+{
+    Text [en-US] = "Purple Square";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_6
+{
+    Text [en-US] = "Diamond Blue";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_7
+{
+    Text [en-US] = "Light Blue Diamond";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_8
+{
+    Text [en-US] = "Red Diamond";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_9
+{
+    Text [en-US] = "Yellow Star";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_10
+{
+    Text [en-US] = "Blue Star";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_11
+{
+    Text [en-US] = "Blue Triangle";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_12
+{
+    Text [en-US] = "Dark Green Triangle";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_13
+{
+    Text [en-US] = "Red Arrow";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_14
+{
+    Text [en-US] = "Blue Arrow";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_15
+{
+    Text [en-US] = "Blue Box";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_16
+{
+    Text [en-US] = "Red Box";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_17
+{
+    Text [en-US] = "Light Blue Asterisk";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_18
+{
+    Text [en-US] = "Red Leaves";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_19
+{
+    Text [en-US] = "Blue Target";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_20
+{
+    Text [en-US] = "Blue Arrow";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_21
+{
+    Text [en-US] = "Dark Blue Arrow";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_22
+{
+    Text [en-US] = "Brown Arrow";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_23
+{
+    Text [en-US] = "Red Flag";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_24
+{
+    Text [en-US] = "Green Flag";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_25
+{
+    Text [en-US] = "Red X";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_26
+{
+    Text [en-US] = "Black X";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_27
+{
+    Text [en-US] = "Green Checkmark";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_28
+{
+    Text [en-US] = "Blue Checkmark";
+};
+String RID_SVXSTR_GRAPHICS_DESCRIPTION_29
+{
+    Text [en-US] = "Dark Red Square";
+};
\ No newline at end of file

Propchange: openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
------------------------------------------------------------------------------
    svn:executable = *

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/tools/ValueSetWithTextControl.cxx?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/tools/ValueSetWithTextControl.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/tools/ValueSetWithTextControl.cxx Mon Apr  1 14:43:34 2013
@@ -20,12 +20,60 @@
  *************************************************************/
 
 #include "svx/sidebar/ValueSetWithTextControl.hxx"
-
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 
+#include <limits.h>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/style/NumberingType.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/text/XDefaultNumberingProvider.hpp>
+#include <com/sun/star/text/XNumberingFormatter.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/text/XNumberingTypeInfo.hpp>
 #include <i18npool/mslangid.hxx>
+#include <svtools/valueset.hxx>
+#include <editeng/brshitem.hxx>
+#include <vcl/graph.hxx>
+#include <svx/nbdtmg.hxx>
+#include <svx/nbdtmgfact.hxx>
+
+using namespace com::sun::star::uno;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::i18n;
+using namespace com::sun::star::text;
+using namespace com::sun::star::container;
+using namespace com::sun::star::style;
+using rtl::OUString;
+
+#define C2U(cChar) OUString::createFromAscii(cChar)
 
 namespace svx { namespace sidebar {
+static const sal_Char cValue[] = "Value";
+
+static Font& lcl_GetDefaultBulletFont()
+{
+	static sal_Bool bInit = 0;
+	static Font aDefBulletFont( UniString::CreateFromAscii(
+		                        RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ),
+								String(), Size( 0, 14 ) );
+	if(!bInit)
+	{
+        aDefBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
+		aDefBulletFont.SetFamily( FAMILY_DONTKNOW );
+		aDefBulletFont.SetPitch( PITCH_DONTKNOW );
+		aDefBulletFont.SetWeight( WEIGHT_DONTKNOW );
+		aDefBulletFont.SetTransparent( sal_True );
+		bInit = sal_True;
+	}
+	return aDefBulletFont;
+}
 
 ValueSetWithTextControl::ValueSetWithTextControl(
     const tControlType eControlType,
@@ -198,4 +246,284 @@ void ValueSetWithTextControl::UserDraw( 
     pDev->Pop();
 }
 
+SvxNumValueSet2::SvxNumValueSet2( Window* pParent, const ResId& rResId) :
+	ValueSet( pParent, rResId ),
+    aLineColor  ( COL_LIGHTGRAY ),    
+    pVDev       ( NULL )
+{
+	SetColCount( 3 );
+    SetLineCount( 3 );
+	SetStyle( GetStyle() | WB_ITEMBORDER );	
+}
+
+ SvxNumValueSet2::~SvxNumValueSet2()
+{
+	delete pVDev;
+}
+
+void SvxNumValueSet2::SetNumberingSettings(
+	const Sequence<Sequence<PropertyValue> >& aNum,
+	Reference<XNumberingFormatter>& xFormat,
+	const Locale& rLocale	)
+{
+	aNumSettings = aNum;
+	xFormatter = xFormat;
+	aLocale = rLocale;
+    	if(aNum.getLength() > 9)
+       	SetStyle( GetStyle()|WB_VSCROLL);
+	InsertItem( DEFAULT_NONE, DEFAULT_NONE - 1 );
+	SetItemText( DEFAULT_NONE, SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE ));
+
+    	for ( sal_uInt32 i = 0; i < aNum.getLength(); i++ )
+    	{
+    		InsertItem( i + 1);
+            	if( i < 8 )
+            	{            		
+			NBOTypeMgrBase* pNumbering = NBOutlineTypeMgrFact::CreateInstance(eNBOType::NUMBERING);	
+			if ( pNumbering )
+			{
+				SetItemText( i + 1, pNumbering->GetDescription(i));
+			}
+            	}
+	}
+}
+
+void  SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt )
+{
+    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+    const Color aBackColor = rStyleSettings.GetFieldColor();
+    const Color aTextColor = rStyleSettings.GetFieldTextColor();
+
+    OutputDevice*  pDev = rUDEvt.GetDevice();
+	Rectangle aRect = rUDEvt.GetRect();
+	sal_uInt32	nItemId = rUDEvt.GetItemId();
+	long nRectWidth = aRect.GetWidth();
+	long nRectHeight = aRect.GetHeight();
+	Size aRectSize(nRectWidth, aRect.GetHeight());
+	Point aBLPos = aRect.TopLeft();
+	Font aOldFont = pDev->GetFont();
+	Color aOldColor = pDev->GetLineColor();
+    pDev->SetLineColor(aBackColor);
+    Font aFont(OutputDevice::GetDefaultFont(
+                DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
+
+    Size aSize = aFont.GetSize();	
+	aSize.Height() = nRectHeight/5;
+	aFont.SetColor(aTextColor);
+	aFont.SetFillColor(aBackColor);
+	aFont.SetSize( aSize );
+	pDev->SetFont(aFont);
+	pDev->SetLineColor(aTextColor);
+	if(!pVDev)
+	{
+		// Die Linien werden nur einmalig in das VirtualDevice gepainted
+		// nur die Gliederungspage bekommt es aktuell
+		pVDev = new VirtualDevice(*pDev);
+		pVDev->SetMapMode(pDev->GetMapMode());
+		pVDev->EnableRTL( IsRTLEnabled() );
+ 		pVDev->SetOutputSize( aRectSize );
+		aOrgRect = aRect;
+	
+		pVDev->SetLineColor( aBackColor );
+		pVDev->SetFillColor( aBackColor );
+		pVDev->DrawRect(aOrgRect);		
+
+        if(aBackColor == aLineColor)
+            aLineColor.Invert();
+		if(GetSettings().GetStyleSettings().GetHighContrastMode())
+			pVDev->SetLineColor(aTextColor);
+		else
+			pVDev->SetLineColor(aLineColor);
+		// Linien nur einmalig Zeichnen
+		Point aStart(aBLPos.X() + nRectWidth *30 / 100,0);
+		Point aEnd(aBLPos.X() + nRectWidth * 9 / 10,0);
+		for( sal_uInt32 i = 11; i < 100; i += 33)
+		{
+			aStart.Y() = aEnd.Y() = aBLPos.Y() + nRectHeight  * i / 100;
+			pVDev->DrawLine(aStart, aEnd);
+			aStart.Y() = aEnd.Y() = aBLPos.Y() + nRectHeight  * (i + 11) / 100;
+			pVDev->DrawLine(aStart, aEnd);
+		}		
+	}
+	if ( nItemId != DEFAULT_NONE)
+		pDev->DrawOutDev(	aRect.TopLeft(), aRectSize,
+							aOrgRect.TopLeft(), aRectSize,
+							*pVDev );
+	const OUString sValue(C2U(cValue));
+   	
+	Point aStart(aBLPos.X() + nRectWidth / 9,0);
+	if ( nItemId == DEFAULT_NONE)
+	{				
+		String sText(SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE));
+		Font aFont = pDev->GetFont();	
+		Size aSize = aFont.GetSize();	
+		aSize.Height() = nRectHeight/4;
+		aFont.SetSize( aSize );
+		pDev->SetFont(aFont);
+		long nTextWidth = pDev->GetTextWidth(sText); 
+	    long nTextHeight = pDev->GetTextHeight();
+		//GVT refine
+		while (nTextWidth>nRectWidth && aSize.Height()>4) {
+			aSize.Height() = aSize.Height()*0.9;
+			aFont.SetSize( aSize );
+			pDev->SetFont(aFont);
+			nTextWidth = pDev->GetTextWidth(sText); 
+		}
+		Point aSStart(aBLPos.X()+(nRectWidth-nTextWidth)/2, aBLPos.Y() +(nRectHeight-nTextHeight)/2);
+		pDev->DrawText(aSStart, sText);	
+		pDev->SetFont(aOldFont);
+	}
+	else
+	{
+		NBOTypeMgrBase* pNumbering = NBOutlineTypeMgrFact::CreateInstance(eNBOType::NUMBERING);
+		if ( pNumbering && nItemId <= DEFAULT_BULLET_TYPES ) 
+		{
+			for( sal_uInt32 i = 0; i < 3; i++ )
+			{
+				sal_uInt32 nY = 11 + i * 33;
+				aStart.Y() = aBLPos.Y() + nRectHeight  * nY / 100;
+				String sText;
+				sal_uInt16 nLvl = 0;
+				SvxNumRule aTempRule( 0, 10, false );
+				pNumbering->ApplyNumRule(aTempRule,nItemId -1,1<<nLvl);
+				SvxNumberFormat aNumFmt(aTempRule.GetLevel(nLvl));
+				sText=aNumFmt.GetNumStr(i+1);
+				sText.Insert( aNumFmt.GetPrefix(), 0 );
+				sText += aNumFmt.GetSuffix();
+				aStart.X() = aBLPos.X() + 2;
+				aStart.Y() -= pDev->GetTextHeight()/2;
+				pDev->DrawText(aStart, sText);		
+			}
+		}
+		pDev->SetFont(aOldFont);
+		pDev->SetLineColor(aOldColor);
+	}
+	//End
+}
+
+//===============================================================================================
+
+static const long aOffsetX[] =
+{
+	-1,//1,
+	3,//4,
+	4,//5,
+	-3,//0,
+	-1,//0,
+	3
+};
+
+SvxNumValueSet3::SvxNumValueSet3( Window* pParent, const ResId& rResId) :
+	ValueSet( pParent, rResId )    
+{
+	SetColCount( 3 );
+    SetLineCount( 4 );
+	SetStyle( GetStyle() | WB_ITEMBORDER );	
+}
+
+ SvxNumValueSet3::~SvxNumValueSet3()
+{	
+}
+
+void  SvxNumValueSet3::UserDraw( const UserDrawEvent& rUDEvt )
+{
+	Rectangle aRect = rUDEvt.GetRect();
+	OutputDevice*  pDev = rUDEvt.GetDevice();
+	sal_uInt32	nItemId = rUDEvt.GetItemId();
+	
+	long nRectHeight = aRect.GetHeight();
+	long nRectWidth = aRect.GetWidth();	
+	Point aBLPos = aRect.TopLeft();	
+	NBOTypeMgrBase* pBullets = NBOutlineTypeMgrFact::CreateInstance(eNBOType::MIXBULLETS);	
+	if ( pBullets )
+	{
+		if ( nItemId <= DEFAULT_BULLET_TYPES ) {
+			sal_uInt16 nLvl = 0;
+			SvxNumRule aTempRule( 0, 10, false );
+			pBullets->ApplyNumRule(aTempRule,nItemId -1,1<<nLvl);
+			SvxNumberFormat aFmt(aTempRule.GetLevel(nLvl));
+			sal_Int16 eNumType = aFmt.GetNumberingType();
+			if( eNumType == SVX_NUM_CHAR_SPECIAL)
+			{
+				sal_Unicode cChar = aFmt.GetBulletChar();
+			//End
+				const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+				const Color aBackColor = rStyleSettings.GetFieldColor();	
+				const Color aTextColor = rStyleSettings.GetFieldTextColor();
+
+				Font aOldFont = pDev->GetFont();
+				Font aFont( lcl_GetDefaultBulletFont() );
+
+				Size aSize = aFont.GetSize();	
+				aSize.Height() = nRectHeight*3/6;
+				aFont.SetColor(aTextColor);
+				aFont.SetFillColor(aBackColor);
+				aFont.SetSize( aSize );
+				pDev->SetFont(aFont);
+				pDev->SetFillColor( aBackColor ); //wj
+					
+				String sText;
+				sText = cChar;
+				Font aOldBulletFont = pDev->GetFont();
+				Font aBulletFnt(aFmt.GetBulletFont() ? *aFmt.GetBulletFont() : aOldBulletFont);
+				Size aBulSize = aOldBulletFont.GetSize();	
+				aBulletFnt.SetSize(aBulSize);
+				pDev->SetFont(aBulletFnt);
+				long nTextWidth = pDev->GetTextWidth(sText); 
+	            long nTextHeight = pDev->GetTextHeight();
+				Point aStart(aBLPos.X()+(nRectWidth-nTextWidth)/2, aBLPos.Y() +(nRectHeight-nTextHeight)/2);
+				pDev->DrawText(aStart, sText);	
+				pDev->SetFont(aOldFont);
+			}else if ( eNumType == SVX_NUM_BITMAP )
+			{
+				const SvxBrushItem* pBrushItem = aFmt.GetBrush();			
+				if(pBrushItem)
+				{
+					const Graphic* pGrf = pBrushItem->GetGraphic();
+					if(pGrf)
+					{			
+						Size aSize(nRectHeight*6/20, nRectHeight*6/20);
+						Point aStart(aBLPos.X() + nRectWidth*7/20, aBLPos.Y() + nRectHeight*7/20);    
+
+						pGrf->Draw( pDev, aStart, aSize );
+					}
+				}
+			}
+		}else if ( nItemId == DEFAULT_NONE)
+		{	
+			const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+			const Color aBackColor = rStyleSettings.GetFieldColor();	
+			const Color aTextColor = rStyleSettings.GetFieldTextColor();
+
+			Font aOldFont = pDev->GetFont();	
+			Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
+			Size aSize = aFont.GetSize();	
+			//aSize.Height() = nRectHeight/5;
+			aSize.Height() = nRectHeight/4;
+			aFont.SetColor(aTextColor);
+			aFont.SetFillColor(aBackColor);
+			aFont.SetSize( aSize );
+			pDev->SetFont(aFont);
+			pDev->SetFillColor( aBackColor ); 
+					
+			String sText(SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE));
+			
+			long nTextWidth = pDev->GetTextWidth(sText); 
+	        long nTextHeight = pDev->GetTextHeight();
+			//GVT refine
+			while (nTextWidth>nRectWidth && aSize.Height()>4) {
+				aSize.Height() = aSize.Height()*0.9;
+				aFont.SetSize( aSize );
+				pDev->SetFont(aFont);
+				nTextWidth = pDev->GetTextWidth(sText); 
+			}
+			Point aStart(aBLPos.X()+(nRectWidth-nTextWidth)/2, aBLPos.Y() +(nRectHeight-nTextHeight)/2);
+			pDev->DrawText(aStart, sText);	
+						
+			pDev->SetFont(aOldFont);
+		}
+	}
+	
+}
+
 } } // end of namespace svx::sidebar

Modified: openoffice/branches/sidebar/main/svx/source/svdraw/svdedxv.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/svdraw/svdedxv.cxx?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/svdraw/svdedxv.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/svdraw/svdedxv.cxx Mon Apr  1 14:43:34 2013
@@ -2052,6 +2052,38 @@ void SdrObjEditView::OnEndPasteOrDrop( P
     // applications can derive from these virtual methods to do something before a drop or paste operation
 }
 
+sal_uInt16 SdrObjEditView::GetSelectionLevel() const
+{
+	sal_uInt16 nLevel = 0xFFFF;
+    if( IsTextEdit() )
+	{
+        DBG_ASSERT(pTextEditOutlinerView!=NULL,"SdrObjEditView::GetAttributes(): pTextEditOutlinerView=NULL");
+        DBG_ASSERT(pTextEditOutliner!=NULL,"SdrObjEditView::GetAttributes(): pTextEditOutliner=NULL");
+		if( pTextEditOutlinerView )
+		{
+			//start and end position
+			ESelection aSelect = pTextEditOutlinerView->GetSelection();
+			sal_uInt16 nStartPara = ::std::min( aSelect.nStartPara, aSelect.nEndPara );
+			sal_uInt16 nEndPara = ::std::max( aSelect.nStartPara, aSelect.nEndPara );
+			//get level from each paragraph
+			nLevel = 0;
+			for( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
+			{
+				sal_uInt16 nParaDepth = 1 << pTextEditOutliner->GetDepth( nPara );
+				if( !(nLevel & nParaDepth) )
+					nLevel += nParaDepth;
+			}
+			//reduce one level for Outliner Object
+			//if( nLevel > 0 && GetTextEditObject()->GetObjIdentifier() == OBJ_OUTLINETEXT )
+			//	nLevel = nLevel >> 1;
+			//no bullet paragraph selected
+			if( nLevel == 0)
+				nLevel = 0xFFFF;
+		}
+	}
+	return nLevel;
+}
+
 bool SdrObjEditView::SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const
 {
     if( nObjectInventor != SdrInventor && nObjectInventor != E3dInventor )

Modified: openoffice/branches/sidebar/main/svx/source/table/accessibletableshape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/table/accessibletableshape.cxx?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/table/accessibletableshape.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/table/accessibletableshape.cxx Mon Apr  1 14:43:34 2013
@@ -34,7 +34,7 @@
 #include <vcl/svapp.hxx>
 
 #include <svx/AccessibleTableShape.hxx>
-#include "tablecontroller.hxx"
+#include <svx/sdr/table/tablecontroller.hxx>
 #include "accessiblecell.hxx"
 
 #include <algorithm>

Modified: openoffice/branches/sidebar/main/svx/source/table/tablecontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/table/tablecontroller.cxx?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/table/tablecontroller.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/table/tablecontroller.cxx Mon Apr  1 14:43:34 2013
@@ -24,7 +24,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "tablecontroller.hxx"
+#include <svx/sdr/table/tablecontroller.hxx>
+#include <tablemodel.hxx>
 
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>

Modified: openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/_annotsh.sdi Mon Apr  1 14:43:34 2013
@@ -179,6 +179,24 @@ interface _Annotation
 		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 	]
 
+	SID_ATTR_PARA_LRSPACE
+	[
+		ExecMethod = Exec;
+		StateMethod = GetState ;
+	]
+	
+	SID_ATTR_PARA_LINESPACE
+	[
+		ExecMethod = Exec;
+		StateMethod = GetState ;
+	]
+	
+	SID_ATTR_PARA_ULSPACE
+	[
+		ExecMethod = Exec;
+		StateMethod = GetState ;
+	]
+
 	FN_INSERT_STRING
 	[
 			ExecMethod = Exec ;

Modified: openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi Mon Apr  1 14:43:34 2013
@@ -793,6 +793,21 @@ interface BaseText
 		ExecMethod = ExecMoveMisc ;
 		StateMethod = NoState ;
 	]
+	FN_SVX_SET_NUMBER
+	[
+		ExecMethod = ExecSetNumber;
+		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+	]
+	FN_SVX_SET_BULLET
+	[
+		ExecMethod = ExecSetNumber;
+		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+	]
+	SID_OUTLINE_BULLET // status(final|play)
+	[
+		ExecMethod = ExecEnterNum ;		
+		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+	]
 
 	FN_INSERT_FOOTNOTE_DLG // status(final|play|rec)
 	[

Modified: openoffice/branches/sidebar/main/sw/sdi/_viewsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/_viewsh.sdi?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/_viewsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/_viewsh.sdi Mon Apr  1 14:43:34 2013
@@ -404,6 +404,13 @@ interface BaseTextEditView
 		ExecMethod = Execute ;
 		StateMethod = GetState ;
 	]
+
+	SID_ATTR_PARA_ULSPACE
+	[
+		ExecMethod = ExecTabWin ;
+    	StateMethod = StateTabWin ;
+	]
+		
     SID_ATTR_PAGE_COLUMN
     [
         ExecMethod = ExecTabWin ;

Modified: openoffice/branches/sidebar/main/sw/sdi/drwtxtsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/drwtxtsh.sdi?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/drwtxtsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/drwtxtsh.sdi Mon Apr  1 14:43:34 2013
@@ -210,6 +210,24 @@ interface TextDrawText
 		DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 	]
 
+	SID_ATTR_PARA_LRSPACE  //for indent
+	[
+		ExecMethod = Execute ;
+		StateMethod = GetState ;
+	]
+	
+	SID_ATTR_PARA_LINESPACE // api:
+	[
+		ExecMethod = Execute ;
+		StateMethod = GetState ;
+	]
+	
+	SID_ATTR_PARA_ULSPACE
+	[
+		ExecMethod = Execute ;
+		StateMethod = GetState ;
+	]
+
 	SID_ATTR_PARA_ADJUST_LEFT // api:
 	[
 		ExecMethod = Execute ;

Modified: openoffice/branches/sidebar/main/sw/source/ui/inc/textsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/inc/textsh.hxx?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/inc/textsh.hxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/inc/textsh.hxx Mon Apr  1 14:43:34 2013
@@ -64,6 +64,7 @@ public:
 	void	ExecMoveLingu(SfxRequest &);
 	void	ExecMoveMisc(SfxRequest &);
 	void	ExecField(SfxRequest &rReq);
+	void	ExecSetNumber(SfxRequest &);
 	void	StateField(SfxItemSet &);
 	void	ExecIdx(SfxRequest &);
 	void	GetIdxState(SfxItemSet &);

Modified: openoffice/branches/sidebar/main/sw/source/ui/shells/annotsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/shells/annotsh.cxx?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/shells/annotsh.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/shells/annotsh.cxx Mon Apr  1 14:43:34 2013
@@ -40,6 +40,8 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <editeng/spltitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
 #include <editeng/orphitem.hxx>
 #include <editeng/brkitem.hxx>
 #include <editeng/widwitem.hxx>
@@ -188,6 +190,35 @@ void SwAnnotationShell::Exec( SfxRequest
     sal_uInt16 nEEWhich = 0;
 	switch (nSlot)
 	{
+		case SID_ATTR_PARA_LRSPACE:
+			{
+				SvxLRSpaceItem aParaMargin((const SvxLRSpaceItem&)rReq.
+										GetArgs()->Get(nSlot));
+				aParaMargin.SetWhich( EE_PARA_LRSPACE );
+
+				aNewAttr.Put(aParaMargin);
+				rReq.Done();
+				break;
+			}
+		case SID_ATTR_PARA_LINESPACE:
+			{
+				SvxLineSpacingItem aParaMargin = (const SvxLineSpacingItem&)pNewAttrs->Get(
+															GetPool().GetWhich(nSlot));
+				aParaMargin.SetWhich( EE_PARA_SBL );
+
+				aNewAttr.Put(aParaMargin);
+				rReq.Done();
+				break;
+			}
+		case SID_ATTR_PARA_ULSPACE:
+			{
+				SvxULSpaceItem aULSpace = (const SvxULSpaceItem&)pNewAttrs->Get(
+					GetPool().GetWhich(nSlot));
+				aULSpace.SetWhich( EE_PARA_ULSPACE );
+				aNewAttr.Put( aULSpace );
+				rReq.Done();
+			}
+			break;
 		case SID_ATTR_CHAR_FONT:
 		case SID_ATTR_CHAR_FONTHEIGHT:
 		case SID_ATTR_CHAR_WEIGHT:
@@ -599,6 +630,44 @@ void SwAnnotationShell::GetState(SfxItem
         sal_uInt16 nSlotId = GetPool().GetSlotId( nWhich );
 		switch( nSlotId )
 		{
+			case SID_ATTR_PARA_LRSPACE:
+			{
+				SfxItemState eState = aEditAttr.GetItemState( EE_PARA_LRSPACE );
+				if( eState >= SFX_ITEM_DEFAULT )
+				{
+					SvxLRSpaceItem aLR = ( (const SvxLRSpaceItem&) aEditAttr.Get( EE_PARA_LRSPACE ) );
+					aLR.SetWhich(SID_ATTR_PARA_LRSPACE);
+					rSet.Put(aLR);
+				}
+				else
+					rSet.InvalidateItem(nSlotId);
+			}
+			break;
+			case SID_ATTR_PARA_LINESPACE:
+			{
+				SfxItemState eState = aEditAttr.GetItemState( EE_PARA_SBL );
+				if( eState >= SFX_ITEM_DEFAULT )
+				{
+					SvxLineSpacingItem aLR = ( (const SvxLineSpacingItem&) aEditAttr.Get( EE_PARA_SBL ) );
+					rSet.Put(aLR);
+				}
+				else
+					rSet.InvalidateItem(nSlotId);
+			}
+			break;
+			case SID_ATTR_PARA_ULSPACE:
+				{
+					SfxItemState eState = aEditAttr.GetItemState( EE_PARA_ULSPACE );
+					if( eState >= SFX_ITEM_DEFAULT )
+					{
+						SvxULSpaceItem aULSpace = (const SvxULSpaceItem&) aEditAttr.Get( EE_PARA_ULSPACE );
+						aULSpace.SetWhich(SID_ATTR_PARA_ULSPACE);
+						rSet.Put(aULSpace);
+					}
+					else
+						rSet.InvalidateItem(nSlotId);
+				}
+            		break;
 			case SID_ATTR_CHAR_FONT:
 			case SID_ATTR_CHAR_FONTHEIGHT:
 			case SID_ATTR_CHAR_WEIGHT:

Modified: openoffice/branches/sidebar/main/sw/source/ui/shells/drwtxtex.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/shells/drwtxtex.cxx?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/shells/drwtxtex.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/shells/drwtxtex.cxx Mon Apr  1 14:43:34 2013
@@ -34,6 +34,8 @@
 #include <tools/shl.hxx>
 #include <svx/svdview.hxx>
 #include <editeng/spltitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
 #include <editeng/orphitem.hxx>
 #include <editeng/brkitem.hxx>
 #include <editeng/widwitem.hxx>
@@ -236,6 +238,33 @@ void SwDrawTextShell::Execute( SfxReques
 		case SID_ATTR_PARA_ADJUST_BLOCK:
 			aNewAttr.Put(SvxAdjustItem(SVX_ADJUST_BLOCK, EE_PARA_JUST));
         break;
+		case SID_ATTR_PARA_LRSPACE:
+			{
+				SvxLRSpaceItem aParaMargin((const SvxLRSpaceItem&)rReq.
+										GetArgs()->Get(nSlot));
+				aParaMargin.SetWhich( EE_PARA_LRSPACE );
+				aNewAttr.Put(aParaMargin);
+				rReq.Done();
+			}
+			break;
+		case SID_ATTR_PARA_LINESPACE:
+			{
+				SvxLineSpacingItem aLineSpace = (const SvxLineSpacingItem&)pNewAttrs->Get(
+															GetPool().GetWhich(nSlot));
+				aLineSpace.SetWhich( EE_PARA_SBL );
+				aNewAttr.Put( aLineSpace );
+				rReq.Done();
+			}
+			break;
+		case SID_ATTR_PARA_ULSPACE:
+			{
+				SvxULSpaceItem aULSpace = (const SvxULSpaceItem&)pNewAttrs->Get(
+					GetPool().GetWhich(nSlot));
+				aULSpace.SetWhich( EE_PARA_ULSPACE );
+				aNewAttr.Put( aULSpace );
+				rReq.Done();
+			}
+			break;
 
 		case SID_ATTR_PARA_LINESPACE_10:
 		{
@@ -640,6 +669,49 @@ ASK_ADJUST:
 			}
 			break;
 
+		case SID_ATTR_PARA_LRSPACE:
+			{
+				SfxItemState eState = aEditAttr.GetItemState(EE_PARA_LRSPACE);
+				if( eState >= SFX_ITEM_DEFAULT )
+				{
+					SvxLRSpaceItem aLR = (const SvxLRSpaceItem&) aEditAttr.Get( EE_PARA_LRSPACE );
+					aLR.SetWhich(SID_ATTR_PARA_LRSPACE);
+					rSet.Put(aLR);
+				}
+				else
+					rSet.InvalidateItem(nSlotId);
+				nSlotId = 0;
+			}
+			break;
+		case SID_ATTR_PARA_LINESPACE:
+			{
+				SfxItemState eState = aEditAttr.GetItemState(EE_PARA_SBL);
+				if( eState >= SFX_ITEM_DEFAULT )
+				{
+					SvxLineSpacingItem aLR = (const SvxLineSpacingItem&) aEditAttr.Get( EE_PARA_SBL );
+					rSet.Put(aLR);
+				}
+				else
+					rSet.InvalidateItem(nSlotId);
+				nSlotId = 0;
+			}
+			break;
+		case SID_ATTR_PARA_ULSPACE:
+			{
+				SfxItemState eState = aEditAttr.GetItemState(EE_PARA_ULSPACE);
+				if( eState >= SFX_ITEM_DEFAULT )
+				{
+					SvxULSpaceItem aULSpace = (const SvxULSpaceItem&) aEditAttr.Get( EE_PARA_ULSPACE );
+					aULSpace.SetWhich(SID_ATTR_PARA_ULSPACE);
+					rSet.Put(aULSpace);
+				}
+				else
+					rSet.InvalidateItem(nSlotId);
+				Invalidate(SID_ATTR_PARA_ULSPACE);
+				nSlotId = 0;
+			}
+			break;
+
 		case SID_ATTR_PARA_LINESPACE_10:	nLSpace = 100;	goto ASK_LINESPACE;
 		case SID_ATTR_PARA_LINESPACE_15:	nLSpace = 150;	goto ASK_LINESPACE;
 		case SID_ATTR_PARA_LINESPACE_20:	nLSpace = 200;	goto ASK_LINESPACE;

Modified: openoffice/branches/sidebar/main/sw/source/ui/shells/txtnum.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/shells/txtnum.cxx?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/shells/txtnum.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/shells/txtnum.cxx Mon Apr  1 14:43:34 2013
@@ -46,6 +46,10 @@
 #include "swabstdlg.hxx"
 #include <globals.hrc>
 #include <sfx2/tabdlg.hxx>
+#include <svx/nbdtmg.hxx>
+#include <svx/nbdtmgfact.hxx>
+
+using namespace svx::sidebar;
 
 void SwTextShell::ExecEnterNum(SfxRequest &rReq)
 {
@@ -91,6 +95,7 @@ void SwTextShell::ExecEnterNum(SfxReques
 	}
 	break;
 	case FN_NUMBER_BULLETS:
+	case SID_OUTLINE_BULLET:
 	{
         // --> OD 2008-02-29 #refactorlists#
 //        // per default sal_True, damit die Schleife im Dialog richtig arbeitet!
@@ -244,4 +249,179 @@ void SwTextShell::ExecEnterNum(SfxReques
 	}
 }
 
+void SwTextShell::ExecSetNumber(SfxRequest &rReq)
+{	
+	SwNumRule aRule( GetShell().GetUniqueNumRuleName(),
+						 // --> OD 2008-06-06 #i89178#
+						 numfunc::GetDefaultPositionAndSpaceMode() );
+						 // <--
+	
+	SvxNumRule aSvxRule = aRule.MakeSvxNumRule();
+    const bool bRightToLeft = GetShell().IsInRightToLeftText( 0 );
+
+    if( bRightToLeft )
+	{
+        for( sal_uInt8 n = 0; n < MAXLEVEL; ++n )
+		{
+			SvxNumberFormat aFmt( aSvxRule.GetLevel( n ) );
+           /* if ( n && bHtml )
+            {
+                // 1/2" fuer HTML
+                aFmt.SetLSpace(720);
+                aFmt.SetAbsLSpace(n * 720);
+            }*/
+            // --> FME 2005-01-21 #i38904#  Default alignment for
+            // numbering/bullet should be rtl in rtl paragraph:
+            if ( bRightToLeft )
+            {
+                aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
+            }
+            // <--
+            aSvxRule.SetLevel( n, aFmt, sal_False );
+		}
+		aSvxRule.SetFeatureFlag(NUM_ENABLE_EMBEDDED_BMP, sal_False);
+	}	
+
+	const SwNumRule* pCurRule = GetShell().GetCurNumRule();	
+	sal_uInt16		nActNumLvl = (sal_uInt16)0xFFFF;
+	if( pCurRule )
+	{		
+		sal_uInt16 nLevel = GetShell().GetNumLevel();
+     	if( nLevel < MAXLEVEL )
+		{
+			nActNumLvl = 1<<nLevel;			
+		}
+		
+		aSvxRule = pCurRule->MakeSvxNumRule();
+
+		//convert type of linked bitmaps from SVX_NUM_BITMAP to (SVX_NUM_BITMAP|LINK_TOKEN)
+		for(sal_uInt16 i = 0; i < aSvxRule.GetLevelCount(); i++)
+		{
+			SvxNumberFormat aFmt(aSvxRule.GetLevel(i));
+			if(SVX_NUM_BITMAP == aFmt.GetNumberingType())
+			{
+				const SvxBrushItem* pBrush = aFmt.GetBrush();
+				const String* pLinkStr;
+				if(pBrush &&
+					0 != (pLinkStr = pBrush->GetGraphicLink()) &&
+						pLinkStr->Len())
+					aFmt.SetNumberingType(SvxExtNumType(SVX_NUM_BITMAP|LINK_TOKEN));
+				aSvxRule.SetLevel(i, aFmt, aSvxRule.Get(i) != 0);
+			}
+		}
+	}
+	
 
+	switch(rReq.GetSlot())
+	{
+	case FN_SVX_SET_NUMBER:
+		{
+			SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_NUMBER , sal_False );
+			if (pItem)
+			{
+				sal_uInt16 nIdx = pItem->GetValue();
+				if (nIdx==DEFAULT_NONE) {
+					GetShell().DelNumRules();
+					break;
+				}
+				--nIdx;
+
+				NBOTypeMgrBase* pNumbering = NBOutlineTypeMgrFact::CreateInstance(eNBOType::NUMBERING);
+				if ( pNumbering )
+				{
+					SwNumRule aTmpRule( GetShell().GetUniqueNumRuleName(),						
+						 numfunc::GetDefaultPositionAndSpaceMode() );
+	
+					SvxNumRule aTempRule = aTmpRule.MakeSvxNumRule();
+					//Sym3_2508, set unit attribute to NB Manager
+					SfxItemSet aSet(GetPool(),
+							SID_ATTR_NUMBERING_RULE, SID_PARAM_CUR_NUM_LEVEL,
+							0 );
+					aSet.Put(SvxNumBulletItem(aTempRule));
+					pNumbering->SetItems(&aSet);
+					pNumbering->ApplyNumRule(aTempRule,nIdx,nActNumLvl);
+					
+					sal_uInt16 nMask = 1;
+					for(sal_uInt16 i = 0; i < aSvxRule.GetLevelCount(); i++)
+					{
+						if(nActNumLvl & nMask)
+						{
+							SvxNumberFormat aFmt(aTempRule.GetLevel(i));							
+							aSvxRule.SetLevel(i, aFmt);
+						}
+						nMask <<= 1 ;
+					}
+
+					aSvxRule.UnLinkGraphics();
+					SwNumRule aSetRule( pCurRule
+											? pCurRule->GetName()
+											: GetShell().GetUniqueNumRuleName(),
+										numfunc::GetDefaultPositionAndSpaceMode() );
+					aSetRule.SetSvxRule( aSvxRule, GetShell().GetDoc());
+
+					aSetRule.SetAutoRule( sal_True );
+					const bool bCreateList = (pCurRule == 0);
+					GetShell().SetCurNumRule( aSetRule, bCreateList );
+				}
+				//End
+			}
+			break;
+		}
+	case FN_SVX_SET_BULLET:
+		{
+			SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_BULLET , sal_False );
+			if (pItem)
+			{
+				sal_uInt16 nIdx = pItem->GetValue();
+				if (nIdx==DEFAULT_NONE) {
+					GetShell().DelNumRules();
+					break;
+				}
+				nIdx--;
+				
+				NBOTypeMgrBase* pBullets = NBOutlineTypeMgrFact::CreateInstance(eNBOType::MIXBULLETS);
+				if ( pBullets )
+				{
+					SwNumRule aTmpRule( GetShell().GetUniqueNumRuleName(),						
+						 numfunc::GetDefaultPositionAndSpaceMode() );
+	
+					SvxNumRule aTempRule = aTmpRule.MakeSvxNumRule();
+					//Sym3_2508, set unit attribute to NB Manager
+					SfxItemSet aSet(GetPool(),
+							SID_ATTR_NUMBERING_RULE, SID_PARAM_CUR_NUM_LEVEL,
+							0 );
+					aSet.Put(SvxNumBulletItem(aTempRule));
+					pBullets->SetItems(&aSet);
+					
+					//SvxNumRule aTempRule( 0, 10, false );
+					pBullets->ApplyNumRule(aTempRule,nIdx,nActNumLvl);
+					sal_uInt16 nMask = 1;
+					for(sal_uInt16 i = 0; i < aSvxRule.GetLevelCount(); i++)
+					{
+						if(nActNumLvl & nMask)
+						{
+							SvxNumberFormat aFmt(aTempRule.GetLevel(i));							
+							aSvxRule.SetLevel(i, aFmt);
+						}
+						nMask <<= 1;
+					}					
+					aSvxRule.UnLinkGraphics();
+					
+					SwNumRule aSetRule( pCurRule
+											? pCurRule->GetName()
+											: GetShell().GetUniqueNumRuleName(),										
+										numfunc::GetDefaultPositionAndSpaceMode() );										
+					
+					aSetRule.SetSvxRule( aSvxRule, GetShell().GetDoc());
+
+					aSetRule.SetAutoRule( sal_True );
+					const bool bCreateList = (pCurRule == 0);
+					GetShell().SetCurNumRule( aSetRule, bCreateList );
+				}
+				//End
+			}
+
+		}
+		break;
+	}
+}

Modified: openoffice/branches/sidebar/main/sw/source/ui/uiview/viewtab.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/uiview/viewtab.cxx?rev=1463154&r1=1463153&r2=1463154&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/uiview/viewtab.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/uiview/viewtab.cxx Mon Apr  1 14:43:34 2013
@@ -788,6 +788,29 @@ void SwView::ExecTabWin( SfxRequest& rRe
         }
         break;
 
+    case SID_ATTR_PARA_ULSPACE:
+	{
+		SvxULSpaceItem aParaMargin((const SvxULSpaceItem&)rReq.
+			GetArgs()->Get(nSlot));
+
+		long nUDist = 0;
+		long nLDist = 0;
+		aParaMargin.SetUpper( aParaMargin.GetUpper() - nUDist );
+		aParaMargin.SetLower(aParaMargin.GetLower() - nLDist);
+
+		aParaMargin.SetWhich( RES_UL_SPACE );
+		SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
+		if(	pColl && pColl->IsAutoUpdateFmt() )
+		{
+			SfxItemSet aSet(GetPool(), RES_UL_SPACE, RES_UL_SPACE);
+			aSet.Put(aParaMargin);
+			rSh.AutoUpdatePara( pColl, aSet);
+		}
+		else
+			rSh.SetAttr( aParaMargin );
+	}
+	break;
+
     case SID_RULER_BORDERS_VERTICAL:
     case SID_RULER_BORDERS:
         {
@@ -1298,6 +1321,19 @@ void SwView::StateTabWin(SfxItemSet& rSe
                 break;
             }
 
+	case SID_ATTR_PARA_ULSPACE:
+	{	
+		SvxULSpaceItem aUL = (const SvxULSpaceItem&)aCoreSet.Get(RES_UL_SPACE);
+		aUL.SetWhich(nWhich);
+
+		SfxItemState e = aCoreSet.GetItemState(RES_UL_SPACE);
+		if( e >= SFX_ITEM_AVAILABLE )
+			rSet.Put( aUL );
+		else
+			rSet.InvalidateItem(nWhich);
+	}
+	break;
+
         case SID_RULER_BORDER_DISTANCE:
             {
                 nLeftBorderDistance = 0;



Mime
View raw message