GNOME.org
 

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

Author: jannieuw
Date: Fri Jun 13 14:40:44 2008
New Revision: 12881
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12881&view=rev

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

	* patches/dev300/layout-tab-sfx2.diff:
	* patches/dev300/layout-tab-toolkit.diff: Fix sizing with mousing.
	Smaller upstream diffs for zoom, wordcount and sort
	dialogs. Cleanups.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/layout-tab-sfx2.diff
   trunk/patches/dev300/layout-tab-toolkit.diff

Modified: trunk/patches/dev300/layout-tab-sfx2.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-sfx2.diff	(original)
+++ trunk/patches/dev300/layout-tab-sfx2.diff	Fri Jun 13 14:40:44 2008
@@ -1,27 +1,5 @@
-diff --git a/inc/sfx2/macrconf.hxx b/inc/sfx2/macrconf.hxx
-index 94bbf4b..4155b05 100644
---- sfx2/inc/sfx2/macrconf.hxx
-+++ sfx2/inc/sfx2/macrconf.hxx
-@@ -141,7 +141,7 @@ public:
- 	sal_uInt16					GetSlotId(SfxMacroInfoPtr);
- 	void					ReleaseSlotId(sal_uInt16 nId);
- 	void					RegisterSlotId(sal_uInt16 nId);
--	const SfxMacroInfoPtr 	GetMacroInfo(sal_uInt16 nId) const;
-+    SfxMacroInfoPtr GetMacroInfo(sal_uInt16 nId) const;
- 	sal_Bool					ExecuteMacro(sal_uInt16 nId, const String& rArgs ) const;
- 	sal_Bool					ExecuteMacro( SfxObjectShell*, const SvxMacro*, const String& ) const;
- 	sal_Bool					CheckMacro(sal_uInt16 nId) const;
-@@ -149,7 +149,7 @@ public:
- 
- //#if 0 // _SOLAR__PRIVATE
- 	SAL_DLLPRIVATE static void Release_Impl();
--	SAL_DLLPRIVATE const SfxMacroInfoPtr GetMacroInfo_Impl( const SvxMacro *pMacro ) const;
-+    SAL_DLLPRIVATE SfxMacroInfoPtr GetMacroInfo_Impl( const SvxMacro *pMacro ) const;
- 	DECL_DLLPRIVATE_LINK( CallbackHdl_Impl, SfxMacroConfig*);
- 	DECL_DLLPRIVATE_LINK( EventHdl_Impl, SfxMacroInfo*);
- //#endif
-diff --git a/inc/sfx2/tabdlg.hxx b/inc/sfx2/tabdlg.hxx
-index d5b930e..6d417c8 100644
+diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
+index d5b930e..6087aba 100644
 --- sfx2/inc/sfx2/tabdlg.hxx
 +++ sfx2/inc/sfx2/tabdlg.hxx
 @@ -43,6 +43,9 @@
@@ -46,27 +24,34 @@
  typedef USHORT*		(*GetTabPageRanges)(); // liefert internationale Which-Wert
  
  struct TabDlg_Impl;
-@@ -98,6 +106,9 @@ friend class SfxTabDialogController;
+@@ -98,6 +106,8 @@ friend class SfxTabDialogController;
  	USHORT				nAppPageId;
  	BOOL				bItemsReset;
  	BOOL				bFmt;
 +    std::map<int, layout::TabPage*> layoutPages;
 +    std::map<int, layout::CreateTabPage> layoutPageFuncs;
-+    std::map<int, layout::CreateTabPage*> layoutPageFuncPtrs;
  
  //#if 0 // _SOLAR__PRIVATE
  	DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
-@@ -168,6 +179,9 @@ public:
+@@ -128,7 +138,7 @@ protected:
+ 		handles the item sets to copy.
+ 		@return TRUE if it is allowed to leave the current page, FALSE otherwise
+ 	*/
+-	BOOL			PrepareLeaveCurrentPage();
++	bool PrepareLeaveCurrentPage();
+ 
+ public:
+     SfxTabDialog( Window* pParent, const ResId &rResId, USHORT nSetId, SfxBindings& rBindings,
+@@ -168,6 +178,8 @@ public:
  									BOOL bItemsOnDemand = FALSE,
  									USHORT nPos = TAB_APPEND);
  
-+    void AddTabPage( int id, layout::TabPage* page );
-+    void AddTabPage( int id, layout::CreateTabPage func );
-+    void AddTabPage( int id, layout::CreateTabPage* func );
++    void AddTabPage( int id, layout::TabPage* page, bool=false );
++    void AddTabPage( int id, layout::CreateTabPage, bool=false );
  	void				RemoveTabPage( USHORT nId );
  
  	void				SetCurPageId( USHORT nId ) { nAppPageId = nId; }
-@@ -181,7 +195,7 @@ public:
+@@ -181,7 +193,7 @@ public:
  	const SfxItemSet*	GetOutputItemSet() const { return pOutSet; }
  	const SfxItemSet*	GetOutputItemSet( USHORT nId ) const;
  	int					FillOutputItemSet();
@@ -75,30 +60,8 @@
  
  	const OKButton& 	GetOKButton() const { return aOKBtn; }
  	OKButton&			GetOKButton() { return aOKBtn; }
