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

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu May  8 07:39:50 2008
New Revision: 12489
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12489&view=rev

Log:
	* patches/dev300/linkwarn-officecfg-disable-msgbox.diff: actually
	added this file
	* patches/dev300/linkwarn-svtools-miscopts-bits.diff: fixed
	errorneously removing system print dlg config



Added:
   trunk/patches/dev300/linkwarn-officecfg-disable-msgbox.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff

Added: trunk/patches/dev300/linkwarn-officecfg-disable-msgbox.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/linkwarn-officecfg-disable-msgbox.diff	Thu May  8 07:39:50 2008
@@ -0,0 +1,18 @@
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs	2008-05-08 07:04:27.000000000 +0200
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2008-05-07 10:32:49.000000000 +0200
+@@ -5505,6 +5505,15 @@
+ 				</info>
+ 				<value>true</value>
+ 			</prop>
++			<prop oor:name="ShowLinkWarningDialog" oor:type="xs:boolean">
++				<info>
++					<author>THB</author>
++					<desc>Determines if a warning dialog should be
++					displayed when a user checks the link checkbox in
++					the insert graphics dialog.</desc>
++				</info>
++				<value>true</value>
++			</prop>
+ 			<prop oor:name="UseSystemPrintDialog" oor:type="xs:boolean">
+ 				<info>
+ 					<author>PL</author>

Modified: trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff
==============================================================================
--- trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff	(original)
+++ trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff	Thu May  8 07:39:50 2008
@@ -59,25 +59,24 @@
  
  {
  	// Use our static list of configuration keys to get his values.
-@@ -374,13 +389,13 @@
+@@ -384,6 +399,16 @@
                  break;
              }
  
--            case PROPERTYHANDLE_USESYSTEMPRINTDIALOG :
 +            case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG :
-             {
--                if( !(seqValues[nProperty] >>= m_bUseSystemPrintDialog) )
++            {
 +                if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) )
-                 {
--                    DBG_ERROR("Wrong type of \"Misc\\UseSystemPrintDialog\"!" );
++                {
 +                    DBG_ERROR("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" );
-                 }
--                m_bIsUseSystemPrintDialogRO = seqRO[nProperty];
++                }
 +                m_bIsShowLinkWarningDialogRO = seqRO[nProperty];
-                 break;
-             }
- 
-@@ -485,6 +500,13 @@
++                break;
++            }
++
+             case PROPERTYHANDLE_SYMBOLSTYLE :
+             {
+                 ::rtl::OUString aSymbolsStyle;
+@@ -485,6 +510,13 @@
                                                              }
                                                          }
                                                      break;
@@ -91,7 +90,7 @@
              case PROPERTYHANDLE_SYMBOLSTYLE         :   {
                                                              ::rtl::OUString aSymbolsStyle;
                                                              if( seqValues[nProperty] >>= aSymbolsStyle )
-@@ -642,6 +664,13 @@
+@@ -642,6 +674,13 @@
                      seqValues[nProperty] <<= m_bUseSystemPrintDialog;
                  break;
              }
@@ -105,7 +104,7 @@
          }
  	}
  	// Set properties in configuration.
-@@ -661,7 +690,8 @@
+@@ -661,7 +700,8 @@
          PROPERTYNAME_TOOLBOXSTYLE,
          PROPERTYNAME_USESYSTEMFILEDIALOG,
          PROPERTYNAME_SYMBOLSTYLE,
@@ -115,7 +114,7 @@
  	};
  
  	// Initialize return sequence with these list ...
-@@ -832,6 +862,21 @@
+@@ -832,6 +872,21 @@
      m_pDataContainer->SetUseSystemPrintDialog( bEnable );
  }