GNOME.org
 

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

Author: jannieuw
Date: Fri Jul  4 16:00:51 2008
New Revision: 13072
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13072&view=rev

Log:
2008-07-04  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-tab-toolkit.diff:
	* patches/dev300/layout-tab-sfx2.diff: Handle Reset button.  Fix
	crashing upon second invocation of sort dialog.


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 Jul  4 16:00:51 2008
@@ -1,5 +1,3 @@
-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 @@
@@ -61,7 +59,7 @@
  	const OKButton& 	GetOKButton() const { return aOKBtn; }
  	OKButton&			GetOKButton() { return aOKBtn; }
 diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
-index 57a8e89..9db6fba 100644
+index 084ec17..d3254ed 100644
 --- sfx2/source/dialog/tabdlg.cxx
 +++ sfx2/source/dialog/tabdlg.cxx
 @@ -56,6 +56,7 @@
@@ -85,7 +83,18 @@
              SfxTabPage* pTabPage = (SfxTabPage*) pDialog->aTabCtrl.GetTabPage( nPageId );
              if ( pTabPage )
              {
-@@ -922,6 +929,16 @@ void SfxTabDialog::AddTabPage
+@@ -617,6 +624,10 @@ SfxTabDialog::~SfxTabDialog()
+ 	delete pOutSet;
+ 	delete pExampleSet;
+ 	delete [] pRanges;
++
++    for ( size_t i = 0; i < layoutPages.size(); i++ )
++        if (layout::TabPage *page = layoutPages[i])
++            delete page;
+ }
+ 
+ // -----------------------------------------------------------------------
+@@ -922,6 +933,16 @@ void SfxTabDialog::AddTabPage
  }
  #endif
  
@@ -102,7 +111,7 @@
  // -----------------------------------------------------------------------
  
  void SfxTabDialog::RemoveTabPage( USHORT nId )
-@@ -1164,19 +1181,39 @@ IMPL_LINK( SfxTabDialog, OkHdl, Button *, EMPTYARG )
+@@ -1164,19 +1185,39 @@ IMPL_LINK( SfxTabDialog, OkHdl, Button *, EMPTYARG )
  
  // -----------------------------------------------------------------------
  
@@ -146,7 +155,7 @@
  
  			if ( pPage->HasExchangeSupport() )
  				nRet = pPage->DeactivatePage( &aTmp );
-@@ -1189,8 +1226,6 @@ BOOL SfxTabDialog::PrepareLeaveCurrentPage()
+@@ -1189,8 +1230,6 @@ BOOL SfxTabDialog::PrepareLeaveCurrentPage()
  				pExampleSet->Put( aTmp );
  				pOutSet->Put( aTmp );
  			}
@@ -155,7 +164,7 @@
  		}
  		else
  			nRet = pPage->DeactivatePage( NULL );
