incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1394326 [9/15] - in /incubator/ooo/branches/buildsys/main: ./ basebmp/inc/basebmp/ basebmp/prj/ basebmp/test/ basegfx/inc/basegfx/color/ basegfx/inc/basegfx/curve/ basegfx/inc/basegfx/matrix/ basegfx/inc/basegfx/numeric/ basegfx/inc/basegf...
Date Thu, 04 Oct 2012 23:16:58 GMT
Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/app/popup.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/app/popup.src?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/app/popup.src (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/app/popup.src Thu Oct  4 23:16:35 2012
@@ -21,19 +21,2706 @@
 
 
 
- // TEXTOBJ
- // Impress:
-#include "popup2.src"
- // Draw (Graphic):
-#undef SD_POPUP
-#define SD_POPUP RID_GRAPHIC_TEXTOBJ_POPUP
-#include "popup2.src"
-#ifndef _GLOBLMN_HRC
+#define DEFINE_SLOTID_FOR_NUMBER_BULLETS	SID_OUTLINE_BULLET
+
+#include <svx/dialogs.hrc>
 #include <svx/globlmn.hrc>
-#endif
+
+#include "app.hrc"
 #include "helpids.h"
+#include "res_bmp.hrc"
+
+#define SEPARATOR       MenuItem { Separator = TRUE; };
+#define DUMMY 333
+
+// ------------------------------------------------------------------------------------------------
+// slot defines
+// ------------------------------------------------------------------------------------------------
+
+ #define MN_CHANGEBEZIER \
+    MenuItem\
+    {\
+        Identifier = SID_CHANGEBEZIER ; \
+        HelpId = CMD_SID_CHANGEBEZIER ; \
+        Text [ en-US ] = "To ~Curve" ; \
+	};
+
+#define MN_CHANGEPOLYGON \
+    MenuItem\
+    {\
+        Identifier = SID_CHANGEPOLYGON ; \
+        HelpId = CMD_SID_CHANGEPOLYGON ; \
+        Text [ en-US ] = "To ~Polygon" ; \
+	};
+
+#define MN_CONVERT_TO_CONTOUR \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_CONTOUR ; \
+        HelpId = CMD_SID_CONVERT_TO_CONTOUR ; \
+		Text [ en-US ] = "To C~ontour";\
+	};
+
+#define MN_CONVERT_TO_3D \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_3D ; \
+        HelpId = CMD_SID_CONVERT_TO_3D ; \
+        Text [ en-US ] = "To 3~D" ; \
+	};
+
+#define MN_CONVERT_TO_BITMAP \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_BITMAP ; \
+        HelpId = CMD_SID_CONVERT_TO_BITMAP ; \
+        Text [ en-US ] = "To ~Bitmap" ; \
+	};
+
+#define MN_CONVERT_TO_METAFILE \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_METAFILE ; \
+        HelpId = CMD_SID_CONVERT_TO_METAFILE ; \
+        Text [ en-US ] = "To ~Metafile" ; \
+	};
+
+#define MN_CONVERT_TO_3D_LATHE_FAST \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_3D_LATHE_FAST ; \
+        HelpId = CMD_SID_CONVERT_TO_3D_LATHE_FAST ; \
+        Text [ en-US ] = "To 3D ~Rotation Object" ; \
+	};
+
+#define MN_VERTICAL \
+    MenuItem\
+    {\
+        Identifier = SID_VERTICAL ; \
+        HelpId = CMD_SID_VERTICAL ; \
+        Text [ en-US ] = "~Vertically" ; \
+	};
+
+#define MN_HORIZONTAL \
+    MenuItem\
+    {\
+        Identifier = SID_HORIZONTAL ; \
+        HelpId = CMD_SID_HORIZONTAL ; \
+        Text [ en-US ] = "~Horizontally" ; \
+	};
+
+#define MN_3D_WIN \
+    MenuItem\
+    {\
+        Identifier = SID_3D_WIN ; \
+        HelpId = CMD_SID_3D_WIN ; \
+        Text [ en-US ] = "~3D Effects" ; \
+	};
+
+#define MN_PRESENTATION_LAYOUT \
+    MenuItem\
+    {\
+        Identifier = SID_PRESENTATION_LAYOUT ; \
+        HelpId = CMD_SID_PRESENTATION_LAYOUT ; \
+        Text [ en-US ] = "~Slide Design" ; \
+	};
+
+#define MN_DIA \
+    MenuItem\
+    {\
+        Identifier = SID_SLIDE_TRANSITIONS_PANEL ; \
+        HelpId = CMD_SID_SLIDE_TRANSITIONS_PANEL ; \
+        Text [ en-US ] = "Slide ~Transition" ; \
+	};
+
+#define MN_SHOW_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_SHOW_SLIDE ; \
+        HelpId = CMD_SID_SHOW_SLIDE ; \
+        Text [ en-US ] = "~Show Slide" ; \
+	};
+
+#define MN_HIDE_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_HIDE_SLIDE ; \
+        HelpId = CMD_SID_HIDE_SLIDE ; \
+        Text [ en-US ] = "~Hide Slide" ; \
+	};
+
+#define MN_GROUP_IMPRESS \
+    MenuItem\
+    {\
+        Identifier = SID_GROUP ; \
+        HelpId = CMD_SID_GROUP ; \
+        Text [ en-US ] = "~Group" ; \
+	};
+
+#define MN_UNGROUP_IMPRESS \
+    MenuItem\
+    {\
+        Identifier = SID_UNGROUP ; \
+        HelpId = CMD_SID_UNGROUP ; \
+        Text [ en-US ] = "~Ungroup" ; \
+	};
+
+#define MN_ENTER_GROUP_IMPRESS \
+    MenuItem\
+    {\
+        Identifier = SID_ENTER_GROUP ; \
+        HelpId = CMD_SID_ENTER_GROUP ; \
+        Text [ en-US ] = "~Edit Group" ; \
+	};
+
+#define MN_LEAVE_GROUP_IMPRESS \
+    MenuItem\
+    {\
+        Identifier = SID_LEAVE_GROUP ; \
+        HelpId = CMD_SID_LEAVE_GROUP ; \
+        Text [ en-US ] = "E~xit group" ; \
+	};
+
+#define MNSUB_GROUP \
+    MenuItem\
+    {\
+        Identifier = MN_SUB_GROUP ; \
+        HelpID = HID_MN_SUB_GROUP ; \
+        Command = ".uno:GroupMenu" ; \
+        Text [ en-US ] = "~Group" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_GROUP_IMPRESS\
+                MN_UNGROUP_IMPRESS\
+                MN_ENTER_GROUP_IMPRESS\
+                MN_LEAVE_GROUP_IMPRESS\
+            };\
+        };\
+	};
+
+#define MN_DISTRIBUTE \
+    MenuItem\
+    {\
+        Identifier = SID_DISTRIBUTE_DLG ; \
+        HelpId = CMD_SID_DISTRIBUTE_DLG ; \
+        Text [ en-US ] = "~Distribution..." ; \
+	};
+
+#define MN_DRAWINGMODE \
+    MenuItem\
+    {\
+        Identifier = SID_DRAWINGMODE ; \
+        HelpId = CMD_SID_DRAWINGMODE ; \
+        Check = TRUE ; \
+        Text [ en-US ] = "~Drawing View" ; \
+	};
+
+#define MN_OUTLINEMODE \
+    MenuItem\
+    {\
+        Identifier = SID_OUTLINEMODE ; \
+        HelpId = CMD_SID_OUTLINEMODE ; \
+        Check = TRUE ; \
+        Text [ en-US ] = "~Outline View" ; \
+	};
+
+#define MN_DIAMODE \
+    MenuItem\
+    {\
+        Identifier = SID_DIAMODE ; \
+        HelpId = CMD_SID_DIAMODE ; \
+        Check = TRUE ; \
+        Text [ en-US ] = "~Slide Sorter" ; \
+	};
+
+#define MN_PRESENTATION \
+    MenuItem\
+    {\
+        Identifier = SID_PRESENTATION ; \
+        HelpId = CMD_SID_PRESENTATION ; \
+        Text [ en-US ] = "Slide Sho~w" ; \
+	};
+
+#define MN_CAPTUREPOINT \
+    MenuItem\
+    {\
+        Identifier = SID_CAPTUREPOINT ; \
+        HelpId = CMD_SID_CAPTUREPOINT ; \
+        Text [ en-US ] = "~Insert Snap Point/Line..." ; \
+	};
+
+#define MN_SET_SNAPITEM \
+    MenuItem\
+    {\
+        Identifier = SID_SET_SNAPITEM ; \
+        HelpId = CMD_SID_SET_SNAPITEM ; \
+        Text [ en-US ] = "~Edit..." ; \
+	};
+
+#define MN_DELETE_SNAPITEM \
+    MenuItem\
+    {\
+        Identifier = SID_DELETE_SNAPITEM ; \
+        HelpId = CMD_SID_DELETE_SNAPITEM ; \
+        Text [ en-US ] = "~Delete" ; \
+	};
+
+ // Seiten-Attribute
+#define MN_MODIFY_PAGE \
+    MenuItem\
+    {\
+        Identifier = SID_MODIFYPAGE ; \
+        HelpId = CMD_SID_MODIFYPAGE ; \
+        Text [ en-US ] = "Slide ~Layout" ; \
+	};
+
+#define MN_FORMAT_PAGE \
+    MenuItem\
+    {\
+        Identifier = SID_PAGESETUP ; \
+        HelpId = CMD_SID_PAGESETUP ; \
+        Text [ en-US ] = "~Page Setup..." ; \
+	};
+
+
+#define MN_INSERT_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_INSERTPAGE ; \
+        HelpId = CMD_SID_INSERTPAGE ; \
+        Text [ en-US ] = "~New Slide" ; \
+    };
+
+#define MN_INSERT_MASTER \
+    MenuItem\
+    {\
+        Identifier = SID_INSERT_MASTER_PAGE ; \
+        HelpId = CMD_SID_INSERT_MASTER_PAGE ; \
+        Text [ en-US ] = "~New Master" ; \
+    };
+
+#define MN_INSERT_PAGE \
+    MenuItem\
+    {\
+        Identifier = SID_INSERTPAGE ; \
+        HelpId = CMD_SID_INSERTPAGE ; \
+        Text [ en-US ] = "~New Page" ; \
+    };
+#define MN_SELECT_BACKGROUND \
+    MenuItem\
+    {\
+        Identifier = SID_SELECT_BACKGROUND ; \
+        HelpId = CMD_SID_SELECT_BACKGROUND ; \
+        Text [ en-US ] = "Set Background Picture for Slide ..." ; \
+    };
+#define MN_DISPLAY_MASTER_BACKGROUND \
+    MenuItem\
+    {\
+        Identifier = SID_DISPLAY_MASTER_BACKGROUND ; \
+        HelpId = CMD_SID_DISPLAY_MASTER_BACKGROUND ; \
+        Text [ en-US ] = "Display Background of Master" ; \
+    };
+#define MN_DISPLAY_MASTER_OBJECTS \
+    MenuItem\
+    {\
+        Identifier = SID_DISPLAY_MASTER_OBJECTS ; \
+        HelpId = CMD_SID_DISPLAY_MASTER_OBJECTS ; \
+        Text [ en-US ] = "Display Objects from Master" ; \
+    };
+
+
+#define MN_PAGE_MENU \
+    MenuItem\
+    {\
+        Identifier = DUMMY + 3 ; \
+        Command = ".uno:PageMenu" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_FORMAT_PAGE\
+                MN_PRESENTATION_LAYOUT\
+				MN_RENAME_PAGE\
+                SEPARATOR\
+                MN_INSERT_PAGE\
+                MN_DELETE_PAGE\
+            };\
+        };\
+        Text [ en-US ] = "Pag~e" ; \
+	};
+
+#define MN_SLIDE_MENU \
+    MenuItem\
+    {\
+        Identifier = DUMMY + 8 ; \
+        Command = ".uno:PageMenu" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_FORMAT_PAGE\
+                MN_PRESENTATION_LAYOUT\
+                MN_MODIFY_PAGE\
+                MN_SELECT_BACKGROUND\
+				MN_RENAME_SLIDE\
+                SEPARATOR\
+                MN_DISPLAY_MASTER_BACKGROUND\
+                MN_DISPLAY_MASTER_OBJECTS\
+                SEPARATOR\
+                MN_INSERT_SLIDE\
+                MN_DELETE_SLIDE\
+            };\
+        };\
+        Text [ en-US ] = "Slid~e" ; \
+	};
+
+ // Layer
+#define MN_RENAME_LAYER \
+    MenuItem\
+    {\
+        Identifier = SID_RENAMELAYER ; \
+        HelpId = CMD_SID_RENAMELAYER ; \
+        Text [ en-US ] = "~Rename Layer..." ; \
+	};
+
+#define MN_DELETE_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_DELETE_PAGE ; \
+        HelpId = CMD_SID_DELETE_PAGE ; \
+        Text [ en-US ] = "D~elete Slide" ; \
+    };
+
+#define MN_DELETE_MASTER \
+    MenuItem\
+    {\
+        Identifier = SID_DELETE_MASTER_PAGE ; \
+        HelpId = CMD_SID_DELETE_MASTER_PAGE ; \
+        Text [ en-US ] = "D~elete Master" ; \
+    };
+
+
+
+#define MN_DELETE_PAGE \
+    MenuItem\
+    {\
+        Identifier = SID_DELETE_PAGE ; \
+        HelpId = CMD_SID_DELETE_PAGE ; \
+        Text [ en-US ] = "D~elete Page" ; \
+	};
+
+#define MN_RENAME_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_RENAMEPAGE ; \
+        HelpId = CMD_SID_RENAMEPAGE ; \
+        Text [ en-US ] = "~Rename Slide" ; \
+    };
+
+#define MN_RENAME_MASTER \
+    MenuItem\
+    {\
+        Identifier = SID_RENAME_MASTER_PAGE ; \
+        HelpId = CMD_SID_RENAME_MASTER_PAGE ; \
+        Text [ en-US ] = "~Rename Master" ; \
+    };
+
+#define MN_RENAME_PAGE \
+    MenuItem\
+    {\
+        Identifier = SID_RENAMEPAGE ; \
+        HelpId = CMD_SID_RENAMEPAGE ; \
+        Text [ en-US ] = "~Rename Page" ; \
+    };
+
+ // Grafik-Attribute
+#define MN_LINE \
+    MenuItem\
+    {\
+        Identifier = SID_ATTRIBUTES_LINE ; \
+        HelpId = CMD_SID_ATTRIBUTES_LINE ; \
+        Text [ en-US ] = "L~ine..." ; \
+	};
+
+#define MN_AREA \
+    MenuItem\
+    {\
+        Identifier = SID_ATTRIBUTES_AREA ; \
+        HelpId = CMD_SID_ATTRIBUTES_AREA ; \
+        Text [ en-US ] = "~Area..." ; \
+	};
+
+#define MN_TEXTATTR \
+    MenuItem\
+    {\
+        Identifier = SID_TEXTATTR_DLG ; \
+        HelpId = CMD_SID_TEXTATTR_DLG ; \
+        Text [ en-US ] = "~Text..." ; \
+	};
+
+#define MN_CONNECTION \
+    MenuItem\
+    {\
+        Identifier = SID_CONNECTION_DLG ; \
+        HelpId = CMD_SID_CONNECTION_DLG ; \
+        Text [ en-US ] = "~Connector..." ; \
+	};
+
+#define MN_NEW_ROUTING \
+    MenuItem\
+    {\
+        Identifier = SID_CONNECTION_NEW_ROUTING ; \
+        HelpId = CMD_SID_CONNECTION_NEW_ROUTING ; \
+        Text [ en-US ] = "Reset ~Routing" ; \
+	};
+
+#define MN_MEASURE \
+    MenuItem\
+    {\
+        Identifier = SID_MEASURE_DLG ; \
+        HelpId = CMD_SID_MEASURE_DLG ; \
+        Text [ en-US ] = "Dimen~sions..." ; \
+	};
+
+#define MN_TRANSFORM \
+    MenuItem\
+    {\
+        Identifier = SID_ATTR_TRANSFORM ; \
+        HelpId = CMD_SID_ATTR_TRANSFORM ; \
+        Text [ en-US ] = "Position and Si~ze..." ; \
+	};
+
+#define MN_EDIT_POINTS \
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_EDIT ; \
+        HelpId = CMD_SID_BEZIER_EDIT ; \
+        Text [ en-US ] = "Edit ~Points" ; \
+	};
+
+ // Anordnung
+#define MN_POSITION \
+    MenuItem\
+    {\
+        Identifier = SID_POSITION ; \
+        HelpId = CMD_SID_POSITION ; \
+        Command = ".uno:ObjectPosition"; \
+        Text [ en-US ] = "Arra~nge" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    Identifier = SID_FRAME_TO_TOP ; \
+                    HelpId = CMD_SID_FRAME_TO_TOP ; \
+                    Text [ en-US ] = "~Bring to Front" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_MOREFRONT ; \
+                    HelpId = CMD_SID_MOREFRONT ; \
+                    Text [ en-US ] = "Bring ~Forward" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_MOREBACK ; \
+                    HelpId = CMD_SID_MOREBACK ; \
+                    Text [ en-US ] = "Send Back~ward" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_FRAME_TO_BOTTOM ; \
+                    HelpId = CMD_SID_FRAME_TO_BOTTOM ; \
+                    Text [ en-US ] = "~Send to Back" ; \
+				};\
+                MenuItem\
+                {\
+                    Separator = TRUE ; \
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_BEFORE_OBJ ; \
+                    HelpId = CMD_SID_BEFORE_OBJ ; \
+                    Text [ en-US ] = "In Front of ~Object" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_BEHIND_OBJ ; \
+                    HelpId = CMD_SID_BEHIND_OBJ ; \
+                    Text [ en-US ] = "Be~hind Object" ; \
+				};\
+                MenuItem\
+                {\
+                    Separator = TRUE ; \
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_REVERSE_ORDER ; \
+                    HelpId = CMD_SID_REVERSE_ORDER ; \
+                    Text [ en-US ] = "~Reverse" ; \
+				};\
+            };\
+        };\
+	};
+
+ // Text-Elemente
+#define MN_CHAR \
+    MenuItem\
+    {\
+        Identifier = SID_CHAR_DLG ; \
+        HelpId = CMD_SID_CHAR_DLG ; \
+        Text [ en-US ] = "C~haracter..." ; \
+	};
+
+#define MN_CHAR_PARAGRAPH \
+    MN_CHAR \
+    MenuItem {\
+        Identifier = SID_PARA_DLG;\
+        HelpId = CMD_SID_PARA_DLG;\
+        Text [ en-US ] = "P~aragraph...";\
+	};
+
+#define MN_TEXT_ATTR\
+    MenuItem\
+    {\
+        Identifier = SID_ATTR_CHAR_FONT ; \
+        HelpId = CMD_SID_ATTR_CHAR_FONT ; \
+        Text [ en-US ] = "~Font" ; \
+	};\
+    MenuItem\
+    {\
+        Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \
+        HelpId = CMD_SID_ATTR_CHAR_FONTHEIGHT ; \
+        Text [ en-US ] = "~Size" ; \
+	};\
+    MenuItem\
+    {\
+        Identifier = DUMMY ; \
+        Command = ".uno:StyleMenu" ; \
+        Text [ en-US ] = "St~yle" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_WEIGHT ; \
+                    HelpId = CMD_SID_ATTR_CHAR_WEIGHT ; \
+                    Text [ en-US ] = "Bold" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_POSTURE ; \
+                    HelpId = CMD_SID_ATTR_CHAR_POSTURE ; \
+                    Text [ en-US ] = "Italic" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_OVERLINE ; \
+                    HelpId = CMD_SID_ATTR_CHAR_OVERLINE ; \
+                    Text [ en-US ] = "Overline" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_UNDERLINE ; \
+                    HelpId = CMD_SID_ATTR_CHAR_UNDERLINE ; \
+                    Text [ en-US ] = "Underline" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_STRIKEOUT ; \
+                    HelpId = CMD_SID_ATTR_CHAR_STRIKEOUT ; \
+                    Text [ en-US ] = "Strikethrough" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_SHADOWED ; \
+                    HelpId = CMD_SID_ATTR_CHAR_SHADOWED ; \
+                    Text [ en-US ] = "Shadow" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_CHAR_CONTOUR ; \
+                    HelpId = CMD_SID_ATTR_CHAR_CONTOUR ; \
+                    Text [ en-US ] = "~Contour" ; \
+				};\
+            };\
+        };\
+	};
+
+#define MN_LINESPACING_ATTR\
+    MenuItem\
+    {\
+        Identifier = DUMMY + 1 ; \
+        Command = ".uno:LineSpacingMenu" ; \
+        Text [ en-US ] = "~Line Spacing" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_LINESPACE_10 ; \
+                    HelpId = CMD_SID_ATTR_PARA_LINESPACE_10 ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "Single Line Spacing" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_LINESPACE_15 ; \
+                    HelpId = CMD_SID_ATTR_PARA_LINESPACE_15 ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "1.5 Lines" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_LINESPACE_20 ; \
+                    HelpId = CMD_SID_ATTR_PARA_LINESPACE_20 ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "~Double" ; \
+				};\
+            };\
+        };\
+	};
+
+#define MN_BULLET \
+    MenuItem\
+    {\
+        Identifier = SID_CHARMAP ; \
+        HelpId = CMD_SID_CHARMAP ; \
+        Text [ en-US ] = "S~pecial Character..." ; \
+	};
+
+ // Text-Ausrichtung
+#define MN_TEXT_ALIGN\
+    MenuItem\
+    {\
+        Identifier = DUMMY + 2 ; \
+        Command = ".uno:AlignTextMenu" ; \
+        Text [ en-US ] = "A~lignment" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_LEFT ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "~Left" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_RIGHT ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "~Right" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_CENTER ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "~Centered" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "Justified" ; \
+				};\
+            };\
+        };\
+	};
+
+ // Objekt-Ausrichtung
+#define MN_OBJECT_ALIGN \
+    MenuItem\
+    {\
+        Identifier = SID_OBJECT_ALIGN ; \
+        Command = ".uno:AlignObjetMenu" ; \
+        HelpId = CMD_SID_OBJECT_ALIGN ; \
+        Text [ en-US ] = "Al~ignment" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_LEFT ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_LEFT ; \
+                    Text [ en-US ] = "~Left" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_CENTER ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_CENTER ; \
+                    Text [ en-US ] = "~Centered" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_RIGHT ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_RIGHT ; \
+                    Text [ en-US ] = "~Right" ; \
+				};\
+                SEPARATOR\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_UP ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_UP ; \
+                    Text [ en-US ] = "~Top" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_MIDDLE ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_MIDDLE ; \
+                    Text [ en-US ] = "C~enter" ; \
+				};\
+                MenuItem\
+                {\
+                    Identifier = SID_OBJECT_ALIGN_DOWN ; \
+                    HelpId = CMD_SID_OBJECT_ALIGN_DOWN ; \
+                    Text [ en-US ] = "~Bottom" ; \
+				};\
+            };\
+        };\
+	};
+
+ // Bezier-Funktionen
+#define MN_CLOSE_OBJECT \
+    MenuItem\
+    {\
+        Identifier = SID_OBJECT_CLOSE ; \
+        HelpId = CMD_SID_OBJECT_CLOSE ; \
+        Text [ en-US ] = "Close ~Object" ; \
+	};
+
+#define MN_BEZIER \
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_EDIT ; \
+        HelpId = CMD_SID_BEZIER_EDIT ; \
+        Text [ en-US ] = "Edit ~Points" ; \
+	};\
+    SEPARATOR\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_MOVE ; \
+        HelpId = CMD_SID_BEZIER_MOVE ; \
+        Text [ en-US ] = "~Move Points" ; \
+	};\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_INSERT ; \
+        HelpId = CMD_SID_BEZIER_INSERT ; \
+        Text [ en-US ] = "Insert ~Points" ; \
+	};\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_DELETE ; \
+        HelpId = CMD_SID_BEZIER_DELETE ; \
+        Text [ en-US ] = "~Delete Points" ; \
+	};\
+    SEPARATOR\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_CLOSE ; \
+        HelpId = CMD_SID_BEZIER_CLOSE ; \
+        Text [ en-US ] = "Close ~Object" ; \
+	};\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_CUTLINE ; \
+        HelpId = CMD_SID_BEZIER_CUTLINE ; \
+        Text [ en-US ] = "~Split Curve" ; \
+	};\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_CONVERT ; \
+        HelpId = CMD_SID_BEZIER_CONVERT ; \
+        Text [ en-US ] = "Con~vert to Curve" ; \
+	};\
+    SEPARATOR\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_EDGE ; \
+        HelpId = CMD_SID_BEZIER_EDGE ; \
+        Text [ en-US ] = "~Corner" ; \
+	};\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_SMOOTH ; \
+        HelpId = CMD_SID_BEZIER_SMOOTH ; \
+        Text [ en-US ] = "Smoot~h" ; \
+	};\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_SYMMTR ; \
+        HelpId = CMD_SID_BEZIER_SYMMTR ; \
+        Text [ en-US ] = "S~ymmetric" ; \
+	};\
+    SEPARATOR\
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_ELIMINATE_POINTS ; \
+        HelpId = CMD_SID_BEZIER_ELIMINATE_POINTS ; \
+        Text [ en-US ] = "~Reduce Points" ; \
+	};
+
+ // Gruppen-/Kombination-Funktionen
+#define MN_GROUP \
+    MenuItem\
+    {\
+        Identifier = SID_GROUP ; \
+        HelpId = CMD_SID_GROUP ; \
+        Text [ en-US ] = "~Group" ; \
+	};
+
+#define MN_UNGROUP \
+    MenuItem\
+    {\
+        Identifier = SID_UNGROUP ; \
+        HelpId = CMD_SID_UNGROUP ; \
+        Text [ en-US ] = "~Ungroup" ; \
+	};
+
+#define MN_COMBINE \
+    MenuItem\
+    {\
+        Identifier = SID_COMBINE ; \
+        HelpId = CMD_SID_COMBINE ; \
+        Text [ en-US ] = "Comb~ine" ; \
+	};
+
+#define MN_DISMANTLE \
+    MenuItem\
+    {\
+        Identifier = SID_DISMANTLE ; \
+        HelpId = CMD_SID_DISMANTLE ; \
+        Text [ en-US ] = "~Split" ; \
+	};
+
+#define MN_ENTER_GROUP \
+    MenuItem\
+    {\
+        Identifier = SID_ENTER_GROUP ; \
+        HelpId = CMD_SID_ENTER_GROUP ; \
+        Text [ en-US ] = "~Enter Group" ; \
+	};
+
+#define MN_LEAVE_GROUP \
+    MenuItem\
+    {\
+        Identifier = SID_LEAVE_GROUP ; \
+        HelpId = CMD_SID_LEAVE_GROUP ; \
+        Text [ en-US ] = "E~xit Group" ; \
+	};
+
+#define MN_NAME_GROUP \
+    MenuItem\
+    {\
+        Identifier = SID_NAME_GROUP ; \
+        HelpId = CMD_SID_NAME_GROUP ; \
+        Text [ en-US ] = "Name..." ; \
+	};
+
+#define MN_OBJECT_TITLE_DESCRIPTION \
+    MenuItem\
+    {\
+        Identifier = SID_OBJECT_TITLE_DESCRIPTION; \
+        HelpId = CMD_SID_OBJECT_TITLE_DESCRIPTION; \
+        Text [ en-US ] = "Description..." ; \
+	};
+
+#define MN_EFFECT \
+    MenuItem\
+    {\
+        Identifier = SID_CUSTOM_ANIMATION_PANEL ; \
+        HelpId = CMD_SID_CUSTOM_ANIMATION_PANEL ; \
+		Text [ en-US ] = "Custom Animation..." ; \
+	};
+
+#define MN_ACTION \
+    MenuItem\
+    {\
+        Identifier = SID_ANIMATION_EFFECTS ; \
+        HelpId = CMD_SID_ANIMATION_EFFECTS ; \
+        Text [ en-US ] = "Int~eraction..." ; \
+	};
+
+#define MN_PRESENTATIONOBJECT \
+    MenuItem\
+    {\
+        Identifier = SID_PRESENTATIONOBJECT ; \
+        HelpId = CMD_SID_PRESENTATIONOBJECT ; \
+        Text [ en-US ] = "Presentation ~Object..." ; \
+	};
+
+#define MN_SET_DEFAULT\
+    MenuItem\
+    {\
+        Identifier = SID_SET_DEFAULT ; \
+        HelpId = CMD_SID_SET_DEFAULT ; \
+        Text [ en-US ] = "~Default" ; \
+	};
+
+#define MN_FONTWORK\
+    MenuItem\
+    {\
+        Identifier = SID_FONTWORK ; \
+        HelpId = CMD_SID_FONTWORK ; \
+        Text [ en-US ] = "F~ontwork" ; \
+	};
+
+#define MN_OLE_OBJECT\
+    MenuItem\
+    {\
+        Identifier = SID_OBJECT ; \
+        HelpId = CMD_SID_OBJECT ; \
+        Text [ en-US ] = "~OLE Object" ; \
+	};
+
+#define MN_ORIGINAL_SIZE\
+    MenuItem\
+    {\
+        Identifier = SID_ORIGINAL_SIZE ; \
+        HelpId = CMD_SID_ORIGINAL_SIZE ; \
+        Text [ en-US ] = "~Original Size" ; \
+	};
+
+#define MN_SAVEGRAPHIC\
+    MenuItem\
+    {\
+        Identifier = SID_SAVEGRAPHIC ; \
+        HelpId = CMD_SID_SAVEGRAPHIC ; \
+		Text [ en-US ] = "Save as Picture..." ; \
+	};
+
+#define MN_CROP\
+	MenuItem\
+	{\
+		Identifier = SID_ATTR_GRAF_CROP ; \
+		HelpId = CMD_SID_ATTR_GRAF_CROP ; \
+		Text [ en-US ] = "Crop Picture..." ; \
+	};
+
+#define MN_NAVIGATOR\
+    MenuItem\
+    {\
+		Identifier = SID_NAVIGATOR ; \
+		Command = ".uno:Navigator" ; \
+		HelpId = CMD_SID_NAVIGATOR ; \
+		Text [ en-US ] = "Na~vigator" ; \
+	};
+
+#define MN_GLUE_INSERT_POINT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_INSERT_POINT ; \
+        HelpId = CMD_SID_GLUE_INSERT_POINT ; \
+        Text [ en-US ] = "Insert ~Point" ; \
+	};
+
+#define MN_GLUE_ESC_DIR_LEFT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_ESCDIR_LEFT ; \
+        HelpId = CMD_SID_GLUE_ESCDIR_LEFT ; \
+        Text [ en-US ] = "~Left" ; \
+	};
+
+#define MN_GLUE_ESC_DIR_TOP\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_ESCDIR_TOP ; \
+        HelpId = CMD_SID_GLUE_ESCDIR_TOP ; \
+        Text [ en-US ] = "~Top" ; \
+	};
+
+#define MN_GLUE_ESC_DIR_RIGHT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_ESCDIR_RIGHT ; \
+        HelpId = CMD_SID_GLUE_ESCDIR_RIGHT ; \
+        Text [ en-US ] = "~Right" ; \
+	};
+
+#define MN_GLUE_ESC_DIR_BOTTOM\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_ESCDIR_BOTTOM ; \
+        HelpId = CMD_SID_GLUE_ESCDIR_BOTTOM ; \
+        Text [ en-US ] = "~Bottom" ; \
+	};
+
+#define MN_GLUE_PERCENT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_PERCENT ; \
+        HelpId = CMD_SID_GLUE_PERCENT ; \
+        Text [ en-US ] = "~Adapt Position to Object" ; \
+	};
+
+#define MN_GLUE_HORZALIGN_LEFT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_HORZALIGN_LEFT ; \
+        HelpId = CMD_SID_GLUE_HORZALIGN_LEFT ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed ~Horizontal Left" ; \
+	};
+
+#define MN_GLUE_HORZALIGN_CENTER\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_HORZALIGN_CENTER ; \
+        HelpId = CMD_SID_GLUE_HORZALIGN_CENTER ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed Horizontal ~Center" ; \
+	};
+
+#define MN_GLUE_HORZALIGN_RIGHT\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_HORZALIGN_RIGHT ; \
+        HelpId = CMD_SID_GLUE_HORZALIGN_RIGHT ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed Hori~zontal Right" ; \
+	};
+
+#define MN_GLUE_VERTALIGN_TOP\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_VERTALIGN_TOP ; \
+        HelpId = CMD_SID_GLUE_VERTALIGN_TOP ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed ~Vertical Top" ; \
+	};
+
+#define MN_GLUE_VERTALIGN_CENTER\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_VERTALIGN_CENTER ; \
+        HelpId = CMD_SID_GLUE_VERTALIGN_CENTER ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed V~ertical Center" ; \
+	};
+
+#define MN_GLUE_VERTALIGN_BOTTOM\
+    MenuItem\
+    {\
+        Identifier = SID_GLUE_VERTALIGN_BOTTOM ; \
+        HelpId = CMD_SID_GLUE_VERTALIGN_BOTTOM ; \
+        RadioCheck = TRUE ; \
+        Text [ en-US ] = "Fixed Ver~tical Bottom" ; \
+	};
+
+#define MN_GRID_VISIBLE\
+    MenuItem\
+    {\
+        Identifier = SID_GRID_VISIBLE ; \
+        HelpId = CMD_SID_GRID_VISIBLE ; \
+        Text [ en-US ] = "~Visible Grid" ; \
+	};
+
+#define MN_GRID_USE\
+    MenuItem\
+    {\
+        Identifier = SID_GRID_USE ; \
+        HelpId = CMD_SID_GRID_USE; \
+		Text [ en-US ] = "Snap to Grid"; \
+	};
+
+#define MN_GRID_FRONT\
+    MenuItem\
+    {\
+        Identifier = SID_GRID_FRONT ; \
+        HelpId = CMD_SID_GRID_FRONT ; \
+        Text [ en-US ] = "Grid to ~Front" ; \
+	};
+
+#define MN_GRID \
+    MenuItem\
+    {\
+        Identifier = DUMMY + 5 ; \
+        Command = ".uno:GridMenu" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_GRID_VISIBLE\
+                MN_GRID_USE\
+                MN_GRID_FRONT\
+            };\
+        };\
+		Text [ en-US ] = "~Grid";\
+	};
+
+#define MN_HELPLINES_VISIBLE\
+    MenuItem\
+    {\
+        Identifier = SID_HELPLINES_VISIBLE ; \
+        HelpId = CMD_SID_HELPLINES_VISIBLE ; \
+        Text [ en-US ] = "~Snap Lines Visible" ; \
+	};
+
+#define MN_HELPLINES_USE\
+    MenuItem\
+    {\
+        Identifier = SID_HELPLINES_USE ; \
+        HelpId = CMD_SID_HELPLINES_USE ; \
+		Text [ en-US ] = "Snap to Snap Lines"; \
+	};
+
+#define MN_HELPLINES_FRONT\
+    MenuItem\
+    {\
+        Identifier = SID_HELPLINES_FRONT ; \
+        HelpId = CMD_SID_HELPLINES_FRONT ; \
+        Text [ en-US ] = "Snap Lines to Front" ; \
+	};
+
+#define MN_HELPLINES \
+    MenuItem\
+    {\
+        Identifier = DUMMY + 6 ; \
+        Command = ".uno:SnapLinesMenu" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_HELPLINES_VISIBLE\
+                MN_HELPLINES_USE\
+                MN_HELPLINES_FRONT\
+            };\
+        };\
+		Text [ en-US ] = "~Snap Lines";\
+	};
+
+#define MN_CONTROL_SHOW_BROWSER\
+    MenuItem\
+    {\
+        Identifier = SID_SHOW_BROWSER ; \
+        HelpId = CMD_SID_SHOW_BROWSER ; \
+        Text [ en-US ] = "Propert~ies..." ; \
+	};
+
+#define MN_CONVERT_TO_1BIT_THRESHOLD\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_1BIT_THRESHOLD ; \
+        HelpId = CMD_SID_CONVERT_TO_1BIT_THRESHOLD ; \
+        Text [ en-US ] = "1Bit ~Threshold" ; \
+	};
+
+#define MN_CONVERT_TO_1BIT_MATRIX\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_1BIT_MATRIX ; \
+        HelpId = CMD_SID_CONVERT_TO_1BIT_MATRIX ; \
+        Text [ en-US ] = "1 Bit ~Dithering" ; \
+	};
+
+#define MN_CONVERT_TO_4BIT_GRAYS\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_4BIT_GRAYS ; \
+        HelpId = CMD_SID_CONVERT_TO_4BIT_GRAYS ; \
+        Text [ en-US ] = "4 Bit G~rayscales" ; \
+	};
+
+#define MN_CONVERT_TO_4BIT_COLORS\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_4BIT_COLORS ; \
+        HelpId = CMD_SID_CONVERT_TO_4BIT_COLORS ; \
+        Text [ en-US ] = "4 Bit ~Color Palette" ; \
+	};
+
+#define MN_CONVERT_TO_8BIT_GRAYS\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_8BIT_GRAYS ; \
+        HelpId = CMD_SID_CONVERT_TO_8BIT_GRAYS ; \
+        Text [ en-US ] = "8 Bit Gr~ayscales" ; \
+	};
+
+#define MN_CONVERT_TO_8BIT_COLORS\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_8BIT_COLORS ; \
+        HelpId = CMD_SID_CONVERT_TO_8BIT_COLORS ; \
+        Text [ en-US ] = "8 Bit C~olor Palette" ; \
+	};
+
+#define MN_CONVERT_TO_24BIT\
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT_TO_24BIT ; \
+        HelpId = CMD_SID_CONVERT_TO_24BIT ; \
+        Text [ en-US ] = "24 Bit ~True Colors" ; \
+	};
+
+#define MN_COLORRESOLUTION \
+    MenuItem\
+    {\
+        Identifier = DUMMY + 4 ; \
+        Command = ".uno:ColorResMenu" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_CONVERT_TO_1BIT_THRESHOLD\
+                MN_CONVERT_TO_1BIT_MATRIX\
+                MN_CONVERT_TO_4BIT_GRAYS\
+                MN_CONVERT_TO_4BIT_COLORS\
+                MN_CONVERT_TO_8BIT_GRAYS\
+                MN_CONVERT_TO_8BIT_COLORS\
+                MN_CONVERT_TO_24BIT\
+            };\
+        };\
+        Text [ en-US ] = "~Color Resolution" ; \
+	};
+
+#define MNSUB_CONVERT \
+    MenuItem\
+    {\
+        Identifier = SID_CONVERT ; \
+        Command = ".uno:ConvertMenu" ; \
+        HelpId = HID_MN_SUB_CONVERT ; \
+        Text [ en-US ] = "Con~vert" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_CHANGEBEZIER\
+                MN_CHANGEPOLYGON\
+                MN_CONVERT_TO_CONTOUR\
+                MN_CONVERT_TO_3D\
+                MN_CONVERT_TO_3D_LATHE_FAST\
+				MN_CONVERT_TO_BITMAP\
+				MN_CONVERT_TO_METAFILE\
+            };\
+        };\
+	};
+
+#define MNSUB_MIRROR \
+    MenuItem\
+    {\
+        Identifier = SID_MIRROR ; \
+        HelpId = HID_MN_SUB_MIRROR ; \
+        Command = ".uno:MirrorMenu" ; \
+        Text [ en-US ] = "~Flip" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MN_VERTICAL\
+                MN_HORIZONTAL\
+            };\
+        };\
+	};
+
+#define MNSUB_ROTATE \
+    MenuItem\
+    {\
+		Identifier = SID_OBJECT_ROTATE ; \
+		HelpId = CMD_SID_OBJECT_ROTATE ; \
+		Text [ en-US ] = "~Rotate";\
+	};
+
+#define MN_CONNECT \
+    MenuItem\
+    {\
+        Identifier = SID_CONNECT ; \
+        HelpId = CMD_SID_CONNECT ; \
+        Text [ en-US ] = "C~onnect" ; \
+	};
+
+#define MN_BREAK \
+    MenuItem\
+    {\
+        Identifier = SID_BREAK ; \
+        HelpId = CMD_SID_BREAK ; \
+        Text [ en-US ] = "~Break" ; \
+	};
+
+#define MN_STYLEDT \
+    MenuItem\
+    {\
+        Identifier = SID_STYLE_EDIT ; \
+        HelpId = CMD_SID_STYLE_EDIT ; \
+        Text [ en-US ] = "Edit Style..." ; \
+	};
+
+#define MN_EDIT_HYPERLINK \
+    MenuItem\
+    {\
+        Identifier = SID_EDIT_HYPERLINK ; \
+        HelpId = CMD_SID_EDIT_HYPERLINK ; \
+        Text [ en-US ] = "H~yperlink..." ; \
+	};
+
+#define MN_POINT_EDITMODE \
+    MenuItem\
+    {\
+        Identifier = SID_BEZIER_EDIT ; \
+        HelpId = CMD_SID_BEZIER_EDIT ; \
+		Text [ en-US ] = "Poi~nts";\
+	};
+
+#define MN_GLUE_EDITMODE \
+    MenuItem\
+    {\
+		Identifier = SID_GLUE_EDITMODE ; \
+		HelpId = CMD_SID_GLUE_EDITMODE ; \
+		Text [ en-US ] = "~Glue Points";\
+	};
+
+#define MN_LAYER_EDITMODE \
+    MenuItem\
+	{\
+        Identifier = DUMMY + 7 ; \
+        Command = ".uno:LayerMenu" ; \
+		Text [ en-US ] =  "La~yer"; \
+        SubMenu	= Menu \
+		{\
+            ItemList = \
+            {\
+				MenuItem \
+				{\
+					Identifier = SID_INSERTLAYER ; \
+					HelpId = CMD_SID_INSERTLAYER ; \
+					Text [ en-US ] = "~Insert";\
+				};\
+				MenuItem \
+				{\
+					Identifier = SID_MODIFYLAYER ; \
+					HelpId = CMD_SID_MODIFYLAYER ; \
+					Text [ en-US ] = "~Modify";\
+				};\
+				MenuItem \
+				{\
+					Identifier = SID_DELETE_LAYER ; \
+					HelpId = CMD_SID_DELETE_LAYER ; \
+					Text [ en-US ] = "Delete";\
+				};\
+				MenuItem \
+				{\
+					Identifier = SID_RENAMELAYER ; \
+					HelpId = CMD_SID_RENAMELAYER ; \
+					Text [ en-US ] = "~Rename";\
+				}; \
+            };\
+        };\
+	};
+
+// ------------------------------------------------------------------------------------------------
+// impress popups
+// ------------------------------------------------------------------------------------------------
+
+Menu RID_DRAW_TEXTOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_SET_DEFAULT
+		SEPARATOR
+		MN_LINE
+		MN_AREA
+		MN_TEXTATTR
+		MN_TRANSFORM
+		MN_FONTWORK
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// GEOMOBJ_POPUP
+//
+	Menu RID_DRAW_GEOMOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TEXTATTR
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// Customshape POPUP
+//
+	Menu RID_DRAW_CUSTOMSHAPE_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TEXTATTR
+		MN_TRANSFORM
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		// #i37263#
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+		SEPARATOR
+		MN_STYLEDT
+		SEPARATOR		
+	};
+};
+
+//
+// 3DOSCENE_POPUP
+//
+	Menu RID_DRAW_3DSCENE_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TRANSFORM
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_ENTER_GROUP
+		MN_3D_WIN
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+	};
+};
+
+//
+// 3DOSCENE2_POPUP
+//
+	Menu RID_DRAW_3DSCENE2_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TRANSFORM
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_ENTER_GROUP
+		MN_LEAVE_GROUP
+		MN_3D_WIN
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+	};
+};
+
+//
+// 3DOBJ_POPUP
+//
+Menu RID_DRAW_3DOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TRANSFORM
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_3D_WIN
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// GROUPOBJ_POPUP
+//
+Menu RID_DRAW_GROUPOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_UNGROUP
+		MN_ENTER_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+	};
+};
+
+//
+// LINEOBJ_POPUP
+//
+Menu RID_DRAW_LINEOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// EDGEOBJ_POPUP
+//
+Menu RID_DRAW_EDGEOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_NEW_ROUTING
+		SEPARATOR
+		MN_LINE
+		MN_CONNECTION
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// MEASUREOBJ_POPUP
+//
+Menu RID_DRAW_MEASUREOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_TEXTATTR
+		MN_MEASURE
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// POLYLINEOBJ_POPUP
+//
+Menu RID_DRAW_POLYLINEOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		MN_CLOSE_OBJECT
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		MN_BREAK
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// NOSEL_POPUP
+//
+Menu RID_DRAW_NOSEL_POPUP
+{
+	ItemList =
+	{
+		MN_SLIDE_MENU
+		SEPARATOR
+		MN_CAPTUREPOINT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		SEPARATOR
+		MN_NAVIGATOR
+		SEPARATOR
+		MN_GRID
+		SEPARATOR
+		MN_HELPLINES
+		SEPARATOR
+		MN_OUTLINEMODE
+		MN_DIAMODE
+		MN_PRESENTATION
+	};
+};
+
+//
+// MULTISELECTION_POPUP
+//
+Menu RID_DRAW_MULTISELECTION_POPUP
+{
+	ItemList =
+	{
+		MN_SET_DEFAULT
+		SEPARATOR
+		MN_LINE
+		MN_AREA
+		MN_TRANSFORM
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_GROUP
+		MN_UNGROUP
+		MN_LEAVE_GROUP
+		MN_COMBINE
+		MNSUB_FORMEN
+		MN_DISMANTLE
+		MN_CONNECT
+		MN_BREAK
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+	};
+};
+
+//
+// GRAPHIC_POPUP
+//
+Menu RID_DRAW_GRAPHIC_POPUP
+{
+	ItemList =
+	{
+		MN_TRANSFORM
+		MN_ORIGINAL_SIZE
+		MN_LINE
+		MN_AREA
+		MN_TEXTATTR
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_CROP
+		MN_OBJECT_ALIGN
+		MN_POSITION
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		MN_BREAK
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+		SEPARATOR
+		MN_STYLEDT
+		SEPARATOR
+		MN_SAVEGRAPHIC
+	};
+};
+
+//
+// OLE2_POPUP
+//
+Menu RID_DRAW_OLE2_POPUP
+{
+	ItemList =
+	{
+		MN_TRANSFORM
+		MN_ORIGINAL_SIZE
+		MN_OLE_OBJECT
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MN_BREAK
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+	};
+};
+
+
+//
+// PAGETAB_POPUP
+//
+Menu RID_DRAW_PAGETAB_POPUP
+{
+	ItemList =
+	{
+		MN_INSERT_SLIDE
+		MN_DELETE_SLIDE
+		MN_MODIFY_PAGE
+		MN_RENAME_PAGE
+	};
+};
+
+//
+// Media_POPUP
+//
+Menu RID_DRAW_MEDIA_POPUP
+{
+	ItemList =
+	{
+		MN_TRANSFORM
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MN_BREAK
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+	};
+};
+
+//
+// Table shape context menu
+//
+Menu RID_DRAW_TABLE_POPUP
+{
+	ItemList =
+	{
+		MN_SET_DEFAULT
+		SEPARATOR
+		MN_TRANSFORM
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MenuItem
+		{
+			Identifier = SID_FORMAT_TABLE_DLG;
+			HelpId = CMD_SID_FORMAT_TABLE_DLG;
+			Text [ en-US ] = "~Table...";
+		};
+		MenuItem
+		{
+			Identifier = DUMMY + 10 ;
+			Command = ".uno:CellMenu" ;
+			Text [ en-US ] = "~Cell" ;
+			SubMenu = Menu
+			{
+				ItemList =
+				{
+					MenuItem
+					{
+						Identifier = SID_TABLE_MERGE_CELLS;
+						HelpId = CMD_SID_TABLE_MERGE_CELLS;
+						Text [ en-US ] = "~Merge";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_SPLIT_CELLS;
+						HelpId = CMD_SID_TABLE_SPLIT_CELLS;
+						Text [ en-US ] = "~Split...";
+					};
+					SEPARATOR
+					MenuItem
+					{
+						Identifier = SID_TABLE_VERT_NONE;
+						HelpId = CMD_SID_TABLE_VERT_NONE;
+						Text [ en-US ] = "~Top";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_VERT_CENTER;
+						HelpId = CMD_SID_TABLE_VERT_CENTER;
+						Text [ en-US ] = "C~enter";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_VERT_BOTTOM;
+						HelpId = CMD_SID_TABLE_VERT_BOTTOM;
+						Text [ en-US ] = "~Bottom";
+					};
+				};
+			};
+		};
+		MenuItem
+		{
+			Identifier = DUMMY + 11 ;
+			Command = ".uno:RowMenu" ;
+			Text [ en-US ] = "~Row" ;
+			SubMenu = Menu
+			{
+				ItemList =
+				{
+					MenuItem
+					{
+						Identifier = SID_TABLE_DISTRIBUTE_ROWS;
+						HelpId = CMD_SID_TABLE_DISTRIBUTE_ROWS;
+						Text [ en-US ] = "Space ~Equally";
+					};
+					SEPARATOR
+					MenuItem
+					{
+						Identifier = SID_TABLE_SELECT_ROW;
+						HelpId = CMD_SID_TABLE_SELECT_ROW;
+						Text [ en-US ] = "~Select";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_INSERT_ROW_DLG;
+						HelpId = CMD_SID_TABLE_INSERT_ROW_DLG;
+						Text [ en-US ] = "~Insert...";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_DELETE_ROW;
+						HelpId = CMD_SID_TABLE_DELETE_ROW;
+						Text [ en-US ] = "~Delete";
+					};
+				};
+			};
+		};
+		MenuItem
+		{
+			Identifier = DUMMY + 12 ;
+			Command = ".uno:ColumnMenu" ;
+			Text [ en-US ] = "Colu~mn" ;
+			SubMenu = Menu
+			{
+				ItemList =
+				{
+					MenuItem
+					{
+						Identifier = SID_TABLE_DISTRIBUTE_COLUMNS;
+						HelpId = CMD_SID_TABLE_DISTRIBUTE_COLUMNS;
+						Text [ en-US ] = "Space ~Equally";
+					};
+					SEPARATOR
+					MenuItem
+					{
+						Identifier = SID_TABLE_SELECT_COL;
+						HelpId = CMD_SID_TABLE_SELECT_COL;
+						Text [ en-US ] = "~Select";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_INSERT_COL_DLG;
+						HelpId = CMD_SID_TABLE_INSERT_COL_DLG;
+						Text [ en-US ] = "~Insert...";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_DELETE_COL;
+						HelpId = CMD_SID_TABLE_DELETE_COL;
+						Text [ en-US ] = "~Delete";
+					};
+				};
+			};
+		};
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_EFFECT
+		MN_ACTION
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+// ------------------------------------------------------------------------------------------------
+// draw popups
+// ------------------------------------------------------------------------------------------------
+
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ 
+//
+// TEXTOBJ_POPUP
+//
+Menu RID_GRAPHIC_TEXTOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_SET_DEFAULT
+		SEPARATOR
+		MN_LINE
+		MN_AREA
+		MN_TEXTATTR
+		MN_TRANSFORM
+		MN_FONTWORK
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// GEOMOBJ_POPUP
+//
+Menu RID_GRAPHIC_GEOMOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TEXTATTR
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// Customshape POPUP
+//
+Menu RID_GRAPHIC_CUSTOMSHAPE_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TEXTATTR
+		MN_TRANSFORM
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		// #i37263#
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_STYLEDT
+		SEPARATOR
+		
+	};
+};
+
+//
+// 3DOSCENE_POPUP
+//
+Menu RID_GRAPHIC_3DSCENE_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TRANSFORM
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_ENTER_GROUP
+		MN_3D_WIN
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+	};
+};
+
+//
+// 3DOSCENE2_POPUP
+//
+Menu RID_GRAPHIC_3DSCENE2_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TRANSFORM
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_ENTER_GROUP
+		MN_LEAVE_GROUP
+		MN_3D_WIN
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+	};
+};
+
+//
+// 3DOBJ_POPUP
+//
+Menu RID_GRAPHIC_3DOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TRANSFORM
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_3D_WIN
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// GROUPOBJ_POPUP
+//
+Menu RID_GRAPHIC_GROUPOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_AREA
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_UNGROUP
+		MN_ENTER_GROUP
+	};
+};
+
+//
+// LINEOBJ_POPUP
+//
+Menu RID_GRAPHIC_LINEOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// EDGEOBJ_POPUP
+//
+Menu RID_GRAPHIC_EDGEOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_NEW_ROUTING
+		SEPARATOR
+		MN_LINE
+		MN_CONNECTION
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// MEASUREOBJ_POPUP
+//
+Menu RID_GRAPHIC_MEASUREOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_TEXTATTR
+		MN_MEASURE
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+
+//
+// POLYLINEOBJ_POPUP
+//
+Menu RID_GRAPHIC_POLYLINEOBJ_POPUP
+{
+	ItemList =
+	{
+		MN_LINE
+		MN_TRANSFORM
+		MN_EDIT_POINTS
+		MN_CLOSE_OBJECT
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		MN_DISMANTLE
+		MN_BREAK
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+//
+// NOSEL_POPUP
+//
+Menu RID_GRAPHIC_NOSEL_POPUP
+{
+	ItemList =
+	{
+		MN_PAGE_MENU
+		SEPARATOR
+		MN_CAPTUREPOINT
+		SEPARATOR
+		MN_LEAVE_GROUP
+		SEPARATOR
+		MN_NAVIGATOR
+		SEPARATOR
+		MN_GRID
+		SEPARATOR
+		MN_HELPLINES
+	};
+};
+
+//
+// MULTISELECTION_POPUP
+//
+Menu RID_GRAPHIC_MULTISELECTION_POPUP
+{
+	ItemList =
+	{
+		MN_SET_DEFAULT
+		SEPARATOR
+		MN_LINE
+		MN_AREA
+		MN_TRANSFORM
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_GROUP
+		MN_UNGROUP
+		MN_LEAVE_GROUP
+		MN_COMBINE
+		MNSUB_FORMEN
+		MN_DISMANTLE
+		MN_CONNECT
+		MN_BREAK
+	};
+};
+
+//
+// GRAPHIC_POPUP
+//
+Menu RID_GRAPHIC_GRAPHIC_POPUP
+{
+	ItemList =
+	{
+		MN_TRANSFORM
+		MN_ORIGINAL_SIZE
+		MN_LINE
+		MN_AREA
+		MN_TEXTATTR
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MN_CROP
+		MN_OBJECT_ALIGN
+		MN_POSITION
+		MN_DISTRIBUTE
+		MNSUB_MIRROR
+		MNSUB_CONVERT
+		MN_BREAK
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_STYLEDT
+		SEPARATOR
+		MN_SAVEGRAPHIC
+	};
+};
+
+//
+// OLE2_POPUP
+//
+Menu RID_GRAPHIC_OLE2_POPUP
+{
+	ItemList =
+	{
+		MN_TRANSFORM
+		MN_ORIGINAL_SIZE
+		MN_OLE_OBJECT
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MN_BREAK
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+	};
+};
+
+
+//
+// PAGETAB_POPUP
+//
+Menu RID_GRAPHIC_PAGETAB_POPUP
+{
+	ItemList =
+	{
+		MN_INSERT_PAGE
+		MN_DELETE_PAGE
+		MN_RENAME_PAGE
+	};
+};
+
+//
+// Media_POPUP
+//
+Menu RID_GRAPHIC_MEDIA_POPUP
+{
+	ItemList =
+	{
+		MN_TRANSFORM
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MN_BREAK
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+	};
+};
+
+//
+// Table shape context menu
+//
+Menu RID_GRAPHIC_TABLE_POPUP
+{
+	ItemList =
+	{
+		MN_SET_DEFAULT
+		SEPARATOR
+		MN_TRANSFORM
+		SEPARATOR
+		MN_CHAR_PARAGRAPH
+		SEPARATOR
+		MenuItem
+		{
+			Identifier = SID_FORMAT_TABLE_DLG;
+			HelpId = CMD_SID_FORMAT_TABLE_DLG;
+			Text [ en-US ] = "~Table...";
+		};
+		MenuItem
+		{
+			Identifier = DUMMY + 10 ;
+			Command = ".uno:CellMenu" ;
+			Text [ en-US ] = "~Cell" ;
+			SubMenu = Menu
+			{
+				ItemList =
+				{
+					MenuItem
+					{
+						Identifier = SID_TABLE_MERGE_CELLS;
+						HelpId = CMD_SID_TABLE_MERGE_CELLS;
+						Text [ en-US ] = "~Merge";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_SPLIT_CELLS;
+						HelpId = CMD_SID_TABLE_SPLIT_CELLS;
+						Text [ en-US ] = "~Split...";
+					};
+					SEPARATOR
+					MenuItem
+					{
+						Identifier = SID_TABLE_VERT_NONE;
+						HelpId = CMD_SID_TABLE_VERT_NONE;
+						Text [ en-US ] = "~Top";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_VERT_CENTER;
+						HelpId = CMD_SID_TABLE_VERT_CENTER;
+						Text [ en-US ] = "C~enter";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_VERT_BOTTOM;
+						HelpId = CMD_SID_TABLE_VERT_BOTTOM;
+						Text [ en-US ] = "~Bottom";
+					};
+				};
+			};
+		};
+		MenuItem
+		{
+			Identifier = DUMMY + 11 ;
+			Command = ".uno:RowMenu" ;
+			Text [ en-US ] = "~Row" ;
+			SubMenu = Menu
+			{
+				ItemList =
+				{
+					MenuItem
+					{
+						Identifier = SID_TABLE_DISTRIBUTE_ROWS;
+						HelpId = CMD_SID_TABLE_DISTRIBUTE_ROWS;
+						Text [ en-US ] = "Space ~Equally";
+					};
+					SEPARATOR
+					MenuItem
+					{
+						Identifier = SID_TABLE_SELECT_ROW;
+						HelpId = CMD_SID_TABLE_SELECT_ROW;
+						Text [ en-US ] = "~Select";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_INSERT_ROW_DLG;
+						HelpId = CMD_SID_TABLE_INSERT_ROW_DLG;
+						Text [ en-US ] = "~Insert...";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_DELETE_ROW;
+						HelpId = CMD_SID_TABLE_DELETE_ROW;
+						Text [ en-US ] = "~Delete";
+					};
+				};
+			};
+		};
+		MenuItem
+		{
+			Identifier = DUMMY + 12 ;
+			Command = ".uno:ColumnMenu" ;
+			Text [ en-US ] = "Colu~mn" ;
+			SubMenu = Menu
+			{
+				ItemList =
+				{
+					MenuItem
+					{
+						Identifier = SID_TABLE_DISTRIBUTE_COLUMNS;
+						HelpId = CMD_SID_TABLE_DISTRIBUTE_COLUMNS;
+						Text [ en-US ] = "Space ~Equally";
+					};
+					SEPARATOR
+					MenuItem
+					{
+						Identifier = SID_TABLE_SELECT_COL;
+						HelpId = CMD_SID_TABLE_SELECT_COL;
+						Text [ en-US ] = "~Select";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_INSERT_COL_DLG;
+						HelpId = CMD_SID_TABLE_INSERT_COL_DLG;
+						Text [ en-US ] = "~Insert...";
+					};
+					MenuItem
+					{
+						Identifier = SID_TABLE_DELETE_COL;
+						HelpId = CMD_SID_TABLE_DELETE_COL;
+						Text [ en-US ] = "~Delete";
+					};
+				};
+			};
+		};
+		SEPARATOR
+		MN_POSITION
+		MN_OBJECT_ALIGN
+		MN_DISTRIBUTE
+		MNSUB_CONVERT
+		SEPARATOR
+		MN_OBJECT_TITLE_DESCRIPTION
+		MN_NAME_GROUP
+		SEPARATOR
+		MN_STYLEDT
+	};
+};
+
+
+// ------------------------------------------------------------------------------------------------
+// common popups
+// ------------------------------------------------------------------------------------------------
 
-#define DEFINE_SLOTID_FOR_NUMBER_BULLETS	SID_OUTLINE_BULLET
 
 Menu RID_DRAW_TEXTOBJ_INSIDE_POPUP
 {
@@ -213,20 +2900,6 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP
 	};
 };
 
-Menu RID_DRAW_CONTROL_POPUP
-{
-	ItemList =
-	{
-		MN_TRANSFORM
-		MN_CONTROL_SHOW_BROWSER
-		SEPARATOR
-		MN_POSITION
-		MN_OBJECT_ALIGN
-		SEPARATOR
-		MN_LEAVE_GROUP
-		MN_DISMANTLE
-	};
-};
 Menu RID_FORM_CONTROL_POPUP
 {
 	ItemList =
@@ -241,12 +2914,9 @@ Menu RID_FORM_CONTROL_POPUP
 		SEPARATOR
 		MN_LEAVE_GROUP
 		MN_DISMANTLE
-
-		//-#i68101#----------------------
 		SEPARATOR
 		MN_OBJECT_TITLE_DESCRIPTION
 		MN_NAME_GROUP
-		//-#i68101#----------------------
 	};
 };
 
