diff options
author | Steve Yin <steve_y@apache.org> | 2013-11-26 14:25:22 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-26 15:27:17 +0000 |
commit | c23ab5eaed57cc3fb5860e26c591c73c5b22687b (patch) | |
tree | 7a918b328e80763fa334f59c789cff399f207541 /editeng/source/outliner | |
parent | 62fcdfa34aa302aa9051e90e75b94eb442fa1db7 (diff) |
Integrate branch of IAccessible2
WaE: Reorder initializations to prevent compiler warnings.
(cherry picked from commit c05431aa92fa2c7c7258418a6ecd651b5c26d982)
WaE: unname unused variable to prevent compiler warnings.
(cherry picked from commit 2259256a390c4b6f83cfb5dbe4a65df5032aee47)
Conflicts:
editeng/source/accessibility/AccessibleEditableTextPara.cxx
ad61537527a74670af266feb9e4d26d2d654daf7
66044902b8d94fc15d4c30270e6cc419fb7d3565
Change-Id: I3ec9798f2c7d854824722c0cf44b62128b4f4cb4
Diffstat (limited to 'editeng/source/outliner')
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index a8e3d660ef04..0d3e5ac5e737 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1477,6 +1477,13 @@ sal_Bool Outliner::HasChildren( Paragraph* pParagraph ) const bool Outliner::ImplHasNumberFormat( sal_Int32 nPara ) const { return GetNumberFormat(nPara) != 0; + if ( GetNumberFormat(nPara) ) + { + const SfxBoolItem& rBulletState = (const SfxBoolItem&) pEditEngine->GetParaAttrib( nPara, EE_PARA_BULLETSTATE ); + return rBulletState.GetValue(); + } + else + return sal_False; } const SvxNumberFormat* Outliner::GetNumberFormat( sal_Int32 nPara ) const |