-@@ -1215,37 +1250,7 @@ IMPL_LINK( SfxTabDialog, UserHdl, Button *, EMPTYARG )
+@@ -1215,37 +1254,7 @@ IMPL_LINK( SfxTabDialog, UserHdl, Button *, EMPTYARG )
  */
  
  {
@@ -194,7 +203,23 @@
  	{
  		short nRet = Ok();
  
-@@ -1365,6 +1370,7 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
+@@ -1271,7 +1280,14 @@ IMPL_LINK( SfxTabDialog, ResetHdl, Button *, EMPTYARG )
+ */
+ 
+ {
+-	Data_Impl* pDataObject = Find( *pImpl->pData, aTabCtrl.GetCurPageId() );
++    int const nId = aTabCtrl.GetCurPageId();
++    if ( layout::TabPage* page = layoutPages[nId] )
++    {
++        page->Reset( *pSet );
++        return 0;
++    }
++
++	Data_Impl* pDataObject = Find( *pImpl->pData, nId );
+ 	DBG_ASSERT( pDataObject, "Id nicht bekannt" );
+ 
+ 	if ( pDataObject->bOnDemand )
+@@ -1365,6 +1381,7 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
  
  // -----------------------------------------------------------------------
  
@@ -202,7 +227,7 @@
  IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
  
  /*  [Beschreibung]
-@@ -1379,8 +1385,33 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
+@@ -1379,8 +1396,33 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
  */
  
  {
@@ -237,7 +262,7 @@
  	SFX_APP();
  
  	// Tab Page schon da?
-@@ -1455,6 +1486,9 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
+@@ -1455,6 +1497,9 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
  */
  
  {

Modified: trunk/patches/dev300/layout-tab-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-toolkit.diff	(original)
+++ trunk/patches/dev300/layout-tab-toolkit.diff	Fri Jul  4 16:00:51 2008
@@ -89,7 +89,7 @@
  #define Window ::Window
  
 diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
-index ecbf73c..d231f54 100644
+index ecbf73c..ff223e7 100644
 --- toolkit/inc/layout/layout.hxx
 +++ toolkit/inc/layout/layout.hxx
 @@ -39,6 +39,8 @@
@@ -115,6 +115,15 @@
  
  namespace layout
  {
+@@ -65,7 +73,7 @@ class TOOLKIT_DLLPUBLIC Context
+     ContextImpl *pImpl;
+ public:
+     Context( char const* pPath );
+-    ~Context();
++    virtual ~Context();
+     PeerHandle GetPeerHandle( char const* pId, sal_uInt32 nId = 0 ) const;
+     void setToplevel( PeerHandle xToplevel );
+     PeerHandle getToplevel();
 @@ -94,12 +102,13 @@ protected:
      static PeerHandle CreatePeer( Window *pParent, WinBits nStyle,
                                    char const* pName);
@@ -225,7 +234,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,45 @@ public:
+@@ -432,6 +457,46 @@ public:
      void SetText( String const& rStr );
  };
  
@@ -240,6 +249,7 @@
 +    
 +    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 );
++    ~TabPage();
 +    //DECL_GET_WINDOW( TabPage );
 +    ::TabPage* GetTabPage();
 +    virtual void ActivatePage();
@@ -271,7 +281,7 @@
  class ProgressBarImpl;
  class TOOLKIT_DLLPUBLIC ProgressBar : public Control
  {
-@@ -520,7 +584,6 @@ public:
+@@ -520,7 +585,6 @@ public:
  class PluginImpl;
  class TOOLKIT_DLLPUBLIC Plugin : public Control
  {
@@ -279,7 +289,7 @@
      DECL_GET_IMPL( Plugin );
      //DECL_CONSTRUCTORS( Plugin, Control, 0 );
  public:
-@@ -528,6 +591,18 @@ public:
+@@ -528,6 +592,18 @@ public:
      Plugin( Context *pCtx, char const* pId, ::Control *plugin );
  };
  
@@ -418,10 +428,10 @@
  {
 diff --git a/toolkit/source/awt/vclxtabpage.cxx b/toolkit/source/awt/vclxtabpage.cxx
 new file mode 100644
-index 0000000..92fcc79
+index 0000000..4a1c127
 --- /dev/null
 +++ toolkit/source/awt/vclxtabpage.cxx
-@@ -0,0 +1,136 @@
+@@ -0,0 +1,140 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -516,6 +526,10 @@
 +         && reqSize.Height > curSize.Height )
 +        reqSize.Height = curSize.Height;
 +
++    // FIXME: missing destructor?
++    if ( !GetWindow() )
++        return;
++
 +    Size window = GetWindow()->GetSizePixel();
 +    Size parent = GetWindow()->GetParent()->GetSizePixel();
 +
@@ -1047,10 +1061,10 @@
 +
 +#endif /* CORE_LOCALIZED_STRING_HXX */
 diff --git a/toolkit/source/layout/makefile.mk b/toolkit/source/layout/makefile.mk
-index 5bab848..44331d3 100644
+index 7521c42..8531f53 100644
 --- toolkit/source/layout/makefile.mk
 +++ toolkit/source/layout/makefile.mk
-@@ -59,6 +59,7 @@ SLOFILES= \
+@@ -63,6 +63,7 @@ SLOFILES= \
  	$(SLO)$/flow.obj \
  	$(SLO)$/helper.obj \
  	$(SLO)$/import.obj \
@@ -1576,7 +1590,7 @@
  
  } // namespace layout
 diff --git a/toolkit/source/vclcompat/wrapper.cxx b/toolkit/source/vclcompat/wrapper.cxx
-index 6188ac1..b0e8418 100644
+index 6188ac1..95bc106 100644
 --- toolkit/source/vclcompat/wrapper.cxx
 +++ toolkit/source/vclcompat/wrapper.cxx
 @@ -36,23 +36,34 @@
@@ -1799,7 +1813,7 @@
  short Dialog::Execute()
  {
      if ( !getImpl().mxDialog.is() )
-@@ -391,13 +421,99 @@ void Dialog::EndDialog( long nResult )
+@@ -391,13 +421,104 @@ void Dialog::EndDialog( long nResult )
      getImpl().mxDialog->endDialog( nResult );
  }
  
@@ -1846,6 +1860,11 @@
 +        SetParent( pParent );
 +}
 +
++TabPage::~TabPage()
++{
++    delete GetTabPage();
++}
++
 +IMPL_GET_WINDOW( TabPage );
 +
 +void TabPage::ActivatePage()
@@ -1900,7 +1919,7 @@
  class FixedLineImpl : public ControlImpl
  {
  public:
-@@ -407,8 +523,8 @@ public:
+@@ -407,8 +528,8 @@ public:
      }
  };
  
@@ -1911,7 +1930,7 @@
  
  bool FixedLine::IsEnabled()
  {
-@@ -433,10 +549,10 @@ public:
+@@ -433,10 +554,10 @@ public:
      }
  };
  
@@ -1925,7 +1944,7 @@
  {
      if ( !getImpl().mxFixedText.is() )
          return;
-@@ -452,8 +568,8 @@ public:
+@@ -452,8 +573,8 @@ public:
      }
  };
  