-diff --git a/source/control/macrconf.cxx b/source/control/macrconf.cxx
-index 0a2a595..1ab851b 100644
---- sfx2/source/control/macrconf.cxx
-+++ sfx2/source/control/macrconf.cxx
-@@ -662,7 +662,7 @@ void SfxMacroConfig::RegisterSlotId(sal_uInt16 nId)
- 
- //==========================================================================
- 
--const SfxMacroInfoPtr SfxMacroConfig::GetMacroInfo(sal_uInt16 nId) const
-+SfxMacroInfoPtr SfxMacroConfig::GetMacroInfo(sal_uInt16 nId) const
- {
- 	sal_uInt16 nCount = pImp->aArr.Count();
- 	for (sal_uInt16 i=0; i<nCount; i++)
-@@ -674,7 +674,7 @@ const SfxMacroInfoPtr SfxMacroConfig::GetMacroInfo(sal_uInt16 nId) const
- 
- //==========================================================================
- 
--const SfxMacroInfoPtr SfxMacroConfig::GetMacroInfo_Impl( const SvxMacro *pMacro ) const
-+SfxMacroInfoPtr SfxMacroConfig::GetMacroInfo_Impl( const SvxMacro *pMacro ) const
- {
- 	sal_uInt16 nCount = pImp->aArr.Count();
- 	for (sal_uInt16 i=0; i<nCount; i++)
-diff --git a/source/dialog/tabdlg.cxx b/source/dialog/tabdlg.cxx
-index 57a8e89..297694f 100644
+diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
+index 57a8e89..9db6fba 100644
 --- sfx2/source/dialog/tabdlg.cxx
 +++ sfx2/source/dialog/tabdlg.cxx
 @@ -56,6 +56,7 @@
@@ -122,33 +85,116 @@
              SfxTabPage* pTabPage = (SfxTabPage*) pDialog->aTabCtrl.GetTabPage( nPageId );
              if ( pTabPage )
              {
-@@ -922,6 +929,25 @@ void SfxTabDialog::AddTabPage
+@@ -922,6 +929,16 @@ void SfxTabDialog::AddTabPage
  }
  #endif
  
-+void SfxTabDialog::AddTabPage( int id, layout::TabPage* page )
++void SfxTabDialog::AddTabPage( int id, layout::TabPage* page, bool )
 +{
 +    layoutPages[id] = page;
 +}
 +
-+void SfxTabDialog::AddTabPage( int id, layout::CreateTabPage* func )
++void SfxTabDialog::AddTabPage( int id, layout::CreateTabPage func, bool )
 +{
-+    OSL_TRACE ("%s: page: %d", __FUNCTION__, id );
-+    layoutPageFuncs[id] = *func;
-+    layoutPageFuncPtrs[id] = func;
-+}
-+
-+void SfxTabDialog::AddTabPage( int id, layout::CreateTabPage func )
-+{
-+    OSL_TRACE ("%s: page: %d", __FUNCTION__, id );
 +    layoutPageFuncs[id] = func;
-+    layoutPageFuncPtrs[id] = &func;
 +}
 +
  // -----------------------------------------------------------------------
  
  void SfxTabDialog::RemoveTabPage( USHORT nId )
-@@ -1365,6 +1391,7 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
+@@ -1164,19 +1181,39 @@ IMPL_LINK( SfxTabDialog, OkHdl, Button *, EMPTYARG )
+ 
+ // -----------------------------------------------------------------------
+ 
+-BOOL SfxTabDialog::PrepareLeaveCurrentPage()
++bool SfxTabDialog::PrepareLeaveCurrentPage()
+ {
+-	SfxTabPage* pPage =
+-		(SfxTabPage*)aTabCtrl.GetTabPage( aTabCtrl.GetCurPageId() );
++	USHORT const nId = aTabCtrl.GetCurPageId();
++
++    if ( layout::TabPage* page = layoutPages[nId] )
++    {
++		if ( !pSet )
++			return page->DeactivatePage( 0 );
++
++        SfxItemSet set( *pSet->GetPool(), pSet->GetRanges() );
++
++        if ( page->HasExchangeSupport() )
++            return page->DeactivatePage( &set );
++
++		int result = page->DeactivatePage( 0 );
++        if ( result & layout::TabPage::LEAVE_PAGE && set.Count() )
++        {
++            pExampleSet->Put( set );
++            pOutSet->Put( set );
++		}
++		return result;
++    }
++
++	SfxTabPage* pPage = (SfxTabPage*)aTabCtrl.GetTabPage( nId );
+ 
+ 	bool bEnd = !pPage;
++
+ 	if ( pPage )
+ 	{
+ 		int nRet = SfxTabPage::LEAVE_PAGE;
+ 		if ( pSet )
+ 		{
+ 			SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() );
+-			BOOL bRet = FALSE;
+ 
+ 			if ( pPage->HasExchangeSupport() )
+ 				nRet = pPage->DeactivatePage( &aTmp );
+@@ -1189,8 +1226,6 @@ BOOL SfxTabDialog::PrepareLeaveCurrentPage()
+ 				pExampleSet->Put( aTmp );
+ 				pOutSet->Put( aTmp );
+ 			}
+-			else if ( bRet )
+-				pImpl->bModified |= TRUE;
+ 		}
+ 		else
+ 			nRet = pPage->DeactivatePage( NULL );
+@@ -1215,37 +1250,7 @@ IMPL_LINK( SfxTabDialog, UserHdl, Button *, EMPTYARG )
+ */
+ 
+ {
+-	SfxTabPage* pPage =
+-		(SfxTabPage *)aTabCtrl.GetTabPage( aTabCtrl.GetCurPageId() );
+-
+-	FASTBOOL bEnd = !pPage;
+-
+-	if ( pPage )
+-	{
+-		int nRet = SfxTabPage::LEAVE_PAGE;
+-
+-		if ( pSet )
+-		{
+-			SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() );
+-
+-			if ( pPage->HasExchangeSupport() )
+-				nRet = pPage->DeactivatePage( &aTmp );
+-			else
+-				nRet = pPage->DeactivatePage( NULL );
+-
+-			if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE
+-				 && aTmp.Count() )
+-			{
+-				pExampleSet->Put( aTmp );
+-				pOutSet->Put( aTmp );
+-			}
+-		}
+-		else
+-			nRet = pPage->DeactivatePage( NULL );
+-		bEnd = nRet;
+-	}
+-
+-	if ( bEnd )
++	if ( PrepareLeaveCurrentPage () )
+ 	{
+ 		short nRet = Ok();
+ 
+@@ -1365,6 +1370,7 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
  
  // -----------------------------------------------------------------------
  
@@ -156,48 +202,46 @@
  IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
  
  /*  [Beschreibung]
-@@ -1379,6 +1406,36 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
+@@ -1379,8 +1385,33 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
  */
  
  {
-+    int newId = pTabCtrl->GetCurPageId();
-+    OSL_TRACE ("%s: page: %d", __FUNCTION__, newId );
-+    layout::CreateTabPage func = layoutPageFuncs[newId];
-+    layout::CreateTabPage *pfunc = layoutPageFuncPtrs[newId];
-+    //if ( layout::CreateTabPage *func = layoutPageFuncPtrs[newId] )
-+        //layout::CreateTabPage *func = layoutPageFuncs[newId];
-+    if (func)
-+    {
-+        layout::TabPage::global_parent = pTabCtrl;
-+        layout::TabPage* page = (func) (pTabCtrl, *pSet);
-+        AddTabPage( newId, page );
-+    }
-+    if ( layout::TabPage* page = layoutPages[newId] )
++	int const nId = pTabCtrl->GetCurPageId();
++    OSL_TRACE ("%s: page: %d", __FUNCTION__, nId );
++    if ( !layoutPages[nId] )
++        if ( layout::CreateTabPage func = layoutPageFuncs[nId] )
++        {
++            layout::TabPage::global_parent = pTabCtrl;
++            layout::TabPage* page = (func) (pTabCtrl, *pSet);
++            AddTabPage( nId, page );
++        }
++    if ( layout::TabPage* page = layoutPages[nId] )
 +    {
 +        TabPage *vclPage = page->GetTabPage();
 +        TabControl *dialog = pTabCtrl;
 +        page->Reset( page->GetItemSet() );
 +        page->ActivatePage();
-+        dialog->SetTabPage( newId, vclPage );
++        dialog->SetTabPage( nId, vclPage );
 +
 +        Size tabSize = vclPage->GetSizePixel();
 +        Size dialogSize = dialog->GetTabPageSizePixel();
 +        OSL_TRACE ("%s: tabSize: %d, %d", __FUNCTION__, tabSize.Width(), tabSize.Height() );
 +        OSL_TRACE ("%s: dialogSize: %d, %d", __FUNCTION__, dialogSize.Width(), dialogSize.Height() );
 +
-+        //dialog->SetTabPageSizePixel( tabSize );
 +        dialog->SetTabPageSizePixel( dialogSize );
 +        return 0;
 +    }
 +    
  	DBG_ASSERT( pImpl->pData->Count(), "keine Pages angemeldet" );
- 	const USHORT nId = pTabCtrl->GetCurPageId();
+-	const USHORT nId = pTabCtrl->GetCurPageId();
  	SFX_APP();
-@@ -1455,6 +1512,9 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
+ 
+ 	// Tab Page schon da?
+@@ -1455,6 +1486,9 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
  */
  
  {
-+    if ( layout::TabPage* p = layoutPages[pTabCtrl->GetCurPageId()] )
++    if ( /* layout::TabPage* p = */ layoutPages[pTabCtrl->GetCurPageId()] )
 +        return SfxTabPage::LEAVE_PAGE;
 +
  	USHORT nId = pTabCtrl->GetCurPageId();

Modified: trunk/patches/dev300/layout-tab-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-toolkit.diff	(original)
+++ trunk/patches/dev300/layout-tab-toolkit.diff	Fri Jun 13 14:40:44 2008
@@ -1,4 +1,4 @@
-diff --git a/doc/layout/README b/doc/layout/README
+diff --git a/toolkit/doc/layout/README b/toolkit/doc/layout/README
 index 1e3737f..d7ced38 100644
 --- toolkit/doc/layout/README
 +++ toolkit/doc/layout/README
@@ -33,7 +33,7 @@
 +
 +* Also See workben/layout/README.
 \ No newline at end of file
-diff --git a/doc/layout/TODO b/doc/layout/TODO
+diff --git a/toolkit/doc/layout/TODO b/toolkit/doc/layout/TODO
 index e6fb771..abd717c 100644
 --- toolkit/doc/layout/TODO
 +++ toolkit/doc/layout/TODO
@@ -46,7 +46,7 @@
  
  
  * i18n
-diff --git a/inc/layout/layout-post.hxx b/inc/layout/layout-post.hxx
+diff --git a/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx
 index 25e1cfc..09f90bf 100644
 --- toolkit/inc/layout/layout-post.hxx
 +++ toolkit/inc/layout/layout-post.hxx
@@ -67,7 +67,7 @@
  
  #undef Window
  
-diff --git a/inc/layout/layout-pre.hxx b/inc/layout/layout-pre.hxx
+diff --git a/toolkit/inc/layout/layout-pre.hxx b/toolkit/inc/layout/layout-pre.hxx
 index f1ff571..327da0b 100644
 --- toolkit/inc/layout/layout-pre.hxx
 +++ toolkit/inc/layout/layout-pre.hxx
@@ -88,8 +88,8 @@
  
  #define Window ::Window
  
-diff --git a/inc/layout/layout.hxx b/inc/layout/layout.hxx
-index ecbf73c..3e9e73e 100644
+diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
+index ecbf73c..d231f54 100644
 --- toolkit/inc/layout/layout.hxx
 +++ toolkit/inc/layout/layout.hxx
 @@ -39,6 +39,8 @@
@@ -225,7 +225,7 @@
  public:
      Dialog( Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
      Dialog( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
-@@ -432,6 +457,43 @@ public:
+@@ -432,6 +457,45 @@ public:
      void SetText( String const& rStr );
  };
  
@@ -238,8 +238,8 @@
 +public:
 +    static ::Window* global_parent;
 +    
-+    TabPage( Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
-+    TabPage( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
++    TabPage( Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0, SfxItemSet const* set = 0 );
++    TabPage( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0, SfxItemSet const* set = 0 );
 +    //DECL_GET_WINDOW( TabPage );
 +    ::TabPage* GetTabPage();
 +    virtual void ActivatePage();
@@ -251,25 +251,27 @@
 +class TOOLKIT_DLLPUBLIC SfxTabPage : public TabPage
 +{
 +public:
-+    SfxTabPage( Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
-+    SfxTabPage( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0 );
++    SfxTabPage( Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0, SfxItemSet const* set = 0 );
++    SfxTabPage( ::Window *pOptParent, char const* pXMLPath, char const* pId, sal_uInt32 nId = 0, SfxItemSet const* set = 0 );
 +#endif
 +    // SfxTabPage...
 +    enum PageAction { KEEP_PAGE, LEAVE_PAGE, REFRESH_SET };
 +
 +    bool bHasExchangeSupport;
 +    bool HasExchangeSupport() { return bHasExchangeSupport; }
-+    SfxItemSet *pSet;
-+    SfxItemSet& GetItemSet() const { return *pSet; }
++    SfxItemSet const* pSet;
++    SfxItemSet const& GetItemSet() const { return *pSet; }
 +    virtual void Reset( SfxItemSet const& r );
 +    void SetExchangeSupport( bool exchangeSupport = true ) { bHasExchangeSupport = exchangeSupport; }
 +    //static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot );
++	virtual void ActivatePage( SfxItemSet const& ) { }
++	virtual int DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; }
 +};
 +
  class ProgressBarImpl;
  class TOOLKIT_DLLPUBLIC ProgressBar : public Control
  {
-@@ -520,7 +582,6 @@ public:
+@@ -520,7 +584,6 @@ public:
  class PluginImpl;
  class TOOLKIT_DLLPUBLIC Plugin : public Control
  {
@@ -277,7 +279,7 @@
      DECL_GET_IMPL( Plugin );
      //DECL_CONSTRUCTORS( Plugin, Control, 0 );
  public:
-@@ -528,6 +589,18 @@ public:
+@@ -528,6 +591,18 @@ public:
      Plugin( Context *pCtx, char const* pId, ::Control *plugin );
  };
  
@@ -296,7 +298,7 @@
  } // end namespace layout
  
  #endif /* _LAYOUT_HXX */
-diff --git a/source/awt/makefile.mk b/source/awt/makefile.mk
+diff --git a/toolkit/source/awt/makefile.mk b/toolkit/source/awt/makefile.mk
 index a3798a5..8a851c5 100644
 --- toolkit/source/awt/makefile.mk
 +++ toolkit/source/awt/makefile.mk
@@ -310,7 +312,7 @@
  
  SRS1NAME=$(TARGET)
  SRC1FILES=\
-diff --git a/source/awt/vclxbutton.cxx b/source/awt/vclxbutton.cxx
+diff --git a/toolkit/source/awt/vclxbutton.cxx b/toolkit/source/awt/vclxbutton.cxx
 index f49b6f0..48f6203 100644
 --- toolkit/source/awt/vclxbutton.cxx
 +++ toolkit/source/awt/vclxbutton.cxx
@@ -323,7 +325,7 @@
  #include <com/sun/star/awt/ImagePosition.hpp>
  #include <vcl/button.hxx>
  
-diff --git a/source/awt/vclxdialog.hxx b/source/awt/vclxdialog.hxx
+diff --git a/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx
 index 8c01a48..c270e63 100644
 --- toolkit/source/awt/vclxdialog.hxx
 +++ toolkit/source/awt/vclxdialog.hxx
@@ -336,7 +338,7 @@
  
      // XInterface
      DECLARE_XINTERFACE()
-diff --git a/source/awt/vclxplugin.cxx b/source/awt/vclxplugin.cxx
+diff --git a/toolkit/source/awt/vclxplugin.cxx b/toolkit/source/awt/vclxplugin.cxx
 index 4c3091a..f17552a 100644
 --- toolkit/source/awt/vclxplugin.cxx
 +++ toolkit/source/awt/vclxplugin.cxx
@@ -364,7 +366,7 @@
      return awt::Size();
  }
  
-diff --git a/source/awt/vclxsplitter.cxx b/source/awt/vclxsplitter.cxx
+diff --git a/toolkit/source/awt/vclxsplitter.cxx b/toolkit/source/awt/vclxsplitter.cxx
 index cecc592..9b73c91 100644
 --- toolkit/source/awt/vclxsplitter.cxx
 +++ toolkit/source/awt/vclxsplitter.cxx
@@ -414,12 +416,12 @@
  
  Any SAL_CALL VCLXSplitter::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
  {
-diff --git a/source/awt/vclxtabpage.cxx b/source/awt/vclxtabpage.cxx
+diff --git a/toolkit/source/awt/vclxtabpage.cxx b/toolkit/source/awt/vclxtabpage.cxx
 new file mode 100644
-index 0000000..e0b9e2e
+index 0000000..92fcc79
 --- /dev/null
 +++ toolkit/source/awt/vclxtabpage.cxx
-@@ -0,0 +1,167 @@
+@@ -0,0 +1,136 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -500,28 +502,6 @@
 +    VCLXWindow::dispose();
 +}
 +
-+void VCLXTabPage::ProcessWindowEvent( VclWindowEvent const& event )
-+{
-+    ::vos::OClearableGuard aGuard( GetMutex() );
-+
-+    OSL_TRACE ("%s: %d", __FUNCTION__, event.GetId());
-+
-+#if 0
-+    //Bin::ProcessWindowEvent( event );
-+    switch ( event.GetId() )
-+    {
-+        case VCLEVENT_WINDOW_RESIZE:
-+            resizedCb();
-+        default:
-+            aGuard.clear();
-+#endif
-+            VCLXWindow::ProcessWindowEvent( event );
-+#if 0
-+            break;
-+    }
-+#endif
-+}
-+
 +void SAL_CALL VCLXTabPage::allocateArea( awt::Rectangle const& area )
 +    throw (uno::RuntimeException)
 +{
@@ -529,19 +509,13 @@
 +    awt::Size reqSize = getMinimumSize();
 +    reqSize.Height = getHeightForWidth( area.Width );
 +
-+#if 0 // huh?
-+    if ( curSize.Width && reqSize.Width > curSize.Width )
-+        reqSize.Width = curSize.Width;
-+    if ( curSize.Height && reqSize.Height > curSize.Height )
-+        reqSize.Height = curSize.Height;
-+#else
-+    if ( reqSize.Width < curSize.Width )
++    if ( curSize.Width > 0 && curSize.Height > 0
++         && reqSize.Width > curSize.Width )
 +        reqSize.Width = curSize.Width;
-+    if ( reqSize.Height < curSize.Height )
++    if ( curSize.Width > 0 && curSize.Height > 0
++         && reqSize.Height > curSize.Height )
 +        reqSize.Height = curSize.Height;
-+#endif
 +
-+    OSL_TRACE ("%s: ismousetransparent, %d", __FUNCTION__, GetWindow()->IsMouseTransparent() );
 +    Size window = GetWindow()->GetSizePixel();
 +    Size parent = GetWindow()->GetParent()->GetSizePixel();
 +
@@ -557,10 +531,7 @@
 +    if ( !bRealized )
 +    {
 +        setPosSize( 0, 0, reqSize.Width, reqSize.Height, awt::PosSize::SIZE );
-+        //setPosSize( 0, 0, reqSize.Width, reqSize.Height, awt::PosSize::POSSIZE );
 +        bRealized = true;
-+        /* Must NOT set visible for OOo integration */
-+        //setVisible( true );
 +    }
 +    else
 +    {
@@ -587,12 +558,12 @@
 +}
 +
 +} // namespace layoutimpl
-diff --git a/source/awt/vclxtabpage.hxx b/source/awt/vclxtabpage.hxx
+diff --git a/toolkit/source/awt/vclxtabpage.hxx b/toolkit/source/awt/vclxtabpage.hxx
 new file mode 100644
-index 0000000..0283a46
+index 0000000..d6e3032
 --- /dev/null
 +++ toolkit/source/awt/vclxtabpage.hxx
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,80 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -659,9 +630,6 @@
 +    // XComponent
 +    void SAL_CALL dispose() throw(css::uno::RuntimeException);
 +
-+    // VCLXWindow
-+    void ProcessWindowEvent( VclWindowEvent const& event );
-+
 +    // ::com::sun::star::awt::XLayoutContainer
 +    virtual void SAL_CALL allocateArea( css::awt::Rectangle const& rArea )
 +        throw (css::uno::RuntimeException);
@@ -676,7 +644,7 @@
 +} // namespace layoutimpl
 +
 +#endif /* LAYOUT_AWT_VCLXTABPAGE_HXX */
-diff --git a/source/layout/box-base.hxx b/source/layout/box-base.hxx
+diff --git a/toolkit/source/layout/box-base.hxx b/toolkit/source/layout/box-base.hxx
 index 04f0c95..d8b580b 100644
 --- toolkit/source/layout/box-base.hxx
 +++ toolkit/source/layout/box-base.hxx
@@ -686,7 +654,7 @@
  
 -#endif /* CORE_BOX__BASE HXX */
 +#endif /* CORE_BOX_BASE HXX */
-diff --git a/source/layout/container.cxx b/source/layout/container.cxx
+diff --git a/toolkit/source/layout/container.cxx b/toolkit/source/layout/container.cxx
 index 22e3b08..b34bfe5 100644
 --- toolkit/source/layout/container.cxx
 +++ toolkit/source/layout/container.cxx
@@ -699,7 +667,7 @@
                  if ( aChildren[ node ] == xContainer )
                      break;
          }
-diff --git a/source/layout/factory.cxx b/source/layout/factory.cxx
+diff --git a/toolkit/source/layout/factory.cxx b/toolkit/source/layout/factory.cxx
 index b83b706..a072b12 100644
 --- toolkit/source/layout/factory.cxx
 +++ toolkit/source/layout/factory.cxx
@@ -725,7 +693,7 @@
      return sal_False;
  }
  
-diff --git a/source/layout/flow.cxx b/source/layout/flow.cxx
+diff --git a/toolkit/source/layout/flow.cxx b/toolkit/source/layout/flow.cxx
 index a99ba70..13d90fe 100644
 --- toolkit/source/layout/flow.cxx
 +++ toolkit/source/layout/flow.cxx
@@ -751,7 +719,7 @@
          children[i] = (*it)->xChild;
  
      return children;
-diff --git a/source/layout/helper.cxx b/source/layout/helper.cxx
+diff --git a/toolkit/source/layout/helper.cxx b/toolkit/source/layout/helper.cxx
 index 78cdbd4..92e63ea 100644
 --- toolkit/source/layout/helper.cxx
 +++ toolkit/source/layout/helper.cxx
@@ -882,7 +850,7 @@
  
      if ( !pNewWindow )
          return xRef;
-diff --git a/source/layout/import.cxx b/source/layout/import.cxx
+diff --git a/toolkit/source/layout/import.cxx b/toolkit/source/layout/import.cxx
 index 71e5a16..87b3a32 100644
 --- toolkit/source/layout/import.cxx
 +++ toolkit/source/layout/import.cxx
@@ -895,7 +863,7 @@
          throw xml::sax::SAXException(
              OUString( RTL_CONSTASCII_USTRINGPARAM( "invalid namespace!" ) ),
              uno::Reference< uno::XInterface >(), uno::Any() );
-diff --git a/source/layout/localized-string.cxx b/source/layout/localized-string.cxx
+diff --git a/toolkit/source/layout/localized-string.cxx b/toolkit/source/layout/localized-string.cxx
 new file mode 100644
 index 0000000..9bc9df3
 --- /dev/null
@@ -988,7 +956,7 @@
 +}
 +
 +} // namespace layoutimpl
-diff --git a/source/layout/localized-string.hxx b/source/layout/localized-string.hxx
+diff --git a/toolkit/source/layout/localized-string.hxx b/toolkit/source/layout/localized-string.hxx
 new file mode 100644
 index 0000000..bbb3896
 --- /dev/null
@@ -1078,7 +1046,7 @@
 +} // namespace layoutimpl
 +
 +#endif /* CORE_LOCALIZED_STRING_HXX */