@@ -364,7 +3034,6 @@ Menu RID_MASTERPAGE_POPUP
 		MN_TRANSFORM
 		SEPARATOR
 		MN_CHAR_PARAGRAPH
-		 //	MN_PRESENTATIONOBJECT
 		SEPARATOR
 		MN_POSITION
 	};
@@ -403,21 +3072,6 @@ Menu RID_BEZIER_POPUP
 };
 
 
-Menu RID_DRAW_BMP_CONVERT_POPUP
-{
-	ItemList =
-	{
-		MN_CONVERT_TO_1BIT_THRESHOLD
-		MN_CONVERT_TO_1BIT_MATRIX
-		MN_CONVERT_TO_4BIT_GRAYS
-		MN_CONVERT_TO_4BIT_COLORS
-		MN_CONVERT_TO_8BIT_GRAYS
-		MN_CONVERT_TO_8BIT_COLORS
-		MN_CONVERT_TO_24BIT
-	};
-};
-
-
 Menu RID_LAYERTAB_POPUP
 {
 	ItemList =
@@ -426,21 +3080,18 @@ Menu RID_LAYERTAB_POPUP
 		{
 			Identifier = SID_INSERTLAYER ;
 			HelpId = CMD_SID_INSERTLAYER ;
-			/* ### ACHTUNG: Neuer Text in Resource? ~Ebene einfügen... : ~Ebene einf³gen... */
 			Text [ en-US ] = "~Insert Layer..." ;
 		};
 		MenuItem
 		{
 			Identifier = SID_MODIFYLAYER ;
 			HelpId = CMD_SID_MODIFYLAYER ;
-			/* ### ACHTUNG: Neuer Text in Resource? E~bene ändern... : E~bene õndern... */
 			Text [ en-US ] = "Modify La~yer..." ;
 		};
 		MenuItem
 		{
 			Identifier = SID_DELETE_LAYER ;
 			HelpId = CMD_SID_DELETE_LAYER ;
-			/* ### ACHTUNG: Neuer Text in Resource? Ebe~ne löschen... : Ebe~ne l÷schen... */
 			Text [ en-US ] = "Delete ~Layer..." ;
 		};
 		MN_RENAME_LAYER

Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/app/res_bmp.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/app/res_bmp.src?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/app/res_bmp.src (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/app/res_bmp.src Thu Oct  4 23:16:35 2012
@@ -420,24 +420,25 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
 		{
 			SfxStyleFamiliesRes1
             StyleFamily = SFX_STYLE_FAMILY_PARA ;
-			FilterList  =
+    		FilterList [ en-US ] =
 			{
-				< STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
-				< STR_STYLE_FILTER_USED ; SFXSTYLEBIT_USED ; > ;
-				< STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; > ;
+				< "All Styles" ; SFXSTYLEBIT_ALL ; > ;
+				< "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
+				< "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
 			};
 		};
 		SfxStyleFamilyItem RID_PRESENTATIONSTYLEFAMILY
 		{
 			SfxStyleFamiliesRes2
             StyleFamily = SFX_STYLE_FAMILY_PSEUDO ;
-			FilterList =
+    		FilterList [ en-US ] =
 			{
-				< STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
+				< "All Styles" ; SFXSTYLEBIT_ALL ; > ;
 			};
 		};		
 	};
 	#define STYLE_IMAGE_LISTEF \
+		MaskColor = IMAGE_MASK_STDCOLOR; \
 		IdList = \
 		{ \
 			1; 2; \
@@ -447,13 +448,11 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
 	ImageList 1	// == BMP_COLOR_NORMAL + 1
 	{
 		Prefix = "sf";
-		MaskColor = IMAGE_MASK_STDCOLOR;
 		STYLE_IMAGE_LISTEF
 	};
 	ImageList 2	// == BMP_COLOR_HIGHCONTRAST + 1
 	{
 		Prefix = "sfh";
-		MaskColor = IMAGE_MASK_STDCOLOR_HC;
 		STYLE_IMAGE_LISTEF
 	};
 	#undef STYLE_IMAGE_LISTEF

Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/app/strings.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/app/strings.src?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/app/strings.src (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/app/strings.src Thu Oct  4 23:16:35 2012
@@ -21,8 +21,10 @@
 
 
 #include "strings.hrc"
+#include "sdstring.hrc"
 #include "glob.hrc"
 #include "helpids.h"
+#include "sdstring.hrc"
 
 String STR_DRAW_TOOLBOX
 {
@@ -1265,3 +1267,49 @@ String STR_INSERT_MOVIE
 {
  	Text [ en-US ] = "Insert Movie";
 };
+
+String RID_DRAW_VIEWER_TOOLBOX
+{
+	Text [ en-US ] = "Function Bar (viewing mode)" ;
+};
+
+String RID_GRAPHIC_VIEWER_TOOLBOX
+{
+	Text [ en-US ] = "Function Bar (viewing mode)" ;
+};
+
+String RID_DRAW_MEDIA_TOOLBOX
+{
+	Text [ en-US ] = "Media Playback" ;
+};
+
+String RID_DRAW_TABLE_TOOLBOX
+{
+	TEXT [ de ] = "Tabelle" ;
+	Text [ en-US ] = "Table" ;
+};
+
+String STR_SAR_NOT_FOUND
+{
+	Text [ en-US ] = "Search key not found.";
+};
+
+String STR_SAR_WRAP_FORWARD
+{
+	Text [ en-US ] = "%PRODUCTNAME Impress has searched to the end of the presentation. Do you want to continue at the beginning?";
+};
+
+String STR_SAR_WRAP_BACKWARD
+{
+	Text [ en-US ] = "%PRODUCTNAME Impress has searched to the beginning of the presentation. Do you want to continue at the end?";
+};
+
+String STR_SAR_WRAP_FORWARD_DRAW
+{
+	Text [ en-US ] = "%PRODUCTNAME Draw has searched to the end of the document. Do you want to continue at the beginning?";
+};
+
+String STR_SAR_WRAP_BACKWARD_DRAW
+{
+	Text [ en-US ] = "%PRODUCTNAME Draw has searched to the beginning of the document. Do you want to continue at the end?";
+};

Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/ins_paste.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/ins_paste.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/ins_paste.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/ins_paste.cxx Thu Oct  4 23:16:35 2012
@@ -24,6 +24,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
+#include "sdresid.hxx"
+
 #ifdef SD_DLLIMPLEMENTATION
 #undef SD_DLLIMPLEMENTATION
 #endif

Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/sdabstdlg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/sdabstdlg.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/sdabstdlg.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/dlg/sdabstdlg.cxx Thu Oct  4 23:16:35 2012
@@ -25,10 +25,10 @@
 #include "precompiled_sd.hxx"
 
 #include "sdabstdlg.hxx"
-#include "sduilib.hxx"
 
 #include <osl/module.hxx>
 #include <tools/string.hxx>
+#include <vcl/unohelp.hxx>
 
 typedef SdAbstractDialogFactory* (__LOADONCALLAPI *SdFuncPtrCreateDialogFactory)();
 
@@ -38,7 +38,8 @@ SdAbstractDialogFactory* SdAbstractDialo
 {
     SdFuncPtrCreateDialogFactory fp = 0;
 	static ::osl::Module aDialogLibrary;
-	if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
+	static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True));
+	if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ) ) )
         fp = ( SdAbstractDialogFactory* (__LOADONCALLAPI*)() )
 			aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") );
 	if ( fp )

Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/inc/res_bmp.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/inc/res_bmp.hrc?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/inc/res_bmp.hrc (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/inc/res_bmp.hrc Thu Oct  4 23:16:35 2012
@@ -254,7 +254,7 @@
 #define RID_DRAW_3DOBJ_POPUP				RID_APP_START+59
 #define RID_DRAW_MEASUREOBJ_POPUP			RID_APP_START+60
 #define RID_DRAW_EDGEOBJ_POPUP				RID_APP_START+61
-#define RID_DRAW_BMP_CONVERT_POPUP			RID_APP_START+62
+//#define RID_DRAW_BMP_CONVERT_POPUP			RID_APP_START+62
 #define RID_DRAW_POLYLINEOBJ_POPUP			RID_APP_START+63
 #define RID_DRAW_3DSCENE_POPUP				RID_APP_START+64
 #define RID_DRAW_3DSCENE2_POPUP				RID_APP_START+65
@@ -328,7 +328,7 @@
 
 #define RID_DRAW_SNAPOBJECT_POPUP			RID_APP_START+390
 #define RID_DRAW_GLUEPOINT_POPUP			RID_APP_START+392
-#define RID_DRAW_CONTROL_POPUP				RID_APP_START+393
+//#define RID_DRAW_CONTROL_POPUP				RID_APP_START+393
 #define RID_FORM_CONTROL_POPUP				RID_APP_START+394
 
 #define RID_GRAPHICSTYLEFAMILY		RID_APP_START+395

Modified: incubator/ooo/branches/buildsys/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sd/source/ui/slidesorter/shell/SlideSorter.cxx Thu Oct  4 23:16:35 2012
@@ -25,7 +25,6 @@
 
 #include "SlideSorter.hxx"
 
-#include "SlideSorterChildWindow.hrc"
 #include "SlideSorterViewShell.hxx"
 #include "controller/SlideSorterController.hxx"
 #include "controller/SlsScrollBarManager.hxx"

Modified: incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/inc/pdfihelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/inc/pdfihelper.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/inc/pdfihelper.hxx (original)
+++ incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/inc/pdfihelper.hxx Thu Oct  4 23:16:35 2012
@@ -24,6 +24,8 @@
 #ifndef INCLUDED_PDFI_HELPER_HXX
 #define INCLUDED_PDFI_HELPER_HXX
 
+#define BASEGFX_STATICLIBRARY
+
 #include "contentsink.hxx"
 
 #include <rtl/ustring.hxx>

Modified: incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/test/tests.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/test/tests.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/test/tests.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/test/tests.cxx Thu Oct  4 23:16:35 2012
@@ -24,6 +24,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sdext.hxx"
 
+#define BASEGFX_STATICLIBRARY
+
 #ifdef SYSTEM_ZLIB
 #include "zlib.h"
 #else

Modified: incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx (original)
+++ incubator/ooo/branches/buildsys/main/sdext/source/pdfimport/tree/pdfiprocessor.hxx Thu Oct  4 23:16:35 2012
@@ -24,6 +24,8 @@
 #ifndef INCLUDED_PDFI_PROCESSOR_HXX
 #define INCLUDED_PDFI_PROCESSOR_HXX
 
+#include "pdfihelper.hxx"
+
 #include <com/sun/star/util/XStringMapping.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
@@ -46,7 +48,6 @@
 #include <hash_map>
 
 #include "imagecontainer.hxx"
-#include "pdfihelper.hxx"
 #include "contentsink.hxx"
 #include "treevisitorfactory.hxx"
 #include "genericelements.hxx"

Modified: incubator/ooo/branches/buildsys/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/set_soenv.in?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/set_soenv.in (original)
+++ incubator/ooo/branches/buildsys/main/set_soenv.in Thu Oct  4 23:16:35 2012
@@ -679,7 +679,7 @@ elsif ( $platform =~ m/cygwin/ ) 
       $use_shl_versions = "TRUE";
       $wps = ';'; # Windows style path seperator
   if ( $MINGW eq "yes" )
-  {   # At the moment this implies the use of tcsh
+  {
       print "Setting Windows NT cygwin MinGW specific values... ";
       $FLIPCMD        = "slfl.pl";
       $PATH_SEPERATOR = ';';
@@ -1552,8 +1552,6 @@ print "done\n";
 # VI. Open the output file.
 #--------------------------
 #
-open( OUT, ">$outfile" ) ||
-   die "Cannot open $outfile: $!\n";
 
 # Create sh environment file
 open( OUT_SH, ">$outfile_sh" ) ||
@@ -1571,7 +1569,6 @@ if(defined($outfile_bat))
 #------------------------------------------
 #
 # Write file header.
-CreateFileHeader( *OUT, $UPD, $platform, "(t)csh", "#" );
 CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
 CreateFileHeader( *OUT_BAT, $UPD, $platform, "4nt", "rem" ) if defined($outfile_bat);
 
@@ -2089,9 +2086,6 @@ ToFile( "ZIPDEP",        $perlpre."zipde
 #
 # Writing the aliases to file.
 ToFile( "Aliases.",          $empty,             "c" );
-ToFile( "Don't set aliases when bootstrapping", $empty, "c" );
-ToFile( 'if ( ! ${?_ISBOOTSTRAP_} ) then', $empty, "y");
-ToFile( "if test -z \"\$_ISBOOTSTRAP_\"; then", $empty, "z");
 
 ToFile( "alias mkout",       $mkout,             "a" );
 ToFile( "alias deliver",     $deliver,           "a" );
@@ -2138,8 +2132,6 @@ ToFile( "SAL_ENABLE_FILE_LOCKING",	"1",	
 #
 # Writing unset variables you might not need to file.
 # 
-print OUT $unsetvars;
-
 print OUT_SH "export $exportvars$newline";
 print OUT_SH "unset $unsetvarssh$newline";
 
@@ -2152,8 +2144,6 @@ if(defined($outfile_bat))
 # VIII. Closing output file.
 #---------------------------
 #
-close( OUT ) || print "Can't close $outfile: $!";
-
 close( OUT_SH ) || print "Can't close $outfile_sh: $!";
 
 if( defined($outfile_bat))
@@ -2214,8 +2204,7 @@ if ( $Warning ne "" ) 
 }
 
 print "*$newline* USAGE: $newline";
-print "* Source $outfile (in tcsh)";
-print " or $outfile.sh (in sh)";
+print "* Source $outfile.sh (in sh)";
 print "$newline";
 print "* in order to set up the build-environment variables.$newline";
 for ( $tmp = 0; $tmp < 2; $tmp++ ) 
@@ -2228,8 +2217,6 @@ $bootfile = "bootstrap";
 open( OUT, ">$bootfile" ) ||
 die "Cannot open $bootfile: $!\n";
 print OUT "#!/bin/sh\n";
-print OUT "_ISBOOTSTRAP_=TRUE ; export _ISBOOTSTRAP_ ; . $SRC_ROOT/$outfile.sh\n"; 
-print OUT "unset _ISBOOTSTRAP_; export _ISBOOTSTRAP_\n"; 
 if ( $MINGW eq "yes" )
 {  print OUT 'PATH="/usr/bin:$PATH" : export PATH'."\n"; }
 close( OUT ) || print "Can't close $bootfile: $!";
@@ -2332,8 +2319,6 @@ sub CreateFileHeader 
 #                   a - alias
 #                   c - comment
 #                   n - newline
-#                   x - raw, write as is to OUT_BAT
-#                   y - raw, write as is to OUT
 #                   z - raw, write as is to OUT_SH
 # Return value:  void
 #---------------------------------------------------------
@@ -2375,7 +2360,6 @@ sub ToFile {
          }
 
          printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar);
-         print OUT "$setenv $_[ 0 ] \"$envvar\"$newline";  # to tcsh file
          print OUT_SH "$_[ 0 ]=\"$envvarbash\"$newline";   # to sh file
          $exportvars .= " $_[ 0 ]";                        # add to export list for sh file
 
@@ -2396,8 +2380,7 @@ sub ToFile {
    elsif ( $_[ 2 ] eq "a" ) 
    {  # Write an alias to file.
       print "The $_[ 0 ] is set to: $_[ 1 ]\n";    # to stdout
-      print OUT "$_[ 0 ] $_[ 1 ]$newline";         # to tcsh file
-      print OUT_SH "$_[ 0 ]=$_[ 1 ]$newline";      # to sh file
+       print OUT_SH "$_[ 0 ]=$_[ 1 ]$newline";      # to sh file
       if(defined($outfile_bat)) # create the correct 4nt alias format
       {  my $aliastmp = $_[ 1 ];
          $aliastmp =~ s/\$/\%/g;
@@ -2412,10 +2395,6 @@ sub ToFile {
       print "$comment$newline";
       print "$comment $_[ 0 ]$newline";
       print "$comment$newline";
-      print OUT "$newline";
-      print OUT "$comment$newline";
-      print OUT "$comment $_[ 0 ]$newline";
-      print OUT "$comment$newline";
       print OUT_SH "$newline";
       print OUT_SH "$comment$newline";
       print OUT_SH "$comment $_[ 0 ]$newline";
@@ -2429,15 +2408,9 @@ sub ToFile {
    }
    elsif ( $_[ 2 ] eq "n" )
    {  #Write a newline to a file
-      print OUT "$newline";
       print OUT_SH "$newline";
       print OUT_BAT "$newline" if defined($outfile_bat);
    }
-   elsif ( $_[ 2 ] eq "y" )
-   {
-      #Write first argument as is, and nothing else
-      print OUT "$_[ 0 ]$newline";
-   }
    elsif ( $_[ 2 ] eq "z" )
    {
       #Write first argument as is, and nothing else

Modified: incubator/ooo/branches/buildsys/main/setup_native/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/setup_native/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/setup_native/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/setup_native/prj/build.lst Thu Oct  4 23:16:35 2012
@@ -1,4 +1,4 @@
-pk	setup_native	:	L10N:l10n l10ntools soltools sal xml2cmp NULL
+pk	setup_native	:	L10N:l10n l10ntools sfx2 soltools sal xml2cmp NULL
 pk  setup_native                                          usr1    - all  sn_mkout NULL
 pk  setup_native\scripts\source                           nmake   -  u   sn_source NULL
 pk  setup_native\scripts                                  nmake   -  u   sn_scripts sn_source.u NULL

Modified: incubator/ooo/branches/buildsys/main/setup_native/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/setup_native/prj/d.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/setup_native/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/setup_native/prj/d.lst Thu Oct  4 23:16:35 2012
@@ -56,5 +56,3 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
 
 ..\%__SRC%\lib\getuid.so %_DEST%\bin%_EXT%\getuid.so
 
-..\inc\setup_native\qswin32.h %_DEST%\inc%_EXT%\setup_native\qswin32.h
-

Modified: incubator/ooo/branches/buildsys/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx (original)
+++ incubator/ooo/branches/buildsys/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx Thu Oct  4 23:16:35 2012
@@ -22,7 +22,7 @@
 
 
 #include "quickstarter.hxx"
-#include <setup_native/qswin32.h>
+#include <sfx2/qswin32.h>
 
 static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam )
 {

Modified: incubator/ooo/branches/buildsys/main/setup_native/source/win32/customactions/reg64/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/setup_native/source/win32/customactions/reg64/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/setup_native/source/win32/customactions/reg64/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/setup_native/source/win32/customactions/reg64/makefile.mk Thu Oct  4 23:16:35 2012
@@ -97,7 +97,6 @@ DEF1EXPORTFILE=exports.dxp
 
 .INCLUDE : target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
 
 # -------------------------------------------------------------------------
 

Modified: incubator/ooo/branches/buildsys/main/sfx2/CppunitTest_sfx2_metadatable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/CppunitTest_sfx2_metadatable.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/CppunitTest_sfx2_metadatable.mk (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/CppunitTest_sfx2_metadatable.mk Thu Oct  4 23:16:35 2012
@@ -40,9 +40,4 @@ $(eval $(call gb_CppunitTest_set_include
 	-I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_CppunitTest_set_ldflags,sfx2_metadatable,\
-    $$(LDFLAGS) \
-    -lcppunit \
-))
-
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/sfx2/JunitTest_sfx2_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/JunitTest_sfx2_complex.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/JunitTest_sfx2_complex.mk (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/JunitTest_sfx2_complex.mk Thu Oct  4 23:16:35 2012
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,sfx2_complex))
+$(eval $(call gb_JunitTest_JunitTest,sfx2_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
 	$$(DEFS) \

Modified: incubator/ooo/branches/buildsys/main/sfx2/JunitTest_sfx2_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/JunitTest_sfx2_unoapi.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/JunitTest_sfx2_unoapi.mk (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/JunitTest_sfx2_unoapi.mk Thu Oct  4 23:16:35 2012
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sfx2_unoapi,\
 	$$(DEFS) \

Modified: incubator/ooo/branches/buildsys/main/sfx2/Library_qstart.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/Library_qstart.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/Library_qstart.mk (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/Library_qstart.mk Thu Oct  4 23:16:35 2012
@@ -34,23 +34,20 @@ $(eval $(call gb_Library_set_include,qst
     $(filter -I%,$(GTK_CFLAGS)) \
 ))
 
-$(eval $(call gb_Library_set_defs,qstart_gtk,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,qstart_gtk,\
 	-DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \
 	-DENABLE_QUICKSTART_APPLET \
 ))
 
-$(eval $(call gb_Library_set_cflags,qstart_gtk,\
-    $$(CFLAGS) \
+$(eval $(call gb_Library_add_cflags,qstart_gtk,\
     $(filter-out -I%,$(GTK_CFLAGS)) \
 ))
 
-$(eval $(call gb_Library_set_ldflags,qstart_gtk,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,qstart_gtk,\
 ))
 
-$(eval $(call gb_Library_add_external_libs,qstart_gtk,	\
-    $(patsubst -l%,%, $(filter -l%,	$(GTK_LIBS)))	\
+$(eval $(call gb_Library_add_libs,qstart_gtk,\
+    $(GTK_LIBS) \
 ))
 
 
@@ -74,10 +71,11 @@ $(eval $(call gb_Library_add_linked_libs
 	utl \
 	vcl \
 	vos3 \
-	xml2 \
 	sfx \
 ))
 
+$(call gb_Library_use_external,qstart_gtk,libxml2)
+
 $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
     sfx2/source/appl/shutdowniconunx \
 ))

Modified: incubator/ooo/branches/buildsys/main/sfx2/Library_sfx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/Library_sfx.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/Library_sfx.mk (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/Library_sfx.mk Thu Oct  4 23:16:35 2012
@@ -47,8 +47,7 @@ $(eval $(call gb_Library_set_include,sfx
 	$(LIBXML_CFLAGS) \
 ))
 
-$(eval $(call gb_Library_set_defs,sfx,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
 	-DSFX2_DLLIMPLEMENTATION \
 ))
 
@@ -71,10 +70,11 @@ $(eval $(call gb_Library_add_linked_libs
 	utl \
 	vcl \
 	vos3 \
-	xml2 \
 	$(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,sfx,libxml2)
+
 $(eval $(call gb_Library_add_exception_objects,sfx,\
 	sfx2/source/appl/app \
 	sfx2/source/appl/appbas \
@@ -255,23 +255,13 @@ $(eval $(call gb_SdiTarget_set_include,s
 ))
 
 ifeq ($(OS),$(filter WNT MACOSX,$(OS)))
-$(eval $(call gb_Library_set_defs,sfx,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
 	-DENABLE_QUICKSTART_APPLET \
 ))
 endif
 
 ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
-$(eval $(call gb_Library_set_defs,sfx,\
-	$$(DEFS) \
-	-DENABLE_QUICKSTART_APPLET \
-	-DENABLE_SYSTRAY_GTK \
-))
-endif
-
-ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
-$(eval $(call gb_Library_set_defs,sfx,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
 	-DENABLE_QUICKSTART_APPLET \
 	-DENABLE_SYSTRAY_GTK \
 ))

Modified: incubator/ooo/branches/buildsys/main/sfx2/Module_sfx2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/Module_sfx2.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/Module_sfx2.mk (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/Module_sfx2.mk Thu Oct  4 23:16:35 2012
@@ -50,7 +50,6 @@ $(eval $(call gb_Module_add_targets,sfx2
 endif
 
 #todo: source/dialog BUILD_VER_STRING
-#todo: source/doc SYSTEM_LIBXML2
 #todo: ENABLE_LAYOUT
 #todo: clean up quickstarter stuff in both libraries
 #todo: move standard pool to svl

Modified: incubator/ooo/branches/buildsys/main/sfx2/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/Package_inc.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/Package_inc.mk (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/Package_inc.mk Thu Oct  4 23:16:35 2012
@@ -131,3 +131,4 @@ $(eval $(call gb_Package_add_file,sfx2_i
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/qswin32.h,sfx2/qswin32.h))

Modified: incubator/ooo/branches/buildsys/main/sfx2/inc/pch/precompiled_sfx2.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/inc/pch/precompiled_sfx2.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/inc/pch/precompiled_sfx2.hxx (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/inc/pch/precompiled_sfx2.hxx Thu Oct  4 23:16:35 2012
@@ -476,7 +476,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/config.h"
 #include "sal/types.h"
-#include "setup_native/qswin32.h"
 #include "sot/clsids.hxx"
 #include "sot/exchange.hxx"
 #include "sot/factory.hxx"

Modified: incubator/ooo/branches/buildsys/main/sfx2/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/prj/build.lst Thu Oct  4 23:16:35 2012
@@ -1,3 +1,3 @@
-sf      sfx2    :    L10N:l10n idl basic xmlscript framework readlicense_oo shell setup_native sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
+sf      sfx2    :    L10N:l10n idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
 sf	sfx2\prj								nmake	-	all	sf_prj NULL
 

Modified: incubator/ooo/branches/buildsys/main/sfx2/source/appl/shutdowniconw32.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sfx2/source/appl/shutdowniconw32.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sfx2/source/appl/shutdowniconw32.cxx (original)
+++ incubator/ooo/branches/buildsys/main/sfx2/source/appl/shutdowniconw32.cxx Thu Oct  4 23:16:35 2012
@@ -49,7 +49,7 @@
 #include <stdio.h>
 #include <io.h>
 #include <osl/thread.h>
-#include <setup_native/qswin32.h>
+#include <sfx2/qswin32.h>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Reference.h>

Modified: incubator/ooo/branches/buildsys/main/shell/source/all/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/all/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/all/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/all/makefile.mk Thu Oct  4 23:16:35 2012
@@ -63,7 +63,6 @@ SLOFILES_X64=$(SLO_X64)$/xml_parser.obj
 .INCLUDE :  target.mk
 .IF "$(OS)" == "WNT" 
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE 
 .ENDIF 
 .INCLUDE :  tg_wntx64.mk
 

Modified: incubator/ooo/branches/buildsys/main/shell/source/all/ooofilereader/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/all/ooofilereader/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/all/ooofilereader/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/all/ooofilereader/makefile.mk Thu Oct  4 23:16:35 2012
@@ -79,7 +79,7 @@ LIB1FILES_X64=$(SLB_X64)$/zipfile.lib\
 .INCLUDE :	target.mk
 .IF "$(OS)" == "WNT" 
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE 
+ 
 .ENDIF
 .INCLUDE :	tg_wntx64.mk
 

Modified: incubator/ooo/branches/buildsys/main/shell/source/all/zipfile/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/all/zipfile/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/all/zipfile/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/all/zipfile/makefile.mk Thu Oct  4 23:16:35 2012
@@ -48,7 +48,7 @@ SLOFILES_X64=$(SLO_X64)$/zipfile.obj\
 .INCLUDE :	target.mk
 .IF "$(OS)" == "WNT" 
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE 
+ 
 .ENDIF
 .INCLUDE :	tg_wntx64.mk
 

Modified: incubator/ooo/branches/buildsys/main/shell/source/win32/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/win32/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/win32/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/win32/makefile.mk Thu Oct  4 23:16:35 2012
@@ -61,7 +61,7 @@ DEF1EXPORTFILE=	exports.dxp
 
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
 
 
 ALLTAR : $(MISC)/syssh.component



Mime
View raw message