[ooo-build-commit] patches/dev300 patches/ooxml
Kohei Yoshida
kohei at kemper.freedesktop.org
Fri Sep 11 09:35:04 PDT 2009
patches/dev300/apply | 14 -
patches/dev300/ui-desktop-integration-m57.diff | 223 ++++++++++++++++
patches/dev300/ui-desktop-integration.diff | 3
patches/ooxml/buildfix-oox-depends-on-unotools-m57.diff | 8
patches/ooxml/buildfix-oox-depends-on-unotools.diff | 4
5 files changed, 248 insertions(+), 4 deletions(-)
New commits:
commit a9bb7f11f0b47067f38d7b3e65bb96a9e513ecec
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri Sep 11 12:34:32 2009 -0400
More branching of patches for dev300-m58.
* patches/dev300/apply:
* patches/dev300/ui-desktop-integration-m57.diff:
* patches/dev300/ui-desktop-integration.diff:
* patches/ooxml/buildfix-oox-depends-on-unotools-m57.diff:
* patches/ooxml/buildfix-oox-depends-on-unotools.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3133e33..79de51f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1914,7 +1914,11 @@ vba-automation-defaultmember.diff, n#507501
ibm-misc-fixes-1.diff,i#104203, i#103653
vba-automation-fix-named-paramaters.diff, n#535087
vba-automation-put-get-property-improvements.diff, n#535086, n#535088, n#535089
+
+[ VBAObjects < dev300-m58 ]
+# FIXME: doesn't apply against dev300-m58. --kohei
vba-toolbar-menu-support.diff
+
[VBAUntested]
SectionOwner => noelpwer
# doesn't work
@@ -1980,8 +1984,13 @@ writerfilter-source-dmapper-domainmapper-debug.diff
# been restructured substantially. --tml
# docx-import-fixes.diff
+[ OOXML >= dev300-m58 ]
buildfix-oox-depends-on-unotools.diff
+[ OOXML < dev300-m58 ]
+buildfix-oox-depends-on-unotools-m57.diff
+
+[ OOXML ]
oox-fix-placeholder-layout.diff, n#485316, n#480223, rodo
oox-fix-list-style-apply.diff, n#485417, rodo
@@ -2796,10 +2805,13 @@ internal-mesa-headers-slideshow.diff, fridrich
internal-mesa-headers-mesa.diff, fridrich
-[ Lockdown ]
+[ Lockdown >= dev300-m58 ]
# Disable UI [toolbars, menus] customization
ui-desktop-integration.diff, michael
+[ Lockdown < dev300-m58 ]
+# Disable UI [toolbars, menus] customization
+ui-desktop-integration-m57.diff, michael
[ InternalCairo ]
cairo-pixman-makefile-mk.diff
diff --git a/patches/dev300/ui-desktop-integration-m57.diff b/patches/dev300/ui-desktop-integration-m57.diff
new file mode 100644
index 0000000..352cadb
--- /dev/null
+++ b/patches/dev300/ui-desktop-integration-m57.diff
@@ -0,0 +1,223 @@
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old 2009-04-06 16:42:16.000000000 +0000
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2009-04-06 16:42:19.000000000 +0000
+@@ -5653,6 +5653,13 @@ Dymamic border coloring means that when
+ </info>
+ <value>false</value>
+ </prop>
++ <prop oor:name="DisableUICustomization" oor:type="xs:boolean">
++ <info>
++ <author>RSiddhartha</author>
++ <desc>Disables the customization of the UI elements.</desc>
++ </info>
++ <value>false</value>
++ </prop>
+ <prop oor:name="SymbolSet" oor:type="xs:short">
+ <!-- UIHints: Tools Options General View -->
+ <info>
+--- svtools/inc/svtools/miscopt.hxx.old 2009-04-06 16:42:16.000000000 +0000
++++ svtools/inc/svtools/miscopt.hxx 2009-04-06 16:42:19.000000000 +0000
+@@ -117,6 +117,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: publ
+ void SetTryODMADialog( sal_Bool bSet );
+ sal_Bool IsTryUseODMADialogReadOnly() const;
+
++ sal_Bool DisableUICustomization() const;
++
+ sal_Bool IsPluginsEnabled() const;
+ void SetPluginsEnabled( sal_Bool bEnable );
+ sal_Bool IsPluginsEnabledReadOnly() const;
+--- svtools/source/config/miscopt.cxx.old 2009-04-06 16:42:16.000000000 +0000
++++ svtools/source/config/miscopt.cxx 2009-04-06 16:42:19.000000000 +0000
+@@ -89,8 +89,10 @@ using namespace ::com::sun::star;
+ #define PROPERTYHANDLE_TRYODMADIALOG 6
+ #define PROPERTYNAME_SHOWLINKWARNINGDIALOG ASCII_STR("ShowLinkWarningDialog")
+ #define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
++#define PROPERTYNAME_DISABLEUICUSTOMIZATION ASCII_STR("DisableUICustomization")
++#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 8
+
+-#define PROPERTYCOUNT 8
++#define PROPERTYCOUNT 9
+
+ #define VCL_TOOLBOX_STYLE_FLAT ((USHORT)0x0004) // from <vcl/toolbox.hxx>
+
+@@ -123,6 +125,7 @@ class SvtMiscOptions_Impl : public Confi
+ sal_Bool m_bIsUseSystemPrintDialogRO;
+ sal_Bool m_bShowLinkWarningDialog;
+ sal_Bool m_bIsShowLinkWarningDialogRO;
++ sal_Bool m_bDisableUICustomization;
+
+ //-------------------------------------------------------------------------------------------------------------
+ // public methods
+@@ -200,6 +203,9 @@ class SvtMiscOptions_Impl : public Confi
+ inline sal_Bool IsTryUseODMADialogReadOnly() const
+ { return m_bIsTryODMADialogRO; }
+
++ inline sal_Bool DisableUICustomization() const
++ { return m_bDisableUICustomization; }
++
+ inline sal_Bool IsPluginsEnabled() const
+ { return m_bPluginsEnabled; }
+
+@@ -448,6 +454,13 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl
+ m_bIsSymbolsStyleRO = seqRO[nProperty];
+ break;
+ }
++
++ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
++ {
++ if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
++ DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
++ break;
++ }
+ }
+ }
+
+@@ -563,6 +576,11 @@ void SvtMiscOptions_Impl::Load( const Se
+ }
+ }
+ break;
++ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : {
++ if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
++ DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
++ }
++ break;
+ }
+ }
+ }
+@@ -726,6 +744,12 @@ void SvtMiscOptions_Impl::Commit()
+ seqValues[nProperty] <<= m_bShowLinkWarningDialog;
+ break;
+ }
++
++ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
++ {
++ seqValues[nProperty] <<= m_bDisableUICustomization;
++ break;
++ }
+ }
+ }
+ // Set properties in configuration.
+@@ -747,7 +771,8 @@ Sequence< OUString > SvtMiscOptions_Impl
+ PROPERTYNAME_SYMBOLSTYLE,
+ PROPERTYNAME_USESYSTEMPRINTDIALOG,
+ PROPERTYNAME_TRYODMADIALOG,
+- PROPERTYNAME_SHOWLINKWARNINGDIALOG
++ PROPERTYNAME_SHOWLINKWARNINGDIALOG,
++ PROPERTYNAME_DISABLEUICUSTOMIZATION
+ };
+
+ // Initialize return sequence with these list ...
+@@ -908,6 +933,11 @@ sal_Bool SvtMiscOptions::IsGetSymbolsSty
+ return m_pDataContainer->IsGetSymbolsStyleReadOnly();
+ }
+
++sal_Bool SvtMiscOptions::DisableUICustomization() const
++{
++ return m_pDataContainer->DisableUICustomization();
++}
++
+ sal_Int16 SvtMiscOptions::GetToolboxStyle() const
+ {
+ return m_pDataContainer->GetToolboxStyle();
+--- sfx2/sdi/appslots.sdi.old 2009-04-02 10:43:51.000000000 +0000
++++ sfx2/sdi/appslots.sdi 2009-04-06 16:42:19.000000000 +0000
+@@ -188,6 +188,7 @@ interface Application
+ SID_AVAILABLE_TOOLBARS
+ [
+ ExecMethod = MiscExec_Impl ;
++ StateMethod = MiscState_Impl ;
+ ]
+ SID_HELP_TUTORIALS
+ [
+--- sfx2/source/appl/appserv.cxx.old 2009-04-06 16:41:54.000000000 +0000
++++ sfx2/source/appl/appserv.cxx 2009-04-06 16:42:19.000000000 +0000
+@@ -90,6 +90,7 @@
+ #include <svtools/moduleoptions.hxx>
+ #include <svtools/regoptions.hxx>
+ #include <svtools/helpopt.hxx>
++#include <svtools/miscopt.hxx>
+ #include <toolkit/helper/vclunohelper.hxx>
+ #include <tools/shl.hxx>
+ #include <unotools/bootstrap.hxx>
+@@ -680,6 +681,18 @@ void SfxApplication::MiscState_Impl(SfxI
+ break;
+ }
+
++ case SID_CONFIG:
++ case SID_TOOLBOXOPTIONS:
++ case SID_CONFIGSTATUSBAR:
++ case SID_CONFIGMENU:
++ case SID_CONFIGACCEL:
++ case SID_CONFIGEVENT:
++ {
++ if( SvtMiscOptions().DisableUICustomization() )
++ rSet.DisableItem(nWhich);
++ break;
++ }
++
+ case SID_BASICSTOP:
+ if ( !StarBASIC::IsRunning() )
+ rSet.DisableItem(nWhich);
+--- framework/source/uielement/toolbarmanager.cxx.old 2009-04-02 10:56:25.000000000 +0000
++++ framework/source/uielement/toolbarmanager.cxx 2009-04-06 16:42:19.000000000 +0000
+@@ -252,7 +252,7 @@ ToolBarManager::ToolBarManager( const Re
+ m_bUpdateControllers( sal_False ),
+ m_bImageOrientationRegistered( sal_False ),
+ m_bImageMirrored( sal_False ),
+- m_bCanBeCustomized( sal_True ),
++ m_bCanBeCustomized( !SvtMiscOptions().DisableUICustomization() ),
+ m_lImageRotation( 0 ),
+ m_pToolBar( pToolBar ),
+ m_aResourceName( rResourceName ),
+@@ -473,6 +473,24 @@ void ToolBarManager::UpdateControllers()
+ {
+ RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" );
+
++ if( !m_bCanBeCustomized )
++ {
++ Any a;
++ Reference< XLayoutManager > xLayoutManager;
++ Reference< XPropertySet > xFramePropSet( m_xFrame, UNO_QUERY );
++ if ( xFramePropSet.is() )
++ a = xFramePropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
++ a >>= xLayoutManager;
++ Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
++ if ( xLayoutManager.is() && xDockable.is() )
++ {
++ ::com::sun::star::awt::Point aPoint;
++ aPoint.X = aPoint.Y = LONG_MAX;
++ xLayoutManager->dockWindow( m_aResourceName, DockingArea_DOCKINGAREA_DEFAULT, aPoint );
++ xLayoutManager->lockWindow( m_aResourceName );
++ }
++ }
++
+ if ( !m_bUpdateControllers )
+ {
+ m_bUpdateControllers = sal_True;
+@@ -1701,6 +1719,7 @@ PopupMenu * ToolBarManager::GetToolBarCu
+ // Non-configurable toolbars should disable configuration menu items
+ aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, sal_False );
+ aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, sal_False );
++ aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, sal_False );
+ }
+
+ // Disable menu item CLOSE if the toolbar has no closer
+--- framework/source/uielement/toolbarsmenucontroller.cxx.old 2009-04-02 10:56:25.000000000 +0000
++++ framework/source/uielement/toolbarsmenucontroller.cxx 2009-04-06 16:42:19.000000000 +0000
+@@ -85,6 +85,7 @@
+ #include <svtools/menuoptions.hxx>
+ #include <svtools/cmdoptions.hxx>
+ #include <dispatch/uieventloghelper.hxx>
++#include <svtools/miscopt.hxx>
+
+ //_________________________________________________________________________________________________________________
+ // Defines
+@@ -384,6 +385,9 @@ sal_Bool ToolbarsMenuController::isConte
+
+ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
+ {
++ if( SvtMiscOptions().DisableUICustomization() )
++ return;
++
+ vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ resetPopupMenu( rPopupMenu );
+
diff --git a/patches/dev300/ui-desktop-integration.diff b/patches/dev300/ui-desktop-integration.diff
index 352cadb..5be08a4 100644
--- a/patches/dev300/ui-desktop-integration.diff
+++ b/patches/dev300/ui-desktop-integration.diff
@@ -203,10 +203,11 @@
// Disable menu item CLOSE if the toolbar has no closer
--- framework/source/uielement/toolbarsmenucontroller.cxx.old 2009-04-02 10:56:25.000000000 +0000
+++ framework/source/uielement/toolbarsmenucontroller.cxx 2009-04-06 16:42:19.000000000 +0000
-@@ -85,6 +85,7 @@
+@@ -85,7 +85,8 @@
#include <svtools/menuoptions.hxx>
#include <svtools/cmdoptions.hxx>
#include <dispatch/uieventloghelper.hxx>
+ #include <rtl/logfile.hxx>
+#include <svtools/miscopt.hxx>
//_________________________________________________________________________________________________________________
diff --git a/patches/ooxml/buildfix-oox-depends-on-unotools-m57.diff b/patches/ooxml/buildfix-oox-depends-on-unotools-m57.diff
new file mode 100644
index 0000000..731a010
--- /dev/null
+++ b/patches/ooxml/buildfix-oox-depends-on-unotools-m57.diff
@@ -0,0 +1,8 @@
+--- oox/prj/build.lst-old 2008-03-16 10:41:32.000000000 +0100
++++ oox/prj/build.lst 2008-03-16 10:41:45.000000000 +0100
+@@ -1,4 +1,4 @@
+-oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl BOOST:boost NULL
++oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl unotools BOOST:boost NULL
+ oox oox usr1 - all oox_mkout NULL
+ oox oox\prj get - all oox_prj NULL
+ oox oox\source\token nmake - all oox_token NULL
diff --git a/patches/ooxml/buildfix-oox-depends-on-unotools.diff b/patches/ooxml/buildfix-oox-depends-on-unotools.diff
index 731a010..6139906 100644
--- a/patches/ooxml/buildfix-oox-depends-on-unotools.diff
+++ b/patches/ooxml/buildfix-oox-depends-on-unotools.diff
@@ -1,8 +1,8 @@
--- oox/prj/build.lst-old 2008-03-16 10:41:32.000000000 +0100
+++ oox/prj/build.lst 2008-03-16 10:41:45.000000000 +0100
@@ -1,4 +1,4 @@
--oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl BOOST:boost NULL
-+oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl unotools BOOST:boost NULL
+-oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl BOOST:boost OPENSSL:openssl NULL
++oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl unotools BOOST:boost OPENSSL:openssl NULL
oox oox usr1 - all oox_mkout NULL
oox oox\prj get - all oox_prj NULL
oox oox\source\token nmake - all oox_token NULL
More information about the ooo-build-commit
mailing list