ooo-build r12892 - in trunk: . patches/dev300

From: jholesovsky svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12892 - in trunk: . patches/dev300
Date: Mon, 16 Jun 2008 13:51:14 +0000 (UTC)
Author: jholesovsky
Date: Mon Jun 16 13:51:14 2008
New Revision: 12892
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12892&view=rev

Log:
        * patches/dev300/ui-desktop-integration.diff,
          patches/dev300/apply: Update to m19 & enable again.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/ui-desktop-integration.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jun 16 13:51:14 2008
@@ -1490,10 +1490,6 @@
 # hack to ignore writerfilter if odf-converter is present
 odf-converter-ignore-writerfilter.diff, n#348471, jholesov
 
-[ Lockdown ]
-# Disable UI [toolbars, menus] customization
-#FIXME dev300: ui-desktop-integration.diff, michael
-
 
 [ msaccess ]
 SectionOwner => strba
@@ -2204,6 +2200,11 @@
 internal-mesa-headers-mesa.diff, fridrich
 
 
+[ Lockdown ]
+# Disable UI [toolbars, menus] customization
+ui-desktop-integration.diff, michael
+
+
 [ TemporaryHacks ]
 # build our stuff
 # FIXME: should be in the respective patches

Modified: trunk/patches/dev300/ui-desktop-integration.diff
==============================================================================
--- trunk/patches/dev300/ui-desktop-integration.diff	(original)
+++ trunk/patches/dev300/ui-desktop-integration.diff	Mon Jun 16 13:51:14 2008
@@ -1,8 +1,8 @@
 --- officecfg/registry/schema/org/openoffice/Office/Common.xcs	2005-06-27 16:27:27.000000000 +0530
 +++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2005-07-11 18:53:02.204896274 +0530
-@@ -4902,6 +4902,13 @@ Dymamic border coloring means that when 
+@@ -5555,6 +5555,13 @@ Dymamic border coloring means that when 
  				</info>
- 				<value>true</value>
+ 				<value>false</value>
  			</prop>
 +			<prop oor:name="DisableUICustomization" oor:type="xs:boolean">
 +				<info>
@@ -16,9 +16,9 @@
  				<info>
 --- svtools/inc/svtools/miscopt.hxx	2005-06-27 16:27:26.000000000 +0530
 +++ svtools/inc/svtools/miscopt.hxx	2005-07-11 17:58:51.734343074 +0530
-@@ -157,6 +157,8 @@ class SVL_DLLPUBLIC SvtMiscOptions
-         void        SetUseSystemFileDialog( sal_Bool bSet );
-         sal_Bool    IsUseSystemFileDialogReadOnly() const;
+@@ -117,6 +117,8 @@ class SVL_DLLPUBLIC SvtMiscOptions
+         void        SetTryODMADialog( sal_Bool bSet );
+         sal_Bool    IsTryUseODMADialogReadOnly() const;
  
 +        sal_Bool    DisableUICustomization() const;
 +
@@ -28,28 +28,28 @@
 --- svtools/source/config/miscopt.cxx	2005-06-27 16:27:27.000000000 +0530
 +++ svtools/source/config/miscopt.cxx	2005-07-11 18:43:48.450164303 +0530
 @@ -109,8 +109,10 @@ using namespace ::com::sun::star;
- #define PROPERTYHANDLE_USESYSTEMFILEDIALOG	3
- #define PROPERTYNAME_SYMBOLSTYLE			ASCII_STR("SymbolStyle")
- #define PROPERTYHANDLE_SYMBOLSTYLE			4
+ #define PROPERTYHANDLE_TRYODMADIALOG	6
+ #define PROPERTYNAME_SHOWLINKWARNINGDIALOG	ASCII_STR("ShowLinkWarningDialog")
+ #define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
 +#define PROPERTYNAME_DISABLEUICUSTOMIZATION	ASCII_STR("DisableUICustomization")
-+#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION			5
++#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION			8
  
--#define PROPERTYCOUNT						5
-+#define PROPERTYCOUNT						6
+-#define PROPERTYCOUNT						8
++#define PROPERTYCOUNT						9
  
  #define VCL_TOOLBOX_STYLE_FLAT				((USHORT)0x0004) // from <vcl/toolbox.hxx>
  
 @@ -136,6 +138,7 @@ class SvtMiscOptions_Impl : public Confi
-     sal_Bool    m_bIsSymbolSetRO;
-     sal_Int16   m_nToolboxStyle;
-     sal_Bool    m_bIsToolboxStyleRO;
+     sal_Bool    m_bIsUseSystemPrintDialogRO;
+     sal_Bool    m_bShowLinkWarningDialog;
+     sal_Bool    m_bIsShowLinkWarningDialogRO;
 +    sal_Bool    m_bDisableUICustomization;
  
      //-------------------------------------------------------------------------------------------------------------
  	//	public methods
 @@ -204,6 +207,9 @@ class SvtMiscOptions_Impl : public Confi
-         inline sal_Bool IsUseSystemFileDialogReadOnly() const
-         { return m_bIsUseSystemFileDialogRO; }
+         inline sal_Bool IsTryUseODMADialogReadOnly() const
+         { return m_bIsTryODMADialogRO; }
  
 +        inline sal_Bool DisableUICustomization() const
 +        { return m_bDisableUICustomization; }
