Hello,
The patch contains only the removing of comments. I haven't removed 1
line of comment because i don't know what "Wieder raus" mean.
I would have like to remove a warning too since during compilation, I
got this :
/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/sd/source/ui/view/drviewsj.cxx:
In member function 'void sd::DrawViewShell::GetMenuStateSel(SfxItemSet&)':
/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/sd/source/ui/view/drviewsj.cxx:301:
warning: declaration of 'rMarkList' shadows a previous local
/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/sd/source/ui/view/drviewsj.cxx:79:
warning: shadowed declaration is here
The lines 79 and 301 contain this :
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
So i tried on line 301 to remove "const SdrMarkList&" to have this :
rMarkList = mpDrawView->GetMarkedObjectList();
I got this :
/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/sd/source/ui/view/drviewsj.cxx:
In member function 'void sd::DrawViewShell::GetMenuStateSel(SfxItemSet&)':
/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/sd/source/ui/view/drviewsj.cxx:301:
error: passing 'const SdrMarkList' as 'this' argument of 'void
SdrMarkList::operator=(const SdrMarkList&)' discards qualifiers
Perhaps line 301 is just a bad copy-paste but it would be surprising.
What do you think ?
PS : it seems that there are some comments in german in it which could
be useful to translate.
Julien.
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index f4fc9d9..1a5fd36 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -98,8 +98,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONNECTION_NEW_ROUTING ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONVERT_TO_3D_LATHE ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONVERT_TO_3D_LATHE_FAST ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_SHEAR ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONVERT_TO_1BIT_THRESHOLD ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONVERT_TO_1BIT_MATRIX ) ||
@@ -160,12 +158,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
{
rSet.DisableItem(SID_UNGROUP);
}
-/*
- if (!pObj->ISA(SdrObjGroup) && !pObj->ISA(SdrGrafObj) &&
!pObj->ISA(SdrOle2Obj))
- {
- rSet.DisableItem( SID_NAME_GROUP );
- }
-*/
if (!pObj->ISA(SdrGrafObj) ||
((SdrGrafObj*) pObj)->GetGraphicType() != GRAPHIC_BITMAP ||
((SdrGrafObj*) pObj)->IsLinkedGraphic())
@@ -322,8 +314,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
if(nMarkCount <= 2)
rSet.DisableItem(SID_DISTRIBUTE_DLG);
-// rSet.ClearItem( SID_BEZIER_EDIT );
-// rSet.DisableItem( SID_BEZIER_EDIT );
rSet.DisableItem( SID_LINEEND_POLYGON );
rSet.DisableItem( SID_ENTER_GROUP );
// Jetzt (28.10.96) muessen Namen fuer Objekte eindeutig sein
@@ -333,21 +323,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
rSet.DisableItem( SID_MODIFY_FIELD );
if( 1 )
-// if( SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_ATTR_FILL_STYLE ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_UNGROUP )
||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_MEASURE_DLG ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONNECTION_DLG ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_COMBINE )
||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_SHEAR ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_TEXTATTR_DLG ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONVERT_TO_3D_LATHE ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONVERT_TO_3D_LATHE_FAST ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_OBJECT_ALIGN_LEFT ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_OBJECT_ALIGN_CENTER ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_OBJECT_ALIGN_RIGHT ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_OBJECT_ALIGN_UP ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_OBJECT_ALIGN_MIDDLE ) ||
-// SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_OBJECT_ALIGN_DOWN ) )
{
BOOL bText = FALSE;
BOOL bLine = FALSE;
@@ -509,8 +484,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
// kein Objekt selektiert
else
{
-// rSet.ClearItem( SID_BEZIER_EDIT );
-
rSet.DisableItem( SID_ENTER_GROUP );
rSet.DisableItem( SID_CUT );
rSet.DisableItem( SID_COPY );
@@ -532,7 +505,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
rSet.DisableItem( SID_BEHIND_OBJ );
rSet.DisableItem( SID_CONVERT );
-// rSet.DisableItem( SID_BEZIER_EDIT );
rSet.DisableItem( SID_SIZE_OPTIMAL );
rSet.DisableItem( SID_LINEEND_POLYGON );
rSet.DisableItem( SID_COPYOBJECTS );
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