-diff --git a/source/layout/makefile.mk b/source/layout/makefile.mk
+diff --git a/toolkit/source/layout/makefile.mk b/toolkit/source/layout/makefile.mk
 index 5bab848..44331d3 100644
 --- toolkit/source/layout/makefile.mk
 +++ toolkit/source/layout/makefile.mk
@@ -1090,7 +1058,7 @@
  	$(SLO)$/proplist.obj \
  	$(SLO)$/root.obj \
  	$(SLO)$/table.obj \
-diff --git a/source/layout/proplist.cxx b/source/layout/proplist.cxx
+diff --git a/toolkit/source/layout/proplist.cxx b/toolkit/source/layout/proplist.cxx
 index eef28ea..02b510a 100644
 --- toolkit/source/layout/proplist.cxx
 +++ toolkit/source/layout/proplist.cxx
@@ -1180,7 +1148,7 @@
      {
          if ( findAndRemove( attribsMap[i].name, rProps, aValue ) )
          {
-diff --git a/source/layout/proplist.hxx b/source/layout/proplist.hxx
+diff --git a/toolkit/source/layout/proplist.hxx b/toolkit/source/layout/proplist.hxx
 index 59a1b4f..446bd48 100644
 --- toolkit/source/layout/proplist.hxx
 +++ toolkit/source/layout/proplist.hxx
@@ -1204,7 +1172,7 @@
 +#endif
  
  #endif // CORE_PROPLIST_HXX
-diff --git a/source/layout/root.cxx b/source/layout/root.cxx
+diff --git a/toolkit/source/layout/root.cxx b/toolkit/source/layout/root.cxx
 index 3cec64e..906ceae 100644
 --- toolkit/source/layout/root.cxx
 +++ toolkit/source/layout/root.cxx
@@ -1272,7 +1240,7 @@
  #endif
  
  LayoutWidget::LayoutWidget( uno::Reference< awt::XToolkit > xToolkit,
-diff --git a/source/layout/table.cxx b/source/layout/table.cxx
+diff --git a/toolkit/source/layout/table.cxx b/toolkit/source/layout/table.cxx
 index 658ef95..6df27c2 100644
 --- toolkit/source/layout/table.cxx
 +++ toolkit/source/layout/table.cxx
@@ -1354,7 +1322,7 @@
              {
                  int gSize = aGroup[ i ].mnSize;
                  if ( aGroup[ i ].mbExpand )
-diff --git a/source/layout/timer.cxx b/source/layout/timer.cxx
+diff --git a/toolkit/source/layout/timer.cxx b/toolkit/source/layout/timer.cxx
 index e36fedc..159acbe 100644
 --- toolkit/source/layout/timer.cxx
 +++ toolkit/source/layout/timer.cxx
@@ -1382,7 +1350,7 @@
               it != mxContainers.end(); it++ )
              (*it)->allocateArea( (*it)->getAllocatedArea() );
      }
-diff --git a/source/vclcompat/wbutton.cxx b/source/vclcompat/wbutton.cxx
+diff --git a/toolkit/source/vclcompat/wbutton.cxx b/toolkit/source/vclcompat/wbutton.cxx
 index 17c2142..5300e70 100644
 --- toolkit/source/vclcompat/wbutton.cxx
 +++ toolkit/source/vclcompat/wbutton.cxx
@@ -1487,7 +1455,7 @@
  
  void MoreButton::AddWindow( Window* w )
  {
-diff --git a/source/vclcompat/wfield.cxx b/source/vclcompat/wfield.cxx
+diff --git a/toolkit/source/vclcompat/wfield.cxx b/toolkit/source/vclcompat/wfield.cxx
 index 7ceed85..8d9ab13 100644
 --- toolkit/source/vclcompat/wfield.cxx
 +++ toolkit/source/vclcompat/wfield.cxx
@@ -1607,8 +1575,8 @@
 +IMPL_GET_IMPL( ListBox );
  
  } // namespace layout
-diff --git a/source/vclcompat/wrapper.cxx b/source/vclcompat/wrapper.cxx
-index 6188ac1..0b02790 100644
+diff --git a/toolkit/source/vclcompat/wrapper.cxx b/toolkit/source/vclcompat/wrapper.cxx
+index 6188ac1..b0e8418 100644
 --- toolkit/source/vclcompat/wrapper.cxx
 +++ toolkit/source/vclcompat/wrapper.cxx
 @@ -36,23 +36,34 @@
@@ -1831,7 +1799,7 @@
  short Dialog::Execute()
  {
      if ( !getImpl().mxDialog.is() )
-@@ -391,13 +421,95 @@ void Dialog::EndDialog( long nResult )
+@@ -391,13 +421,99 @@ void Dialog::EndDialog( long nResult )
      getImpl().mxDialog->endDialog( nResult );
  }
  
@@ -1858,19 +1826,21 @@
 +
 +IMPL_GET_IMPL( TabPage )
 +
-+TabPage::TabPage( Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId )
++TabPage::TabPage( Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId, SfxItemSet const* set )
 +    : Context( pXMLPath )
 +    , Window( new TabPageImpl( this, Context::GetPeerHandle( pId, nId ), this ) )
 +    , bHasExchangeSupport( false )
++    , pSet( set )
 +{
 +    if ( pParent )
 +        SetParent( pParent );
 +}
 +
-+TabPage::TabPage( ::Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId )
++TabPage::TabPage( ::Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId, SfxItemSet const* set )
 +    : Context( pXMLPath )
 +    , Window( new TabPageImpl( this, Context::GetPeerHandle( pId, nId ), this ) )
 +    , bHasExchangeSupport( false )
++    , pSet( set )
 +{
 +    if ( pParent )
 +        SetParent( pParent );
@@ -1887,12 +1857,14 @@
 +}
 +
 +#if 0
-+SfxTabPage::SfxTabPage( Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId )
++SfxTabPage::SfxTabPage( Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId, SfxItemSet const* set )
 +    : TabPage( pParent, pXMLPath, pId, nId )
++    , bHasExchangeSupport( false )
++    , pSet( set )
 +{
 +}
 +
-+SfxTabPage::SfxTabPage( ::Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId )
++SfxTabPage::SfxTabPage( ::Window *pParent, const char *pXMLPath, const char *pId, sal_uInt32 nId, SfxItemSet const* set )
 +    : TabPage( pParent, pXMLPath, pId, nId )
 +{
 +}
@@ -1928,7 +1900,7 @@
  class FixedLineImpl : public ControlImpl
  {
  public:
-@@ -407,8 +519,8 @@ public:
+@@ -407,8 +523,8 @@ public:
      }
  };
  
@@ -1939,7 +1911,7 @@
  
  bool FixedLine::IsEnabled()
  {
-@@ -433,10 +545,10 @@ public:
+@@ -433,10 +549,10 @@ public:
      }
  };
  
