You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/05/31 15:56:04 UTC
svn commit: r1488227 [10/15] - in /openoffice/branches/rejuvenate01: ./
ext_libraries/apr/ ext_libraries/apr/prj/ ext_libraries/coinmp/prj/
ext_libraries/ratscan/prj/ ext_libraries/serf/prj/ main/
main/basctl/source/dlged/ main/basctl/uiconfig/basicide...
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_office_lang.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_office_lang.txt?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_office_lang.txt (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_office_lang.txt Fri May 31 13:55:58 2013
@@ -41,13 +41,14 @@ Start
module = "gid_Module_Langpack_Basis"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
+linuxreplaces = "ooobasis3.0-%LANGUAGESTRING,ooobasis3.1-%LANGUAGESTRING,ooobasis3.2-%LANGUAGESTRING,ooobasis3.3-%LANGUAGESTRING,ooobasis3.4-%LANGUAGESTRING"
+provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -57,13 +58,14 @@ Start
module = "gid_Module_Langpack_Fonts"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-fonts"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-fonts"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-fonts"
+linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-fonts,ooobasis3.1-%LANGUAGESTRING-fonts,ooobasis3.2-%LANGUAGESTRING-fonts,ooobasis3.3-%LANGUAGESTRING-fonts,ooobasis3.4-%LANGUAGESTRING-fonts"
+provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-fonts"
+requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language fonts module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language fonts module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -73,13 +75,14 @@ Start
module = "gid_Module_Langpack_Resource"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-res"
+linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-res,ooobasis3.1-%LANGUAGESTRING-res,ooobasis3.2-%LANGUAGESTRING-res,ooobasis3.3-%LANGUAGESTRING-res,ooobasis3.4-%LANGUAGESTRING-res"
+provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-res"
+requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language resource module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language resource module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -89,13 +92,14 @@ Start
module = "gid_Module_Langpack_Help"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-help"
+linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-help,ooobasis3.1-%LANGUAGESTRING-help,ooobasis3.2-%LANGUAGESTRING-help,ooobasis3.3-%LANGUAGESTRING-help,ooobasis3.4-%LANGUAGESTRING-help"
+provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-help"
+requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Language help module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Language help module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
@@ -105,13 +109,14 @@ Start
module = "gid_Module_Langpack_Writer"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-writer"
+linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-writer,ooobasis3.1-%LANGUAGESTRING-writer,ooobasis3.2-%LANGUAGESTRING-writer,ooobasis3.3-%LANGUAGESTRING-writer,ooobasis3.4-%LANGUAGESTRING-writer"
+provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-writer"
+requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Writer language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Writer language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"
@@ -121,13 +126,14 @@ Start
module = "gid_Module_Langpack_Calc"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-calc"
+linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-calc,ooobasis3.1-%LANGUAGESTRING-calc,ooobasis3.2-%LANGUAGESTRING-calc,ooobasis3.3-%LANGUAGESTRING-calc,ooobasis3.4-%LANGUAGESTRING-calc"
+provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-calc"
+requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Calc language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Calc language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc"
@@ -137,13 +143,14 @@ Start
module = "gid_Module_Langpack_Impress"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-impress"
+linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-impress,ooobasis3.1-%LANGUAGESTRING-impress,ooobasis3.2-%LANGUAGESTRING-impress,ooobasis3.3-%LANGUAGESTRING-impress,ooobasis3.4-%LANGUAGESTRING-impress"
+provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-impress"
+requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Impress language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Impress language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
@@ -153,13 +160,14 @@ Start
module = "gid_Module_Langpack_Draw"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-draw"
+linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-draw,ooobasis3.1-%LANGUAGESTRING-draw,ooobasis3.2-%LANGUAGESTRING-draw,ooobasis3.3-%LANGUAGESTRING-draw,ooobasis3.4-%LANGUAGESTRING-draw"
+provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-draw"
+requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Draw language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Draw language module for %APACHEPROJECTNAME , language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw"
@@ -169,13 +177,14 @@ Start
module = "gid_Module_Langpack_Math"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-math"
+linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-math,ooobasis3.1-%LANGUAGESTRING-math,ooobasis3.2-%LANGUAGESTRING-math,ooobasis3.3-%LANGUAGESTRING-math,ooobasis3.4-%LANGUAGESTRING-math"
+provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-math"
+requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Math language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Math language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math"
@@ -185,45 +194,31 @@ Start
module = "gid_Module_Langpack_Base"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-base"
+linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-base,ooobasis3.1-%LANGUAGESTRING-base,ooobasis3.2-%LANGUAGESTRING-base,ooobasis3.3-%LANGUAGESTRING-base,ooobasis3.4-%LANGUAGESTRING-base"
+provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-base"
+requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Base language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Base language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base"
End
Start
-module = "gid_Module_Langpack_Binfilter"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-binfilter"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-binfilter"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-copyright = "2012 by The Apache Software Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "Apache Software Foundation"
-description = "Legacy filters (e.g. StarOffice 5.2) for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
-destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter"
-End
-
-Start
module = "gid_Module_Langpack_Onlineupdate"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-onlineupd"
-provides = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-onlineupd"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-onlineupd"
+linuxreplaces = "ooobasis3.0-%LANGUAGESTRING-onlineupd,ooobasis3.1-%LANGUAGESTRING-onlineupd,ooobasis3.2-%LANGUAGESTRING-onlineupd,ooobasis3.3-%LANGUAGESTRING-onlineupd,ooobasis3.4-%LANGUAGESTRING-onlineupd"
+provides = "%BASISPACKAGEPREFIX-%LANGUAGESTRING-onlineupd"
+requires = "%BASISPACKAGEPREFIX-%LANGUAGESTRING"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Online update language module for %APACHEPROJECTNAME %OOOBASEVERSION, language %LANGUAGESTRING"
+description = "Online update language module for %APACHEPROJECTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate"
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_sdkoo.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_sdkoo.txt?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_sdkoo.txt (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_sdkoo.txt Fri May 31 13:55:58 2013
@@ -23,13 +23,14 @@ Start
module = "gid_Module_Root"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-sdk"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWbtool (Name="CCS tools bundled with SunOS"), SUNWxcu4 (Name="XCU4 Utilities")"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-sdk"
-freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+packagename = "%BASISPACKAGEPREFIX-sdk"
+linuxreplaces = "ooobasis3.0-sdk,ooobasis3.1-sdk,ooobasis3.2-sdk,ooobasis3.3-sdk,ooobasis3.4-sdk"
+freebsdrequires = "%BASISPACKAGEPREFIX-core01"
+requires = "%BASISPACKAGEPREFIX-core01"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "Software Development Kit for %APACHEPROJECTNAME %OOOBASEVERSION"
+description = "Software Development Kit for %APACHEPROJECTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%OOOPACKAGEVERSION"
End
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_ure.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_ure.txt?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_ure.txt (original)
+++ openoffice/branches/rejuvenate01/main/setup_native/source/packinfo/packinfo_ure.txt Fri May 31 13:55:58 2013
@@ -24,10 +24,11 @@ module = "gid_Module_Root"
solarispackagename = "%SOLSUREPACKAGEPREFIX-ure"
solarisrequires = "SUNWzlibr"
packagename = "%UREPACKAGEPREFIX-ure"
+linuxreplaces = "openoffice.org-ure"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "UNO Runtime Environment"
+description = "UNO Runtime Environment for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%UREPACKAGEVERSION"
End
@@ -37,10 +38,11 @@ module = "gid_Module_Root_Ure_Hidden"
solarispackagename = "%SOLSUREPACKAGEPREFIX-ure"
solarisrequires = "SUNWzlibr"
packagename = "%UREPACKAGEPREFIX-ure"
+linuxreplaces = "openoffice.org-ure"
copyright = "2012 by The Apache Software Foundation"
solariscopyright = "solariscopyrightfile"
vendor = "Apache Software Foundation"
-description = "UNO Runtime Environment"
+description = "UNO Runtime Environment for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%UREPACKAGEVERSION"
End
Modified: openoffice/branches/rejuvenate01/main/sfx2/Library_qstart.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/Library_qstart.mk?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/Library_qstart.mk (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/Library_qstart.mk Fri May 31 13:55:58 2013
@@ -68,7 +68,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
Modified: openoffice/branches/rejuvenate01/main/sfx2/Library_sfx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/Library_sfx.mk?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/Library_sfx.mk (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/Library_sfx.mk Fri May 31 13:55:58 2013
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
- tk \
+ ootk \
tl \
ucbhelper \
utl \
@@ -218,12 +218,15 @@ $(eval $(call gb_Library_add_exception_o
sfx2/source/sidebar/SidebarController \
sfx2/source/sidebar/SidebarPanelBase \
sfx2/source/sidebar/SidebarToolBox \
+ sfx2/source/sidebar/Accessible \
+ sfx2/source/sidebar/AccessibleTitleBar \
sfx2/source/sidebar/AsynchronousCall \
sfx2/source/sidebar/CommandInfoProvider \
sfx2/source/sidebar/Context \
sfx2/source/sidebar/ContextChangeBroadcaster \
sfx2/source/sidebar/ContextList \
sfx2/source/sidebar/ControlFactory \
+ sfx2/source/sidebar/ControllerFactory \
sfx2/source/sidebar/ControllerItem \
sfx2/source/sidebar/CustomImageRadioButton \
sfx2/source/sidebar/Deck \
@@ -234,6 +237,8 @@ $(eval $(call gb_Library_add_exception_o
sfx2/source/sidebar/EnumContext \
sfx2/source/sidebar/FocusManager \
sfx2/source/sidebar/MenuButton \
+ sfx2/source/sidebar/IContextChangeReceiver \
+ sfx2/source/sidebar/ILayoutableWindow \
sfx2/source/sidebar/Paint \
sfx2/source/sidebar/Panel \
sfx2/source/sidebar/PanelDescriptor \
Modified: openoffice/branches/rejuvenate01/main/sfx2/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/Package_inc.mk?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/Package_inc.mk (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/Package_inc.mk Fri May 31 13:55:58 2013
@@ -131,15 +131,16 @@ $(eval $(call gb_Package_add_file,sfx2_i
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/SidebarChildWindow.hxx,sfx2/sidebar/SidebarChildWindow.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/SidebarPanelBase.hxx,sfx2/sidebar/SidebarPanelBase.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/CommandInfoProvider.hxx,sfx2/sidebar/CommandInfoProvider.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ControlFactory.hxx,sfx2/sidebar/ControlFactory.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ControllerFactory.hxx,sfx2/sidebar/ControllerFactory.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ControllerItem.hxx,sfx2/sidebar/ControllerItem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ResourceDefinitions.hrc,sfx2/sidebar/ResourceDefinitions.hrc))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/EnumContext.hxx,sfx2/sidebar/EnumContext.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ControlFactory.hxx,sfx2/sidebar/ControlFactory.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/Theme.hxx,sfx2/sidebar/Theme.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ILayoutableWindow.hxx,sfx2/sidebar/ILayoutableWindow.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/IContextChangeReceiver.hxx,sfx2/sidebar/IContextChangeReceiver.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ILayoutableWindow.hxx,sfx2/sidebar/ILayoutableWindow.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ResourceDefinitions.hrc,sfx2/sidebar/ResourceDefinitions.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/SidebarChildWindow.hxx,sfx2/sidebar/SidebarChildWindow.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/SidebarPanelBase.hxx,sfx2/sidebar/SidebarPanelBase.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/SidebarToolBox.hxx,sfx2/sidebar/SidebarToolBox.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/Theme.hxx,sfx2/sidebar/Theme.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/Tools.hxx,sfx2/sidebar/Tools.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/CommandInfoProvider.hxx,sfx2/sidebar/CommandInfoProvider.hxx))
-
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/mnuitem.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/mnuitem.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/mnuitem.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/mnuitem.hxx Fri May 31 13:55:58 2013
@@ -37,6 +37,9 @@ struct SfxMenuCtrlFactory;
#include <tools/string.hxx>
#include <sfx2/ctrlitem.hxx>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/util/URL.hpp>
+
class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
{
//friend SvStream& operator<<( SvStream& rStream, const SfxMenuControl& rItem );
@@ -165,6 +168,15 @@ public:
SFX_DECL_MENU_CONTROL();
SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings );
~SfxAppMenuControl_Impl();
+
+ struct ExecuteInfo
+ {
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
+ ::com::sun::star::util::URL aTargetURL;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs;
+ };
+
+ DECL_STATIC_LINK( SfxAppMenuControl_Impl, ExecuteHdl_Impl, ExecuteInfo* );
};
//#endif
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/shell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/shell.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/shell.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/shell.hxx Fri May 31 13:55:58 2013
@@ -254,7 +254,20 @@ public:
virtual SfxItemSet* CreateItemSet( sal_uInt16 nId );
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
- void SetContextName (const ::rtl::OUString& rsContextName);
+ /** Set the name of the sidebar context that is broadcast on calls
+ to Activation().
+ */
+ void SetContextName (const ::rtl::OUString& rsContextName);
+
+ /** Broadcast a sidebar context change.
+ This method is typically called from Activate() or
+ Deactivate().
+ @param bIsActivated
+ When <TRUE/> then broadcast the context name that was
+ defined with an earlier call to SetContextName().
+ When <FALSE/> then broadcast the 'default' context.
+ */
+ void BroadcastContextForActivation (const bool bIsActivated);
#ifndef _SFXSH_HXX
SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot );
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControlFactory.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControlFactory.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControlFactory.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControlFactory.hxx Fri May 31 13:55:58 2013
@@ -23,22 +23,58 @@
#define SFX_SIDEBAR_CONTROL_FACTORY_HXX
#include <sfx2/dllapi.h>
+#include <sfx2/sidebar/SidebarToolBox.hxx>
#include <vcl/button.hxx>
-
+#include <com/sun/star/frame/XFrame.hpp>
class ToolBox;
namespace sfx2 { namespace sidebar {
class ToolBoxBackground;
-
+/** Factory for controls used in sidebar panels.
+ The reason to use this factory instead of creating the controls
+ directly is that this way the sidebar has a little more control
+ over look and feel of its controls.
+*/
class SFX2_DLLPUBLIC ControlFactory
{
public:
+ /** Create the menu button for the task bar.
+ */
static CheckBox* CreateMenuButton (Window* pParentWindow);
+
static ImageRadioButton* CreateTabItem (Window* pParentWindow);
- static ToolBox* CreateToolBox (Window* pParentWindow, const ResId& rResId);
- static Window* CreateToolBoxBackground (Window* pParentWindow);
+
+ /** Create a tool box that does *not* handle its items. The
+ caller has to register callbacks to process, among others,
+ click and selection events.
+ */
+ static SidebarToolBox* CreateToolBox (
+ Window* pParentWindow,
+ const ResId& rResId);
+
+ /** Create a tool box that *does* handle its items. All event
+ processing is done by toolbox controllers.
+ */
+ static SidebarToolBox* CreateToolBox (
+ Window* pParentWindow,
+ const ResId& rResId,
+ const ::com::sun::star::uno::Reference<com::sun::star::frame::XFrame>& rxFrame);
+
+ /** Create a window that acts as background of a tool box.
+ In general it is slightly larger than the tool box.
+ @param pParentWindow
+ The parent window of the new background control.
+ @param bShowBorder
+ When <TRUE/> then the background control is made slightly
+ larger then its tool box child, once that is created.
+ Otherwise the background control will not be visible.
+ */
+ static Window* CreateToolBoxBackground (
+ Window* pParentWindow,
+ const bool bShowBorder = true);
+
static ImageRadioButton* CreateCustomImageRadionButton(
Window* pParentWindow,
const ResId& rResId );
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControllerItem.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControllerItem.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControllerItem.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ControllerItem.hxx Fri May 31 13:55:58 2013
@@ -91,7 +91,7 @@ public:
Changes of this state are notified via the
ItemUpdateReceiverInterface::NotifyContextChang() method.
*/
- bool IsEnabled (void) const;
+ bool IsEnabled (const SfxItemState eState) const;
/** Force the controller item to call its NotifyItemUpdate
callback with up-to-date data.
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx Fri May 31 13:55:58 2013
@@ -41,6 +41,7 @@ public:
Application_WriterWeb,
Application_WriterXML,
Application_WriterForm,
+ Application_WriterReport,
Application_Calc,
Application_Draw,
Application_Impress,
@@ -128,7 +129,11 @@ public:
sal_Int32 GetCombinedContext_DI(void) const;
const ::rtl::OUString& GetApplicationName (void) const;
+ Application GetApplication (void) const;
+ Application GetApplication_DI (void) const;
+
const ::rtl::OUString& GetContextName (void) const;
+ Context GetContext (void) const;
bool operator == (const EnumContext aOther);
bool operator != (const EnumContext aOther);
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx Fri May 31 13:55:58 2013
@@ -23,6 +23,7 @@
#define SFX_SIDEBAR_CONTEXT_CHANGE_RECEIVER_INTERFACE_HXX
#include "EnumContext.hxx"
+#include "sfx2/dllapi.h"
namespace sfx2 { namespace sidebar {
@@ -31,8 +32,9 @@ namespace sfx2 { namespace sidebar {
class SFX2_DLLPUBLIC IContextChangeReceiver
{
public:
- virtual void HandleContextChange (
- const EnumContext aContext) = 0;
+ virtual ~IContextChangeReceiver (void);
+
+ virtual void HandleContextChange (const EnumContext aContext) = 0;
};
} } // end of namespace ::sd::sidebar
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx Fri May 31 13:55:58 2013
@@ -22,6 +22,7 @@
#ifndef SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX
#define SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX
+#include "sfx2/dllapi.h"
#include <tools/gen.hxx>
#include <sal/types.h>
@@ -32,9 +33,11 @@ class Window;
namespace sfx2 { namespace sidebar {
-class ILayoutableWindow
+class SFX2_DLLPUBLIC ILayoutableWindow
{
public:
+ virtual ~ILayoutableWindow (void);
+
/** Return the preferred height with the constraint, that the
window will be set to the given width.
*/
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx Fri May 31 13:55:58 2013
@@ -23,6 +23,7 @@
#define SFX_SIDEBAR_PANEL_BASE_HXX
#include "EnumContext.hxx"
+#include "IContextChangeReceiver.hxx"
#include <cppuhelper/compbase4.hxx>
#include <cppuhelper/basemutex.hxx>
@@ -67,7 +68,7 @@ public:
static cssu::Reference<css::ui::XUIElement> Create (
const ::rtl::OUString& rsResourceURL,
const cssu::Reference<css::frame::XFrame>& rxFrame,
- Window* mpWindow,
+ Window* pControl,
const css::ui::LayoutSize& rLayoutSize);
// XContextChangeEventListener
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/Tools.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/Tools.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/Tools.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/sidebar/Tools.hxx Fri May 31 13:55:58 2013
@@ -64,6 +64,9 @@ public:
static cssu::Reference<css::frame::XDispatch> GetDispatch (
const cssu::Reference<css::frame::XFrame>& rxFrame,
const css::util::URL& rURL);
+
+ static ::rtl::OUString GetModuleName (
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
};
Modified: openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/tbxctrl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/tbxctrl.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/tbxctrl.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/inc/sfx2/tbxctrl.hxx Fri May 31 13:55:58 2013
@@ -346,46 +346,6 @@ public:
//------------------------------------------------------------------------
-class SfxAppToolBoxControl_Impl : public SfxToolBoxControl
-
-/* [Beschreibung]
-
- Interne Hilfsklasse f"ur um das Popup-Menu <AppMenu_Impl> unter Neu
- im SDT zu starten.
-*/
-
-{
-public:
- SFX_DECL_TOOLBOX_CONTROL();
- SfxAppToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
- ~SfxAppToolBoxControl_Impl();
- void SetImage( const String& rFacName );
-
- struct ExecuteInfo
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
- ::com::sun::star::util::URL aTargetURL;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs;
- };
-
- DECL_STATIC_LINK( SfxAppToolBoxControl_Impl, ExecuteHdl_Impl, ExecuteInfo* );
-
-protected:
- virtual void Click();
- using SfxToolBoxControl::Select;
- virtual void Select( sal_Bool );
- virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
- virtual SfxPopupWindow* CreatePopupWindow();
- DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
-private:
- String aLastURL;
- sal_Bool bBigImages;
- PopupMenu* pMenu;
- sal_uIntPtr m_nSymbolsStyle;
- sal_Bool m_bWasHiContrastMode;
- sal_Bool m_bShowMenuImages;
-};
-
class SfxHistoryToolBoxControl_Impl : public SfxToolBoxControl
{
Timer aTimer;
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/appl/appreg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/appl/appreg.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/appl/appreg.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/appl/appreg.cxx Fri May 31 13:55:58 2013
@@ -69,8 +69,6 @@ void SfxApplication::Registrations_Impl(
// Controller
SfxToolBoxControl::RegisterControl(SID_REPEAT);
SfxURLToolBoxControl_Impl::RegisterControl(SID_OPENURL);
- SfxAppToolBoxControl_Impl::RegisterControl( SID_NEWDOCDIRECT );
- SfxAppToolBoxControl_Impl::RegisterControl( SID_AUTOPILOTMENU );
};
//--------------------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/control/shell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/control/shell.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/control/shell.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/control/shell.cxx Fri May 31 13:55:58 2013
@@ -761,17 +761,12 @@ void SfxShell::Activate
wird, um den Subclasses die Gelegenheit zu geben, auf das Aktivieren
zu reagieren.
- Die Basisimplementation ist leer und braucht nicht gerufen zu werden.
-
-
[Querverweise]
StarView SystemWindow::Activate(sal_Bool)
*/
{
- SfxViewFrame* pViewFrame = GetFrame();
- if (pViewFrame != NULL)
- pImp->maContextChangeBroadcaster.Activate(pViewFrame->GetFrame().GetFrameInterface());
+ BroadcastContextForActivation(true);
}
//--------------------------------------------------------------------
@@ -797,19 +792,15 @@ void SfxShell::Deactivate
wird, um den Subclasses die Gelegenheit zu geben, auf das Deaktivieren
zu reagieren.
- Die Basisimplementation ist leer und braucht nicht gerufen zu werden.
-
-
[Querverweise]
StarView SystemWindow::Dectivate(sal_Bool)
*/
{
- SfxViewFrame* pViewFrame = GetFrame();
- if (pViewFrame != NULL)
- pImp->maContextChangeBroadcaster.Deactivate(pViewFrame->GetFrame().GetFrameInterface());
+ BroadcastContextForActivation(false);
}
+
void SfxShell::ParentActivate
(
)
@@ -1298,3 +1289,12 @@ void SfxShell::SetViewShell_Impl( SfxVie
+void SfxShell::BroadcastContextForActivation (const bool bIsActivated)
+{
+ SfxViewFrame* pViewFrame = GetFrame();
+ if (pViewFrame != NULL)
+ if (bIsActivated)
+ pImp->maContextChangeBroadcaster.Activate(pViewFrame->GetFrame().GetFrameInterface());
+ else
+ pImp->maContextChangeBroadcaster.Deactivate(pViewFrame->GetFrame().GetFrameInterface());
+}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/dialog/templdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/dialog/templdlg.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/dialog/templdlg.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/dialog/templdlg.cxx Fri May 31 13:55:58 2013
@@ -419,6 +419,8 @@ SfxTemplatePanelControl::SfxTemplatePane
OSL_ASSERT(mpBindings!=NULL);
pImpl->updateNonFamilyImages();
+
+ SetStyle(GetStyle() & ~WB_DOCKABLE);
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/menu/mnuitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/menu/mnuitem.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/menu/mnuitem.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/menu/mnuitem.cxx Fri May 31 13:55:58 2013
@@ -574,3 +574,62 @@ void SfxUnoMenuControl::Select()
{
pUnoCtrl->Execute();
}
+
+long Select_Impl( void* /*pHdl*/, void* pVoid )
+{
+ Menu* pMenu = (Menu*)pVoid;
+ String aURL( pMenu->GetItemCommand( pMenu->GetCurItemId() ) );
+
+ if( !aURL.Len() )
+ return 0;
+
+ Reference < ::com::sun::star::frame::XFramesSupplier > xDesktop =
+ Reference < ::com::sun::star::frame::XFramesSupplier >( ::comphelper::getProcessServiceFactory()->createInstance(
+ DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
+ Reference < ::com::sun::star::frame::XFrame > xFrame( xDesktop, UNO_QUERY );
+
+ URL aTargetURL;
+ aTargetURL.Complete = aURL;
+ Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
+ rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )),
+ UNO_QUERY );
+ xTrans->parseStrict( aTargetURL );
+
+ Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
+ Reference < XDispatch > xDisp;
+ if ( xProv.is() )
+ {
+ if ( aTargetURL.Protocol.compareToAscii("slot:") == COMPARE_EQUAL )
+ xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+ else
+ {
+ ::rtl::OUString aTargetFrame( ::rtl::OUString::createFromAscii( "_blank" ) );
+ ::framework::MenuConfiguration::Attributes* pMenuAttributes =
+ (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() );
+
+ if ( pMenuAttributes )
+ aTargetFrame = pMenuAttributes->aTargetFrame;
+
+ xDisp = xProv->queryDispatch( aTargetURL, aTargetFrame , 0 );
+ }
+ }
+
+ if ( xDisp.is() )
+ {
+ SfxAppMenuControl_Impl::ExecuteInfo* pExecuteInfo = new SfxAppMenuControl_Impl::ExecuteInfo;
+ pExecuteInfo->xDispatch = xDisp;
+ pExecuteInfo->aTargetURL = aTargetURL;
+ pExecuteInfo->aArgs = Sequence< PropertyValue >();
+ Application::PostUserEvent( STATIC_LINK( 0, SfxAppMenuControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
+ }
+
+ return sal_True;
+}
+
+
+IMPL_STATIC_LINK_NOINSTANCE( SfxAppMenuControl_Impl, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
+{
+ pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
+ delete pExecuteInfo;
+ return 0;
+}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/AsynchronousCall.cxx Fri May 31 13:55:58 2013
@@ -72,7 +72,7 @@ void AsynchronousCall::CancelRequest (vo
if (mnCallId != 0)
{
Application::RemoveUserEvent(mnCallId);
- mnCallId = -1;
+ mnCallId = 0;
}
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ContextList.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ContextList.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ContextList.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ContextList.cxx Fri May 31 13:55:58 2013
@@ -56,18 +56,6 @@ const ContextList::Entry* ContextList::G
-ContextList::Entry* ContextList::GetMatch (const Context& rContext)
-{
- const ::std::vector<Entry>::const_iterator iEntry = FindBestMatch(rContext);
- if (iEntry != maEntries.end())
- return const_cast<Entry*>(&*iEntry);
- else
- return NULL;
-}
-
-
-
-
::std::vector<ContextList::Entry>::const_iterator ContextList::FindBestMatch (const Context& rContext) const
{
sal_Int32 nBestMatch (Context::NoMatch);
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControlFactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControlFactory.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControlFactory.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControlFactory.cxx Fri May 31 13:55:58 2013
@@ -25,7 +25,7 @@
#include "MenuButton.hxx"
#include "TabItem.hxx"
-#include "SidebarToolBox.hxx"
+#include "sfx2/sidebar/SidebarToolBox.hxx"
#include "ToolBoxBackground.hxx"
#include "CustomImageRadioButton.hxx"
#include <vcl/toolbox.hxx>
@@ -50,11 +50,27 @@ ImageRadioButton* ControlFactory::Create
-ToolBox* ControlFactory::CreateToolBox (
+SidebarToolBox* ControlFactory::CreateToolBox (
Window* pParentWindow,
const ResId& rResId)
{
- SidebarToolBox* pToolBox = new SidebarToolBox(pParentWindow, rResId);
+ SidebarToolBox* pToolBox = new SidebarToolBox(pParentWindow, rResId, NULL);
+ pToolBox->SetBorderWindow(pParentWindow);
+
+ pToolBox->Invalidate();
+
+ return pToolBox;
+}
+
+
+
+
+SidebarToolBox* ControlFactory::CreateToolBox (
+ Window* pParentWindow,
+ const ResId& rResId,
+ const cssu::Reference<css::frame::XFrame>& rxFrame)
+{
+ SidebarToolBox* pToolBox = new SidebarToolBox(pParentWindow, rResId, rxFrame);
pToolBox->SetBorderWindow(pParentWindow);
pToolBox->Invalidate();
@@ -66,9 +82,10 @@ ToolBox* ControlFactory::CreateToolBox (
Window* ControlFactory::CreateToolBoxBackground (
- Window* pParentWindow)
+ Window* pParentWindow,
+ const bool bShowBorder)
{
- ToolBoxBackground* pBorderWindow = new ToolBoxBackground(pParentWindow);
+ ToolBoxBackground* pBorderWindow = new ToolBoxBackground(pParentWindow, bShowBorder);
pBorderWindow->Show();
return pBorderWindow;
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControllerItem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControllerItem.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControllerItem.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ControllerItem.cxx Fri May 31 13:55:58 2013
@@ -139,15 +139,17 @@ void ControllerItem::StateChanged (
SfxItemState eState,
const SfxPoolItem* pState)
{
- mrItemUpdateReceiver.NotifyItemUpdate(nSID, eState, pState, IsEnabled());
+ mrItemUpdateReceiver.NotifyItemUpdate(nSID, eState, pState, IsEnabled(eState));
}
-bool ControllerItem::IsEnabled (void) const
+bool ControllerItem::IsEnabled (SfxItemState eState) const
{
- if ( ! SvtCommandOptions().HasEntries(SvtCommandOptions::CMDOPTION_DISABLED))
+ if (eState == SFX_ITEM_DISABLED)
+ return false;
+ else if ( ! SvtCommandOptions().HasEntries(SvtCommandOptions::CMDOPTION_DISABLED))
{
// There are no disabled commands.
return true;
@@ -174,7 +176,7 @@ void ControllerItem::RequestUpdate (void
{
SfxPoolItem* pState = NULL;
const SfxItemState eState (GetBindings().QueryState(GetId(), pState));
- mrItemUpdateReceiver.NotifyItemUpdate(GetId(), eState, pState, IsEnabled());
+ mrItemUpdateReceiver.NotifyItemUpdate(GetId(), eState, pState, IsEnabled(eState));
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Deck.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Deck.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Deck.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Deck.cxx Fri May 31 13:55:58 2013
@@ -26,6 +26,7 @@
#include "DeckLayouter.hxx"
#include "DrawHelper.hxx"
#include "DeckTitleBar.hxx"
+#include "PanelTitleBar.hxx"
#include "Paint.hxx"
#include "Panel.hxx"
#include "ToolBoxBackground.hxx"
@@ -222,49 +223,57 @@ void Deck::DataChanged (const DataChange
long Deck::Notify (NotifyEvent& rEvent)
{
- if (rEvent.GetType() != EVENT_COMMAND)
- return sal_False;
+ if (rEvent.GetType() == EVENT_COMMAND)
+ {
+ CommandEvent* pCommandEvent = reinterpret_cast<CommandEvent*>(rEvent.GetData());
+ if (pCommandEvent != NULL)
+ switch (pCommandEvent->GetCommand())
+ {
+ case COMMAND_WHEEL:
+ return ProcessWheelEvent(pCommandEvent, rEvent)
+ ? sal_True
+ : sal_False;
+
+ default:
+ break;
+ }
+ }
+
+ return Window::Notify(rEvent);
+}
- CommandEvent* pCommandEvent = reinterpret_cast<CommandEvent*>(rEvent.GetData());
- if (pCommandEvent == NULL)
- return sal_False;
- switch (pCommandEvent->GetCommand())
- {
- case COMMAND_WHEEL:
- {
- if ( ! mpVerticalScrollBar
- || ! mpVerticalScrollBar->IsVisible())
- return sal_False;
-
- // Ignore all wheel commands from outside the vertical
- // scroll bar. Otherwise after a scroll we might land on
- // a spin field and subsequent wheel events would change
- // the value of that control.
- if (rEvent.GetWindow() != mpVerticalScrollBar.get())
- return sal_True;
-
- // Get the wheel data and check that it describes a valid
- // vertical scroll.
- const CommandWheelData* pData = pCommandEvent->GetWheelData();
- if (pData==NULL
- || pData->GetModifier()
- || pData->GetMode() != COMMAND_WHEEL_SCROLL
- || pData->IsHorz())
- return sal_False;
-
- // Execute the actual scroll action.
- long nDelta = pData->GetDelta();
- mpVerticalScrollBar->DoScroll(
- mpVerticalScrollBar->GetThumbPos() - nDelta);
- return sal_True;
- }
- default:
- break;
- }
- return sal_False;
+bool Deck::ProcessWheelEvent (
+ CommandEvent* pCommandEvent,
+ NotifyEvent& rEvent)
+{
+ if ( ! mpVerticalScrollBar)
+ return false;
+ if ( ! mpVerticalScrollBar->IsVisible())
+ return false;
+
+ // Ignore all wheel commands from outside the vertical scroll bar.
+ // Otherwise after a scroll we might land on a spin field and
+ // subsequent wheel events would change the value of that control.
+ if (rEvent.GetWindow() != mpVerticalScrollBar.get())
+ return true;
+
+ // Get the wheel data and check that it describes a valid vertical
+ // scroll.
+ const CommandWheelData* pData = pCommandEvent->GetWheelData();
+ if (pData==NULL
+ || pData->GetModifier()
+ || pData->GetMode() != COMMAND_WHEEL_SCROLL
+ || pData->IsHorz())
+ return false;
+
+ // Execute the actual scroll action.
+ long nDelta = pData->GetDelta();
+ mpVerticalScrollBar->DoScroll(
+ mpVerticalScrollBar->GetThumbPos() - nDelta);
+ return true;
}
@@ -290,8 +299,6 @@ const SharedPanelContainer& Deck::GetPan
void Deck::RequestLayout (void)
{
- // PrintWindowTree();
-
DeckLayouter::LayoutDeck(
GetContentArea(),
maPanels,
@@ -300,8 +307,6 @@ void Deck::RequestLayout (void)
*mpScrollContainer,
*mpFiller,
*mpVerticalScrollBar);
-
- Invalidate();
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Deck.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Deck.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Deck.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Deck.hxx Fri May 31 13:55:58 2013
@@ -104,8 +104,9 @@ private:
::boost::scoped_ptr<ScrollBar> mpVerticalScrollBar;
DECL_LINK(HandleVerticalScrollBarChange,void*);
-
-
+ bool ProcessWheelEvent (
+ CommandEvent* pCommandEvent,
+ NotifyEvent& rEvent);
};
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckDescriptor.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckDescriptor.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckDescriptor.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckDescriptor.cxx Fri May 31 13:55:58 2013
@@ -30,9 +30,12 @@ DeckDescriptor::DeckDescriptor (void)
msId(),
msIconURL(),
msHighContrastIconURL(),
+ msTitleBarIconURL(),
+ msHighContrastTitleBarIconURL(),
msHelpURL(),
msHelpText(),
maContextList(),
+ mbIsEnabled(true),
mnOrderIndex(10000) // Default value as defined in Sidebar.xcs
{
}
@@ -45,9 +48,12 @@ DeckDescriptor::DeckDescriptor (const De
msId(rOther.msId),
msIconURL(rOther.msIconURL),
msHighContrastIconURL(rOther.msHighContrastIconURL),
+ msTitleBarIconURL(rOther.msTitleBarIconURL),
+ msHighContrastTitleBarIconURL(rOther.msHighContrastTitleBarIconURL),
msHelpURL(rOther.msHelpURL),
msHelpText(rOther.msHelpText),
maContextList(rOther.maContextList),
+ mbIsEnabled(rOther.mbIsEnabled),
mnOrderIndex(rOther.mnOrderIndex)
{
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckLayouter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckLayouter.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckLayouter.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckLayouter.cxx Fri May 31 13:55:58 2013
@@ -24,7 +24,7 @@
#include "DeckLayouter.hxx"
#include "sfx2/sidebar/Theme.hxx"
#include "Panel.hxx"
-#include "TitleBar.hxx"
+#include "PanelTitleBar.hxx"
#include "Deck.hxx"
#include <vcl/window.hxx>
@@ -222,7 +222,7 @@ sal_Int32 DeckLayouter::PlacePanels (
nY += nDeckSeparatorHeight;
// Place the title bar.
- TitleBar* pTitleBar = rPanel.GetTitleBar();
+ PanelTitleBar* pTitleBar = rPanel.GetTitleBar();
if (pTitleBar != NULL)
{
if (iItem->mbShowTitleBar)
@@ -328,7 +328,7 @@ void DeckLayouter::GetRequestedSizes (
if (xPanel.is())
aLayoutSize = xPanel->getHeightForWidth(rContentBox.GetWidth());
else
- aLayoutSize = ui::LayoutSize(MinimalPanelHeight, 0, -1);
+ aLayoutSize = ui::LayoutSize(MinimalPanelHeight, -1, 0);
}
}
iItem->maLayoutSize = aLayoutSize;
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckTitleBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckTitleBar.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckTitleBar.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckTitleBar.cxx Fri May 31 13:55:58 2013
@@ -23,6 +23,8 @@
#include "DeckTitleBar.hxx"
#include "sfx2/sidebar/Theme.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "Sidebar.hrc"
#include <vcl/image.hxx>
@@ -44,16 +46,12 @@ DeckTitleBar::DeckTitleBar (
: TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()),
mnCloserItemIndex(1),
maCloserAction(rCloserAction),
- mbIsCloserVisible(rCloserAction)
+ mbIsCloserVisible(false)
{
OSL_ASSERT(pParentWindow != NULL);
if (maCloserAction)
- {
- maToolBox.InsertItem(
- mnCloserItemIndex,
- Theme::GetImage(Theme::Image_Closer));
- }
+ SetCloserVisible(true);
#ifdef DEBUG
SetText(A2S("DeckTitleBar"));
@@ -77,9 +75,14 @@ void DeckTitleBar::SetCloserVisible (con
mbIsCloserVisible = bIsCloserVisible;
if (mbIsCloserVisible)
+ {
maToolBox.InsertItem(
mnCloserItemIndex,
Theme::GetImage(Theme::Image_Closer));
+ maToolBox.SetQuickHelpText(
+ mnCloserItemIndex,
+ String(SfxResId(SFX_STR_SIDEBAR_CLOSE_DECK)));
+ }
else
maToolBox.RemoveItem(
maToolBox.GetItemPos(mnCloserItemIndex));
@@ -136,6 +139,17 @@ void DeckTitleBar::HandleToolBoxItemClic
+cssu::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessible (void)
+{
+ const ::rtl::OUString sAccessibleName(msTitle);
+ SetAccessibleName(sAccessibleName);
+ SetAccessibleDescription(sAccessibleName);
+ return TitleBar::CreateAccessible();
+}
+
+
+
+
void DeckTitleBar::DataChanged (const DataChangedEvent& rEvent)
{
maToolBox.SetItemImage(
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckTitleBar.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckTitleBar.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckTitleBar.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/DeckTitleBar.hxx Fri May 31 13:55:58 2013
@@ -49,6 +49,7 @@ protected:
virtual sidebar::Paint GetBackgroundPaint (void);
virtual Color GetTextColor (void);
virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
+ virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void);
private:
const sal_uInt16 mnCloserItemIndex;
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/EnumContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/EnumContext.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/EnumContext.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/EnumContext.cxx Fri May 31 13:55:58 2013
@@ -88,21 +88,39 @@ sal_Int32 EnumContext::GetCombinedContex
sal_Int32 EnumContext::GetCombinedContext_DI (void) const
{
- switch (meApplication)
- {
- case Application_Draw:
- case Application_Impress:
- return CombinedEnumContext(Application_DrawImpress, meContext);
-
- case Application_Writer:
- case Application_WriterGlobal:
- case Application_WriterWeb:
- case Application_WriterXML:
- return CombinedEnumContext(Application_WriterVariants, meContext);
-
- default:
- return CombinedEnumContext(meApplication, meContext);
- }
+ return CombinedEnumContext(GetApplication_DI(), meContext);
+}
+
+
+
+
+EnumContext::Application EnumContext::GetApplication_DI (void) const
+{
+ switch (meApplication)
+ {
+ case Application_Draw:
+ case Application_Impress:
+ return Application_DrawImpress;
+
+ case Application_Writer:
+ case Application_WriterGlobal:
+ case Application_WriterWeb:
+ case Application_WriterXML:
+ case Application_WriterForm:
+ case Application_WriterReport:
+ return Application_WriterVariants;
+
+ default:
+ return meApplication;
+ }
+}
+
+
+
+
+EnumContext::Application EnumContext::GetApplication (void) const
+{
+ return meApplication;
}
@@ -124,6 +142,14 @@ const ::rtl::OUString& EnumContext::GetC
+EnumContext::Context EnumContext::GetContext (void) const
+{
+ return meContext;
+}
+
+
+
+
bool EnumContext::operator== (const EnumContext aOther)
{
return meApplication==aOther.meApplication
@@ -164,6 +190,7 @@ void EnumContext::ProvideApplicationCont
AddEntry(A2S("com.sun.star.text.WebDocument"), EnumContext::Application_WriterWeb);
AddEntry(A2S("com.sun.star.xforms.XMLFormDocument"), EnumContext::Application_WriterXML);
AddEntry(A2S("com.sun.star.sdb.FormDesign"), EnumContext::Application_WriterForm);
+ AddEntry(A2S("com.sun.star.sdb.TextReportDesign"), EnumContext::Application_WriterReport);
AddEntry(A2S("com.sun.star.sheet.SpreadsheetDocument"), EnumContext::Application_Calc);
AddEntry(A2S("com.sun.star.drawing.DrawingDocument"), EnumContext::Application_Draw);
AddEntry(A2S("com.sun.star.presentation.PresentationDocument"), EnumContext::Application_Impress);
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/FocusManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/FocusManager.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/FocusManager.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/FocusManager.cxx Fri May 31 13:55:58 2013
@@ -24,6 +24,7 @@
#include "FocusManager.hxx"
#include "Panel.hxx"
#include "DeckTitleBar.hxx"
+#include "PanelTitleBar.hxx"
#include "sfx2/sidebar/Tools.hxx"
#include "TitleBar.hxx"
#include <vcl/button.hxx>
@@ -46,7 +47,9 @@ FocusManager::FocusManager (const ::boos
: mpDeckTitleBar(),
maPanels(),
maButtons(),
- maShowPanelFunctor(rShowPanelFunctor)
+ maShowPanelFunctor(rShowPanelFunctor),
+ mbObservingContentControlFocus(false),
+ mpFirstFocusedContentControl(NULL)
{
}
@@ -194,11 +197,13 @@ FocusManager::FocusLocation FocusManager
{
// Check the deck title.
if (mpDeckTitleBar != NULL)
+ {
if (mpDeckTitleBar == &rWindow)
return FocusLocation(PC_DeckTitle, -1);
else if (&mpDeckTitleBar->GetToolBox() == &rWindow)
return FocusLocation(PC_DeckToolBox, -1);
-
+ }
+
// Search the panels.
for (sal_Int32 nIndex=0,nCount(maPanels.size()); nIndex<nCount; ++nIndex)
{
@@ -256,17 +261,23 @@ bool FocusManager::IsAnyButtonFocused (v
void FocusManager::FocusDeckTitle (void)
{
- if (IsDeckTitleVisible())
+ if (mpDeckTitleBar != NULL)
{
- ToolBox& rToolBox = mpDeckTitleBar->GetToolBox();
- if (rToolBox.GetItemCount() > 0)
+ if (IsDeckTitleVisible())
+ {
+ mpDeckTitleBar->GrabFocus();
+ }
+ else if (mpDeckTitleBar->GetToolBox().GetItemCount() > 0)
{
+ ToolBox& rToolBox = mpDeckTitleBar->GetToolBox();
rToolBox.GrabFocus();
rToolBox.Invalidate();
}
+ else
+ FocusPanel(0, false);
}
else
- FocusPanel(0);
+ FocusPanel(0, false);
}
@@ -280,10 +291,31 @@ bool FocusManager::IsDeckTitleVisible (v
-void FocusManager::FocusPanel (const sal_Int32 nPanelIndex)
+bool FocusManager::IsPanelTitleVisible (const sal_Int32 nPanelIndex) const
+{
+ if (nPanelIndex<0 || nPanelIndex>=static_cast<sal_Int32>(maPanels.size()))
+ return false;
+
+ TitleBar* pTitleBar = maPanels[nPanelIndex]->GetTitleBar();
+ if (pTitleBar==NULL)
+ return false;
+ return pTitleBar->IsVisible();
+}
+
+
+
+
+void FocusManager::FocusPanel (
+ const sal_Int32 nPanelIndex,
+ const bool bFallbackToDeckTitle)
{
- if (nPanelIndex<0 || nPanelIndex>=maPanels.size())
+ if (nPanelIndex<0 || nPanelIndex>=static_cast<sal_Int32>(maPanels.size()))
+ {
+ if (bFallbackToDeckTitle)
+ FocusDeckTitle();
return;
+ }
+
Panel& rPanel (*maPanels[nPanelIndex]);
TitleBar* pTitleBar = rPanel.GetTitleBar();
if (pTitleBar!=NULL && pTitleBar->IsVisible())
@@ -291,8 +323,21 @@ void FocusManager::FocusPanel (const sal
rPanel.SetExpanded(true);
pTitleBar->GrabFocus();
}
+ else if (bFallbackToDeckTitle)
+ {
+ // The panel title is not visible, fall back to the deck
+ // title.
+ // Make sure that the desk title is visible here to prevent a
+ // loop when both the title of panel 0 and the deck title are
+ // not present.
+ if (IsDeckTitleVisible())
+ FocusDeckTitle();
+ else
+ FocusPanelContent(nPanelIndex);
+ }
else
FocusPanelContent(nPanelIndex);
+
if (maShowPanelFunctor)
maShowPanelFunctor(rPanel);
}
@@ -304,7 +349,11 @@ void FocusManager::FocusPanelContent (co
{
Window* pWindow = VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow());
if (pWindow != NULL)
+ {
+ mbObservingContentControlFocus = true;
pWindow->GrabFocus();
+ mbObservingContentControlFocus = false;
+ }
}
@@ -324,7 +373,7 @@ void FocusManager::ClickButton (const sa
maButtons[nButtonIndex]->Click();
if (nButtonIndex > 0)
if ( ! maPanels.empty())
- FocusPanel(0);
+ FocusPanel(0, true);
maButtons[nButtonIndex]->GetParent()->Invalidate();
}
@@ -388,12 +437,47 @@ bool FocusManager::MoveFocusInsidePanel
+bool FocusManager::MoveFocusInsideDeckTitle (
+ const FocusLocation aFocusLocation,
+ const sal_Int32 nDirection)
+{
+ // Note that when the title bar of the first (and only) panel is
+ // not visible then the deck title takes its place and the focus
+ // is moved between a) deck title, b) deck closer and c) content
+ // of panel 0.
+ const bool bHasToolBoxItem (
+ mpDeckTitleBar->GetToolBox().GetItemCount() > 0);
+ switch (aFocusLocation.meComponent)
+ {
+ case PC_DeckTitle:
+ if (nDirection<0 && ! IsPanelTitleVisible(0))
+ FocusPanelContent(0);
+ else if (bHasToolBoxItem)
+ mpDeckTitleBar->GetToolBox().GrabFocus();
+ return true;
+
+ case PC_DeckToolBox:
+ if (nDirection>0 && ! IsPanelTitleVisible(0))
+ FocusPanelContent(0);
+ else
+ mpDeckTitleBar->GrabFocus();
+ return true;
+
+ default:
+ return false;
+ }
+}
+
+
+
+
void FocusManager::HandleKeyEvent (
const KeyCode& rKeyCode,
const Window& rWindow)
{
const FocusLocation aLocation (GetFocusLocation(rWindow));
-
+ mpLastFocusedWindow = NULL;
+
switch (rKeyCode.GetCode())
{
case KEY_SPACE:
@@ -437,22 +521,30 @@ void FocusManager::HandleKeyEvent (
return;
case KEY_TAB:
+ {
+ const sal_Int32 nDirection (
+ rKeyCode.IsShift()
+ ? -1
+ : +1);
switch (aLocation.meComponent)
{
case PC_PanelTitle:
case PC_PanelToolBox:
case PC_PanelContent:
- if (rKeyCode.IsShift())
- MoveFocusInsidePanel(aLocation, -1);
- else
- MoveFocusInsidePanel(aLocation, +1);
+ MoveFocusInsidePanel(aLocation, nDirection);
break;
+ case PC_DeckTitle:
+ case PC_DeckToolBox:
+ MoveFocusInsideDeckTitle(aLocation, nDirection);
+ break;
+
default:
break;
}
break;
-
+ }
+
case KEY_LEFT:
case KEY_UP:
switch (aLocation.meComponent)
@@ -462,7 +554,7 @@ void FocusManager::HandleKeyEvent (
case PC_PanelContent:
// Go to previous panel or the deck title.
if (aLocation.mnIndex > 0)
- FocusPanel(aLocation.mnIndex-1);
+ FocusPanel(aLocation.mnIndex-1, true);
else if (IsDeckTitleVisible())
FocusDeckTitle();
else
@@ -478,7 +570,7 @@ void FocusManager::HandleKeyEvent (
case PC_TabBar:
// Go to previous tab bar item.
if (aLocation.mnIndex == 0)
- FocusPanel(maPanels.size()-1);
+ FocusPanel(maPanels.size()-1, true);
else
FocusButton((aLocation.mnIndex + maButtons.size() - 1) % maButtons.size());
break;
@@ -496,8 +588,8 @@ void FocusManager::HandleKeyEvent (
case PC_PanelToolBox:
case PC_PanelContent:
// Go to next panel.
- if (aLocation.mnIndex < maPanels.size()-1)
- FocusPanel(aLocation.mnIndex+1);
+ if (aLocation.mnIndex < static_cast<sal_Int32>(maPanels.size())-1)
+ FocusPanel(aLocation.mnIndex+1, false);
else
FocusButton(0);
break;
@@ -505,17 +597,20 @@ void FocusManager::HandleKeyEvent (
case PC_DeckTitle:
case PC_DeckToolBox:
// Focus the first panel.
- FocusPanel(0);
+ if (IsPanelTitleVisible(0))
+ FocusPanel(0, false);
+ else
+ FocusButton(0);
break;
case PC_TabBar:
// Go to next tab bar item.
- if (aLocation.mnIndex < maButtons.size()-1)
+ if (aLocation.mnIndex < static_cast<sal_Int32>(maButtons.size())-1)
FocusButton(aLocation.mnIndex + 1);
else if (IsDeckTitleVisible())
FocusDeckTitle();
else
- FocusPanel(0);
+ FocusPanel(0, true);
break;
default:
@@ -557,6 +652,10 @@ IMPL_LINK(FocusManager, WindowEventListe
case VCLEVENT_WINDOW_GETFOCUS:
case VCLEVENT_WINDOW_LOSEFOCUS:
pSource->Invalidate();
+ return 1;
+
+ default:
+ break;
}
return 0;
@@ -584,8 +683,8 @@ IMPL_LINK(FocusManager, ChildEventListen
{
KeyEvent* pKeyEvent = static_cast<KeyEvent*>(pWindowEvent->GetData());
- // Go up the window hierarchy to find the parent of the
- // event source which is known to us.
+ // Go up the window hierarchy to find out whether the
+ // parent of the event source is known to us.
Window* pWindow = pSource;
FocusLocation aLocation (PC_None, -1);
while (true)
@@ -604,21 +703,41 @@ IMPL_LINK(FocusManager, ChildEventListen
{
case KEY_ESCAPE:
// Return focus back to the panel title.
- FocusPanel(aLocation.mnIndex);
+ FocusPanel(aLocation.mnIndex, true);
+ break;
+
+ case KEY_TAB:
+ if (mpFirstFocusedContentControl!=NULL
+ && mpLastFocusedWindow == mpFirstFocusedContentControl)
+ {
+ // Move focus back to panel (or deck)
+ // title.
+ FocusPanel(aLocation.mnIndex, true);
+ }
break;
default:
break;
}
}
- break;
+ return 1;
}
+ case VCLEVENT_WINDOW_GETFOCUS:
+ // Keep track of focused controls in panel content.
+ // Remember the first focused control. When it is later
+ // focused again due to pressing the TAB key then the
+ // focus is moved to the panel or deck title.
+ mpLastFocusedWindow = pSource;
+ if (mbObservingContentControlFocus)
+ mpFirstFocusedContentControl = pSource;
+ break;
+
default:
break;
}
- return 1;
+ return 0;
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/FocusManager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/FocusManager.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/FocusManager.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/FocusManager.hxx Fri May 31 13:55:58 2013
@@ -76,7 +76,10 @@ private:
::std::vector<Panel*> maPanels;
::std::vector<Button*> maButtons;
const ::boost::function<void(const Panel&)> maShowPanelFunctor;
-
+ bool mbObservingContentControlFocus;
+ Window* mpFirstFocusedContentControl;
+ Window* mpLastFocusedWindow;
+
enum PanelComponent
{
PC_DeckTitle,
@@ -118,17 +121,30 @@ private:
void FocusDeckTitle (void);
bool IsDeckTitleVisible (void) const;
+ bool IsPanelTitleVisible (const sal_Int32 nPanelIndex) const;
/** Set the focus to the title bar of the panel or, if the the
title bar is not visible, directly to the panel.
+ @param nPanelIndex
+ Index of the panel to focus.
+ @param bFallbackToDeckTitle
+ When the panel title bar is not visible then The fallback
+ bias defines whether to focus the deck (true) or the panel
+ content (false) will be focused instead.
*/
- void FocusPanel (const sal_Int32 nPanelIndex);
+ void FocusPanel (
+ const sal_Int32 nPanelIndex,
+ const bool bFallbackToDeckTitle);
+
void FocusPanelContent (const sal_Int32 nPanelIndex);
void FocusButton (const sal_Int32 nButtonIndex);
void ClickButton (const sal_Int32 nButtonIndex);
bool MoveFocusInsidePanel (
const FocusLocation aLocation,
const sal_Int32 nDirection);
+ bool MoveFocusInsideDeckTitle (
+ const FocusLocation aLocation,
+ const sal_Int32 nDirection);
void HandleKeyEvent (
const KeyCode& rKeyCode,
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/MenuButton.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/MenuButton.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/MenuButton.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/MenuButton.cxx Fri May 31 13:55:58 2013
@@ -109,18 +109,12 @@ void MenuButton::MouseMove (const MouseE
void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent)
{
-#if 0
- Hide();
- CheckBox::MouseButtonDown(rMouseEvent);
- Show();
-#else
if (rMouseEvent.IsLeft())
{
mbIsLeftButtonDown = true;
CaptureMouse();
Invalidate();
}
-#endif
}
@@ -128,11 +122,6 @@ void MenuButton::MouseButtonDown (const
void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent)
{
-#if 0
- Hide();
- CheckBox::MouseButtonUp(rMouseEvent);
- Show();
-#else
if (IsMouseCaptured())
ReleaseMouse();
@@ -150,7 +139,6 @@ void MenuButton::MouseButtonUp (const Mo
mbIsLeftButtonDown = false;
Invalidate();
}
-#endif
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Panel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Panel.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Panel.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Panel.cxx Fri May 31 13:55:58 2013
@@ -87,28 +87,10 @@ Panel::~Panel (void)
-void Panel::SetShowMenuFunctor( const ::boost::function<void(void)>& rShowMenuFunctor )
-{
- if ( mpTitleBar.get() )
- {
- mpTitleBar->SetMenuAction( rShowMenuFunctor );
- }
-}
-
-
-
-
void Panel::Dispose (void)
{
mxPanelComponent = NULL;
- if (mxElement.is())
- {
- Reference<lang::XComponent> xComponent (mxElement->getRealInterface(), UNO_QUERY);
- if (xComponent.is())
- xComponent->dispose();
- }
-
{
Reference<lang::XComponent> xComponent (mxElement, UNO_QUERY);
mxElement = NULL;
@@ -128,7 +110,7 @@ void Panel::Dispose (void)
-TitleBar* Panel::GetTitleBar (void) const
+PanelTitleBar* Panel::GetTitleBar (void) const
{
return mpTitleBar.get();
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Panel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Panel.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Panel.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/Panel.hxx Fri May 31 13:55:58 2013
@@ -57,8 +57,7 @@ public:
void Dispose (void);
- void SetShowMenuFunctor( const ::boost::function<void(void)>& rShowMenuFunctor );
- TitleBar* GetTitleBar (void) const;
+ PanelTitleBar* GetTitleBar (void) const;
bool IsTitleBarOptional (void) const;
void SetUIElement (const cssu::Reference<css::ui::XUIElement>& rxElement);
cssu::Reference<css::ui::XSidebarPanel> GetPanelComponent (void) const;
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelDescriptor.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelDescriptor.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelDescriptor.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelDescriptor.cxx Fri May 31 13:55:58 2013
@@ -31,10 +31,13 @@ PanelDescriptor::PanelDescriptor (void)
mbIsTitleBarOptional(false),
msId(),
msDeckId(),
+ msTitleBarIconURL(),
+ msHighContrastTitleBarIconURL(),
msHelpURL(),
maContextList(),
msImplementationURL(),
mnOrderIndex(10000), // Default value as defined in Sidebar.xcs
+ mbShowForReadOnlyDocuments(false),
mbWantsCanvas(false)
{
}
@@ -47,10 +50,13 @@ PanelDescriptor::PanelDescriptor (const
mbIsTitleBarOptional(rOther.mbIsTitleBarOptional),
msId(rOther.msId),
msDeckId(rOther.msDeckId),
+ msTitleBarIconURL(rOther.msTitleBarIconURL),
+ msHighContrastTitleBarIconURL(rOther.msHighContrastTitleBarIconURL),
msHelpURL(rOther.msHelpURL),
maContextList(rOther.maContextList),
msImplementationURL(rOther.msImplementationURL),
mnOrderIndex(rOther.mnOrderIndex),
+ mbShowForReadOnlyDocuments(rOther.mbShowForReadOnlyDocuments),
mbWantsCanvas(rOther.mbWantsCanvas)
{
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelTitleBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelTitleBar.cxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelTitleBar.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelTitleBar.cxx Fri May 31 13:55:58 2013
@@ -22,19 +22,21 @@
#include "precompiled_sfx2.hxx"
#include "PanelTitleBar.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "Sidebar.hrc"
#include "Paint.hxx"
#include "Panel.hxx"
#include "sfx2/sidebar/Theme.hxx"
-
+#include "sfx2/sidebar/ControllerFactory.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include <tools/svborder.hxx>
#include <vcl/gradient.hxx>
#include <vcl/image.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
-#ifdef DEBUG
-#include "sfx2/sidebar/Tools.hxx"
-#endif
-
+using namespace css;
+using namespace cssu;
namespace sfx2 { namespace sidebar {
@@ -46,12 +48,14 @@ static const sal_Int32 gaRightIconPaddin
PanelTitleBar::PanelTitleBar (
const ::rtl::OUString& rsTitle,
Window* pParentWindow,
- Panel* pPanel )
+ Panel* pPanel)
: TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()),
mbIsLeftButtonDown(false),
mpPanel(pPanel),
mnMenuItemIndex(1),
- maMenuAction()
+ mxFrame(),
+ msMoreOptionsCommand(),
+ msAccessibleNamePrefix(String(SfxResId(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX)))
{
OSL_ASSERT(mpPanel != NULL);
@@ -70,20 +74,38 @@ PanelTitleBar::~PanelTitleBar (void)
-void PanelTitleBar::SetMenuAction ( const ::boost::function<void(void)>& rMenuAction )
+void PanelTitleBar::SetMoreOptionsCommand (
+ const ::rtl::OUString& rsCommandName,
+ const ::cssu::Reference<css::frame::XFrame>& rxFrame)
{
- if ( !maMenuAction && rMenuAction )
+ if ( ! rsCommandName.equals(msMoreOptionsCommand))
{
- maToolBox.InsertItem(
- mnMenuItemIndex,
- Theme::GetImage(Theme::Image_PanelMenu));
- maToolBox.SetOutStyle(TOOLBOX_STYLE_FLAT);
- }
- else if ( maMenuAction && !rMenuAction )
- {
- maToolBox.RemoveItem( maToolBox.GetItemPos( mnMenuItemIndex ) );
+ if (msMoreOptionsCommand.getLength() > 0)
+ maToolBox.RemoveItem(maToolBox.GetItemPos(mnMenuItemIndex));
+
+ msMoreOptionsCommand = rsCommandName;
+ mxFrame = rxFrame;
+
+ if (msMoreOptionsCommand.getLength() > 0)
+ {
+ maToolBox.InsertItem(
+ mnMenuItemIndex,
+ Theme::GetImage(Theme::Image_PanelMenu));
+ Reference<frame::XToolbarController> xController (
+ ControllerFactory::CreateToolBoxController(
+ &maToolBox,
+ mnMenuItemIndex,
+ msMoreOptionsCommand,
+ rxFrame,
+ VCLUnoHelper::GetInterface(&maToolBox),
+ 0));
+ maToolBox.SetController(mnMenuItemIndex, xController, msMoreOptionsCommand);
+ maToolBox.SetOutStyle(TOOLBOX_STYLE_FLAT);
+ maToolBox.SetQuickHelpText(
+ mnMenuItemIndex,
+ String(SfxResId(SFX_STR_SIDEBAR_MORE_OPTIONS)));
+ }
}
- maMenuAction = rMenuAction;
}
@@ -147,8 +169,32 @@ Color PanelTitleBar::GetTextColor (void)
void PanelTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex)
{
if (nItemIndex == mnMenuItemIndex)
- if (maMenuAction)
- maMenuAction();
+ if (msMoreOptionsCommand.getLength() > 0)
+ {
+ try
+ {
+ const util::URL aURL (Tools::GetURL(msMoreOptionsCommand));
+ Reference<frame::XDispatch> xDispatch (Tools::GetDispatch(mxFrame, aURL));
+ if (xDispatch.is())
+ xDispatch->dispatch(aURL, Sequence<beans::PropertyValue>());
+ }
+ catch(Exception& rException)
+ {
+ OSL_TRACE("caught exception: %s",
+ OUStringToOString(rException.Message, RTL_TEXTENCODING_ASCII_US).getStr());
+ }
+ }
+}
+
+
+
+
+Reference<accessibility::XAccessible> PanelTitleBar::CreateAccessible (void)
+{
+ const ::rtl::OUString sAccessibleName(msAccessibleNamePrefix + msTitle);
+ SetAccessibleName(sAccessibleName);
+ SetAccessibleDescription(sAccessibleName);
+ return TitleBar::CreateAccessible();
}
Modified: openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelTitleBar.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelTitleBar.hxx?rev=1488227&r1=1488226&r2=1488227&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelTitleBar.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/PanelTitleBar.hxx Fri May 31 13:55:58 2013
@@ -24,6 +24,7 @@
#include "TitleBar.hxx"
+#include <com/sun/star/frame/XFrame.hpp>
#include <boost/function.hpp>
@@ -41,7 +42,9 @@ public:
Panel* pPanel );
virtual ~PanelTitleBar (void);
- void SetMenuAction ( const ::boost::function<void(void)>& rMenuAction );
+ void SetMoreOptionsCommand (
+ const ::rtl::OUString& rsCommandName,
+ const ::cssu::Reference<css::frame::XFrame>& rxFrame);
virtual void DataChanged (const DataChangedEvent& rEvent);
virtual void MouseButtonDown (const MouseEvent& rMouseEvent);
@@ -53,12 +56,15 @@ protected:
virtual sidebar::Paint GetBackgroundPaint (void);
virtual Color GetTextColor (void);
virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
+ virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void);
private:
bool mbIsLeftButtonDown;
Panel* mpPanel;
const sal_uInt16 mnMenuItemIndex;
- ::boost::function<void(void)> maMenuAction;
+ cssu::Reference<css::frame::XFrame> mxFrame;
+ ::rtl::OUString msMoreOptionsCommand;
+ ::rtl::OUString msAccessibleNamePrefix;
};