openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1466396 [2/13] - in /openoffice/trunk: ./ main/chart2/source/controller/dialogs/ main/chart2/source/controller/drawinglayer/ main/chart2/source/controller/inc/ main/chart2/source/controller/main/ main/chart2/source/inc/chartview/ main/char...
Date Wed, 10 Apr 2013 09:20:24 GMT
Modified: openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx (original)
+++ openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx Wed Apr 10 09:20:16 2013
@@ -1024,11 +1024,11 @@ void DffPropertyReader::ApplyLineAttribu
 		if ( eShapeType == mso_sptMin )
 			eLineJointDefault = mso_lineJoinRound;
 		MSO_LineJoin eLineJoint = (MSO_LineJoin)GetPropertyValue( DFF_Prop_lineJoinStyle, eLineJointDefault );
-		XLineJoint eXLineJoint( XLINEJOINT_MITER );
+		com::sun::star::drawing::LineJoint eXLineJoint( com::sun::star::drawing::LineJoint_MITER );
 		if ( eLineJoint == mso_lineJoinBevel )
-			eXLineJoint = XLINEJOINT_BEVEL;
+			eXLineJoint = com::sun::star::drawing::LineJoint_BEVEL;
 		else if ( eLineJoint == mso_lineJoinRound )
-			eXLineJoint = XLINEJOINT_ROUND;
+			eXLineJoint = com::sun::star::drawing::LineJoint_ROUND;
 		rSet.Put( XLineJointItem( eXLineJoint ) );
 
 		if ( nLineFlags & 0x10 )

