diff options
| author | Serge Krot <Serge.Krot@cib.de> | 2020-01-03 20:08:45 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-07 05:56:19 +0100 |
| commit | e88a993b5b0a1a6245a0ae9e1d1e9f365ec7cba3 (patch) | |
| tree | 9d74e5d4560c7ad49506724ec50df4c37dc138f9 /sd | |
| parent | Resolves: tdf#129527 enable/disable edit-style button at the right time (diff) | |
| download | core-e88a993b5b0a1a6245a0ae9e1d1e9f365ec7cba3.tar.gz core-e88a993b5b0a1a6245a0ae9e1d1e9f365ec7cba3.zip | |
tdf#129708 speed-up: check if we could create outline instead of creation of it
Change-Id: I0629b4e6ccae4ab9be0142fe39c627f2f9a8f5ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86199
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 92ccf53b2a8102299ac2c3e2612bb507d3a79c0f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86278
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews7.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 99be5ad168bb..c49d9ddad355 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -578,8 +578,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj ); if( pTextObj ) { - std::unique_ptr<OutlinerParaObject> pParaObj = pTextObj->GetEditOutlinerParaObject(); - if( pParaObj ) + if( pTextObj->CanCreateEditOutlinerParaObject() ) { bDisable = false; } diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 6c728052b2cb..e0dab445c5c6 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -854,8 +854,7 @@ bool SdXShape::IsEmptyPresObj() const if( pTextObj == nullptr ) return true; - const std::unique_ptr<OutlinerParaObject> pParaObj(pTextObj->GetEditOutlinerParaObject()); - return !pParaObj; + return !pTextObj->CanCreateEditOutlinerParaObject(); } return false; diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 7fd0ce58368e..21a4d187c014 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -382,8 +382,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj ); if( pTextObj ) { - std::unique_ptr<OutlinerParaObject> pParaObj = pTextObj->GetEditOutlinerParaObject(); - if( pParaObj ) + if( pTextObj->CanCreateEditOutlinerParaObject() ) { bDisable = false; } diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 87bb5de8a454..180dd2486923 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -959,8 +959,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj ); if( pTextObj ) { - std::unique_ptr<OutlinerParaObject> pParaObj = pTextObj->GetEditOutlinerParaObject(); - if( pParaObj ) + if( pTextObj->CanCreateEditOutlinerParaObject() ) { bDisable = false; } |