Author: af
Date: Thu Apr 4 11:40:34 2013
New Revision: 1464468
URL: http://svn.apache.org/r1464468
Log:
i121995: Added functions panel for Calc.
Added:
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-large-hc.png
(with props)
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-large.png
(with props)
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-small-hc.png
(with props)
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-small.png
(with props)
Modified:
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
openoffice/branches/sidebar/main/sc/source/ui/formdlg/dwfunctr.cxx
openoffice/branches/sidebar/main/sc/source/ui/sidebar/ScPanelFactory.cxx
openoffice/branches/sidebar/main/sfx2/source/dialog/dockwin.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.hrc
openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.src
Added:
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-large-hc.png
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-large-hc.png?rev=1464468&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-large-hc.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-large.png
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-large.png?rev=1464468&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-large.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-small-hc.png
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-small-hc.png?rev=1464468&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-small-hc.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-small.png
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-small.png?rev=1464468&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/sidebar-functions-small.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified:
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu?rev=1464468&r1=1464467&r2=1464468&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
(original)
+++
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
Thu Apr 4 11:40:34 2013
@@ -24,6 +24,7 @@
<oor:component-data oor:name="Sidebar" oor:package="org.openoffice.Office.UI"
xmlns:install="http://openoffice.org/2004/installation";
xmlns:oor="http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<node oor:name="Content">
<node oor:name="DeckList">
+
<node oor:name="PropertyDeck" oor:op="replace">
<prop oor:name="Title" oor:type="xs:string">
<value xml:lang="en-US">Properties</value>
@@ -62,11 +63,11 @@
</prop>
<prop oor:name="ContextList">
<value oor:separator=";">
- DrawImpress, any, visible ;
+ any, any, visible ;
</value>
</prop>
<prop oor:name="OrderIndex" oor:type="xs:int">
- <value>150</value>
+ <value>300</value>
</prop>
</node>
@@ -89,7 +90,7 @@
</value>
</prop>
<prop oor:name="OrderIndex" oor:type="xs:int">
- <value>200</value>
+ <value>120</value>
</prop>
</node>
@@ -112,7 +113,7 @@
</value>
</prop>
<prop oor:name="OrderIndex" oor:type="xs:int">
- <value>300</value>
+ <value>140</value>
</prop>
</node>
@@ -135,7 +136,7 @@
</value>
</prop>
<prop oor:name="OrderIndex" oor:type="xs:int">
- <value>400</value>
+ <value>160</value>
</prop>
</node>
@@ -158,7 +159,7 @@
</value>
</prop>
<prop oor:name="OrderIndex" oor:type="xs:int">
- <value>150</value>
+ <value>400</value>
</prop>
</node>
@@ -181,7 +182,30 @@
</value>
</prop>
<prop oor:name="OrderIndex" oor:type="xs:int">
- <value>150</value>
+ <value>200</value>
+ </prop>
+ </node>
+
+ <node oor:name="FunctionsDeck" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Functions</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>FunctionsDeck</value>
+ </prop>
+ <prop oor:name="IconURL" oor:type="xs:string">
+
<value>private:graphicrepository/sfx2/res/symphony/sidebar-functions-large.png</value>
+ </prop>
+ <prop oor:name="HighContrastIconURL" oor:type="xs:string">
+
<value>private:graphicrepository/sfx2/res/symphony/sidebar-functions-large-hc.png</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>500</value>
</prop>
</node>
@@ -932,6 +956,32 @@
</prop>
</node>
+ <node oor:name="FunctionsPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Functions</value>
+ </prop>
+ <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>FunctionsPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>FunctionsDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Calc, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+
<value>private:resource/toolpanel/ScPanelFactory/FunctionsPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
+
</node>
</node>
</oor:component-data>
Modified: openoffice/branches/sidebar/main/sc/source/ui/formdlg/dwfunctr.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/formdlg/dwfunctr.cxx?rev=1464468&r1=1464467&r2=1464468&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/formdlg/dwfunctr.cxx
(original)
+++ openoffice/branches/sidebar/main/sc/source/ui/formdlg/dwfunctr.cxx Thu Apr
4 11:40:34 2013
@@ -118,7 +118,10 @@ ScFunctionDockWin::ScFunctionDockWin( Sf
aTimer.SetTimeout(200);
aTimer.SetTimeoutHdl(LINK( this, ScFunctionDockWin, TimerHdl));
- eSfxNewAlignment=GetAlignment();
+ if (pCW != NULL)
+ eSfxNewAlignment=GetAlignment();
+ else
+ eSfxNewAlignment=SFX_ALIGN_RIGHT;
eSfxOldAlignment=eSfxNewAlignment;
aFiFuncDesc.SetUpdateMode(sal_True);
pAllFuncList=&aFuncList;
Modified:
openoffice/branches/sidebar/main/sc/source/ui/sidebar/ScPanelFactory.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/sidebar/ScPanelFactory.cxx?rev=1464468&r1=1464467&r2=1464468&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/sidebar/ScPanelFactory.cxx
(original)
+++ openoffice/branches/sidebar/main/sc/source/ui/sidebar/ScPanelFactory.cxx
Thu Apr 4 11:40:34 2013
@@ -27,6 +27,8 @@
#include <CellAppearancePropertyPanel.hxx>
#include <NumberFormatPropertyPanel.hxx>
#include <navipi.hxx>
+#include <dwfunctr.hxx>
+#include "sc.hrc"
#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sfxbasecontroller.hxx>
@@ -152,6 +154,15 @@ Reference<ui::XUIElement> SAL_CALL ScPan
pPanel,
ui::LayoutSize(0,-1,-1));
}
+ else if (DoesResourceEndWith("/FunctionsPanel"))
+ {
+ Window* pPanel = new ScFunctionDockWin(pBindings, NULL, pParentWindow,
ScResId(FID_FUNCTION_BOX));
+ xElement = sfx2::sidebar::SidebarPanelBase::Create(
+ rsResourceURL,
+ xFrame,
+ pPanel,
+ ui::LayoutSize(0,-1,-1));
+ }
#undef DoesResourceEndWith
return xElement;
Modified: openoffice/branches/sidebar/main/sfx2/source/dialog/dockwin.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/dialog/dockwin.cxx?rev=1464468&r1=1464467&r2=1464468&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/dialog/dockwin.cxx (original)
+++ openoffice/branches/sidebar/main/sfx2/source/dialog/dockwin.cxx Thu Apr 4
11:40:34 2013
@@ -1859,11 +1859,12 @@ long SfxDockingWindow::Notify( NotifyEve
{
if ( rEvt.GetType() == EVENT_GETFOCUS )
{
- pBindings->SetActiveFrame( pMgr->GetFrame() );
+ if (pMgr != NULL)
+ pBindings->SetActiveFrame( pMgr->GetFrame() );
if ( pImp->pSplitWin )
pImp->pSplitWin->SetActiveWindow_Impl( this );
- else
+ else if (pMgr != NULL)
pMgr->Activate_Impl();
Window* pWindow = rEvt.GetWindow();
@@ -1894,7 +1895,8 @@ long SfxDockingWindow::Notify( NotifyEve
else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() )
{
pBindings->SetActiveFrame( NULL );
- pMgr->Deactivate_Impl();
+ if (pMgr != NULL)
+ pMgr->Deactivate_Impl();
}
return DockingWindow::Notify( rEvt );
Modified: openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.hrc
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.hrc?rev=1464468&r1=1464467&r2=1464468&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.hrc (original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.hrc Thu Apr 4
11:40:34 2013
@@ -37,47 +37,51 @@
#define IMAGE_SIDEBAR_TOOLBOX_SEPARATOR 11
#define IMAGE_SIDEBAR_DECK_3D_LARGE 20
#define IMAGE_SIDEBAR_DECK_3D_LARGE_HC 21
-#define IMAGE_SIDEBAR_DECK_3D_SMALL 22
-#define IMAGE_SIDEBAR_DECK_3D_SMALL_HC 23
-#define IMAGE_SIDEBAR_DECK_ANIMATION_LARGE 30
-#define IMAGE_SIDEBAR_DECK_ANIMATION_LARGE_HC 31
-#define IMAGE_SIDEBAR_DECK_ANIMATION_SMALL 32
-#define IMAGE_SIDEBAR_DECK_ANIMATION_SMALL_HC 33
-#define IMAGE_SIDEBAR_DECK_COLORS_LARGE 40
-#define IMAGE_SIDEBAR_DECK_COLORS_LARGE_HC 41
-#define IMAGE_SIDEBAR_DECK_COLORS_SMALL 42
-#define IMAGE_SIDEBAR_DECK_COLORS_SMALL_HC 43
-#define IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE 50
-#define IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE_HC 51
-#define IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL 52
-#define IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL_HC 53
-#define IMAGE_SIDEBAR_DECK_GALLERY_LARGE 60
-#define IMAGE_SIDEBAR_DECK_GALLERY_LARGE_HC 61
-#define IMAGE_SIDEBAR_DECK_GALLERY_SMALL 62
-#define IMAGE_SIDEBAR_DECK_GALLERY_SMALL_HC 63
-#define IMAGE_SIDEBAR_DECK_IMGANIM_LARGE 70
-#define IMAGE_SIDEBAR_DECK_IMGANIM_LARGE_HC 71
-#define IMAGE_SIDEBAR_DECK_IMGANIM_SMALL 72
-#define IMAGE_SIDEBAR_DECK_IMGANIM_SMALL_HC 73
-#define IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE 80
-#define IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE_HC 81
-#define IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL 82
-#define IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL_HC 83
-#define IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE 90
-#define IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE_HC 91
-#define IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL 92
-#define IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL_HC 93
-#define IMAGE_SIDEBAR_DECK_STYLE_LARGE 100
-#define IMAGE_SIDEBAR_DECK_STYLE_LARGE_HC 101
-#define IMAGE_SIDEBAR_DECK_STYLE_SMALL 102
-#define IMAGE_SIDEBAR_DECK_STYLE_SMALL_HC 103
-#define IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE 110
-#define IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE_HC 111
-#define IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL 112
-#define IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL_HC 113
-#define IMAGE_SIDEBAR_DECK_TRANSITION_LARGE 120
-#define IMAGE_SIDEBAR_DECK_TRANSITION_LARGE_HC 121
-#define IMAGE_SIDEBAR_DECK_TRANSITION_SMALL 122
-#define IMAGE_SIDEBAR_DECK_TRANSITION_SMALL_HC 123
+#define IMAGE_SIDEBAR_DECK_3D_SMALL 22
+#define IMAGE_SIDEBAR_DECK_3D_SMALL_HC 23
+#define IMAGE_SIDEBAR_DECK_ANIMATION_LARGE 30
+#define IMAGE_SIDEBAR_DECK_ANIMATION_LARGE_HC 31
+#define IMAGE_SIDEBAR_DECK_ANIMATION_SMALL 32
+#define IMAGE_SIDEBAR_DECK_ANIMATION_SMALL_HC 33
+#define IMAGE_SIDEBAR_DECK_COLORS_LARGE 40
+#define IMAGE_SIDEBAR_DECK_COLORS_LARGE_HC 41
+#define IMAGE_SIDEBAR_DECK_COLORS_SMALL 42
+#define IMAGE_SIDEBAR_DECK_COLORS_SMALL_HC 43
+#define IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE 50
+#define IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE_HC 51
+#define IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL 52
+#define IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL_HC 53
+#define IMAGE_SIDEBAR_DECK_GALLERY_LARGE 60
+#define IMAGE_SIDEBAR_DECK_GALLERY_LARGE_HC 61
+#define IMAGE_SIDEBAR_DECK_GALLERY_SMALL 62
+#define IMAGE_SIDEBAR_DECK_GALLERY_SMALL_HC 63
+#define IMAGE_SIDEBAR_DECK_IMGANIM_LARGE 70
+#define IMAGE_SIDEBAR_DECK_IMGANIM_LARGE_HC 71
+#define IMAGE_SIDEBAR_DECK_IMGANIM_SMALL 72
+#define IMAGE_SIDEBAR_DECK_IMGANIM_SMALL_HC 73
+#define IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE 80
+#define IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE_HC 81
+#define IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL 82
+#define IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL_HC 83
+#define IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE 90
+#define IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE_HC 91
+#define IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL 92
+#define IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL_HC 93
+#define IMAGE_SIDEBAR_DECK_STYLE_LARGE 100
+#define IMAGE_SIDEBAR_DECK_STYLE_LARGE_HC 101
+#define IMAGE_SIDEBAR_DECK_STYLE_SMALL 102
+#define IMAGE_SIDEBAR_DECK_STYLE_SMALL_HC 103
+#define IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE 110
+#define IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE_HC 111
+#define IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL 112
+#define IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL_HC 113
+#define IMAGE_SIDEBAR_DECK_TRANSITION_LARGE 120
+#define IMAGE_SIDEBAR_DECK_TRANSITION_LARGE_HC 121
+#define IMAGE_SIDEBAR_DECK_TRANSITION_SMALL 122
+#define IMAGE_SIDEBAR_DECK_TRANSITION_SMALL_HC 123
+#define IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE 130
+#define IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE_HC 131
+#define IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL 132
+#define IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL_HC 133
#define STRING_CUSTOMIZATION 200
#define STRING_RESTORE 201
Modified: openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.src
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.src?rev=1464468&r1=1464467&r2=1464468&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.src (original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.src Thu Apr 4
11:40:34 2013
@@ -265,6 +265,23 @@ Resource RID_SIDEBAR_RESOURCE
ImageBitmap = Bitmap { File =
"symphony/sidebar-transition-small-hc.png" ;};
};
+ Image IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE
+ {
+ ImageBitmap = Bitmap { File = "symphony/sidebar-functions-large.png"
;};
+ };
+ Image IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE_HC
+ {
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-functions-large-hc.png" ;};
+ };
+ Image IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL
+ {
+ ImageBitmap = Bitmap { File = "symphony/sidebar-functions-small.png"
;};
+ };
+ Image IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL_HC
+ {
+ ImageBitmap = Bitmap { File =
"symphony/sidebar-functions-small-hc.png" ;};
+ };
+
String STRING_CUSTOMIZATION
{
Text [en-US] = "Customization";
