diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-12-03 22:54:50 +0100 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-12-04 18:23:50 +0100 |
commit | 6f9bb9bd767e4bc46424df86a1c3d3f7851e5bfc (patch) | |
tree | 726b64642605c24a6ebcaaa75985e69c0f09e48d /sd/source | |
parent | d6eedfe27a04df597a83df5576a31245f3fff0f4 (diff) |
Remove image color conversion menu from Impress
In impress there is (or was) a submenu "Mode" for images that
containted color transforms for images to various bitdepths and
palettes. The action is destructable - which means the original
is replaced by a new image. This also has little use today as I
don't think many people want to shrink image (byte) size this way.
The only useful transform is to 8-bit indexed for certain types
of images to save space without a bigger color degradation, but it
makes more sense to add this option to "compress image dialog".
Change-Id: I7450b2ec3507fb5d180cbd1ec879cb5560a2dd22
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/ui/view/drviewse.cxx | 82 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsj.cxx | 34 |
2 files changed, 1 insertions, 115 deletions
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 4aa451078449..ab82b59e1142 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1326,88 +1326,6 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) } break; - case SID_CONVERT_TO_1BIT_THRESHOLD: - case SID_CONVERT_TO_1BIT_MATRIX: - case SID_CONVERT_TO_4BIT_GRAYS: - case SID_CONVERT_TO_4BIT_COLORS: - case SID_CONVERT_TO_8BIT_GRAYS: - case SID_CONVERT_TO_8BIT_COLORS: - case SID_CONVERT_TO_24BIT: - { - BmpConversion eBmpConvert = BMP_CONVERSION_NONE; - - switch( nSId ) - { - case SID_CONVERT_TO_1BIT_THRESHOLD: - eBmpConvert = BMP_CONVERSION_1BIT_THRESHOLD; - break; - - case SID_CONVERT_TO_1BIT_MATRIX: - eBmpConvert = BMP_CONVERSION_1BIT_MATRIX; - break; - - case SID_CONVERT_TO_4BIT_GRAYS: - eBmpConvert = BMP_CONVERSION_4BIT_GREYS; - break; - - case SID_CONVERT_TO_4BIT_COLORS: - eBmpConvert = BMP_CONVERSION_4BIT_COLORS; - break; - - case SID_CONVERT_TO_8BIT_GRAYS: - eBmpConvert = BMP_CONVERSION_8BIT_GREYS; - break; - - case SID_CONVERT_TO_8BIT_COLORS: - eBmpConvert = BMP_CONVERSION_8BIT_COLORS; - break; - - case SID_CONVERT_TO_24BIT: - eBmpConvert = BMP_CONVERSION_24BIT; - break; - } - - mpDrawView->BegUndo(SD_RESSTR(STR_UNDO_COLORRESOLUTION)); - const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - - for (size_t i=0; i<rMarkList.GetMarkCount(); ++i) - { - SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); - - if (pObj->GetObjInventor() == SdrInventor) - { - if (pObj->GetObjIdentifier() == OBJ_GRAF && !static_cast<SdrGrafObj*>(pObj)->IsLinkedGraphic()) - { - const Graphic& rGraphic = static_cast<SdrGrafObj*>(pObj)->GetGraphic(); - - if( rGraphic.GetType() == GRAPHIC_BITMAP ) - { - SdrGrafObj* pNewObj = static_cast<SdrGrafObj*>( pObj->Clone() ); - - if( rGraphic.IsAnimated() ) - { - Animation aAnim( rGraphic.GetAnimation() ); - aAnim.Convert( eBmpConvert ); - pNewObj->SetGraphic( aAnim ); - } - else - { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - aBmpEx.Convert( eBmpConvert ); - pNewObj->SetGraphic( aBmpEx ); - } - - mpDrawView->ReplaceObjectAtView( pObj, *mpDrawView->GetSdrPageView(), pNewObj ); - } - } - } - } - - mpDrawView->EndUndo(); - rReq.Done (); - } - break; - case SID_TRANSLITERATE_SENTENCE_CASE: case SID_TRANSLITERATE_TITLE_CASE: case SID_TRANSLITERATE_TOGGLE_CASE: diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index 26bb10613a80..f056d621905e 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -85,13 +85,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) SfxItemState::DEFAULT == rSet.GetItemState( SID_CONNECTION_DLG ) || SfxItemState::DEFAULT == rSet.GetItemState( SID_CONNECTION_NEW_ROUTING ) || SfxItemState::DEFAULT == rSet.GetItemState( SID_OBJECT_SHEAR ) || - SfxItemState::DEFAULT == rSet.GetItemState( SID_CONVERT_TO_1BIT_THRESHOLD ) || - SfxItemState::DEFAULT == rSet.GetItemState( SID_CONVERT_TO_1BIT_MATRIX ) || - SfxItemState::DEFAULT == rSet.GetItemState( SID_CONVERT_TO_4BIT_GRAYS ) || - SfxItemState::DEFAULT == rSet.GetItemState( SID_CONVERT_TO_4BIT_COLORS ) || - SfxItemState::DEFAULT == rSet.GetItemState( SID_CONVERT_TO_8BIT_GRAYS ) || - SfxItemState::DEFAULT == rSet.GetItemState( SID_CONVERT_TO_8BIT_COLORS ) || - SfxItemState::DEFAULT == rSet.GetItemState( SID_CONVERT_TO_24BIT ) || SfxItemState::DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_LEFT ) || SfxItemState::DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_CENTER ) || SfxItemState::DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_RIGHT ) || @@ -145,19 +138,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) { rSet.DisableItem(SID_UNGROUP); } - if(!pSdrGrafObj || - pSdrGrafObj->GetGraphicType() != GRAPHIC_BITMAP || - pSdrGrafObj->IsLinkedGraphic() || - pSdrGrafObj->isEmbeddedSvg()) - { - rSet.DisableItem(SID_CONVERT_TO_1BIT_THRESHOLD); - rSet.DisableItem(SID_CONVERT_TO_1BIT_MATRIX); - rSet.DisableItem(SID_CONVERT_TO_4BIT_GRAYS); - rSet.DisableItem(SID_CONVERT_TO_4BIT_COLORS); - rSet.DisableItem(SID_CONVERT_TO_8BIT_GRAYS); - rSet.DisableItem(SID_CONVERT_TO_8BIT_COLORS); - rSet.DisableItem(SID_CONVERT_TO_24BIT); - } if( nInv == SdrInventor && (nId == OBJ_LINE || @@ -315,7 +295,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) bool bText = false; bool bLine = false; bool bGroup = false; - bool bGraf = false; bool bDrawObj = false; bool b3dObj = false; bool bTable = false; @@ -353,7 +332,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) case OBJ_GRUP: bGroup = true; break; - case OBJ_GRAF: bGraf = true; break; + case OBJ_GRAF: break; case OBJ_TABLE: bTable = true; break; } @@ -403,17 +382,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) if( !bMeasureObj ) rSet.DisableItem( SID_MEASURE_DLG ); - if (!bGraf) - { - rSet.DisableItem(SID_CONVERT_TO_1BIT_THRESHOLD); - rSet.DisableItem(SID_CONVERT_TO_1BIT_MATRIX); - rSet.DisableItem(SID_CONVERT_TO_4BIT_GRAYS); - rSet.DisableItem(SID_CONVERT_TO_4BIT_COLORS); - rSet.DisableItem(SID_CONVERT_TO_8BIT_GRAYS); - rSet.DisableItem(SID_CONVERT_TO_8BIT_COLORS); - rSet.DisableItem(SID_CONVERT_TO_24BIT); - } - if(bE3dCompoundObject) { rSet.DisableItem( SID_OBJECT_ALIGN ); |