@@ -1936,7 +1955,7 @@
  
  class ProgressBarImpl : public ControlImpl
  {
-@@ -494,8 +610,8 @@ public:
+@@ -494,8 +615,8 @@ public:
      }
  };
  
@@ -1947,7 +1966,7 @@
  
  void FixedImage::setImage( ::Image const& i )
  {
-@@ -521,7 +637,7 @@ FixedImage::~FixedImage()
+@@ -521,7 +642,7 @@ FixedImage::~FixedImage()
  #endif
  
      
@@ -1956,7 +1975,7 @@
  #if 0
  ProgressBar::ProgressBar( Context *pCtx, const char *pId, sal_uInt32 nId )
      : Control( new ProgressBarImpl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) )
-@@ -534,7 +650,7 @@ ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
+@@ -534,7 +655,7 @@ ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
  }
  #endif
  
@@ -1965,13 +1984,13 @@
  
  
  void ProgressBar::SetForegroundColor( css::util::Color color )
-@@ -601,7 +717,46 @@ Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
+@@ -601,7 +722,46 @@ Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
  {
  }
  
 -DECL_GET_IMPL_IMPL( Plugin )
 +IMPL_GET_IMPL( Plugin );
-+
+ 
 +class LocalizedStringImpl : public WindowImpl
 +{
 +public:
@@ -2005,7 +2024,7 @@
 +{
 +    return getImpl().getText();
 +}
- 
++
 +String LocalizedString::operator= (String const& s)
 +{
 +    getImpl().setText( s );
@@ -4367,7 +4386,7 @@
 +#endif // SC_TPSORT_HXX
 +
 diff --git a/toolkit/workben/layout/wordcountdialog.cxx b/toolkit/workben/layout/wordcountdialog.cxx
-index 9acb027..dc1f82b 100644
+index 9acb027..64f1836 100644
 --- toolkit/workben/layout/wordcountdialog.cxx
 +++ toolkit/workben/layout/wordcountdialog.cxx
 @@ -84,17 +84,12 @@ SwWordCountDialog::~SwWordCountDialog()
@@ -4394,7 +4413,7 @@
      aCurrentCharacterFI.SetText(String::CreateFromInt32(rCurrent.nChar ));
      aDocWordFI.SetText(         String::CreateFromInt32(rDoc.nWord ));
 diff --git a/toolkit/workben/layout/zoom.cxx b/toolkit/workben/layout/zoom.cxx
-index 290a5ad..76c33b4 100644
+index 290a5ad..3185c96 100644
 --- toolkit/workben/layout/zoom.cxx
 +++ toolkit/workben/layout/zoom.cxx
 @@ -127,9 +127,9 @@ static USHORT pRanges[] =
@@ -4469,7 +4488,7 @@
  		{
  			DBG_ERROR( "Wrong Button" );
 diff --git a/toolkit/workben/layout/zoom.hxx b/toolkit/workben/layout/zoom.hxx
-index 5832233..461cd5a 100644
+index 5832233..7dc09dc 100644
 --- toolkit/workben/layout/zoom.hxx
 +++ toolkit/workben/layout/zoom.hxx
 @@ -67,9 +67,9 @@ class SvxZoomDialog : public SfxModalDialog
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]