@@ -1953,7 +1925,7 @@
  {
      if ( !getImpl().mxFixedText.is() )
          return;
-@@ -452,8 +564,8 @@ public:
+@@ -452,8 +568,8 @@ public:
      }
  };
  
@@ -1964,7 +1936,7 @@
  
  class ProgressBarImpl : public ControlImpl
  {
-@@ -494,8 +606,8 @@ public:
+@@ -494,8 +610,8 @@ public:
      }
  };
  
@@ -1975,7 +1947,7 @@
  
  void FixedImage::setImage( ::Image const& i )
  {
-@@ -521,7 +633,7 @@ FixedImage::~FixedImage()
+@@ -521,7 +637,7 @@ FixedImage::~FixedImage()
  #endif
  
      
@@ -1984,7 +1956,7 @@
  #if 0
  ProgressBar::ProgressBar( Context *pCtx, const char *pId, sal_uInt32 nId )
      : Control( new ProgressBarImpl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) )
-@@ -534,7 +646,7 @@ ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
+@@ -534,7 +650,7 @@ ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
  }
  #endif
  
@@ -1993,7 +1965,7 @@
  
  
  void ProgressBar::SetForegroundColor( css::util::Color color )
-@@ -601,7 +713,46 @@ Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
+@@ -601,7 +717,46 @@ Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
  {
  }
  
