[Libreoffice-commits] core.git: 3 commits - officecfg/registry sd/inc sd/sdi sd/source sd/uiconfig vcl/source
Tomaž Vajngerl
tomaz.vajngerl at collabora.com
Fri Dec 4 09:24:19 PST 2015
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 35 --
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5
sd/inc/app.hrc | 10
sd/sdi/_drvwsh.sdi | 35 --
sd/sdi/sdraw.sdi | 169 ----------
sd/source/ui/view/drviewse.cxx | 82 ----
sd/source/ui/view/drviewsj.cxx | 34 --
sd/uiconfig/simpress/menubar/menubar.xml | 11
vcl/source/gdi/pdfwriter_impl.cxx | 18 -
9 files changed, 6 insertions(+), 393 deletions(-)
New commits:
commit 82e0c38e1205a3c8a70234a95ca33ab1400fbe57
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Fri Dec 4 18:19:08 2015 +0100
tdf#94739 use GetScanlineSize instead of calculating it
We calculate the scanline size wrongly when writing a PDF so the
image is not exported correctly. BitmapAccess already has a method
to determine the scanline size so use that instead.
Change-Id: Icccba8f26c5e0fd4bd4c37bba7c5a7fe8d0094bd
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index d6d5bd9..2d92b59 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -11419,7 +11419,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
beginCompression();
if( ! bTrueColor || pAccess->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB )
{
- const int nScanLineBytes = 1 + ( pAccess->GetBitCount() * ( pAccess->Width() - 1 ) / 8U );
+ const int nScanLineBytes = pAccess->GetScanlineSize();
for( long i = 0; i < pAccess->Height(); i++ )
{
commit 7bda8fbd17e271e8eaf3df2719da7f637465854a
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Fri Dec 4 18:15:39 2015 +0100
pdf export: use ScopedBitmapAccess and remove AccessReleaser
AccessReleaser does the same job as a ScopedBitmapAccess, but it
is a local class in pdf writer - removing it.
Change-Id: I3608a80fde8af938de479a9ecf44b134e1be7aa8
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index c28cf3a..d6d5bd9 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -10758,14 +10758,6 @@ void PDFWriterImpl::drawPixel( const Point& rPoint, const Color& rColor )
setFillColor( aOldFillColor );
}
-class AccessReleaser
-{
- BitmapReadAccess* m_pAccess;
-public:
- explicit AccessReleaser( BitmapReadAccess* pAccess ) : m_pAccess( pAccess ){}
- ~AccessReleaser() { delete m_pAccess; }
-};
-
bool PDFWriterImpl::writeTransparentObject( TransparencyEmit& rObject )
{
CHECK_RETURN( updateObject( rObject.m_nObject ) );
@@ -10925,8 +10917,7 @@ bool PDFWriterImpl::writeGradientFunction( GradientEmit& rObject )
aDev->DrawGradient( Rectangle( Point( 0, 0 ), rObject.m_aSize ), rObject.m_aGradient );
Bitmap aSample = aDev->GetBitmap( Point( 0, 0 ), rObject.m_aSize );
- BitmapReadAccess* pAccess = aSample.AcquireReadAccess();
- AccessReleaser aReleaser( pAccess );
+ Bitmap::ScopedReadAccess pAccess(aSample);
Size aSize = aSample.GetSizePixel();
@@ -11240,8 +11231,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
}
}
- BitmapReadAccess* pAccess = aBitmap.AcquireReadAccess();
- AccessReleaser aReleaser( pAccess );
+ Bitmap::ScopedReadAccess pAccess(aBitmap);
bool bTrueColor;
sal_Int32 nBitsPerComponent;
@@ -11421,7 +11411,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
#ifndef DEBUG_DISABLE_PDFCOMPRESSION
if( nBitsPerComponent == 1 )
{
- writeG4Stream( pAccess );
+ writeG4Stream(pAccess.get());
}
else
#endif
commit 6f9bb9bd767e4bc46424df86a1c3d3f7851e5bfc
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Thu Dec 3 22:54:50 2015 +0100
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
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 33c9eb9..9133ee0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1346,41 +1346,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:ConvertTo1BitThreshold" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">1 Bit Threshold</value>
- </prop>
- </node>
- <node oor:name=".uno:ConvertTo1BitMatrix" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">1 Bit Dithered</value>
- </prop>
- </node>
- <node oor:name=".uno:ConvertTo4BitGrays" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">4 Bit grayscales</value>
- </prop>
- </node>
- <node oor:name=".uno:ConvertTo4BitColors" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">4 Bit color palette</value>
- </prop>
- </node>
- <node oor:name=".uno:ConvertTo8BitGrays" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">8 Bit Grayscales</value>
- </prop>
- </node>
- <node oor:name=".uno:ConvertTo8BitColors" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">8 Bit color palette</value>
- </prop>
- </node>
- <node oor:name=".uno:ConvertToTrueColor" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">24 Bit True Color</value>
- </prop>
- </node>
<node oor:name=".uno:DoubleClickTextEdit" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Double-click to edit Text</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 80d2325..8292827 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3239,11 +3239,6 @@
<value xml:lang="en-US">~Filters</value>
</prop>
</node>
- <node oor:name=".uno:FormatImageModeMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Mo~de</value>
- </prop>
- </node>
<node oor:name=".uno:FormatTextMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Text</value>
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index c9dd138..928a19f 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -212,15 +212,7 @@
#define SID_SNAP_POINTS (SID_SD_START+157)
#define SID_QUICKEDIT (SID_SD_START+158)
#define SID_PICK_THROUGH (SID_SD_START+159)
- // FREE
-#define SID_CONVERT_TO_1BIT_THRESHOLD (SID_SD_START+161)
-#define SID_CONVERT_TO_1BIT_MATRIX (SID_SD_START+162)
-#define SID_CONVERT_TO_4BIT_GRAYS (SID_SD_START+163)
-#define SID_CONVERT_TO_4BIT_COLORS (SID_SD_START+164)
-#define SID_CONVERT_TO_8BIT_GRAYS (SID_SD_START+165)
-#define SID_CONVERT_TO_8BIT_COLORS (SID_SD_START+166)
-#define SID_CONVERT_TO_24BIT (SID_SD_START+167)
- // FREE
+ // FREE 160 - 168
#define SID_DOUBLECLICK_TEXTEDIT (SID_SD_START+169)
#define SID_CLICK_CHANGE_ROTATION (SID_SD_START+170)
#define SID_DRAWTBX_ARROWS (SID_SD_START+171)
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index c25285d..9482da0 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -2220,41 +2220,6 @@ interface DrawView
ExecMethod = ExecOptionsBar ;
StateMethod = GetOptionsBarState ;
]
- SID_CONVERT_TO_1BIT_THRESHOLD // ole : no, status : ?
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
- SID_CONVERT_TO_1BIT_MATRIX // ole : no, status : ?
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
- SID_CONVERT_TO_4BIT_GRAYS // ole : no, status : ?
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
- SID_CONVERT_TO_4BIT_COLORS // ole : no, status : ?
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
- SID_CONVERT_TO_8BIT_GRAYS // ole : no, status : ?
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
- SID_CONVERT_TO_8BIT_COLORS // ole : no, status : ?
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
- SID_CONVERT_TO_24BIT // ole : no, status : ?
- [
- ExecMethod = FuSupport ;
- StateMethod = GetMenuState ;
- ]
SID_HYPHENATION // ole : no, status : play rec
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 2ad46fd..0624cee 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -1462,174 +1462,6 @@ SfxVoidItem ConvertIntoMetaFile SID_CONVERT_TO_METAFILE
GroupId = GID_MODIFY;
]
-SfxBoolItem ConvertTo1BitMatrix SID_CONVERT_TO_1BIT_MATRIX
-()
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MODIFY;
-]
-
-SfxBoolItem ConvertTo1BitThreshold SID_CONVERT_TO_1BIT_THRESHOLD
-()
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MODIFY;
-]
-
-SfxBoolItem ConvertTo4BitColors SID_CONVERT_TO_4BIT_COLORS
-()
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MODIFY;
-]
-
-SfxBoolItem ConvertTo4BitGrays SID_CONVERT_TO_4BIT_GRAYS
-()
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MODIFY;
-]
-
-SfxBoolItem ConvertTo8BitColors SID_CONVERT_TO_8BIT_COLORS
-()
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MODIFY;
-]
-
-SfxBoolItem ConvertTo8BitGrays SID_CONVERT_TO_8BIT_GRAYS
-()
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MODIFY;
-]
-
-SfxBoolItem ConvertToTrueColor SID_CONVERT_TO_24BIT
-()
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MODIFY;
-]
-
SfxVoidItem CopyObjects SID_COPYOBJECTS
()
[
@@ -7271,4 +7103,3 @@ SfxVoidItem UnicodeNotationToggle SID_UNICODE_NOTATION_TOGGLE
ToolBoxConfig = FALSE,
GroupId = GID_OPTIONS;
]
-
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 4aa4510..ab82b59 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 26bb106..f056d62 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 );
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 0c7e96e..e727b6c 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -349,17 +349,6 @@
<menu:menuitem menu:id=".uno:GraphicFilterSolarize"/>
</menu:menupopup>
</menu:menu>
- <menu:menu menu:id=".uno:FormatImageModeMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:ConvertTo1BitMatrix"/>
- <menu:menuitem menu:id=".uno:ConvertTo1BitThreshold"/>
- <menu:menuitem menu:id=".uno:ConvertTo4BitColors"/>
- <menu:menuitem menu:id=".uno:ConvertTo4BitGrays"/>
- <menu:menuitem menu:id=".uno:ConvertTo8BitColors"/>
- <menu:menuitem menu:id=".uno:ConvertTo8BitGrays"/>
- <menu:menuitem menu:id=".uno:ConvertToTrueColor"/>
- </menu:menupopup>
- </menu:menu>
<menu:menuitem menu:id=".uno:ColorSettings"/>
</menu:menupopup>
</menu:menu>
More information about the Libreoffice-commits
mailing list