Modified: openoffice/trunk/main/framework/Library_fwk.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/Library_fwk.mk?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/framework/Library_fwk.mk (original)
+++ openoffice/trunk/main/framework/Library_fwk.mk Wed Apr 10 09:20:16 2013
@@ -116,6 +116,7 @@ $(eval $(call gb_Library_add_exception_o
 	framework/source/services/backingcomp \
 	framework/source/services/backingwindow \
 	framework/source/services/desktop \
+	framework/source/services/ContextChangeEventMultiplexer \
 	framework/source/services/frame \
 	framework/source/services/modelwinservice \
 	framework/source/services/modulemanager \

Modified: openoffice/trunk/main/framework/inc/macros/registration.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/inc/macros/registration.hxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/framework/inc/macros/registration.hxx (original)
+++ openoffice/trunk/main/framework/inc/macros/registration.hxx Wed Apr 10 09:20:16 2013
@@ -102,7 +102,7 @@ ________________________________________
 		{																																\
 			LOG_REGISTRATION_GETFACTORY( "\t\tpImplementationName and pServiceManager are valid ...\n" )								\
 			/* Define variables which are used in following macros. */																	\
-			::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory >	xFactory			;					\
+			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >	xFactory			;					\
 			::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >	xServiceManager		;					\
 			xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager )	;					\
 			/* These parameter will expand to      */																					\

Modified: openoffice/trunk/main/framework/source/register/registerservices.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/register/registerservices.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/register/registerservices.cxx (original)
+++ openoffice/trunk/main/framework/source/register/registerservices.cxx Wed Apr 10 09:20:16 2013
@@ -53,26 +53,14 @@
 #include <services/tabwindowservice.hxx>
 #include <services/frame.hxx>
 #include <services/modulemanager.hxx>
-//#include <dispatch/oxt_handler.hxx>
 #include <jobs/jobexecutor.hxx>
-//#include <recording/dispatchrecordersupplier.hxx>
-//#include <recording/dispatchrecorder.hxx>
-//#include <dispatch/mailtodispatcher.hxx>
-//#include <dispatch/servicehandler.hxx>
 #include <jobs/jobdispatch.hxx>
 #include <services/backingcomp.hxx>
-//#include <services/dispatchhelper.hxx>
 #include <services/layoutmanager.hxx>
-//#include <services/license.hxx>
 #include <uifactory/uielementfactorymanager.hxx>
 #include <uifactory/popupmenucontrollerfactory.hxx>
-//#include <uielement/fontmenucontroller.hxx>
-//#include <uielement/fontsizemenucontroller.hxx>
 #include <uielement/objectmenucontroller.hxx>
-//#include <uielement/headermenucontroller.hxx>
-//#include <uielement/footermenucontroller.hxx>
 #include <uielement/controlmenucontroller.hxx>
-//#include <uielement/macrosmenucontroller.hxx>
 #include <uielement/uicommanddescription.hxx>
 #include <uiconfiguration/uiconfigurationmanager.hxx>
 #include <uiconfiguration/moduleuicfgsupplier.hxx>
@@ -84,7 +72,6 @@
 #include <uifactory/toolboxfactory.hxx>
 #include <uifactory/addonstoolboxfactory.hxx>
 #include "uiconfiguration/windowstateconfiguration.hxx"
-//#include <uielement/toolbarsmenucontroller.hxx>
 #include "uifactory/toolbarcontrollerfactory.hxx"
 #include "uifactory/statusbarcontrollerfactory.hxx"
 #include <services/autorecovery.hxx>
@@ -93,42 +80,27 @@
 #include <uifactory/statusbarfactory.hxx>
 #include <uiconfiguration/uicategorydescription.hxx>
 #include <services/sessionlistener.hxx>
-//#include <uielement/newmenucontroller.hxx>
 #include <services/taskcreatorsrv.hxx>
-//#include <services/uriabbreviation.hxx>
-
 #include <uielement/langselectionstatusbarcontroller.hxx>
-//#include <uielement/langselectionmenucontroller.hxx>
 #include <uiconfiguration/imagemanager.hxx>
 #include <uifactory/windowcontentfactorymanager.hxx>
 #include <services/substitutepathvars.hxx>
 #include <services/pathsettings.hxx>
+#include <services/ContextChangeEventMultiplexer.hxx>
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
 COMPONENTGETFACTORY	(	IFFACTORY( ::framework::URLTransformer					        )	else
 						IFFACTORY( ::framework::Desktop							        )	else
                         IFFACTORY( ::framework::Frame                                   )   else
-                        //IFFACTORY( ::framework::Oxt_Handler                             )   else
                         IFFACTORY( ::framework::JobExecutor                             )   else
-                        //IFFACTORY( ::framework::DispatchRecorderSupplier                )   else
-                        //IFFACTORY( ::framework::DispatchRecorder                        )   else
-                        //IFFACTORY( ::framework::MailToDispatcher                        )   else
-                        //IFFACTORY( ::framework::ServiceHandler                          )   else
                         IFFACTORY( ::framework::JobDispatch                             )   else
                         IFFACTORY( ::framework::BackingComp                             )	else
-                        //IFFACTORY( ::framework::DispatchHelper                          )   else
 						IFFACTORY( ::framework::LayoutManager                           )   else
-                        //IFFACTORY( ::framework::License                                 )   else
                         IFFACTORY( ::framework::UIElementFactoryManager                 )   else
 						IFFACTORY( ::framework::PopupMenuControllerFactory              )   else
-                        //IFFACTORY( ::framework::FontMenuController                      )   else
-                        //IFFACTORY( ::framework::FontSizeMenuController                  )   else
                         IFFACTORY( ::framework::ObjectMenuController                    )   else
-                        //IFFACTORY( ::framework::HeaderMenuController                    )   else
-                        //IFFACTORY( ::framework::FooterMenuController                    )   else
                         IFFACTORY( ::framework::ControlMenuController                   )   else
-                        //IFFACTORY( ::framework::MacrosMenuController                    )   else
                         IFFACTORY( ::framework::UICommandDescription                    )   else
                         IFFACTORY( ::framework::ModuleManager                           )   else
                         IFFACTORY( ::framework::UIConfigurationManager                  )   else
@@ -142,7 +114,6 @@ COMPONENTGETFACTORY	(	IFFACTORY( ::frame
                         IFFACTORY( ::framework::AddonsToolBoxFactory                    )   else
                         IFFACTORY( ::framework::WindowStateConfiguration                )   else
                         IFFACTORY( ::framework::ToolbarControllerFactory                )   else
-                        //IFFACTORY( ::framework::ToolbarsMenuController                  )	else
                         IFFACTORY( ::framework::AutoRecovery                            )   else
                         IFFACTORY( ::framework::StatusIndicatorFactory                  )	else
                         IFFACTORY( ::framework::RecentFilesMenuController               )   else
@@ -152,15 +123,12 @@ COMPONENTGETFACTORY	(	IFFACTORY( ::frame
 						IFFACTORY( ::framework::StatusbarControllerFactory              )   else
                         IFFACTORY( ::framework::SessionListener                         )   else
                         IFFACTORY( ::framework::TaskCreatorService	                    )   else
-						//IFFACTORY( ::framework::NewMenuController                       )   else
-                        //IFFACTORY( ::framework::UriAbbreviation                         )   else
-                        //IFFACTORY( ::framework::PopupMenuDispatcher                     )   else
                         IFFACTORY( ::framework::ImageManager                            )   else
                         IFFACTORY( ::framework::LangSelectionStatusbarController        )   else
-                        //IFFACTORY( ::framework::LanguageSelectionMenuController         )   else
                         IFFACTORY( ::framework::WindowContentFactoryManager             )   else
                         IFFACTORY( ::framework::TabWindowService                        )   else
                         IFFACTORY( ::framework::SubstitutePathVariables			        )	else
-						IFFACTORY( ::framework::PathSettings					        )
+						IFFACTORY( ::framework::PathSettings					        )   else
+						IFFACTORY( ::framework::ContextChangeEventMultiplexer			)
 			)
 

Modified: openoffice/trunk/main/framework/util/fwk.component
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/util/fwk.component?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/framework/util/fwk.component (original)
+++ openoffice/trunk/main/framework/util/fwk.component Wed Apr 10 09:20:16 2013
@@ -45,6 +45,10 @@
   <implementation name="com.sun.star.comp.framework.DocumentAcceleratorConfiguration">
     <service name="com.sun.star.ui.DocumentAcceleratorConfiguration"/>
   </implementation>
+  <implementation name="org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer">
+    <service name="com.sun.star.ui.ContextChangeEventMultiplexer"/>
+    <singleton name="com.sun.star.ui.ContextChangeEventMultiplexer"/>
+  </implementation>
   <implementation name="com.sun.star.comp.framework.Frame">
     <service name="com.sun.star.frame.Frame"/>
   </implementation>

Modified: openoffice/trunk/main/offapi/com/sun/star/ui/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/ui/makefile.mk?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/ui/makefile.mk (original)
+++ openoffice/trunk/main/offapi/com/sun/star/ui/makefile.mk Wed Apr 10 09:20:16 2013
@@ -40,6 +40,8 @@ IDLFILES=\
     ActionTriggerSeparatorType.idl              \
     ConfigurableUIElement.idl                   \
     ConfigurationEvent.idl                      \
+	ContextChangeEventMultiplexer.idl			\
+	ContextChangeEventObject.idl				\
     ContextMenuExecuteEvent.idl                 \
     ContextMenuInterceptorAction.idl            \
     DockingArea.idl                             \
@@ -48,6 +50,7 @@ IDLFILES=\
     ItemDescriptor.idl                          \
     ItemStyle.idl                               \
     ItemType.idl                                \
+	LayoutSize.idl								\
     ModuleUICategoryDescription.idl             \
     ModuleUICommandDescription.idl              \
     ModuleUIConfigurationManager.idl            \
@@ -66,10 +69,14 @@ IDLFILES=\
     XAcceleratorConfiguration.idl               \
     XContextMenuInterception.idl                \
     XContextMenuInterceptor.idl                 \
+	XContextChangeEventListener.idl				\
+	XContextChangeEventMultiplexer.idl			\
     XDockingAreaAcceptor.idl                    \
     XImageManager.idl                           \
     XModuleUIConfigurationManager.idl           \
     XModuleUIConfigurationManagerSupplier.idl   \
+	XSidebar.idl								\
+	XSidebarPanel.idl							\
     XStatusbarItem.idl                          \
     XUIConfiguration.idl                        \
     XUIConfigurationListener.idl                \

Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu Wed Apr 10 09:20:16 2013
@@ -46,11 +46,6 @@
                 <value>private:resource/pane/LeftDrawPane</value>
               </prop>
             </node>
-            <node oor:name="R3" oor:op="replace">
-              <prop oor:name="URL">
-                <value>private:resource/pane/RightPane</value>
-              </prop>
-            </node>
           </node>
         </node>
         <node oor:name="F1" oor:op="replace">
@@ -90,11 +85,6 @@
             </node>
             <node oor:name="R6" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/view/TaskPane</value>
-              </prop>
-            </node>
-            <node oor:name="R7" oor:op="replace">
-              <prop oor:name="URL">
                 <value>private:resource/view/PresentationView</value>
               </prop>
             </node>
@@ -114,43 +104,53 @@
         </node>
         <node oor:name="F3" oor:op="replace">
           <prop oor:name="ServiceName">
-            <value>com.sun.star.drawing.framework.TaskPanelFactory</value>
+            <value>com.sun.star.comp.Draw.framework.TaskPanelFactory</value>
           </prop>
           <node oor:name="ResourceList">
-            <node oor:name="R0" oor:op="replace">
+            <node oor:name="R0a" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/toolpanel/DrawingFramework/MasterPages</value>
+                <value>private:resource/toolpanel/AllMasterPages</value>
+              </prop>
+            </node>
+            <node oor:name="R0b" oor:op="replace">
+              <prop oor:name="URL">
+                <value>private:resource/toolpanel/RecentMasterPages</value>
+              </prop>
+            </node>
+            <node oor:name="R0c" oor:op="replace">
+              <prop oor:name="URL">
+                <value>private:resource/toolpanel/UsedMasterPages</value>
               </prop>
             </node>
             <node oor:name="R1" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/toolpanel/DrawingFramework/Layouts</value>
+                <value>private:resource/toolpanel/Layouts</value>
               </prop>
             </node>
             <node oor:name="R2" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/toolpanel/DrawingFramework/TableDesign</value>
+                <value>private:resource/toolpanel/TableDesign</value>
               </prop>
             </node>
             <node oor:name="R3" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/toolpanel/DrawingFramework/CustomAnimations</value>
+                <value>private:resource/toolpanel/CustomAnimations</value>
               </prop>
             </node>
             <node oor:name="R4" oor:op="replace">
               <prop oor:name="URL">
-                <value>private:resource/toolpanel/DrawingFramework/SlideTransitions</value>
+                <value>private:resource/toolpanel/SlideTransitions</value>
               </prop>
             </node>
           </node>
         </node>
       </node>
       <node oor:name="StartupServices">
-        <node oor:name="S0" oor:op="replace">
-          <prop oor:name="ServiceName">
-            <value>com.sun.star.drawing.framework.PresentationFactoryProvider</value>
-          </prop>
-        </node>
+	<node oor:name="S0" oor:op="replace">
+	  <prop oor:name="ServiceName">
+	    <value>com.sun.star.drawing.framework.PresentationFactoryProvider</value>
+	  </prop>
+	</node>
       </node>  
     </node>
   </node>

Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu Wed Apr 10 09:20:16 2013
@@ -81,18 +81,60 @@
           <value>com.sun.star.comp.framework.StatusBarFactory</value>
         </prop>
       </node>
-      <node oor:name="org.openoffice.Office.Impress.ImpressToolPanelFactory" oor:op="replace">
+      <node oor:name="SvxPanelFactory" oor:op="replace">
         <prop oor:name="Type">
           <value>toolpanel</value>
         </prop>
         <prop oor:name="Name">
-          <value>DrawingFramework</value>
+          <value>SvxPanelFactory</value>
         </prop>
         <prop oor:name="Module">
-          <value>com.sun.star.presentation.PresentationDocument</value>
+          <value/>
         </prop>
         <prop oor:name="FactoryImplementation">
-          <value>com.sun.star.drawing.DefaultToolPanelFactory</value>
+          <value>org.apache.openoffice.comp.svx.sidebar.PanelFactory</value>
+        </prop>
+      </node>
+      <node oor:name="SdPanelFactory" oor:op="replace">
+        <prop oor:name="Type">
+          <value>toolpanel</value>
+        </prop>
+        <prop oor:name="Name">
+          <value>SdPanelFactory</value>
+        </prop>
+        <prop oor:name="Module">
+          <value></value>
+        </prop>
+        <prop oor:name="FactoryImplementation">
+          <value>org.openoffice.comp.Draw.framework.PanelFactory</value>
+        </prop>
+      </node>
+      <node oor:name="ScPanelFactory" oor:op="replace">
+        <prop oor:name="Type">
+          <value>toolpanel</value>
+        </prop>
+        <prop oor:name="Name">
+          <value>ScPanelFactory</value>
+        </prop>
+        <prop oor:name="Module">
+          <value></value>
+        </prop>
+        <prop oor:name="FactoryImplementation">
+          <value>org.apache.openoffice.comp.sc.sidebar.ScPanelFactory</value>
+        </prop>
+      </node>
+      <node oor:name="SwPanelFactory" oor:op="replace">
+        <prop oor:name="Type">
+          <value>toolpanel</value>
+        </prop>
+        <prop oor:name="Name">
+          <value>SwPanelFactory</value>
+        </prop>
+        <prop oor:name="Module">
+          <value></value>
+        </prop>
+        <prop oor:name="FactoryImplementation">
+          <value>org.apache.openoffice.comp.sw.sidebar.SwPanelFactory</value>
         </prop>
       </node>
     </node>

Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu Wed Apr 10 09:20:16 2013
@@ -5332,6 +5332,11 @@
                     <value xml:lang="en-US">Task Pane</value>
                 </prop>
             </node>
+            <node oor:name=".uno:Sidebar" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Sidebar</value>
+                </prop>
+            </node>
             <node oor:name=".uno:TestMode" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Test Mode On/Off</value>

Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu Wed Apr 10 09:20:16 2013
@@ -797,61 +797,6 @@
           <value>true</value>
         </prop>
       </node>
-      <node oor:name="private:resource/toolpanel/DrawingFramework/MasterPages" oor:op="replace">
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Master Pages</value>
-        </prop>
-        <prop oor:name="ImageURL" oor:type="xs:string">
-          <value>private:commandimage/PresentationLayout</value>
-        </prop>
-      </node>
-      <node oor:name="private:resource/toolpanel/DrawingFramework/Layouts" oor:op="replace">
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Layouts</value>
-        </prop>
-        <prop oor:name="ImageURL" oor:type="xs:string">
-          <value>private:commandimage/ModifyPage</value>
-        </prop>
-      </node>
-      <node oor:name="private:resource/toolpanel/DrawingFramework/TableDesign" oor:op="replace">
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Table Design</value>
-        </prop>
-        <prop oor:name="ImageURL" oor:type="xs:string">
-          <value>private:commandimage/InsertTable</value>
-        </prop>
-      </node>
-      <node oor:name="private:resource/toolpanel/DrawingFramework/CustomAnimations" oor:op="replace">
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Custom Animation</value>
-        </prop>
-        <prop oor:name="ImageURL" oor:type="xs:string">
-          <value>private:commandimage/CustomAnimation</value>
-        </prop>
-      </node>
-      <node oor:name="private:resource/toolpanel/DrawingFramework/SlideTransitions" oor:op="replace">
-        <prop oor:name="Visible" oor:type="xs:boolean">
-          <value>false</value>
-        </prop>
-        <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Slide Transition</value>
-        </prop>
-        <prop oor:name="ImageURL" oor:type="xs:string">
-          <value>private:commandimage/RehearseTimings</value>
-        </prop>
-      </node>
       <node oor:name="private:resource/toolbar/optimizetablebar" oor:op="replace">
         <prop oor:name="Docked" oor:type="xs:boolean">
           <value>false</value>

Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk Wed Apr 10 09:20:16 2013
@@ -64,6 +64,7 @@ LOCALIZEDFILES= \
     WriterWebWindowState.xcu \
     WriterCommands.xcu\
     GenericCategories.xcu\
+	Sidebar.xcu
 
 XCUFILES= \
     $(LOCALIZEDFILES) \

Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Views.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Views.xcu?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Views.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Views.xcu Wed Apr 10 09:20:16 2013
@@ -29,5 +29,13 @@
     <value>false</value>
    </prop>
   </node>
+
+  <!-- show Sidebar child window by default - oor:name == SID_SIDEBAR -->
+  <node oor:name="10336" oor:op="replace">
+    <prop oor:name="Visible" oor:type="xs:boolean">
+      <value>true</value>
+    </prop>
+  </node>
  </node>
+
 </oor:component-data>

Modified: openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk (original)
+++ openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk Wed Apr 10 09:20:16 2013
@@ -70,7 +70,8 @@ XCSFILES= \
     Category.xcs \
     GenericCategories.xcs \
     GlobalSettings.xcs \
-    WindowContentFactories.xcs
+    WindowContentFactories.xcs \
+    Sidebar.xcs
 
 .INCLUDE :  target.mk
 

Modified: openoffice/trunk/main/postprocess/packregistry/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packregistry/makefile.mk?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packregistry/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packregistry/makefile.mk Wed Apr 10 09:20:16 2013
@@ -196,6 +196,7 @@ MY_FILES_main = \
     $(MY_XCS)/Office/UI/GenericCategories.xcs \
     $(MY_XCS)/Office/UI/GenericCommands.xcs \
     $(MY_XCS)/Office/UI/GlobalSettings.xcs \
+    $(MY_XCS)/Office/UI/Sidebar.xcs \
     $(MY_XCS)/Office/UI/StartModuleCommands.xcs \
     $(MY_XCS)/Office/UI/StartModuleWindowState.xcs \
     $(MY_XCS)/Office/UI/WindowContentFactories.xcs \
@@ -259,6 +260,7 @@ MY_FILES_main = \
     $(MY_XCU)/Office/UI/Factories.xcu \
     $(MY_XCU)/Office/UI/GenericCategories.xcu \
     $(MY_XCU)/Office/UI/GenericCommands.xcu \
+    $(MY_XCU)/Office/UI/Sidebar.xcu \
     $(MY_XCU)/Office/UI/StartModuleCommands.xcu \
     $(MY_XCU)/Office/UI/StartModuleWindowState.xcu \
     $(MY_XCU)/Office/UI.xcu \

Modified: openoffice/trunk/main/reportdesign/source/ui/dlg/Condition.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/dlg/Condition.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/dlg/Condition.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/dlg/Condition.cxx Wed Apr 10 09:20:16 2013
@@ -146,7 +146,7 @@ OColorPopup::OColorPopup(Window* _pParen
     m_aColorSet.SetHelpId( HID_RPT_POPUP_COLOR_CTRL );
     SetHelpId( HID_RPT_POPUP_COLOR );
     const Size aSize12( 13, 13 );
-    ::std::auto_ptr<XColorTable> pColorTable(new XColorTable( SvtPathOptions().GetPalettePath() ));
+    ::std::auto_ptr< XColorList > pColorTable(new XColorList( SvtPathOptions().GetPalettePath() ));
     short i = 0;
     long nCount = pColorTable->Count();
     XColorEntry* pEntry = NULL;

Modified: openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx Wed Apr 10 09:20:16 2013
@@ -44,7 +44,7 @@
 #include <editeng/charscaleitem.hxx>
 #include <svx/algitem.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/xtable.hxx>		// XColorTable
+#include <svx/xtable.hxx>		// XColorList
 #include <editeng/brshitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/emphitem.hxx>
@@ -654,7 +654,7 @@ bool openCharDialog( const uno::Referenc
 	};
     Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
 	::std::auto_ptr<FontList> pFontList(new FontList( pParent ));
-	::std::auto_ptr<XColorTable> pColorTable( new XColorTable( SvtPathOptions().GetPalettePath() ));
+	::std::auto_ptr< XColorList > pColorTable( new XColorList( SvtPathOptions().GetPalettePath() ));
 	SfxPoolItem* pDefaults[] =
 	{
 		new SvxFontItem(ITEMID_FONT),
@@ -774,7 +774,7 @@ bool openAreaDialog( const uno::Referenc
             // #i74099# by default, the dialog deletes the current color table if a different one is loaded
             // (see SwDrawShell::ExecDrawDlg)
             const SvxColorTableItem* pColorItem = static_cast<const SvxColorTableItem*>( pDescriptor->GetItem(SID_COLOR_TABLE) );
-            if (pColorItem && pColorItem->GetColorTable() == XColorTable::GetStdColorTable())
+            if (pColorItem && pColorItem->GetColorTable() == XColorList::GetStdColorList())
                 pDialog->DontDeleteColorTable();
             bSuccess = ( RET_OK == pDialog->Execute() );
             if ( bSuccess )

Modified: openoffice/trunk/main/sc/inc/document.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/document.hxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/inc/document.hxx (original)
+++ openoffice/trunk/main/sc/inc/document.hxx Wed Apr 10 09:20:16 2013
@@ -75,7 +75,7 @@ namespace sfx2 {
 class SvxSearchItem;
 class SvxShadowItem;
 class Window;
-class XColorTable;
+class XColorList;
 class List;
 
 class ScAutoFormatData;
@@ -261,7 +261,7 @@ private:
 	SfxPrinter*			pPrinter;
 	VirtualDevice*		pVirtualDevice_100th_mm;
 	ScDrawLayer*		pDrawLayer;						// SdrModel
-	XColorTable*		pColorTable;
+	XColorList*		pColorTable;
 	ScConditionalFormatList* pCondFormList;				// bedingte Formate
 	ScValidationDataList* pValidationList;				// Gueltigkeit
 	SvNumberFormatterIndexTable*	pFormatExchangeList;			// zum Umsetzen von Zahlenformaten
@@ -460,7 +460,7 @@ public:
 	void			GetDocStat( ScDocStat& rDocStat );
 
 	SC_DLLPUBLIC void			InitDrawLayer( SfxObjectShell* pDocShell = NULL );
-	XColorTable*	GetColorTable();
+	XColorList*	GetColorTable();
 
 	SC_DLLPUBLIC sfx2::LinkManager*		GetLinkManager() const;
 

Modified: openoffice/trunk/main/sc/inc/helpids.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/helpids.h?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/inc/helpids.h (original)
+++ openoffice/trunk/main/sc/inc/helpids.h Wed Apr 10 09:20:16 2013
@@ -402,6 +402,73 @@
 #define HID_MN_FORMAT_ALGN                                      "SC_HID_MN_FORMAT_ALGN"
 #define HID_MN_FORMAT_LINESPACE                                 "SC_HID_MN_FORMAT_LINESPACE"
 
+// sidebar -----------------------------------------
+// AlignmentPropertyPanel -----------------------------------------
+#define HID_PROPERTYPANEL_SC_ALIGN_SECTION                      "SC_HID_PROPERTYPANEL_SC_ALIGN_SECTION"
+#define HID_PROPERTY_PANEL_ALIGN_TBX_HOR                        "SC_HID_PROPERTY_PANEL_ALIGN_TBX_HOR"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_L                      "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_L"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_C                      "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_C"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_R                      "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_R"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_HOR_J                      "SC_HID_PROPERTY_PANEL_ALIGN_TBI_HOR_J"
+#define HID_PROPERTY_PANEL_ALIGN_TBX_VER                        "SC_HID_PROPERTY_PANEL_ALIGN_TBX_VER"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_VER_T                      "SC_HID_PROPERTY_PANEL_ALIGN_TBI_VER_T"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_VER_C                      "SC_HID_PROPERTY_PANEL_ALIGN_TBI_VER_C"
+#define HID_PROPERTY_PANEL_ALIGN_TBI_VER_B                      "SC_HID_PROPERTY_PANEL_ALIGN_TBI_VER_B"
+#define HID_PROPERTY_PANEL_ALIGN_MBX_INDENT                     "SC_HID_PROPERTY_PANEL_ALIGN_MBX_INDENT"
+#define HID_PROPERTY_PANEL_ALIGN_CBX_WRAP                       "SC_HID_PROPERTY_PANEL_ALIGN_CBX_WRAP"
+#define HID_PROPERTY_PANEL_ALIGN_CBX_MERGE                      "SC_HID_PROPERTY_PANEL_ALIGN_CBX_MERGE"
+#define HID_PROPERTY_PANEL_ALIGN_MBX_ANGLE                      "SC_HID_PROPERTY_PANEL_ALIGN_MBX_ANGLE"
+#define HID_PROPERTY_PANEL_ALIGN_DIAL_CONTROL                   "SC_HID_PROPERTY_PANEL_ALIGN_DIAL_CONTROL"
+#define HID_PROPERTY_PANEL_ALIGN_CBX_VERT                       "SC_HID_PROPERTY_PANEL_ALIGN_CBX_VERT"
+
+// CellAppearancePropertyPanel -----------------------------------------
+#define HID_PROPERTYPANEL_SC_CELL_SECTION                       "SC_HID_PROPERTYPANEL_SC_CELL_SECTION"
+#define HID_PROPERTYPANEL_SC_TBX_BKCOLOR                        "SC_HID_PROPERTYPANEL_SC_TBX_BKCOLOR"
+#define HID_PROPERTYPANEL_SC_TBI_BKCOLOR                        "SC_HID_PROPERTYPANEL_SC_TBI_BKCOLOR"
+#define HID_PROPERTYPANEL_SC_TBX_BORDER                         "SC_HID_PROPERTYPANEL_SC_TBX_BORDER"
+#define HID_PROPERTYPANEL_SC_TBI_BORDER                         "SC_HID_PROPERTYPANEL_SC_TBI_BORDER"
+#define HID_PROPERTYPANEL_SC_TBX_STYLE                          "SC_HID_PROPERTYPANEL_SC_TBX_STYLE"
+#define HID_PROPERTYPANEL_SC_TBI_STYLE                          "SC_HID_PROPERTYPANEL_SC_TBI_STYLE"
+#define HID_PROPERTYPANEL_SC_TBX_LINECOLOR                      "SC_HID_PROPERTYPANEL_SC_TBX_LINECOLOR"
+#define HID_PROPERTYPANEL_SC_TBI_LINECOLOR                      "SC_HID_PROPERTYPANEL_SC_TBI_LINECOLOR"
+#define HID_PROPERTYPANEL_SC_CBOX_SHOWGRID                      "SC_HID_PROPERTYPANEL_SC_CBOX_SHOWGRID"
+#define HID_PROPERTYPANEL_FILL_COLOR_VS                         "SC_HID_PROPERTYPANEL_FILL_COLOR_VS"
+#define HID_PROPERTYPANEL_LINE_COLOR_VS                         "SC_HID_PROPERTYPANEL_LINE_COLOR_VS"
+#define HID_PROPERTYPANEL_SC_STYLE_VS                           "SC_HID_PROPERTYPANEL_SC_STYLE_VS"
+#define HID_PROPERTYPANEL_SC_STYLE_PB                           "SC_HID_PROPERTYPANEL_SC_STYLE_PB"
+#define HID_PROPERTYPANEL_SC_BORDER1_TBX                        "SC_HID_PROPERTYPANEL_SC_BORDER1_TBX"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_NONE                    "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_NONE"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_ALL                     "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_ALL"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_OUTER                   "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_OUTER"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_OUTERBOLD               "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_OUTERBOLD"
+#define HID_PROPERTYPANEL_SC_BORDER2_TBX                        "SC_HID_PROPERTYPANEL_SC_BORDER2_TBX"
+#define HID_PROPERTYPANEL_SC_BORDER3_TBX                        "SC_HID_PROPERTYPANEL_SC_BORDER3_TBX"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_S1                      "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S1"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_S2                      "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S2"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_S3                      "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S3"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_S4                      "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_S4"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_LEFT                    "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_LEFT"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_RIGHT                   "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_RIGHT"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_TOP                     "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_TOP"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_BOT                     "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_BOT"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_BLTR                    "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_BLTR"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_TLBR                    "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_TLBR"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_TOPBOT                  "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_TOPBOT"
+#define HID_PROPERTYPANEL_SC_BORDER_TBI_LEFTRIGHT               "SC_HID_PROPERTYPANEL_SC_BORDER_TBI_LEFTRIGHT"
+
+// NumberFormatPropertyPanel -----------------------------------------
+#define HID_PROPERTYPANEL_SC_NUM_SECTION                        "SC_HID_PROPERTYPANEL_SC_NUM_SECTION"
+#define HID_PROPERTY_PANEL_NUMFMT_LB_CATEGORY                   "SC_HID_PROPERTY_PANEL_NUMFMT_LB_CATEGORY"
+#define HID_PROPERTY_PANEL_NUMFMT_TBX_CATEGORY                  "SC_HID_PROPERTY_PANEL_NUMFMT_TBX_CATEGORY"
+#define HID_PROPERTY_PANEL_NUMFMT_ID_NUMBER                     "SC_HID_PROPERTY_PANEL_NUMFMT_ID_NUMBER"
+#define HID_PROPERTY_PANEL_NUMFMT_ID_PERCENT                    "SC_HID_PROPERTY_PANEL_NUMFMT_ID_PERCENT"
+#define HID_PROPERTY_PANEL_NUMFMT_ID_CURRENCY                   "SC_HID_PROPERTY_PANEL_NUMFMT_ID_CURRENCY"
+#define HID_PROPERTY_PANEL_NUMFMT_ID_DATE                       "SC_HID_PROPERTY_PANEL_NUMFMT_ID_DATE"
+#define HID_PROPERTY_PANEL_NUMFMT_ID_TEXT                       "SC_HID_PROPERTY_PANEL_NUMFMT_ID_TEXT"
+#define HID_PROPERTY_PANEL_NUMFMT_ED_DECIMALS                   "SC_HID_PROPERTY_PANEL_NUMFMT_ED_DECIMALS"
+#define HID_PROPERTY_PANEL_NUMFMT_ED_LEADZEROES                 "SC_HID_PROPERTY_PANEL_NUMFMT_ED_LEADZEROES"
+#define HID_PROPERTY_PANEL_NUMFMT_BTN_NEGRED                    "SC_HID_PROPERTY_PANEL_NUMFMT_BTN_NEGRED"
+#define HID_PROPERTY_PANEL_NUMFMT_BTN_THOUSAND                  "SC_HID_PROPERTY_PANEL_NUMFMT_BTN_THOUSAND"
 
 // Ende Hilfe IDs ------------------------------------------------------------
 

Modified: openoffice/trunk/main/sc/inc/sc.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/sc.hrc?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/inc/sc.hrc (original)
+++ openoffice/trunk/main/sc/inc/sc.hrc Wed Apr 10 09:20:16 2013
@@ -51,6 +51,8 @@
 #define SC_FUNCTION_END			(SID_SC_START + 299)
 #define SC_PARAM_START			(SID_SC_START + 300)
 #define SC_PARAM_END			(SID_SC_START + 399)
+#define SC_SIDEBAR_PROPERTY_BEGIN	(SID_SC_START + 400)
+#define SC_SIDEBAR_PROPERTY_END	(SID_SC_START + 499)
 
 //	kompatibel zu frueher bleiben:
 #define SC_RESOURCE_START		(RID_APP_START+5000)
@@ -752,6 +754,11 @@
 #define SID_SORT_ATTRIBS		(SC_PARAM_START+3)
 #define SID_SORT_USERDEF		(SC_PARAM_START+4)
 
+// Sidebar -------------------------------------------------------------
+
+#define SID_SCGRIDSHOW          (SC_SIDEBAR_PROPERTY_BEGIN+1)
+#define SID_NUMBER_TYPE_FORMAT  (SC_SIDEBAR_PROPERTY_BEGIN+2)
+
 // Resourcen -------------------------------------------------------------
 
 #define RID_OBJECTBAR_APP		(SC_RESOURCE_START)
@@ -1276,7 +1283,18 @@
 #define RID_POPUP_FILTER                (SC_DIALOGS_START + 153)
 #define RID_SCDLG_TAB_BG_COLOR          (SC_DIALOGS_START + 154)
 
-#define SC_DIALOGS_END                  (SC_DIALOGS_START + 155)
+// defines for AlignmentPropertyPanel
+#define RID_PROPERTYPANEL_SC_ALIGNMENT  (SC_DIALOGS_START + 155)
+
+// defines for CellAppearancePropertyPanel
+#define RID_PROPERTYPANEL_SC_APPEAR     (SC_DIALOGS_START + 156)
+#define RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR (SC_DIALOGS_START + 157)
+#define RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR (SC_DIALOGS_START + 158)
+#define RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE (SC_DIALOGS_START + 159)
+#define RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE (SC_DIALOGS_START + 160)
+#define RID_PROPERTYPANEL_SC_NUMBERFORMAT (SC_DIALOGS_START + 161)
+
+#define SC_DIALOGS_END                  (RID_PROPERTYPANEL_SC_NUMBERFORMAT+1)
 
 #ifndef STD_MASKCOLOR
 #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }

Modified: openoffice/trunk/main/sc/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/prj/build.lst?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/prj/build.lst (original)
+++ openoffice/trunk/main/sc/prj/build.lst Wed Apr 10 09:20:16 2013
@@ -27,6 +27,7 @@ sc	sc\source\ui\namedlg					nmake	-	all	
 sc	sc\source\ui\navipi					nmake	-	all	sc_nvipi sc_sdi sc_inc NULL
 sc	sc\source\ui\optdlg					nmake	-	all	sc_opt sc_sdi sc_inc NULL
 sc	sc\source\ui\pagedlg					nmake	-	all	sc_page sc_sdi sc_inc NULL
+sc	sc\source\ui\sidebar					nmake	-	all	sc_sidebar sc_sdi sc_inc NULL
 sc	sc\source\ui\src					nmake	-	all	sc_uisrc sc_sdi sc_inc NULL
 sc	sc\source\ui\styleui					nmake	-	all	sc_style sc_sdi sc_inc NULL
 sc	sc\source\ui\undo					nmake	-	all	sc_undo sc_sdi sc_inc NULL
@@ -47,7 +48,7 @@ sc	sc\addin						nmake	-	all	sc_add sc_s
 sc	sc\addin\datefunc					nmake	-	all	sc_addfu sc_add sc_sdi sc_inc NULL
 sc	sc\addin\rot13						nmake	-	all	sc_adrot sc_add sc_sdi sc_inc NULL
 sc	sc\addin\util						nmake	-	all	sc_adutil sc_addfu sc_adrot sc_sdi sc_inc NULL
-sc	sc\util							nmake	-	all	sc_util sc_addfu sc_adrot sc_adutil sc_app sc_attr sc_cctrl sc_cosrc sc_data sc_dbgui sc_dif sc_docsh sc_drfnc sc_excel sc_form sc_html sc_lotus sc_qpro sc_misc sc_name sc_nvipi sc_opt sc_page sc_rtf sc_scalc sc_style sc_tool sc_uisrc sc_undo sc_unobj sc_view sc_xcl97 sc_xml sc_acc sc_ftools sc_inc sc_vba NULL
+sc	sc\util							nmake	-	all	sc_util sc_addfu sc_adrot sc_adutil sc_app sc_attr sc_cctrl sc_cosrc sc_data sc_dbgui sc_dif sc_docsh sc_drfnc sc_excel sc_form sc_html sc_lotus sc_qpro sc_misc sc_name sc_nvipi sc_opt sc_page sc_rtf sc_scalc sc_style sc_tool sc_uisrc sc_sidebar sc_undo sc_unobj sc_view sc_xcl97 sc_xml sc_acc sc_ftools sc_inc sc_vba NULL
 
 # remarked due to the fact, key press is need in this test.
 # sc      sc\qa\complex\calcPreview                               nmake   -       all     qa_calcpreview   NULL

Modified: openoffice/trunk/main/sc/sdi/cellsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/sdi/cellsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/sdi/cellsh.sdi (original)
+++ openoffice/trunk/main/sc/sdi/cellsh.sdi Wed Apr 10 09:20:16 2013
@@ -89,6 +89,8 @@ interface CellSelection
 	SID_SELECT_SCENARIO		[ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
 	FID_CELL_FORMAT			[ ExecMethod = Execute; StateMethod = GetBlockState; ]
 	SID_ENABLE_HYPHENATION	[ ExecMethod = Execute; StateMethod = GetBlockState; ]
+	SID_CELL_FORMAT_BORDER	[ ExecMethod = Execute; ]
+	SID_CHAR_DLG_EFFECT		[ ExecMethod = Execute; ]
 	FID_ROW_HEIGHT			[ ExecMethod = Execute; StateMethod = GetState; ]
 	FID_ROW_OPT_HEIGHT		[ ExecMethod = Execute; StateMethod = GetState; ]
 	FID_ROW_HIDE			[ ExecMethod = Execute; StateMethod = GetState; ]

Modified: openoffice/trunk/main/sc/sdi/drawsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/sdi/drawsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/sdi/drawsh.sdi (original)
+++ openoffice/trunk/main/sc/sdi/drawsh.sdi Wed Apr 10 09:20:16 2013
@@ -64,7 +64,8 @@ interface TableDraw
     SID_BITMAP_LIST 		[ StateMethod = GetDrawAttrState; Export = FALSE; ]
     SID_DASH_LIST			[ StateMethod = GetDrawAttrState; Export = FALSE; ]
     SID_LINEEND_LIST		[ StateMethod = GetDrawAttrState; Export = FALSE; ]
-	 // Flaechen-Attribute
+
+     // Flaechen-Attribute
 	SID_ATTR_FILL_STYLE		[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
 
 	// #i25616#
@@ -79,15 +80,37 @@ interface TableDraw
 	SID_ATTR_FILL_GRADIENT	[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
 	SID_ATTR_FILL_HATCH		[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
 	SID_ATTR_FILL_BITMAP	[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+	SID_ATTR_FILL_TRANSPARENCE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+	SID_ATTR_FILL_FLOATTRANSPARENCE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+
 	 // ---- Linien-Attribute:
 	SID_ATTR_LINE_STYLE		[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
 	SID_ATTR_LINEEND_STYLE	[ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+	SID_ATTR_LINE_START [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+	SID_ATTR_LINE_END [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
 	SID_ATTR_LINE_DASH		[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
 	SID_ATTR_LINE_WIDTH		[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
 	SID_ATTR_LINE_COLOR		[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+	SID_ATTR_LINE_TRANSPARENCE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+	SID_ATTR_LINE_JOINT [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+	SID_ATTR_LINE_CAP [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
 	SID_ATTRIBUTES_AREA		[ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
 	SID_ATTRIBUTES_LINE		[ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
 	SID_ATTR_TRANSFORM		[ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
+
+    // For the sidebar
+	SID_ATTR_TRANSFORM_WIDTH	[ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+    SID_ATTR_TRANSFORM_HEIGHT	[ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ] 
+    SID_ATTR_TRANSFORM_POS_X	[ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+    SID_ATTR_TRANSFORM_POS_Y	[ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+    SID_ATTR_TRANSFORM_ANGLE	[ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+    SID_ATTR_TRANSFORM_ROT_X	[ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+    SID_ATTR_TRANSFORM_ROT_Y	[ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+    SID_ATTR_TRANSFORM_PROTECT_POS	[ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+    SID_ATTR_TRANSFORM_PROTECT_SIZE	[ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+    SID_ATTR_TRANSFORM_AUTOWIDTH [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+    SID_ATTR_TRANSFORM_AUTOHEIGHT [ StateMethod = GetDrawAttrStateForIFBX; Export = FALSE; ]
+
 	 // ---- Ausrichtungs - Funktionen:
 	 //!	PseudoSlots gibt Aerger mit Referenz-Dialogen ???
 	SID_OBJECT_ALIGN
@@ -161,6 +184,8 @@ interface TableDraw
 	]
 	*/
 	SID_MIRROR_VERTICAL		[ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
+	SID_FLIP_HORIZONTAL     [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
+	SID_FLIP_VERTICAL       [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
 	SID_ANCHOR_PAGE			[ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ]
 	SID_ANCHOR_TOGGLE		[ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
 	SID_ANCHOR_CELL			[ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ]

Modified: openoffice/trunk/main/sc/sdi/drtxtob.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/sdi/drtxtob.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/sdi/drtxtob.sdi (original)
+++ openoffice/trunk/main/sc/sdi/drtxtob.sdi Wed Apr 10 09:20:16 2013
@@ -83,12 +83,23 @@ interface TableDrawText
 	SID_ALIGNCENTERHOR			[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	SID_ALIGNRIGHT				[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	SID_ALIGNBLOCK				[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+	
+	SID_ATTR_PARA_ADJUST_LEFT				[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+	SID_ATTR_PARA_ADJUST_CENTER			    [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+	SID_ATTR_PARA_ADJUST_RIGHT				[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+	SID_ATTR_PARA_ADJUST_BLOCK				[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+	SID_ATTR_PARA_LRSPACE                   [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+	SID_ATTR_PARA_LINESPACE                 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+	SID_ATTR_PARA_ULSPACE                   [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+	
 	SID_ATTR_PARA_LINESPACE_10	[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	SID_ATTR_PARA_LINESPACE_15	[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	SID_ATTR_PARA_LINESPACE_20	[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	SID_SET_SUPER_SCRIPT		[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	SID_SET_SUB_SCRIPT			[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+	SID_ATTR_CHAR_KERNING		[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	SID_CHAR_DLG				[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+	SID_CHAR_DLG_EFFECT			[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	SID_PARA_DLG				[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	 // ---- FontWork:
 	SID_FONTWORK	[ ExecMethod = ExecuteExtra; StateMethod = GetState; Export = FALSE; ]
@@ -132,6 +143,10 @@ interface TableDrawText
 	SID_TRANSLITERATE_FULLWIDTH	[ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ]
 	SID_TRANSLITERATE_HIRAGANA	[ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ]
 	SID_TRANSLITERATE_KATAGANA	[ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ]
+
+	SID_TABLE_VERT_NONE [ExecMethod = ExecuteAttr ;StateMethod = GetStatePropPanelAttr ;]
+	SID_TABLE_VERT_CENTER [ExecMethod = ExecuteAttr ;StateMethod = GetStatePropPanelAttr ;]
+	SID_TABLE_VERT_BOTTOM [ExecMethod = ExecuteAttr ;StateMethod = GetStatePropPanelAttr ;]
 }
 
 

Modified: openoffice/trunk/main/sc/sdi/editsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/sdi/editsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/sdi/editsh.sdi (original)
+++ openoffice/trunk/main/sc/sdi/editsh.sdi Wed Apr 10 09:20:16 2013
@@ -69,8 +69,10 @@ interface TableText
 	SID_ATTR_CHAR_CONTOUR		[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	SID_SET_SUPER_SCRIPT		[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	SID_SET_SUB_SCRIPT			[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
+	SID_ATTR_CHAR_KERNING		[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
 	SID_CELL_FORMAT_RESET	[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
 	SID_CHAR_DLG			[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
+	SID_CHAR_DLG_EFFECT		[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] 
 	SID_TOGGLE_REL			[ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ]
 
 	SID_HYPERLINK_SETLINK	[ ExecMethod = Execute; Export = FALSE; ]

Modified: openoffice/trunk/main/sc/sdi/formatsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/sdi/formatsh.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/sdi/formatsh.sdi (original)
+++ openoffice/trunk/main/sc/sdi/formatsh.sdi Wed Apr 10 09:20:16 2013
@@ -70,6 +70,7 @@ interface FormatForSelection
     SID_ATTR_ALIGN_INDENT [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
     SID_ATTR_ALIGN_HYPHENATION [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
     SID_ATTR_ALIGN_DEGREES     [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
+    SID_ATTR_ALIGN_STACKED     [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
     SID_ATTR_ALIGN_LOCKPOS     [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
     SID_ATTR_ALIGN_MARGIN      [ ExecMethod = ExecuteAlignment; StateMethod = GetAttrState; ]
 
@@ -99,6 +100,7 @@ interface FormatForSelection
 	SID_ALIGNCENTERVER	[ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]
 	SID_ALIGNBLOCK		[ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]
 	SID_ALIGNCENTERHOR	[ ExecMethod = ExecuteTextAttr;	StateMethod = GetTextAttrState;	]
+	SID_SCGRIDSHOW		[ ExecMethod = ExecViewOptions; StateMethod = GetViewOptions; ]
 
 	SID_V_ALIGNCELL			[ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ]
 	SID_H_ALIGNCELL			[ ExecMethod = ExecuteAlignment; StateMethod = GetAlignState; ]
@@ -122,6 +124,8 @@ interface FormatForSelection
 	SID_NUMBER_INCDEC		[ ExecMethod = ExecuteNumFormat;]
 	SID_NUMBER_DECDEC		[ ExecMethod = ExecuteNumFormat;]
 
+    SID_NUMBER_TYPE_FORMAT  [ ExecMethod = ExecuteNumFormat;StateMethod = GetNumFormatState; ]
+
 	SID_ATTR_BORDER				[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] 	//XXX
 	SID_ATTR_BORDER_INNER		[                           StateMethod = GetBorderState; ] // status()
     SID_ATTR_BORDER_OUTER       [ ExecMethod = ExecuteAttr; StateMethod = GetBorderState; ]
@@ -129,6 +133,8 @@ interface FormatForSelection
 	SID_ATTR_ALIGN_LINEBREAK	[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
 	SID_FRAME_LINESTYLE			[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
 	SID_FRAME_LINECOLOR			[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
+	SID_ATTR_BORDER_DIAG_TLBR	[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
+	SID_ATTR_BORDER_DIAG_BLTR	[ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
 
     SID_FORMATPAINTBRUSH    [ ExecMethod = ExecFormatPaintbrush; StateMethod = StateFormatPaintbrush; ]
 }

Modified: openoffice/trunk/main/sc/sdi/scalc.sdi
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/sdi/scalc.sdi?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/sdi/scalc.sdi (original)
+++ openoffice/trunk/main/sc/sdi/scalc.sdi Wed Apr 10 09:20:16 2013
@@ -7822,3 +7822,53 @@ SfxVoidItem SetTabBgColor FID_TAB_MENU_S
     GroupId = GID_FORMAT;
 ]
 
+//--------------------------------------------------------------------------
+SfxBoolItem ViewOption SID_SCGRIDSHOW
+[
+	AutoUpdate = TRUE,
+	Cachable = Cachable,
+	FastCall = FALSE,
+	HasCoreId = FALSE,
+	HasDialog = FALSE,
+	ReadOnlyDoc = FALSE, //TRUE
+	Toggle = FALSE,
+	Container = FALSE,
+	RecordAbsolute = FALSE,
+	RecordPerSet;
+	Synchron;
+
+	Readonly = FALSE,
+
+	/* config */
+	AccelConfig = FALSE, //TRUE
+	MenuConfig = FALSE,
+	StatusBarConfig = FALSE,
+	ToolBoxConfig = TRUE, //FALSE
+	GroupId = GID_DATA;
+]
+
+//--------------------------------------------------------------------------
+SfxUInt16Item NumberType SID_NUMBER_TYPE_FORMAT
+[
+	/* flags: */
+	AutoUpdate = FALSE,
+	Cachable = Cachable,
+	FastCall = FALSE,
+	HasCoreId = FALSE,
+	HasDialog = FALSE,
+	ReadOnlyDoc = TRUE,
+	Toggle = FALSE,
+	Container = FALSE,
+	RecordAbsolute = FALSE,
+	RecordPerSet;
+	Synchron;
+
+	Readonly = FALSE,
+
+	/* config: */
+	AccelConfig = FALSE,
+	MenuConfig = FALSE,
+	StatusBarConfig = FALSE,
+	ToolBoxConfig = TRUE,
+	GroupId = GID_VIEW;
+]

Modified: openoffice/trunk/main/sc/source/core/data/docpool.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/docpool.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/data/docpool.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/docpool.cxx Wed Apr 10 09:20:16 2013
@@ -181,7 +181,8 @@ static SfxItemInfo __READONLY_DATA  aIte
 	{ SID_ATTR_PAGE_FOOTERSET,		SFX_ITEM_POOLABLE },	// ATTR_PAGE_FOOTERSET
 	{ SID_SCATTR_PAGE_FORMULAS,		SFX_ITEM_POOLABLE },	// ATTR_PAGE_FORMULAS
     { SID_SCATTR_PAGE_NULLVALS,     SFX_ITEM_POOLABLE },    // ATTR_PAGE_NULLVALS
-    { SID_SCATTR_PAGE_SCALETO,      SFX_ITEM_POOLABLE }     // ATTR_PAGE_SCALETO
+    { SID_SCATTR_PAGE_SCALETO,      SFX_ITEM_POOLABLE },    // ATTR_PAGE_SCALETO
+	{ SID_SCGRIDSHOW,				SFX_ITEM_POOLABLE }
 };
 
 // -----------------------------------------------------------------------

Modified: openoffice/trunk/main/sc/source/core/data/documen9.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/documen9.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/data/documen9.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/documen9.cxx Wed Apr 10 09:20:16 2013
@@ -89,7 +89,7 @@ void ScDocument::EndDrawUndo()
 		delete pDrawLayer->GetCalcUndo();
 }
 
-XColorTable* ScDocument::GetColorTable()
+XColorList* ScDocument::GetColorTable()
 {
 	if (pDrawLayer)
 		return pDrawLayer->GetColorTable();
@@ -98,7 +98,7 @@ XColorTable* ScDocument::GetColorTable()
 		if (!pColorTable)
 		{
 			SvtPathOptions aPathOpt;
-			pColorTable = new XColorTable( aPathOpt.GetPalettePath() );
+			pColorTable = new XColorList( aPathOpt.GetPalettePath() );
 		}
 
 		return pColorTable;

Modified: openoffice/trunk/main/sc/source/core/data/drwlayer.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/drwlayer.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/data/drwlayer.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/drwlayer.cxx Wed Apr 10 09:20:16 2013
@@ -225,11 +225,11 @@ ScDrawLayer::ScDrawLayer( ScDocument* pD
 
 		// set color table
         SvxColorTableItem* pColItem = (SvxColorTableItem*) pObjSh->GetItem( SID_COLOR_TABLE );
-		XColorTable* pXCol = pColItem ? pColItem->GetColorTable() : XColorTable::GetStdColorTable();
+		XColorList* pXCol = pColItem ? pColItem->GetColorTable() : XColorList::GetStdColorList();
 		SetColorTable( pXCol );
 	}
 	else
-		SetColorTable( XColorTable::GetStdColorTable() );
+		SetColorTable( XColorList::GetStdColorList() );
 
 	SetSwapGraphics(sal_True);
 //	SetSwapAsynchron(sal_True);		// an der View

Modified: openoffice/trunk/main/sc/source/filter/excel/xiescher.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/filter/excel/xiescher.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/filter/excel/xiescher.cxx (original)
+++ openoffice/trunk/main/sc/source/filter/excel/xiescher.cxx Wed Apr 10 09:20:16 2013
@@ -648,7 +648,7 @@ void XclImpDrawObjBase::ConvertLineStyle
         long nLineWidth = 35 * ::std::min( rLineData.mnWidth, EXC_OBJ_LINE_THICK );
         rSdrObj.SetMergedItem( XLineWidthItem( nLineWidth ) );
         rSdrObj.SetMergedItem( XLineColorItem( EMPTY_STRING, GetPalette().GetColor( rLineData.mnColorIdx ) ) );
-        rSdrObj.SetMergedItem( XLineJointItem( XLINEJOINT_MITER ) );
+        rSdrObj.SetMergedItem( XLineJointItem( com::sun::star::drawing::LineJoint_MITER ) );
 
         sal_uLong nDotLen = ::std::max< sal_uLong >( 70 * rLineData.mnWidth, 35 );
         sal_uLong nDashLen = 3 * nDotLen;

Modified: openoffice/trunk/main/sc/source/ui/app/inputhdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/app/inputhdl.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/app/inputhdl.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/app/inputhdl.cxx Wed Apr 10 09:20:16 2013
@@ -2282,6 +2282,12 @@ void ScInputHandler::InvalidateAttribs()
 		rBindings.Invalidate( SID_ULINE_VAL_DOTTED );
 
 		rBindings.Invalidate( SID_HYPERLINK_GETLINK );
+		
+		rBindings.Invalidate( SID_ATTR_CHAR_KERNING );
+		rBindings.Invalidate( SID_SET_SUPER_SCRIPT );
+		rBindings.Invalidate( SID_SET_SUB_SCRIPT );
+		rBindings.Invalidate( SID_ATTR_CHAR_STRIKEOUT );
+		rBindings.Invalidate( SID_ATTR_CHAR_SHADOWED ); 
 	}
 }
 

Modified: openoffice/trunk/main/sc/source/ui/app/scdll.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/app/scdll.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/app/scdll.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/app/scdll.cxx Wed Apr 10 09:20:16 2013
@@ -37,6 +37,7 @@
 
 #include <sot/clsids.hxx>
 #include <sfx2/taskpane.hxx>
+#include <sfx2/sidebar/SidebarChildWindow.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/docfile.hxx>
@@ -262,7 +263,8 @@ void ScDLL::Init()
 
     // common SFX controller
     ::sfx2::TaskPaneWrapper::RegisterChildWindow( sal_False, pMod );
-
+    ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(NULL, pMod);
+    
 	// Svx-StatusBar-Controller
 	SvxInsertStatusBarControl		::RegisterControl(SID_ATTR_INSERT,		pMod);
 	SvxSelectionModeControl			::RegisterControl(SID_STATUS_SELMODE,	pMod);

Modified: openoffice/trunk/main/sc/source/ui/app/scmod.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/app/scmod.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/app/scmod.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/app/scmod.cxx Wed Apr 10 09:20:16 2013
@@ -1034,7 +1034,10 @@ void ScModule::ModifyOptions( const SfxI
 		}
 		SetViewOptions( rNewOpt );
 		if (pBindings)
+        {
 			pBindings->Invalidate(SID_HELPLINES_MOVE);
+			pBindings->Invalidate(SID_SCGRIDSHOW);
+        }
 	}
 
 	//============================================

Modified: openoffice/trunk/main/sc/source/ui/app/typemap.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/app/typemap.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/app/typemap.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/app/typemap.cxx Wed Apr 10 09:20:16 2013
@@ -107,6 +107,10 @@
 #include <editeng/crsditem.hxx>
 #include <editeng/brkitem.hxx>
 #include <editeng/charreliefitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/kernitem.hxx>
 #include <svx/rotmodit.hxx>
 #include <svx/drawitem.hxx>
 #include <svl/ilstitem.hxx>
@@ -127,5 +131,10 @@
 #define SvxChooseControlItem		SfxEnumItem
 #define avmedia_MediaItem           ::avmedia::MediaItem
 
+#include <svx/xflftrit.hxx>
+#include <svx/xlncapit.hxx>
+#include <svx/xlinjoit.hxx>
+#include <svx/AffineMatrixItem.hxx>
+
 #define SFX_TYPEMAP
 #include "scslots.hxx"

Modified: openoffice/trunk/main/sc/source/ui/dbgui/scendlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/dbgui/scendlg.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/dbgui/scendlg.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/dbgui/scendlg.cxx Wed Apr 10 09:20:16 2013
@@ -78,7 +78,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( Wind
         const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
 		if ( pItem )
 		{
-			XColorTable* pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
+			XColorList* pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
 			if (pColorTable)
 			{
 				aLbColor.SetUpdateMode( sal_False );

Modified: openoffice/trunk/main/sc/source/ui/docshell/docfunc.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/docshell/docfunc.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/docshell/docfunc.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/docshell/docfunc.cxx Wed Apr 10 09:20:16 2013
@@ -3668,6 +3668,11 @@ sal_Bool ScDocFunc::ChangeIndent( const 
 		pBindings->Invalidate( SID_ALIGNRIGHT );
 		pBindings->Invalidate( SID_ALIGNBLOCK );
 		pBindings->Invalidate( SID_ALIGNCENTERHOR );
+		pBindings->Invalidate( SID_ATTR_LRSPACE );
+		pBindings->Invalidate( SID_ATTR_PARA_ADJUST_LEFT );			
+		pBindings->Invalidate( SID_ATTR_PARA_ADJUST_RIGHT );
+		pBindings->Invalidate( SID_ATTR_PARA_ADJUST_BLOCK );
+		pBindings->Invalidate( SID_ATTR_PARA_ADJUST_CENTER);
         // pseudo slots for Format menu
         pBindings->Invalidate( SID_ALIGN_ANY_HDEFAULT );
         pBindings->Invalidate( SID_ALIGN_ANY_LEFT );

Modified: openoffice/trunk/main/sc/source/ui/docshell/docsh2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/docshell/docsh2.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/docshell/docsh2.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/docshell/docsh2.cxx Wed Apr 10 09:20:16 2013
@@ -169,7 +169,7 @@ void ScDocShell::InitItems()
 	else
 	{
 		//	always use global color table instead of local copy
-        PutItem( SvxColorTableItem( XColorTable::GetStdColorTable(), SID_COLOR_TABLE ) );
+        PutItem( SvxColorTableItem( XColorList::GetStdColorList(), SID_COLOR_TABLE ) );
 	}
 
 	if ( !aDocument.GetForbiddenCharacters().isValid() ||

Modified: openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx Wed Apr 10 09:20:16 2013
@@ -568,7 +568,7 @@ void ScDocShell::Execute( SfxRequest& rR
 			{
 				//	passende ColorTable ist per PutItem gesetzt worden
 				SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE);
-				XColorTable* pTable = pColItem->GetColorTable();
+				XColorList* pTable = pColItem->GetColorTable();
 				rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable));
 			}
 			break;

Modified: openoffice/trunk/main/sc/source/ui/drawfunc/chartsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/drawfunc/chartsh.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/drawfunc/chartsh.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/drawfunc/chartsh.cxx Wed Apr 10 09:20:16 2013
@@ -49,6 +49,7 @@
 #include "drawview.hxx"
 #include "scresid.hxx"
 #include <svx/svdobj.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
 
 #define ScChartShell
 #include "scslots.hxx"
@@ -69,6 +70,7 @@ ScChartShell::ScChartShell(ScViewData* p
 {
 	SetHelpId(HID_SCSHELL_CHARTSH);
 	SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ChartObject")));
+    SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Chart));
 }
 
 ScChartShell::~ScChartShell()
@@ -76,4 +78,8 @@ ScChartShell::~ScChartShell()
 }
 
 
-
+void ScChartShell::HandleSelectionChange (void)
+{
+    // Do not call the implementation in the base class.  Let
+    // Activate()/Deactivate() handle context switches.
+}

Modified: openoffice/trunk/main/sc/source/ui/drawfunc/drawsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/drawfunc/drawsh.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/drawfunc/drawsh.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/drawfunc/drawsh.cxx Wed Apr 10 09:20:16 2013
@@ -58,6 +58,8 @@
 #include <svx/dialogs.hrc>
 #include <svx/drawitem.hxx>
 #include <svx/xtable.hxx>
+#include "tabvwsh.hxx"
+#include <sfx2/bindings.hxx>
 
 #define ScDrawShell
 #include "scslots.hxx"
@@ -139,14 +141,21 @@ void ScDrawShell::ExecDrawAttr( SfxReque
 
 		case SID_ATTR_LINE_STYLE:
 		case SID_ATTR_LINEEND_STYLE:
+        case SID_ATTR_LINE_START:
+        case SID_ATTR_LINE_END:
 		case SID_ATTR_LINE_DASH:
 		case SID_ATTR_LINE_WIDTH:
 		case SID_ATTR_LINE_COLOR:
+        case SID_ATTR_LINE_TRANSPARENCE:
+        case SID_ATTR_LINE_JOINT:
+        case SID_ATTR_LINE_CAP:
 		case SID_ATTR_FILL_STYLE:
 		case SID_ATTR_FILL_COLOR:
 		case SID_ATTR_FILL_GRADIENT:
 		case SID_ATTR_FILL_HATCH:
 		case SID_ATTR_FILL_BITMAP:
+		case SID_ATTR_FILL_TRANSPARENCE:
+		case SID_ATTR_FILL_FLOATTRANSPARENCE:
 
 		// #i25616#
 		case SID_ATTR_FILL_SHADOW:
@@ -160,6 +169,9 @@ void ScDrawShell::ExecDrawAttr( SfxReque
 						case SID_ATTR_LINE_DASH:
 						case SID_ATTR_LINE_WIDTH:
 						case SID_ATTR_LINE_COLOR:
+                        case SID_ATTR_LINE_TRANSPARENCE:
+                        case SID_ATTR_LINE_JOINT:
+                        case SID_ATTR_LINE_CAP:
 							ExecuteLineDlg( rReq );
 							break;
 
@@ -168,6 +180,8 @@ void ScDrawShell::ExecDrawAttr( SfxReque
 						case SID_ATTR_FILL_GRADIENT:
 						case SID_ATTR_FILL_HATCH:
 						case SID_ATTR_FILL_BITMAP:
+		                case SID_ATTR_FILL_TRANSPARENCE:
+		                case SID_ATTR_FILL_FLOATTRANSPARENCE:
 
 						// #i25616#
 						case SID_ATTR_FILL_SHADOW:
@@ -235,6 +249,7 @@ void ScDrawShell::ExecDrawAttr( SfxReque
 #endif
 
 		case SID_ATTR_TRANSFORM:
+        {
 			{
 				if ( pView->AreObjectsMarked() )
 				{
@@ -302,8 +317,21 @@ void ScDrawShell::ExecDrawAttr( SfxReque
 						pView->SetGeoAttrToMarked( *pArgs );
 				}
 			}
-			break;
 
+            ScTabViewShell* pViewShell = pViewData->GetViewShell();
+            SfxBindings& rBindings=pViewShell->GetViewFrame()->GetBindings();
+            rBindings.Invalidate(SID_ATTR_TRANSFORM_WIDTH);
+            rBindings.Invalidate(SID_ATTR_TRANSFORM_HEIGHT);
+            rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_X);
+            rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_Y);
+            rBindings.Invalidate(SID_ATTR_TRANSFORM_ANGLE);
+            rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_X);
+            rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_Y);
+            rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOWIDTH);
+            rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOHEIGHT);
+            break;
+        }
+        
 		default:
 			break;
 	}
@@ -438,7 +466,7 @@ void ScDrawShell::ExecuteAreaDlg( SfxReq
     // (see SwDrawShell::ExecDrawDlg)
     const SvxColorTableItem* pColorItem =
         static_cast<const SvxColorTableItem*>( pViewData->GetSfxDocShell()->GetItem(SID_COLOR_TABLE) );
-    if (pColorItem->GetColorTable() == XColorTable::GetStdColorTable())
+    if (pColorItem->GetColorTable() == XColorList::GetStdColorList())
         pDlg->DontDeleteColorTable();
 
 	if ( nTabPage != 0xffff )

Modified: openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/drawfunc/drawsh2.cxx Wed Apr 10 09:20:16 2013
@@ -41,6 +41,8 @@
 #include <svx/svdouno.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
+#include <svx/sidebar/SelectionChangeHandler.hxx>
+#include <svx/sidebar/SelectionAnalyzer.hxx>
 
 #include "drawsh.hxx"
 #include "drawview.hxx"
@@ -53,15 +55,23 @@
 #include <svx/svdoole2.hxx>
 #include <svx/svdocapt.hxx>
 
+#include <boost/bind.hpp>
+
+
 sal_uInt16 ScGetFontWorkId();		// in drtxtob
 
 using namespace com::sun::star;
 
+
 //------------------------------------------------------------------
 
 ScDrawShell::ScDrawShell( ScViewData* pData ) :
 	SfxShell(pData->GetViewShell()),
-	pViewData( pData )
+	pViewData( pData ),
+    mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler(
+            ::boost::bind(&ScDrawShell::GetContextForSelection, this),
+            GetFrame()->GetFrame().GetController(),
+            sfx2::sidebar::EnumContext::Context_Cell))
 {
 	SetPool( &pViewData->GetScDrawView()->GetModel()->GetItemPool() );
     ::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
@@ -72,10 +82,13 @@ ScDrawShell::ScDrawShell( ScViewData* pD
     }
 	SetHelpId( HID_SCSHELL_DRAWSH );
 	SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Drawing")));
+
+    mpSelectionChangeHandler->Connect();
 }
 
 ScDrawShell::~ScDrawShell()
 {
+    mpSelectionChangeHandler->Disconnect();
 }
 
 void ScDrawShell::GetState( SfxItemSet& rSet )			// Zustaende / Toggles
@@ -138,6 +151,8 @@ void ScDrawShell::GetDrawFuncState( SfxI
 	{
 		rSet.DisableItem( SID_MIRROR_HORIZONTAL );
 		rSet.DisableItem( SID_MIRROR_VERTICAL );
+		rSet.DisableItem( SID_FLIP_HORIZONTAL );
+		rSet.DisableItem( SID_FLIP_VERTICAL );
 	}
 
 	const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
@@ -392,4 +407,20 @@ sal_Bool ScDrawShell::AreAllObjectsOnLay
 	return bResult;
 }
 
+void ScDrawShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet )
+{
+  	ScDrawView* pView = pViewData->GetScDrawView();
+  	const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
+  
+  	if( rMarkList.GetMark(0) != 0 )
+  	{
+  		SfxItemSet aNewAttr(pView->GetGeoAttrFromMarked());
+  		rSet.Put(aNewAttr, sal_False);
+  	}
+}
 
+sfx2::sidebar::EnumContext::Context ScDrawShell::GetContextForSelection (void)
+{
+    return ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SC(
+        GetDrawView()->GetMarkedObjectList());
+}

Modified: openoffice/trunk/main/sc/source/ui/drawfunc/drawsh4.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/drawfunc/drawsh4.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/drawfunc/drawsh4.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/drawfunc/drawsh4.cxx Wed Apr 10 09:20:16 2013
@@ -93,7 +93,7 @@ void ScDrawShell::GetFormTextState(SfxIt
 			if ( pDocSh )
 			{
                 const SfxPoolItem*  pItem = pDocSh->GetItem( SID_COLOR_TABLE );
-				XColorTable*		pColorTable = NULL;
+				XColorList*		pColorTable = NULL;
 
 				if ( pItem )
 					pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();

Modified: openoffice/trunk/main/sc/source/ui/drawfunc/drawsh5.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/drawfunc/drawsh5.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/drawfunc/drawsh5.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/drawfunc/drawsh5.cxx Wed Apr 10 09:20:16 2013
@@ -324,10 +324,14 @@ void ScDrawShell::ExecDrawFunc( SfxReque
             break;
 
         case SID_MIRROR_HORIZONTAL:
+        case SID_FLIP_HORIZONTAL:
             pView->MirrorAllMarkedHorizontal();
+            rBindings.Invalidate( SID_ATTR_TRANSFORM_ANGLE );
             break;
         case SID_MIRROR_VERTICAL:
+        case SID_FLIP_VERTICAL:
             pView->MirrorAllMarkedVertical();
+            rBindings.Invalidate( SID_ATTR_TRANSFORM_ANGLE );
             break;
 
         case SID_OBJECT_ALIGN_LEFT:

Modified: openoffice/trunk/main/sc/source/ui/drawfunc/drformsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/drawfunc/drformsh.cxx?rev=1466396&r1=1466395&r2=1466396&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/drawfunc/drformsh.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/drawfunc/drformsh.cxx Wed Apr 10 09:20:16 2013
@@ -50,6 +50,7 @@
 #include "drawview.hxx"
 #include "scresid.hxx"
 #include <svx/svdobj.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
 
 #define ScDrawFormShell
 #include "scslots.hxx"
@@ -69,11 +70,9 @@ ScDrawFormShell::ScDrawFormShell(ScViewD
 {
 	SetHelpId(HID_SCSHELL_DRAWFORMSH);
 	SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("DrawForm")));
+    SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Form));
 }
 
 ScDrawFormShell::~ScDrawFormShell()
 {
 }
-
-
-



Mime
View raw message