@@ -2041,7 +2013,7 @@
 +}
  
  } // namespace layout
-diff --git a/source/vclcompat/wrapper.hxx b/source/vclcompat/wrapper.hxx
+diff --git a/toolkit/source/vclcompat/wrapper.hxx b/toolkit/source/vclcompat/wrapper.hxx
 index f56bc0a..5df64bc 100644
 --- toolkit/source/vclcompat/wrapper.hxx
 +++ toolkit/source/vclcompat/wrapper.hxx
@@ -2069,7 +2041,7 @@
      t::t( Context *pCtx, const char *pId, sal_uInt32 nId ) \
          : win_par( new t##Impl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) ) \
          , other_par( new other_par##Impl( Window::GetPeer() ) ) \
-diff --git a/src2xml/source/src2xml.py b/src2xml/source/src2xml.py
+diff --git a/toolkit/src2xml/source/src2xml.py b/toolkit/src2xml/source/src2xml.py
 index a2a7714..fdcc0fb 100644
 --- toolkit/src2xml/source/src2xml.py
 +++ toolkit/src2xml/source/src2xml.py
@@ -2091,7 +2063,16 @@
      return s
  
  XML_HEADER = '''<?xml version="1.0" encoding="UTF-8"?>
-diff --git a/workben/layout/README b/workben/layout/README
+diff --git a/toolkit/workben/layout/.gitignore b/toolkit/workben/layout/.gitignore
+new file mode 100644
+index 0000000..9b72951
+--- /dev/null
++++ toolkit/workben/layout/.gitignore
+@@ -0,0 +1,3 @@
++/de
++/en-US
++/nl
+diff --git a/toolkit/workben/layout/README b/toolkit/workben/layout/README
 new file mode 100644
 index 0000000..3b83bbf
 --- /dev/null
@@ -2140,7 +2121,7 @@
 +  ./soffice.bin
 +
 +  Start a [Writer] document and choose View/Zoom or Extra/Word count.
-diff --git a/workben/layout/editor.cxx b/workben/layout/editor.cxx
+diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx
 index a13030e..c09d2c5 100644
 --- toolkit/workben/layout/editor.cxx
 +++ toolkit/workben/layout/editor.cxx
@@ -2156,8 +2137,8 @@
  // TODO: automatically generated
  struct WidgetSpec {
      const char *pLabel, *pName, *pIconName;
-diff --git a/workben/layout/makefile.mk b/workben/layout/makefile.mk
-index 7126deb..ad535ee 100644
+diff --git a/toolkit/workben/layout/makefile.mk b/toolkit/workben/layout/makefile.mk
+index 7126deb..2b2609c 100644
 --- toolkit/workben/layout/makefile.mk
 +++ toolkit/workben/layout/makefile.mk
 @@ -47,7 +47,7 @@ ENABLE_EXCEPTIONS=TRUE
@@ -2186,22 +2167,20 @@
  	wordcount.xml\
  	zoom.xml\
  
-@@ -129,6 +132,14 @@ dist .PHONY :
+@@ -128,6 +131,12 @@ dist .PHONY :
+ 	touch ../$(PRJ)/sw/source/ui/dialog/swdlgfact.cxx
  	# FIXME: broken setup
  	ln -sf ../inc/wordcountdialog.hxx ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.hxx 
- 
-+dist-sort .PHONY :
 +	$(SHELL) ./un-test.sh tpsort.cxx > ../$(PRJ)/sc/source/ui/dbgui/tpsort.cxx
 +	$(SHELL) ./un-test.sh tpsort.hxx > ../$(PRJ)/sc/source/ui/inc/tpsort.hxx
 +	$(SHELL) ./un-test.sh sortdlg.cxx > ../$(PRJ)/sc/source/ui/dbgui/sortdlg.cxx
 +	$(SHELL) ./un-test.sh sortdlg.hxx > ../$(PRJ)/sc/source/ui/inc/sortdlg.hxx
 +	touch ../$(PRJ)/sc/source/ui/attrdlg/scdlgfact.cxx
 +	touch ../$(PRJ)/sc/source/ui/view/cellsh2.cxx
-+
+ 
  .ELSE # ENABLE_LAYOUT != TRUE
  all .PHONY:
- .ENDIF # ENABLE_LAYOUT != TRUE
-diff --git a/workben/layout/refresh b/workben/layout/refresh
+diff --git a/toolkit/workben/layout/refresh b/toolkit/workben/layout/refresh
 index de2652c..7969995 100644
 --- toolkit/workben/layout/refresh
 +++ toolkit/workben/layout/refresh
@@ -2214,7 +2193,7 @@
 +  && cp -f ../..$INPATH/lib/libtkx.so $OOO_INSTALL_PREFIX/openoffice.org/basis3.0/program \
 +  && dmake debug=true \
 +  && ../../${INPATH}/bin/test "$@"
-diff --git a/workben/layout/sort-options.xml b/workben/layout/sort-options.xml
+diff --git a/toolkit/workben/layout/sort-options.xml b/toolkit/workben/layout/sort-options.xml
 new file mode 100644
 index 0000000..e2e01f0
 --- /dev/null
@@ -2260,12 +2239,12 @@
 +	</vbox>
 +    </vbox>
 +</tabpage>
-diff --git a/workben/layout/sortdlg.cxx b/workben/layout/sortdlg.cxx
+diff --git a/toolkit/workben/layout/sortdlg.cxx b/toolkit/workben/layout/sortdlg.cxx
 new file mode 100644
-index 0000000..3170050
+index 0000000..e7731ef
 --- /dev/null
 +++ toolkit/workben/layout/sortdlg.cxx
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,65 @@
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -2323,13 +2302,7 @@
 +
 +{
 +	AddTabPage( TP_FIELDS,	ScTabPageSortFields::Create,  0 );
-+#if !ENABLE_LAYOUT
-+	AddTabPage( TP_OPTIONS,	ScTabPageSortOptions::Create,  0 );
-+#else /* ENABLE_LAYOUT */
-+    layout::TabPage::global_parent = pParent;
-+	//AddTabPage( TP_OPTIONS, new ScTabPageSortOptions( this, *pArgSet ) );
-+	AddTabPage( TP_OPTIONS, &ScTabPageSortOptions::Create );
-+#endif /* ENABLE_LAYOUT */
++	AddTabPage( TP_OPTIONS,	ScTabPageSortOptions::Create, 0 );
 +	FreeResource();
 +}
 +
@@ -2337,7 +2310,7 @@
 +{
 +}
 +
-diff --git a/workben/layout/sortdlg.hrc b/workben/layout/sortdlg.hrc
+diff --git a/toolkit/workben/layout/sortdlg.hrc b/toolkit/workben/layout/sortdlg.hrc
 new file mode 100644
 index 0000000..d946f18
 --- /dev/null
@@ -2434,7 +2407,7 @@
 +
 +
 +
-diff --git a/workben/layout/sortdlg.hxx b/workben/layout/sortdlg.hxx
+diff --git a/toolkit/workben/layout/sortdlg.hxx b/toolkit/workben/layout/sortdlg.hxx
 new file mode 100644
 index 0000000..d2ea7ed
 --- /dev/null
@@ -2507,7 +2480,7 @@
 +#endif // SC_SORTDLG_HXX
 +
 +
-diff --git a/workben/layout/sortdlg.src b/workben/layout/sortdlg.src
+diff --git a/toolkit/workben/layout/sortdlg.src b/toolkit/workben/layout/sortdlg.src
 new file mode 100644
 index 0000000..e0d8496
 --- /dev/null
@@ -2838,7 +2811,7 @@
 +};
 +
 +
-diff --git a/workben/layout/sortdlg.xml b/workben/layout/sortdlg.xml
+diff --git a/toolkit/workben/layout/sortdlg.xml b/toolkit/workben/layout/sortdlg.xml
 new file mode 100644
 index 0000000..a17920e
 --- /dev/null
@@ -2909,8 +2882,8 @@
 +        </hbox>
 +    </vbox>
 +</tabdialog>
-diff --git a/workben/layout/test.cxx b/workben/layout/test.cxx
-index 0408590..da3006d 100644
+diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx
+index 0408590..f825417 100644
 --- toolkit/workben/layout/test.cxx
 +++ toolkit/workben/layout/test.cxx
 @@ -42,6 +42,7 @@
@@ -2946,7 +2919,7 @@
  #include "wordcountdialog.hxx"
  #undef _LAYOUT_POST_HXX
  
-@@ -158,12 +170,30 @@ void LayoutTest::InitUCB()
+@@ -158,12 +170,29 @@ void LayoutTest::InitUCB()
      }
  }
  
@@ -2970,17 +2943,34 @@
  {
      ParseCommandLine();
 -    if (!getenv ("OOO_INSTALL_PREFIX") )
-+    if ( !getenv ("OOO_INSTALL_PREFIX") )
-         setenv( "OOO_INSTALL_PREFIX", OUSTRING_CSTR( mInstallDir ), 1 );
+-        setenv( "OOO_INSTALL_PREFIX", OUSTRING_CSTR( mInstallDir ), 1 );
 -    OSL_TRACE( "OOO_INSTALL_PREFIX=%s\n", getenv( "OOO_INSTALL_PREFIX" ) );
++    setenv( "OOO_INSTALL_PREFIX", OUSTRING_CSTR( mInstallDir ), 0 );
 +    support_upstream_brand_prefix ();
 +    OSL_TRACE( "OOO_INSTALL_PREFIX=%s", getenv( "OOO_INSTALL_PREFIX" ) );
 +
      mxContext = defaultBootstrap_InitialComponentContext();
      mxMSF = new UnoBootstrapLayout( Reference< lang::XMultiServiceFactory >( mxContext->getServiceManager(), UNO_QUERY ) );
      ::comphelper::setProcessServiceFactory( mxMSF );
-@@ -231,6 +261,15 @@ void RunDialog( ::Dialog& dialog )
-     fprintf( stderr, "2nd execute exited" );
+@@ -216,9 +245,7 @@ void RunDialog( Dialog& dialog )
+ {
+     dialog.Show();
+     dialog.Execute();
+-    fprintf( stderr, "1st execute exited" );
+-    dialog.Execute();
+-    fprintf( stderr, "2nd execute exited" );
++    fprintf( stderr, "Done: dialog execute exited\n" );
+ }
+ 
+ #undef Dialog
+@@ -226,11 +253,18 @@ void RunDialog( ::Dialog& dialog )
+ {
+     dialog.Show();
+     dialog.Execute();
+-    fprintf( stderr, "1st execute exited" );
+-    dialog.Execute();
+-    fprintf( stderr, "2nd execute exited" );
++    fprintf( stderr, "Done: dialog execute exited\n" );
  }
  
 +#if SORT_DLG
@@ -2995,7 +2985,7 @@
  void TestDialog( OUString const& name )
  {
      if ( 0 )
-@@ -245,6 +284,14 @@ void TestDialog( OUString const& name )
+@@ -245,6 +279,14 @@ void TestDialog( OUString const& name )
          SvxRecoverDialog recover ( 0 );
          RunDialog( recover );
      }
@@ -3010,7 +3000,7 @@
      else if ( name.equalsAscii( "wordcount" ) )
      {
          SwWordCountDialog words ( 0 );
-diff --git a/workben/layout/testrc.in b/workben/layout/testrc.in
+diff --git a/toolkit/workben/layout/testrc.in b/toolkit/workben/layout/testrc.in
 index 15e190d..00ae5eb 100644
 --- toolkit/workben/layout/testrc.in
 +++ toolkit/workben/layout/testrc.in
@@ -3030,12 +3020,12 @@
  OOO_BASE_DIR=${OOO_BASIS_URL}
  #
  UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
-diff --git a/workben/layout/tpsort.cxx b/workben/layout/tpsort.cxx
+diff --git a/toolkit/workben/layout/tpsort.cxx b/toolkit/workben/layout/tpsort.cxx
 new file mode 100644
-index 0000000..73aa236
+index 0000000..9468c5d
 --- /dev/null
 +++ toolkit/workben/layout/tpsort.cxx
-@@ -0,0 +1,1111 @@
+@@ -0,0 +1,1108 @@
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -3592,7 +3582,7 @@
 +#undef ScResId
 +#define ScResId(x) #x
 +#undef SfxTabPage
-+#define SfxTabPage( parent, id, args ) TabPage( parent, "sort-options.xml", id )
++#define SfxTabPage( parent, id, args ) TabPage( parent, "sort-options.xml", id, 0, &args )
 +#endif /* ENABLE_LAYOUT */
 +
 +ScTabPageSortOptions::ScTabPageSortOptions( Window* 			pParent,
@@ -3656,12 +3646,12 @@
 +
 +__EXPORT ScTabPageSortOptions::~ScTabPageSortOptions()
 +{
-+#if !ENABLE_LAYOUT
++#if !TEST_LAYOUT
 +	USHORT nEntries = aLbOutPos.GetEntryCount();
 +
 +	for ( USHORT i=1; i<nEntries; i++ )
 +		delete (String*)aLbOutPos.GetEntryData( i );
-+#endif /* !ENABLE_LAYOUT */
++#endif /* !TEST_LAYOUT */
 +
 +	delete pColRes;
 +	delete pColWrap;		//! not if from document
@@ -3680,10 +3670,10 @@
 +	//!	use CollatorWrapper from document?
 +	pColWrap = new CollatorWrapper( comphelper::getProcessServiceFactory() );
 +
-+#if !ENABLE_LAYOUT
++#if !TEST_LAYOUT
 +	const ScSortItem&	rSortItem = (const ScSortItem&)
 +									GetItemSet().Get( nWhichSort );
-+#endif /* !ENABLE_LAYOUT */
++#endif /* !TEST_LAYOUT */
 +
 +	aLbOutPos.SetSelectHdl	  ( LINK( this, ScTabPageSortOptions, SelOutPosHdl ) );
 +	aBtnCopyResult.SetClickHdl( LINK( this, ScTabPageSortOptions, EnableHdl ) );
@@ -3692,9 +3682,9 @@
 +	aBtnLeftRight.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) );
 +	aLbLanguage.SetSelectHdl  ( LINK( this, ScTabPageSortOptions, FillAlgorHdl ) );
 +
-+#if !ENABLE_LAYOUT
++#if !TEST_LAYOUT
 +	pViewData = rSortItem.GetViewData();
-+#endif /* ENABLE_LAYOUT */
++#endif /* TEST_LAYOUT */
 +	pDoc	  = pViewData ? pViewData->GetDocument() : NULL;
 +
 +	DBG_ASSERT( pViewData, "ViewData not found! :-/" );
@@ -3908,8 +3898,9 @@
 +	}
 +	theSortData.aCollatorAlgorithm = sAlg;
 +
++#if !TEST_LAYOUT
 +	rArgSet.Put( ScSortItem( SCITEM_SORTDATA, &theSortData ) );
-+
++#endif /* TEST_LAYOUT */
 +	return TRUE;
 +}
 +
@@ -3942,7 +3933,6 @@
 +
 +int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
 +{
-+    (void) pSetP;
 +	BOOL bPosInputOk = TRUE;
 +
 +	if ( aBtnCopyResult.IsChecked() )
@@ -4064,8 +4054,6 @@
 +
 +IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn )
 +{
-+    (void) pBtn;
-+
 +	if ( pBtn == &aBtnTopDown )
 +	{
 +		aBtnHeader.SetText( aStrColLabel );
@@ -4081,7 +4069,6 @@
 +
 +void __EXPORT ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
 +{
-+    (void) pEd;
 +	if ( pEd == &aEdOutPos )
 +	{
 +		String	theCurPosStr = aEdOutPos.GetText();
@@ -4147,7 +4134,7 @@
 +}
 +
 +
-diff --git a/workben/layout/tpsort.hxx b/workben/layout/tpsort.hxx
+diff --git a/toolkit/workben/layout/tpsort.hxx b/toolkit/workben/layout/tpsort.hxx
 new file mode 100644
 index 0000000..ed6bdc8
 --- /dev/null
@@ -4379,3 +4366,179 @@
 +
 +#endif // SC_TPSORT_HXX
 +
+diff --git a/toolkit/workben/layout/wordcountdialog.cxx b/toolkit/workben/layout/wordcountdialog.cxx
+index 9acb027..dc1f82b 100644
+--- toolkit/workben/layout/wordcountdialog.cxx
++++ toolkit/workben/layout/wordcountdialog.cxx
+@@ -7,7 +7,7 @@
+  * OpenOffice.org - a multi-platform office productivity suite
+  *
+  * $RCSfile: wordcountdialog.cxx,v $
+- * $Revision: 1.3 $
++ * $Revision: 1.5 $
+  *
+  * This file is part of OpenOffice.org.
+  *
+@@ -84,17 +84,12 @@ SwWordCountDialog::~SwWordCountDialog()
+ /*-- 06.04.2004 16:05:57---------------------------------------------------
+ 
+   -----------------------------------------------------------------------*/
+-void  SwWordCountDialog::SetValues(const SwDocStat& 
+-#if !TEST_LAYOUT
+-                                   rCurrent,
+-#endif
+-                                   , const SwDocStat&
+-#if !TEST_LAYOUT
+-                                   rDoc
+-#endif
+-                                   )
++void  SwWordCountDialog::SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc)
+ {
+-#if !TEST_LAYOUT
++#if TEST_LAYOUT
++    (void) rCurrent;
++    (void) rDoc;
++#else /* !TEST_LAYOUT */
+     aCurrentWordFI.SetText(     String::CreateFromInt32(rCurrent.nWord ));
+     aCurrentCharacterFI.SetText(String::CreateFromInt32(rCurrent.nChar ));
+     aDocWordFI.SetText(         String::CreateFromInt32(rDoc.nWord ));
+diff --git a/toolkit/workben/layout/wordcountdialog.hxx b/toolkit/workben/layout/wordcountdialog.hxx
+index 62e97bb..b0674e2 100644
+--- toolkit/workben/layout/wordcountdialog.hxx
++++ toolkit/workben/layout/wordcountdialog.hxx
+@@ -7,7 +7,7 @@
+  * OpenOffice.org - a multi-platform office productivity suite
+  *
+  * $RCSfile: wordcountdialog.hxx,v $
+- * $Revision: 1.3 $
++ * $Revision: 1.5 $
+  *
+  * This file is part of OpenOffice.org.
+  *
+diff --git a/toolkit/workben/layout/zoom.cxx b/toolkit/workben/layout/zoom.cxx
+index 290a5ad..76c33b4 100644
+--- toolkit/workben/layout/zoom.cxx
++++ toolkit/workben/layout/zoom.cxx
+@@ -7,7 +7,7 @@
+  * OpenOffice.org - a multi-platform office productivity suite
+  *
+  * $RCSfile: zoom.cxx,v $
+- * $Revision: 1.3 $
++ * $Revision: 1.12 $
+  *
+  * This file is part of OpenOffice.org.
+  *
+@@ -127,9 +127,9 @@ static USHORT pRanges[] =
+ 
+ USHORT SvxZoomDialog::GetFactor() const
+ {
+-	if ( a100Btn.IsChecked() )
++    if ( a100Btn.IsChecked() )
+ 		return 100;
+-	if ( aUserBtn.IsChecked() )
++    if ( aUserBtn.IsChecked() )
+ 		return (USHORT)aUserEdit.GetValue();
+ 	else
+ 		return SPECIAL_FACTOR;
+@@ -151,7 +151,7 @@ void SvxZoomDialog::SetFactor( USHORT nNewFactor, USHORT nBtnId )
+ 			a100Btn.Check();
+ 			a100Btn.GrabFocus();
+ 		}
+-		else
++        else
+ 		{
+ 			aUserBtn.Check();
+ 			aUserEdit.Enable();
+@@ -259,7 +259,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
+     aOptimalBtn     ( this, SVX_RES( BTN_OPTIMAL ) ),
+     aWholePageBtn   ( this, SVX_RES( BTN_WHOLE_PAGE ) ),
+     aPageWidthBtn   ( this, SVX_RES( BTN_PAGE_WIDTH ) ),
+-	a100Btn         ( this, SVX_RES( BTN_100 ) ),
++    a100Btn         ( this, SVX_RES( BTN_100 ) ),
+     aUserBtn        ( this, SVX_RES( BTN_USER ) ),
+ 	aUserEdit       ( this, SVX_RES( ED_USER ) ),
+ 
+@@ -283,8 +283,8 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
+ 
+ {
+ 	Link aLink = LINK( this, SvxZoomDialog, UserHdl );
+-	a100Btn.SetClickHdl( aLink );
+-	aOptimalBtn.SetClickHdl( aLink );
++    a100Btn.SetClickHdl( aLink );
++    aOptimalBtn.SetClickHdl( aLink );
+ 	aPageWidthBtn.SetClickHdl( aLink );
+ 	aWholePageBtn.SetClickHdl( aLink );
+ 	aUserBtn.SetClickHdl( aLink );
+@@ -300,7 +300,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
+     Link aViewLayoutCheckLink = LINK( this, SvxZoomDialog, ViewLayoutCheckHdl );
+     aBookModeChk.SetClickHdl( aViewLayoutCheckLink );
+ 
+-	aOKBtn.SetClickHdl( LINK( this, SvxZoomDialog, OKHdl ) );
++    aOKBtn.SetClickHdl( LINK( this, SvxZoomDialog, OKHdl ) );
+ 	aUserEdit.SetModifyHdl( LINK( this, SvxZoomDialog, SpinHdl ) );
+ 
+ 	// Default-Werte
+@@ -362,9 +362,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
+                 break;
+ 		}
+ 
+-		if ( !(SVX_ZOOM_ENABLE_100 & nValSet) )
++        if ( !(SVX_ZOOM_ENABLE_100 & nValSet) )
+ 			a100Btn.Disable();
+-		if ( !(SVX_ZOOM_ENABLE_OPTIMAL & nValSet) )
++        if ( !(SVX_ZOOM_ENABLE_OPTIMAL & nValSet) )
+ 			aOptimalBtn.Disable();
+ 		if ( !(SVX_ZOOM_ENABLE_PAGEWIDTH & nValSet) )
+ 			aPageWidthBtn.Disable();
+@@ -582,7 +582,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn )
+                 aViewLayoutItem.SetValue( static_cast<USHORT>(aColumnsEdit.GetValue()) );
+                 aViewLayoutItem.SetBookMode( aBookModeChk.IsChecked() );
+             }
+-		}
++        }
+ 		else
+ 		{
+ 			DBG_ERROR( "Wrong Button" );
+diff --git a/toolkit/workben/layout/zoom.hxx b/toolkit/workben/layout/zoom.hxx
+index 5832233..461cd5a 100644
+--- toolkit/workben/layout/zoom.hxx
++++ toolkit/workben/layout/zoom.hxx
+@@ -7,7 +7,7 @@
+  * OpenOffice.org - a multi-platform office productivity suite
+  *
+  * $RCSfile: zoom.hxx,v $
+- * $Revision: 1.3 $
++ * $Revision: 1.6 $
+  *
+  * This file is part of OpenOffice.org.
+  *
+@@ -67,9 +67,9 @@ class SvxZoomDialog : public SfxModalDialog
+ private:
+     FixedLine           aZoomFl;
+     RadioButton         aOptimalBtn;
+-	RadioButton 		aWholePageBtn;
++    RadioButton         aWholePageBtn;
+ 	RadioButton 		aPageWidthBtn;
+-	RadioButton 		a100Btn;
++    RadioButton         a100Btn;
+     RadioButton         aUserBtn;
+ 	MetricField 		aUserEdit;
+ 
+@@ -81,7 +81,7 @@ private:
+     CheckBox            aBookModeChk;
+ 
+     FixedLine           aBottomFl;
+-	OKButton  			aOKBtn;
++    OKButton            aOKBtn;
+ 	CancelButton		aCancelBtn;
+ 	HelpButton			aHelpBtn;
+ 
+@@ -97,7 +97,7 @@ private:
+     DECL_LINK( ViewLayoutUserHdl, RadioButton* );
+     DECL_LINK( ViewLayoutSpinHdl, MetricField* );
+     DECL_LINK( ViewLayoutCheckHdl, CheckBox* );
+-	DECL_LINK( OKHdl, Button* );
++    DECL_LINK( OKHdl, Button* );
+ #endif
+ 
+ public:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]