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

[jannieuw svn gnome org]

Author: jannieuw
Date: Thu Nov  6 15:23:38 2008
New Revision: 14465
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14465&view=rev

Log:
2008-11-06  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-disable-experimental.diff: Add
	--enable-layout-experimental configure option and put sort options
	tab page behind that (n#442036).


Added:
   trunk/patches/dev300/layout-disable-experimental.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Nov  6 15:23:38 2008
@@ -2199,6 +2199,9 @@
 #        on openSUSE-11.1-alpha0; pmladek is discussing it with the gcc team
 toolkit-layout-gcc-4.3.2-hack.diff, pmladek
 
+# This will merge with the layoutdialogs2 cws
+layout-disable-experimental.diff
+
 [ AutoCorrectCapsLock ]
 SectionOwner => kohei
 SectionIssue => i#62234

Added: trunk/patches/dev300/layout-disable-experimental.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/layout-disable-experimental.diff	Thu Nov  6 15:23:38 2008
@@ -0,0 +1,137 @@
+diff --git config_office/configure.in config_office/configure.in
+index 531db1e..00b7ab3 100644
+--- config_office/configure.in
++++ config_office/configure.in
+@@ -239,6 +239,10 @@ AC_ARG_ENABLE(static-gtk,
+ AC_ARG_ENABLE(layout,
+ [  --disable-layout        Disable the compilation and use of layout dialogs
+ ],,)
++AC_ARG_ENABLE(layout_experimental,
++[  --enable-layout-experimental  Enable the compilation and use of layout dialogs
++                               tagged experimental.
++],,)
+ AC_ARG_ENABLE(build-mozilla,
+ [  --disable-build-mozilla Use this option if you do not want to build the
+                           mozilla components from the mozilla source code but
+@@ -6471,6 +6475,16 @@ else
+ fi
+ AC_SUBST(ENABLE_LAYOUT)
+ 
++AC_MSG_CHECKING([whether to use experimental layout dialogs])
++if test -n "$enable_layout_experimental" && test "$enable_layout_experimental" == "yes"; then
++   ENABLE_LAYOUT_EXPERIMENTAL="TRUE"
++   AC_MSG_RESULT([yes])
++else
++   ENABLE_LAYOUT_EXPERIMENTAL="FALSE"
++   AC_MSG_RESULT([no])
++fi
++AC_SUBST(ENABLE_LAYOUT)
++
+ # ===================================================================
+ # De- or increase default verbosity of build process
+ # ===================================================================
+diff --git sc/source/ui/dbgui/tpsort.cxx sc/source/ui/dbgui/tpsort.cxx
+index ead9819..d17a08a 100644
+--- sc/source/ui/dbgui/tpsort.cxx
++++ sc/source/ui/dbgui/tpsort.cxx
+@@ -536,6 +536,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
+ // Sortieroptionen-Tabpage:
+ //========================================================================
+ 
++#if ENABLE_LAYOUT_EXPERIMENTAL
+ #include <layout/layout-pre.hxx>
+ 
+ #if ENABLE_LAYOUT
+@@ -545,6 +546,8 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
+ #define SfxTabPage( parent, id, args ) SfxTabPage( parent, "sort-options.xml", id, &args )
+ #endif /* ENABLE_LAYOUT */
+ 
++#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
++
+ ScTabPageSortOptions::ScTabPageSortOptions( Window* 			pParent,
+ 											const SfxItemSet&	rArgSet )
+ 
+@@ -571,11 +574,11 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* 			pParent,
+ // 		aFtAreaLabel	( this, ScResId( FT_AREA_LABEL ) ),
+ //		aFtArea 		( this, ScResId( FT_AREA ) ),
+ 		//
+-#if ENABLE_LAYOUT
++#if ENABLE_LAYOUT_EXPERIMENTAL
+ #undef this
+ #undef ScResId
+ #define ScResId(x) this, #x
+-#endif /* ENABLE_LAYOUT */
++#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
+ 		aStrRowLabel	( ScResId( STR_ROW_LABEL ) ),
+ 		aStrColLabel	( ScResId( STR_COL_LABEL ) ),
+ 		aStrUndefined	( ScResId( SCSTR_UNDEFINED ) ),
+@@ -715,9 +718,9 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
+ 
+ // -----------------------------------------------------------------------
+ 
+-#if ENABLE_LAYOUT
++#if ENABLE_LAYOUT_EXPERIMENTAL
+ #undef SfxTabPage
+-#endif /* ENABLE_LAYOUT */
++#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
+ SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
+ 											Window*				pParent,
+ 											const SfxItemSet&	rArgSet )
+@@ -895,11 +898,11 @@ int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
+ 
+ 		if ( !bPosInputOk )
+ 		{
+-#if !ENABLE_LAYOUT
++#if !ENABLE_LAYOUT_EXPERIMENTAL
+ 			ErrorBox( this, WinBits( WB_OK | WB_DEF_OK ),
+ 					 ScGlobal::GetRscString( STR_INVALID_TABREF )
+ 					).Execute();
+-#endif /* ENABLE_LAYOUT */
++#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
+ 			aEdOutPos.GrabFocus();
+ 			aEdOutPos.SetSelection( Selection( 0, SELECTION_MAX ) );
+ 			theOutPos.Set(0,0,0);
+diff --git sc/source/ui/inc/tpsort.hxx sc/source/ui/inc/tpsort.hxx
+index ccf5db0..c1fe02c 100644
+--- sc/source/ui/inc/tpsort.hxx
++++ sc/source/ui/inc/tpsort.hxx
+@@ -132,8 +132,12 @@ class ScRangeData;
+ class CollatorRessource;
+ class CollatorWrapper;
+ 
++#if ENABLE_LAYOUT_EXPERIMENTAL
+ #include <sfx2/layout.hxx>
+ #include <layout/layout-pre.hxx>
++#else /* !ENABLE_LAYOUT_EXPERIMENTAL */
++#define LocalizedString String
++#endif /* !ENABLE_LAYOUT_EXPERIMENTAL */
+ 
+ class ScTabPageSortOptions : public SfxTabPage
+ {
+@@ -214,7 +218,9 @@ private:
+ #endif
+ };
+ 
++#if ENABLE_LAYOUT_EXPERIMENTAL
+ #include <layout/layout-post.hxx>
++#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
+ 
+ #endif // SC_TPSORT_HXX
+ 
+diff --git solenv/inc/settings.mk solenv/inc/settings.mk
+index 60e9bca..9ac66a8 100644
+--- solenv/inc/settings.mk
++++ solenv/inc/settings.mk
+@@ -1147,6 +1147,12 @@ CDEFS+=-DENABLE_LAYOUT=1
+ CFLAGS+=-DENABLE_LAYOUT=0
+ .ENDIF # ENABLE_LAYOUT != TRUE
+ 
++.IF "$(ENABLE_LAYOUT_EXPERIMENTAL)" == "TRUE"
++CDEFS+=-DENABLE_LAYOUT_EXPERIMENTAL=1
++.ELSE # ENABLE_LAYOUT_EXPERIMENTAL != TRUE
++CFLAGS+=-DENABLE_LAYOUT_EXPERIMENTAL=0
++.ENDIF # ENABLE_LAYOUT_EXPERIMENTAL != TRUE
++
+ # compose flags and defines for GUI
+ .IF "$(TARGETTYPE)"=="GUI"
+ CDEFS+= $(CDEFSGUI)