diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2015-09-27 22:11:59 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-10-29 09:37:30 +0000 |
| commit | 53b8f63d0a8a8d1f99e2f4bf20934cf52c2b6bcd (patch) | |
| tree | c19d3a57c0b66767cb514c7e685257e1fed1215e | |
| parent | f535211ce4687cc311a6ad6fa0ddc1054a791c4f (diff) | |
tdf#93587: insert table in draw ole object
Don't disable "Insert table" option in case of Ole object
Change-Id: Ibe87d35db320f4a9d5c971e3f7b25199fcacbde4
Reviewed-on: https://gerrit.libreoffice.org/18897
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 2135b4a88d755c0b79a3b93b2269f08b709220c5)
Reviewed-on: https://gerrit.libreoffice.org/19067
| -rw-r--r-- | sd/source/ui/table/tablefunction.cxx | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index d78cfffaa559..c0c4aef5fef6 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -224,24 +224,16 @@ void DrawViewShell::FuTable(SfxRequest& rReq) void DrawViewShell::GetTableMenuState( SfxItemSet &rSet ) { - bool bIsUIActive = GetDocSh()->IsUIActive(); - if( bIsUIActive ) + OUString aActiveLayer = mpDrawView->GetActiveLayer(); + SdrPageView* pPV = mpDrawView->GetSdrPageView(); + + if( + ( !aActiveLayer.isEmpty() && pPV && ( pPV->IsLayerLocked(aActiveLayer) || + !pPV->IsLayerVisible(aActiveLayer) ) ) || + SD_MOD()->GetWaterCan() ) { rSet.DisableItem( SID_INSERT_TABLE ); } - else - { - OUString aActiveLayer = mpDrawView->GetActiveLayer(); - SdrPageView* pPV = mpDrawView->GetSdrPageView(); - - if( bIsUIActive || - ( !aActiveLayer.isEmpty() && pPV && ( pPV->IsLayerLocked(aActiveLayer) || - !pPV->IsLayerVisible(aActiveLayer) ) ) || - SD_MOD()->GetWaterCan() ) - { - rSet.DisableItem( SID_INSERT_TABLE ); - } - } } void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel ) |