@@ -58,7 +58,7 @@
          { return m_bPluginsEnabled; }
  
 @@ -369,6 +375,13 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl
-                 m_bIsUseSystemFileDialogRO = seqRO[nProperty];
+                 m_bIsSymbolsStyleRO = seqRO[nProperty];
                  break;
              }
 +	    
@@ -72,7 +72,7 @@
  	}
  
 @@ -453,6 +466,11 @@ void SvtMiscOptions_Impl::Load( const Se
-                                                                 DBG_ERROR("Wrong type of \"Misc\\SymbolSet\"!" );
+                                                                 DBG_ERROR("Wrong type of \"Misc\\SymbolStyle\"!" );
                                                          }
                                                      break;
 +            case PROPERTYHANDLE_DISABLEUICUSTOMIZATION      :   {
@@ -84,7 +84,7 @@
      }
  }
 @@ -633,6 +633,12 @@ void SvtMiscOptions_Impl::Commit()
- 					seqValues[nProperty] <<= GetSymbolsStyleName();
+                     seqValues[nProperty] <<= m_bShowLinkWarningDialog;
  				break;
  			}
 +
@@ -97,17 +97,17 @@
  	}
  	// Set properties in configuration.
 @@ -651,7 +651,8 @@ Sequence< OUString > SvtMiscOptions_Impl
-         PROPERTYNAME_SYMBOLSET,
-         PROPERTYNAME_TOOLBOXSTYLE,
-         PROPERTYNAME_USESYSTEMFILEDIALOG,
--        PROPERTYNAME_SYMBOLSTYLE
-+        PROPERTYNAME_SYMBOLSTYLE,
+         PROPERTYNAME_SYMBOLSTYLE,
+         PROPERTYNAME_USESYSTEMPRINTDIALOG,
+         PROPERTYNAME_TRYODMADIALOG,
+-        PROPERTYNAME_SHOWLINKWARNINGDIALOG
++        PROPERTYNAME_SHOWLINKWARNINGDIALOG,
 +        PROPERTYNAME_DISABLEUICUSTOMIZATION
  	};
  
  	// Initialize return sequence with these list ...
 @@ -743,6 +766,11 @@ sal_Bool SvtMiscOptions::IsGetSymbolSetR
-     return m_pDataContainer->IsGetSymbolSetReadOnly();
+     return m_pDataContainer->IsGetSymbolsStyleReadOnly();
  }
  
 +sal_Bool SvtMiscOptions::DisableUICustomization() const
@@ -126,20 +126,18 @@
  		ExecMethod = MiscExec_Impl ;
 +		StateMethod = MiscState_Impl ;
  	]
- 
- 	//---------------------------------------------------------------------
+ 	SID_HELP_TUTORIALS
+ 	[
 --- sfx2/source/appl/appserv.cxx	2005-06-27 16:27:22.000000000 +0530
 +++ sfx2/source/appl/appserv.cxx	2005-07-11 18:29:05.699333198 +0530
-@@ -186,6 +186,9 @@
+@@ -186,6 +186,7 @@
  #include <svtools/moduleoptions.hxx>
  #include <svtools/regoptions.hxx>
  #include <svtools/helpopt.hxx>
-+#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
 +#include <svtools/miscopt.hxx>
-+#endif // INCLUDED_SVTOOLS_MISCOPT_HXX
+ #include <toolkit/helper/vclunohelper.hxx>
  #include <tools/shl.hxx>
- 
- #include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
+ #include <unotools/bootstrap.hxx>
 @@ -728,6 +731,18 @@ void SfxApplication::MiscState_Impl(SfxI
  					break;
  				}
@@ -168,8 +166,8 @@
 -    m_bCanBeCustomized( sal_True ),
 +    m_bCanBeCustomized( !SvtMiscOptions().DisableUICustomization() ),
      m_lImageRotation( 0 ),
-     m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
- {
+     m_pToolBar( pToolBar ),
+     m_aResourceName( rResourceName ),
 @@ -516,6 +516,24 @@ void ToolBarManager::UpdateControllers()
  {
      RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" );
@@ -205,16 +203,14 @@
  		pItemMenu->SetMenuFlags (pItemMenu->GetMenuFlags () | 
 --- framework/source/uielement/toolbarsmenucontroller.cxx	2005-03-29 20:30:44.000000000 +0530
 +++ framework/source/uielement/toolbarsmenucontroller.cxx	2005-07-11 18:09:16.732966419 +0530
-@@ -155,6 +155,9 @@
- #ifndef INCLUDED_SVTOOLS_MENUOPTIONS_HXX
+@@ -155,6 +155,7 @@
+ #include <vcl/window.hxx>
  #include <svtools/menuoptions.hxx>
- #endif
-+#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
-+#include <svtools/miscopt.hxx>
-+#endif // INCLUDED_SVTOOLS_MISCOPT_HXX
  #include <svtools/cmdoptions.hxx>
++#include <svtools/miscopt.hxx>
  
  //_________________________________________________________________________________________________________________
+ //	Defines
 @@ -417,6 +420,9 @@ Sequence< Sequence< com::sun::star::bean
  
  void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]