diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-03-05 14:42:07 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-06 13:51:57 +0000 |
| commit | a7b318a6ea507c6e35dc3a11f02c1d205519655e (patch) | |
| tree | 7c88fc11a8ae06b4d05e7cc94222245da99ed827 /cui | |
| parent | straighten out that dreaded indentation (diff) | |
| download | core-a7b318a6ea507c6e35dc3a11f02c1d205519655e.tar.gz core-a7b318a6ea507c6e35dc3a11f02c1d205519655e.zip | |
merge isLayoutEnableds
Change-Id: I67e55fd6aac3e0c9b80c63ca682d3aca7be7d815
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/treeopt.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 8cb338c710fc..5de1ae771cbb 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -89,6 +89,7 @@ #include <unotools/optionsdlg.hxx> #include <unotools/viewoptions.hxx> #include <vcl/help.hxx> +#include <vcl/layout.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> #include "svtools/treelistentry.hxx" @@ -938,7 +939,7 @@ IMPL_LINK( OfaTreeOptionsDialog, ImplHandleTreeLayoutTimerHdl, void*, EMPTYARG ) if (pCurrentPageEntry && aTreeLB.GetParent(pCurrentPageEntry)) { OptionsPageInfo* pPageInfo = (OptionsPageInfo*)pCurrentPageEntry->GetUserData(); - if (pPageInfo->m_pPage && pPageInfo->m_pPage->isLayoutEnabled()) + if (pPageInfo->m_pPage && ::isLayoutEnabled(pPageInfo->m_pPage)) SetPaneSize(pPageInfo->m_pPage); } return 0; @@ -1114,7 +1115,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() { pPageInfo->m_pPage->Reset( *pGroupInfo->m_pInItemSet ); } - if (pPageInfo->m_pPage->isLayoutEnabled()) + if (::isLayoutEnabled(pPageInfo->m_pPage)) SetPaneSize(pPageInfo->m_pPage); } } |