Attachment 66373 Details for Bug 53482 – proposed patch

[patch] proposed patch

fdo#53482.diff (text/plain), 2.31 KB, created by Noel Power on 2012-08-30 20:23:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noel Power

Created: 2012-08-30 20:23:55 UTC

Size: 2.31 KB

patch

obsolete

>diff --git sc/source/ui/dbgui/tpsort.cxx sc/source/ui/dbgui/tpsort.cxx
>index 303d6c6..17b126b 100644
>--- sc/source/ui/dbgui/tpsort.cxx
>+++ sc/source/ui/dbgui/tpsort.cxx
>@@ -275,9 +275,11 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
> 
> // -----------------------------------------------------------------------
> 
>-// for data exchange without dialogue detour: (still TODO!)
>-void ScTabPageSortFields::ActivatePage()
>+// for data exchange without dialogue detour: 
>+void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet )
> {
>+    // Refresh local copy with shared data
>+    aSortData = ((const ScSortItem&)rSet.Get( SCITEM_SORTDATA )).GetSortData();
>     if ( pDlg )
>     {
>         if ( bHasHeader  != pDlg->GetHeaders()
>@@ -744,9 +746,11 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
> 
> // -----------------------------------------------------------------------
> 
>-// for data exchange without dialogue detour: (still TODO!)
>-void ScTabPageSortOptions::ActivatePage()
>+// for data exchange without dialogue detour:
>+void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet )
> {
>+    // Refresh local copy with shared data
>+    aSortData = ((const ScSortItem&)rSet.Get( SCITEM_SORTDATA )).GetSortData();
>     if ( pDlg )
>     {
>         if ( aBtnHeader.IsChecked() != pDlg->GetHeaders() )
>diff --git sc/source/ui/inc/tpsort.hxx sc/source/ui/inc/tpsort.hxx
>index 14fce4e..6a7d65a 100644
>--- sc/source/ui/inc/tpsort.hxx
>+++ sc/source/ui/inc/tpsort.hxx
>@@ -70,10 +70,9 @@ public:
> 
> protected:
> // for data exchange (TODO: should be changed!)
>-//  virtual void        ActivatePage    ( const SfxItemSet& rSet );
>+    virtual void        ActivatePage    ( const SfxItemSet& rSet );
>     using SfxTabPage::ActivatePage;
>     using SfxTabPage::DeactivatePage;
>-    virtual void        ActivatePage    ();
>     virtual int         DeactivatePage  ( SfxItemSet* pSet = 0);
> 
> private:
>@@ -133,10 +132,9 @@ public:
> 
> protected:
> // for data exchange (TODO: should be changed!)
>-//  virtual void        ActivatePage    ( const SfxItemSet& rSet );
>+    virtual void        ActivatePage    ( const SfxItemSet& rSet );
>     using SfxTabPage::ActivatePage;
>     using SfxTabPage::DeactivatePage;
>-    virtual void        ActivatePage    ();
>     virtual int         DeactivatePage  ( SfxItemSet* pSet = 0);
> 
> private:

Actions: View

Attachments on bug 53482: 66373 | 70049