diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-27 23:12:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-28 08:48:33 +0100 |
| commit | 4b06d11a8655609b996378dd6ed59c4b74bc99d3 (patch) | |
| tree | 42694e011d956167178b387dc5c33e03bb7421e5 /sfx2 | |
| parent | add a plausible .ui to .sdf extraction tool (diff) | |
| download | core-4b06d11a8655609b996378dd6ed59c4b74bc99d3.tar.gz core-4b06d11a8655609b996378dd6ed59c4b74bc99d3.zip | |
fix merge conflict
Change-Id: I48aedf99459f632e2e94db20be44b0bc5d166805
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index b558ae29358c..37a8bf7d443c 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -963,7 +963,7 @@ void SfxTabDialog::SavePosAndId() // save settings (screen position and current page) SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) ); aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US)); - aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() ); + aDlgOpt.SetPageID( m_pTabCtrl->GetCurPageId() ); } // ----------------------------------------------------------------------- |