[Libreoffice-commits] core.git: 2 commits - sd/AllLangResTarget_sd.mk sd/inc sd/source
Maxim Monastirsky
momonasmon at gmail.com
Sun Feb 28 12:01:39 UTC 2016
sd/AllLangResTarget_sd.mk | 6
sd/inc/sdcommands.h | 76
sd/source/ui/app/menuids3_tmpl.src | 142 -
sd/source/ui/app/menuids_tmpl.src | 915 ----------
sd/source/ui/app/popup.src | 372 ----
sd/source/ui/app/popup2_tmpl.src | 751 --------
sd/source/ui/inc/res_bmp.hrc | 66
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 2
8 files changed, 12 insertions(+), 2318 deletions(-)
New commits:
commit e03f21d400e7ec911f3b0b65c4f35771bc97b003
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun Feb 28 13:55:41 2016 +0200
Fix typo
Change-Id: I454af097a6b416970f80137b46ef5840e3433550
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 07f0803..ce63783 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -336,7 +336,7 @@ bool SlideSorterController::Command (
else if (pPage != nullptr)
aPopupId = "pagepanemaster";
else
- aPopupId = "pagepagenoselmaster";
+ aPopupId = "pagepanenoselmaster";
std::unique_ptr<InsertionIndicatorHandler::ForceShowContext> pContext;
if (pPage == nullptr)
commit 825c6fd49690920f93c5c430292e4e4034daa02a
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun Feb 28 13:50:51 2016 +0200
Unused resources
Change-Id: I30b207fe0027cb4cb04130401b2c7a888624293c
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 027f599..6028dc2 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -49,12 +49,6 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,sd/res,\
sd/source/ui/slidesorter/view/SlsResource.src \
))
-$(eval $(call gb_SrsTarget_add_templates,sd/res,\
- sd/source/ui/app/menuids3_tmpl.src \
- sd/source/ui/app/menuids_tmpl.src \
- sd/source/ui/app/popup2_tmpl.src \
-))
-
$(eval $(call gb_SrsTarget_add_nonlocalizable_templates,sd/res,\
sd/source/ui/app/tbxids_tmpl.src \
sd/source/ui/app/toolbox2_tmpl.src \
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index 77d6531..c5a006b 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -19,91 +19,15 @@
#ifndef INCLUDED_SD_INC_SDCOMMANDS_H
#define INCLUDED_SD_INC_SDCOMMANDS_H
-#define CMD_SID_OBJECT_MIRROR ".uno:Mirror"
-#define CMD_SID_ANIMATION_EFFECTS ".uno:AnimationEffects"
-#define CMD_SID_MOREBACK ".uno:Backward"
-#define CMD_SID_BEFORE_OBJ ".uno:BeforeObject"
-#define CMD_SID_BEHIND_OBJ ".uno:BehindObject"
-#define CMD_SID_BREAK ".uno:Break"
-#define CMD_SID_CAPTUREPOINT ".uno:CapturePoint"
-#define CMD_SID_CHANGEBEZIER ".uno:ChangeBezier"
-#define CMD_SID_CHANGEPOLYGON ".uno:ChangePolygon"
-#define CMD_SID_OBJECT_CLOSE ".uno:CloseObject"
-#define CMD_SID_COMBINE ".uno:Combine"
-#define CMD_SID_CONNECT ".uno:Connect"
-#define CMD_SID_CONNECTION_DLG ".uno:ConnectorAttributes"
-#define CMD_SID_CONVERT_TO_CONTOUR ".uno:convert_to_contour"
-#define CMD_SID_CONVERT_TO_3D ".uno:ConvertInto3D"
-#define CMD_SID_CONVERT_TO_3D_LATHE_FAST ".uno:ConvertInto3DLatheFast"
-#define CMD_SID_CONVERT_TO_BITMAP ".uno:ConvertIntoBitmap"
-#define CMD_SID_CONVERT_TO_METAFILE ".uno:ConvertIntoMetaFile"
-#define CMD_SID_DELETE_LAYER ".uno:DeleteLayer"
-#define CMD_SID_DELETE_PAGE ".uno:DeletePage"
-#define CMD_SID_DELETE_SNAPITEM ".uno:DeleteSnapItem"
-#define CMD_SID_DISMANTLE ".uno:Dismantle"
-#define CMD_SID_CUSTOM_ANIMATION_PANEL ".uno:CustomAnimation"
-#define CMD_SID_MOREFRONT ".uno:Forward"
-#define CMD_SID_GLUE_ESCDIR_BOTTOM ".uno:GlueEscapeDirectionBottom"
-#define CMD_SID_GLUE_ESCDIR_LEFT ".uno:GlueEscapeDirectionLeft"
-#define CMD_SID_GLUE_ESCDIR_RIGHT ".uno:GlueEscapeDirectionRight"
-#define CMD_SID_GLUE_ESCDIR_TOP ".uno:GlueEscapeDirectionTop"
-#define CMD_SID_GLUE_HORZALIGN_CENTER ".uno:GlueHorzAlignCenter"
-#define CMD_SID_GLUE_HORZALIGN_LEFT ".uno:GlueHorzAlignLeft"
-#define CMD_SID_GLUE_HORZALIGN_RIGHT ".uno:GlueHorzAlignRight"
-#define CMD_SID_GLUE_INSERT_POINT ".uno:GlueInsertPoint"
-#define CMD_SID_GLUE_PERCENT ".uno:GluePercent"
-#define CMD_SID_GLUE_VERTALIGN_BOTTOM ".uno:GlueVertAlignBottom"
-#define CMD_SID_GLUE_VERTALIGN_CENTER ".uno:GlueVertAlignCenter"
-#define CMD_SID_GLUE_VERTALIGN_TOP ".uno:GlueVertAlignTop"
-#define CMD_SID_GRID_FRONT ".uno:GridFront"
#define CMD_SID_HANDOUT_MASTER_MODE ".uno:HandoutMode"
-#define CMD_SID_HELPLINES_FRONT ".uno:HelplinesFront"
-#define CMD_SID_HELPLINES_USE ".uno:HelplinesUse"
-#define CMD_SID_HELPLINES_VISIBLE ".uno:HelplinesVisible"
-#define CMD_SID_HIDE_SLIDE ".uno:HideSlide"
-#define CMD_SID_SHOW_SLIDE ".uno:ShowSlide"
-#define CMD_SID_INSERTLAYER ".uno:InsertLayer"
-#define CMD_SID_INSERTPAGE ".uno:InsertPage"
-#define CMD_SID_DUPLICATE_PAGE ".uno:DuplicatePage"
-#define CMD_SID_MEASURE_DLG ".uno:MeasureAttributes"
-#define CMD_SID_HORIZONTAL ".uno:MirrorHorz"
-#define CMD_SID_VERTICAL ".uno:MirrorVert"
-#define CMD_SID_MODIFYLAYER ".uno:ModifyLayer"
-#define CMD_SID_MODIFYPAGE ".uno:ModifyPage"
-#define CMD_SID_PRESENTATIONOBJECT ".uno:ModifyPresentationObject"
-#define CMD_SID_NAME_GROUP ".uno:NameGroup"
-#define CMD_SID_OBJECT_TITLE_DESCRIPTION ".uno:ObjectTitleDescription"
-#define CMD_SID_CONNECTION_NEW_ROUTING ".uno:NewRouting"
#define CMD_SID_NOTES_MODE ".uno:NotesMode"
-#define CMD_SID_POSITION ".uno:ObjectPosition"
-#define CMD_SID_ORIGINAL_SIZE ".uno:OriginalSize"
-#define CMD_SID_OUTLINE_TEXT_AUTOFIT ".uno.OutlineTextAutofit"
-#define CMD_SID_PAGESETUP ".uno:PageSetup"
-#define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout"
-#define CMD_SID_RENAMELAYER ".uno:RenameLayer"
-#define CMD_SID_RENAMEPAGE ".uno:RenamePage"
-#define CMD_SID_REVERSE_ORDER ".uno:ReverseOrder"
-#define CMD_SID_SET_SNAPITEM ".uno:SetSnapItem"
-#define CMD_SID_SLIDE_TRANSITIONS_PANEL ".uno:SlideChangeWindow"
-#define CMD_SID_TEXTATTR_DLG ".uno:TextAttributes"
-#define CMD_SID_INSERT_MASTER_PAGE ".uno:InsertMasterPage"
#define CMD_SID_DELETE_MASTER_PAGE ".uno:DeleteMasterPage"
-#define CMD_SID_RENAME_MASTER_PAGE ".uno:RenameMasterPage"
-#define CMD_SID_SELECT_BACKGROUND ".uno:SelectBackground"
-#define CMD_SID_SAVE_BACKGROUND ".uno:SaveBackground"
-#define CMD_SID_DISPLAY_MASTER_BACKGROUND ".uno:DisplayMasterBackground"
-#define CMD_SID_DISPLAY_MASTER_OBJECTS ".uno:DisplayMasterObjects"
-#define CMD_SID_MASTER_LAYOUTS ".uno:MasterLayouts"
-#define CMD_SID_TABLE_DISTRIBUTE_COLUMNS ".uno:DistributeColumns"
-#define CMD_SID_TABLE_DISTRIBUTE_ROWS ".uno:DistributeRows"
#define CMD_SID_TP_APPLY_TO_ALL_SLIDES ".uno:TaskPaneApplyToAllSlides"
#define CMD_SID_TP_APPLY_TO_SELECTED_SLIDES ".uno:TaskPaneApplyToSelectedSlides"
#define CMD_SID_TP_SHOW_SMALL_PREVIEW ".uno:TaskPaneShowSmallPreview"
#define CMD_SID_TP_SHOW_LARGE_PREVIEW ".uno:TaskPaneShowLargePreview"
#define CMD_SID_TP_EDIT_MASTER ".uno:TaskPaneEditMaster"
#define CMD_SID_INSERTPAGE_LAYOUT_MENU ".uno:TaskPaneInsertPage"
-#define CMD_SID_HIDE_LAST_LEVEL ".uno:HideLastLevel"
-#define CMD_SID_SHOW_NEXT_LEVEL ".uno:ShowNextLevel"
#endif
diff --git a/sd/source/ui/app/menuids3_tmpl.src b/sd/source/ui/app/menuids3_tmpl.src
deleted file mode 100644
index 2ad4d5f..0000000
--- a/sd/source/ui/app/menuids3_tmpl.src
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svx/globlmn.hrc>
-
-#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_PAGE_DESIGN \
- MenuItem\
- {\
- Identifier = SID_PRESENTATION_LAYOUT ; \
- HelpId = CMD_SID_PRESENTATION_LAYOUT ; \
- Text [ en-US ] = "~Page 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" ; \
- };
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
deleted file mode 100644
index a41c102..0000000
--- a/sd/source/ui/app/menuids_tmpl.src
+++ /dev/null
@@ -1,915 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include <svx/dialogs.hrc>
-#include "app.hrc"
-#include "res_bmp.hrc"
-#include "helpids.h"
-
-#define SEPARATOR MenuItem { Separator = TRUE; };
- // DUMMY is a ID where a SubMenu is following
- // (it has to be increased every time!)
-#define DUMMY 333
- // not object related
-
-#define MN_DISTRIBUTE \
- MenuItem\
- {\
- Identifier = SID_DISTRIBUTE_DLG ; \
- HelpId = CMD_SID_DISTRIBUTE_DLG ; \
- Text [ en-US ] = "~Distribution..." ; \
- };
-
-#define MN_INSERT_GRAPHIC \
- MenuItem\
- {\
- Identifier = SID_INSERT_GRAPHIC; \
- HelpId = CMD_SID_INSERT_GRAPHIC; \
- Text [ en-US ] = "Insert I~mage..." ; \
- };
-
-#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" ; \
- };
-
- // page attributes
-#define MN_MODIFY_PAGE \
- MenuItem\
- {\
- Identifier = SID_MODIFYPAGE ; \
- HelpId = CMD_SID_MODIFYPAGE ; \
- Text [ en-US ] = "Page ~Layout" ; \
- };
-
-#define MN_FORMAT_PAGE \
- MenuItem\
- {\
- Identifier = SID_PAGESETUP ; \
- HelpId = CMD_SID_PAGESETUP ; \
- Text [ en-US ] = "~Page Setup..." ; \
- };
-
-#define MN_FORMAT_SLIDE \
- MenuItem\
- {\
- Identifier = SID_PAGESETUP ; \
- HelpId = CMD_SID_PAGESETUP ; \
- Text [ en-US ] = "~Slide Properties..." ; \
- };
-
-#define MN_INSERT_SLIDE \
- MenuItem\
- {\
- Identifier = SID_INSERTPAGE ; \
- HelpId = CMD_SID_INSERTPAGE ; \
- Text [ en-US ] = "~New Slide" ; \
- };
-
-#define MN_DUPLICATE_SLIDE \
- MenuItem\
- {\
- Identifier = SID_DUPLICATE_PAGE ; \
- HelpId = CMD_SID_DUPLICATE_PAGE ; \
- Text [ en-US ] = "~Duplicate 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 Image..." ; \
- };
-#define MN_SAVE_BACKGROUND \
- MenuItem\
- {\
- Identifier = SID_SAVE_BACKGROUND ; \
- HelpId = CMD_SID_SAVE_BACKGROUND ; \
- Text [ en-US ] = "Save Background Image..." ; \
- };
-#define MN_DISPLAY_MASTER_BACKGROUND \
- MenuItem\
- {\
- Identifier = SID_DISPLAY_MASTER_BACKGROUND ; \
- HelpId = CMD_SID_DISPLAY_MASTER_BACKGROUND ; \
- Text [ en-US ] = "Display Master Background" ; \
- };
-#define MN_DISPLAY_MASTER_OBJECTS \
- MenuItem\
- {\
- Identifier = SID_DISPLAY_MASTER_OBJECTS ; \
- HelpId = CMD_SID_DISPLAY_MASTER_OBJECTS ; \
- Text [ en-US ] = "Display Master Objects" ; \
- };
-#define MN_MASTER_ELEMENTS \
- MenuItem\
- {\
- Identifier = SID_MASTER_LAYOUTS ; \
- HelpId = CMD_SID_MASTER_LAYOUTS ; \
- Text [ en-US ] = "Master Elements" ; \
- };
-
-#define MN_PAGE_MENU \
- MenuItem\
- {\
- Identifier = DUMMY + 3 ; \
- Command = ".uno:PageMenu" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MN_INSERT_PAGE\
- MN_DELETE_PAGE\
- SEPARATOR\
- MN_FORMAT_PAGE\
- MN_SELECT_BACKGROUND\
- MN_PAGE_DESIGN\
- MN_RENAME_PAGE\
- MN_SAVE_BACKGROUND\
- };\
- };\
- Text [ en-US ] = "Pag~e" ; \
- };
-
-#define MN_SLIDE_MENU \
- MN_FORMAT_SLIDE\
- MN_SELECT_BACKGROUND\
- MN_SAVE_BACKGROUND\
- MenuItem\
- {\
- Identifier = DUMMY + 8 ; \
- Command = ".uno:PageMenu" ; \
- Text [ en-US ] = "Slid~e Features" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MN_HIDE_SLIDE\
- MN_SHOW_SLIDE\
- SEPARATOR\
- MN_DISPLAY_MASTER_BACKGROUND\
- MN_DISPLAY_MASTER_OBJECTS\
- MN_MASTER_ELEMENTS\
- SEPARATOR\
- MN_PRESENTATION_LAYOUT\
- };\
- };\
- };
-
- // 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..." ; \
- };
-
- // graphic attributes
-#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_OUTLINE_TEXT_AUTOFIT \
- MenuItem\
- {\
- Identifier = SID_OUTLINE_TEXT_AUTOFIT ; \
- HelpID = CMD_SID_OUTLINE_TEXT_AUTOFIT ; \
- Text [ en-US ] = "~Autofit 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" ; \
- };
-
- // arrangement
-#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 elements
-#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_BULLET \
- MenuItem\
- {\
- Identifier = SID_CHARMAP ; \
- HelpId = CMD_SID_CHARMAP ; \
- Text [ en-US ] = "S~pecial Character..." ; \
- };
-
- // object orientation
-#define MN_OBJECT_ALIGN \
- MenuItem\
- {\
- Identifier = SID_OBJECT_ALIGN ; \
- Command = ".uno:AlignObjetMenu" ; \
- HelpId = CMD_SID_OBJECT_ALIGN ; \
- Text [ en-US ] = "Al~ign" ; \
- 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 functions
-#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" ; \
- };
-
- // group/combination functions
-#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_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..." ; \
- };
-
-// #i68101#
-#define MN_OBJECT_TITLE_DESCRIPTION \
- MenuItem\
- {\
- Identifier = SID_OBJECT_TITLE_DESCRIPTION; \
- HelpId = CMD_SID_OBJECT_TITLE_DESCRIPTION; \
- Text [ en-US ] = "Description..." ; \
- };
-
-#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..." ; \
- };
-
- // diverse common functions
-#define MN_DELETE \
- MenuItem\
- {\
- Identifier = SID_DELETE ; \
- HelpId = CMD_SID_DELETE ; \
- Text [ en-US ] = "~Delete" ; \
- };
-
-#define MN_SET_DEFAULT\
- MenuItem\
- {\
- Identifier = SID_SET_DEFAULT ; \
- HelpId = CMD_SID_SET_DEFAULT ; \
- Text [ en-US ] = "~Default Formatting" ; \
- };
-
-#define MN_FONTWORK\
- MenuItem\
- {\
- Identifier = SID_FONTWORK ; \
- HelpId = CMD_SID_FONTWORK ; \
- Text [ en-US ] = "F~ontwork" ; \
- };
-
-#define MN_ORIGINAL_SIZE\
- MenuItem\
- {\
- Identifier = SID_ORIGINAL_SIZE ; \
- HelpId = CMD_SID_ORIGINAL_SIZE ; \
- Text [ en-US ] = "Restore ~Original Size" ; \
- };
-
-#define MN_CROP\
- MenuItem\
- {\
- Identifier = SID_OBJECT_CROP ; \
- Text [ en-US ] = "Crop I~mage" ; \
- };
-
-#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_RULER\
- MenuItem\
- {\
- Identifier = SID_RULER ; \
- HelpId = CMD_SID_RULER ; \
- Checkable = TRUE ; \
- Text [ en-US ] = "View ~Ruler" ; \
- };
-
-#define MN_GRID_VISIBLE\
- MenuItem\
- {\
- Identifier = SID_GRID_VISIBLE ; \
- HelpId = CMD_SID_GRID_VISIBLE ; \
- Checkable = TRUE ; \
- Text [ en-US ] = "~Display Grid" ; \
- };
-
-#define MN_GRID_USE\
- MenuItem\
- {\
- Identifier = SID_GRID_USE ; \
- HelpId = CMD_SID_GRID_USE; \
- Checkable = TRUE ; \
- Text [ en-US ] = "Snap to Grid"; \
- };
-
-#define MN_GRID_FRONT\
- MenuItem\
- {\
- Identifier = SID_GRID_FRONT ; \
- HelpId = CMD_SID_GRID_FRONT ; \
- Checkable = TRUE ; \
- 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 ; \
- Checkable = TRUE ; \
- Text [ en-US ] = "~Display Snap Lines" ; \
- };
-
-#define MN_HELPLINES_USE\
- MenuItem\
- {\
- Identifier = SID_HELPLINES_USE ; \
- HelpId = CMD_SID_HELPLINES_USE ; \
- Checkable = TRUE ; \
- Text [ en-US ] = "~Snap to Snap Lines"; \
- };
-
-#define MN_HELPLINES_FRONT\
- MenuItem\
- {\
- Identifier = SID_HELPLINES_FRONT ; \
- HelpId = CMD_SID_HELPLINES_FRONT ; \
- Checkable = TRUE ; \
- 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 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 MN_STYLEDT \
- MenuItem\
- {\
- Identifier = SID_STYLE_EDIT ; \
- HelpId = CMD_SID_STYLE_EDIT ; \
- Text [ en-US ] = "Edit Style..." ; \
- };
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src
index 0a0cbbc..9668057 100644
--- a/sd/source/ui/app/popup.src
+++ b/sd/source/ui/app/popup.src
@@ -17,367 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- // TEXTOBJ
- // Impress:
-#include "popup2.src"
- // Draw (Graphic):
-#undef SD_POPUP
-#define SD_POPUP RID_GRAPHIC_TEXTOBJ_POPUP
-#include "popup2.src"
-#include <svx/globlmn.hrc>
-#include "helpids.h"
+ #include <svx/dialogs.hrc>
+ #include "app.hrc"
+ #include "res_bmp.hrc"
+ #include "helpids.h"
-#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET
-
-Menu RID_DRAW_TEXTOBJ_INSIDE_POPUP
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = SID_HIDE_LAST_LEVEL;
- Command = CMD_SID_HIDE_LAST_LEVEL;
- Text [ en-US ] = "~Hide Last Level";
- };
- MenuItem
- {
- Identifier = SID_SHOW_NEXT_LEVEL;
- Command = CMD_SID_SHOW_NEXT_LEVEL;
- Text [ en-US ] = "~Show Next Level";
- };
- SEPARATOR
- MN_SET_DEFAULT
- SEPARATOR
- MN_TEXTATTR
- SEPARATOR
- MN_CHAR_PARAGRAPH
- SEPARATOR
- MenuItem
- {
- ITEM_OPEN_HYPERLINK
- };
- SEPARATOR
- MN_BULLET
- ITEM_FORMAT_NUMBERING
- ITEM_TRANSLITERATE_MENU
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP
-{
- ItemList =
- {
- MN_SET_DEFAULT
- SEPARATOR
- MN_TEXTATTR
- 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
- MenuItem
- {
- ITEM_OPEN_HYPERLINK
- };
- SEPARATOR
- MN_BULLET
- ITEM_FORMAT_NUMBERING
- ITEM_TRANSLITERATE_MENU
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-Menu RID_FORM_CONTROL_POPUP
-{
- ItemList =
- {
- MN_TRANSFORM
- MenuItem { ITEM_FORM_CONTROL_PROPERTIES };
- MenuItem { ITEM_FORM_PROPERTIES };
- MenuItem { ITEM_REPLACE_CONTROL };
- SEPARATOR
- MN_POSITION
- MN_OBJECT_ALIGN
- SEPARATOR
- MN_LEAVE_GROUP
- MN_DISMANTLE
-
- //-#i68101#----------------------
- SEPARATOR
- MN_OBJECT_TITLE_DESCRIPTION
- MN_NAME_GROUP
- //-#i68101#----------------------
- };
-};
-
-Menu RID_DRAW_SNAPOBJECT_POPUP
-{
- ItemList =
- {
- MN_SET_SNAPITEM
- SEPARATOR
- MN_DELETE_SNAPITEM
- };
-};
-
-Menu RID_DRAW_GLUEPOINT_POPUP
-{
- ItemList =
- {
- MN_GLUE_INSERT_POINT
- SEPARATOR
- MN_GLUE_ESC_DIR_LEFT
- MN_GLUE_ESC_DIR_TOP
- MN_GLUE_ESC_DIR_RIGHT
- MN_GLUE_ESC_DIR_BOTTOM
- SEPARATOR
- MN_GLUE_PERCENT
- SEPARATOR
- MN_GLUE_HORZALIGN_LEFT
- MN_GLUE_HORZALIGN_CENTER
- MN_GLUE_HORZALIGN_RIGHT
- SEPARATOR
- MN_GLUE_VERTALIGN_TOP
- MN_GLUE_VERTALIGN_CENTER
- MN_GLUE_VERTALIGN_BOTTOM
- };
-};
-
-Menu RID_SLIDE_SORTER_IMPRESS_SEL_POPUP
-{
- ItemList =
- {
- MN_INSERT_SLIDE
- MN_DUPLICATE_SLIDE
- MN_DELETE_SLIDE
- MN_RENAME_SLIDE
- SEPARATOR
- MN_PRESENTATION_LAYOUT
- MN_MODIFY_PAGE
- SEPARATOR
- MN_DIA
- MN_SHOW_SLIDE
- MN_HIDE_SLIDE
- };
-};
-
-Menu RID_SLIDE_SORTER_IMPRESS_NOSEL_POPUP
-{
- ItemList =
- {
- MN_INSERT_SLIDE
- };
-};
-
-Menu RID_SLIDE_SORTER_DRAW_SEL_POPUP
-{
- ItemList =
- {
- MN_INSERT_PAGE
- MN_DELETE_PAGE
- MN_RENAME_PAGE
- };
-};
-
-Menu RID_SLIDE_SORTER_DRAW_NOSEL_POPUP
-{
- ItemList =
- {
- MN_INSERT_PAGE
- };
-};
-
-Menu RID_SLIDE_SORTER_MASTER_SEL_POPUP
-{
- ItemList =
- {
- MN_INSERT_MASTER
- MN_DELETE_MASTER
- MN_RENAME_MASTER
- SEPARATOR
- MN_PRESENTATION_LAYOUT
- };
-};
-
-Menu RID_SLIDE_SORTER_MASTER_NOSEL_POPUP
-{
- ItemList =
- {
- MN_INSERT_MASTER
- };
-};
-
-Menu RID_OUTLINE_POPUP
-{
- ItemList =
- {
- MN_SET_DEFAULT
- SEPARATOR
- MN_CHAR
- ITEM_FORMAT_NUMBERING
- ITEM_TRANSLITERATE_MENU
- MN_PRESENTATIONOBJECT
- };
-};
-
-Menu RID_BEZIER_POPUP
-{
- ItemList =
- {
- MN_BEZIER
- };
-};
-
-Menu RID_LAYERTAB_POPUP
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = SID_INSERTLAYER ;
- HelpId = CMD_SID_INSERTLAYER ;
- Text [ en-US ] = "~Insert Layer..." ;
- };
- MenuItem
- {
- Identifier = SID_MODIFYLAYER ;
- HelpId = CMD_SID_MODIFYLAYER ;
- Text [ en-US ] = "Modify La~yer..." ;
- };
- MenuItem
- {
- Identifier = SID_DELETE_LAYER ;
- HelpId = CMD_SID_DELETE_LAYER ;
- Text [ en-US ] = "Delete ~Layer..." ;
- };
- MN_RENAME_LAYER
- };
-};
+ #define SEPARATOR MenuItem { Separator = TRUE; };
Menu RID_TASKPANE_MASTERPAGESSELECTOR_POPUP
{
@@ -439,7 +84,12 @@ Menu RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP
Text[ en-US ] = "~Edit Master...";
};
- MN_DELETE_MASTER
+ MenuItem
+ {
+ Identifier = SID_DELETE_MASTER_PAGE;
+ HelpId = CMD_SID_DELETE_MASTER_PAGE;
+ Text [ en-US ] = "D~elete Master";
+ };
SEPARATOR
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
deleted file mode 100644
index 9c0d9ca..0000000
--- a/sd/source/ui/app/popup2_tmpl.src
+++ /dev/null
@@ -1,751 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "menuids3.src"
-
-#ifndef SD_POPUP
-#define SD_POPUP RID_DRAW_TEXTOBJ_POPUP
-#include "menuids.src"
-#endif
-
-// TEXTOBJ_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_TEXTOBJ_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_TEXTOBJ_POPUP
-#endif
-{
- ItemList =
- {
- MN_SET_DEFAULT
- SEPARATOR
- MN_TRANSFORM
- MN_LINE
- MN_AREA
- MN_TEXTATTR
- MN_FONTWORK
- SEPARATOR
- MN_CHAR_PARAGRAPH
- SEPARATOR
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MNSUB_CONVERT
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-// OUTLINETEXTOBJ_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_OUTLINETEXTOBJ_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_OUTLINETEXTOBJ_POPUP
-#endif
-{
- ItemList =
- {
- MN_SET_DEFAULT
- SEPARATOR
- MN_TRANSFORM
- MN_LINE
- MN_AREA
- MN_TEXTATTR
- MN_OUTLINE_TEXT_AUTOFIT
- MN_FONTWORK
- SEPARATOR
- MN_CHAR_PARAGRAPH
- SEPARATOR
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MNSUB_CONVERT
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-// GEOMOBJ_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_GEOMOBJ_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_GEOMOBJ_POPUP
-#endif
-{
- ItemList =
- {
- MN_TRANSFORM
- MN_LINE
- MN_AREA
- SEPARATOR
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MNSUB_MIRROR
- MNSUB_CONVERT
- SEPARATOR
- MN_LEAVE_GROUP
- MN_DISMANTLE
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-// Customshape POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_CUSTOMSHAPE_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_CUSTOMSHAPE_POPUP
-#endif
-{
- ItemList =
- {
- MN_TRANSFORM
- MN_LINE
- MN_AREA
- SEPARATOR
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MNSUB_MIRROR
- // #i37263#
- MNSUB_CONVERT
- SEPARATOR
- MN_LEAVE_GROUP
- MN_DISMANTLE
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- SEPARATOR
- MN_STYLEDT
-
- };
-};
-
-// 3DOSCENE_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_3DSCENE_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_3DSCENE_POPUP
-#endif
-{
- ItemList =
- {
- MN_3D_WIN
- SEPARATOR
- MN_TRANSFORM
- MN_LINE
- MN_AREA
- SEPARATOR
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MNSUB_CONVERT
- SEPARATOR
- MN_ENTER_GROUP
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
-// SEPARATOR
-// MN_STYLEDT
- };
-};
-
-// 3DOSCENE2_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_3DSCENE2_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_3DSCENE2_POPUP
-#endif
-{
- ItemList =
- {
- MN_TRANSFORM
- MN_LINE
- MN_AREA
- SEPARATOR
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MNSUB_CONVERT
- SEPARATOR
- MN_ENTER_GROUP
- MN_LEAVE_GROUP
- MN_3D_WIN
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
-// SEPARATOR
-// MN_STYLEDT
- };
-};
-
-// 3DOBJ_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_3DOBJ_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_3DOBJ_POPUP
-#endif
-{
- ItemList =
- {
- MN_TRANSFORM
- MN_LINE
- MN_AREA
- SEPARATOR
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MNSUB_CONVERT
- SEPARATOR
- MN_LEAVE_GROUP
- MN_3D_WIN
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-// GROUPOBJ_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_GROUPOBJ_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_GROUPOBJ_POPUP
-#endif
-{
- ItemList =
- {
- MN_TRANSFORM
- MN_LINE
- MN_AREA
- SEPARATOR
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MNSUB_MIRROR
- MNSUB_CONVERT
-
- SEPARATOR
- MN_UNGROUP
- MN_ENTER_GROUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- };
-};
-
-// LINEOBJ_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_LINEOBJ_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_LINEOBJ_POPUP
-#endif
-{
- ItemList =
- {
- MN_TRANSFORM
- MN_LINE
- MN_EDIT_POINTS
- SEPARATOR
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MNSUB_MIRROR
- MNSUB_CONVERT
- SEPARATOR
- MN_LEAVE_GROUP
- MN_DISMANTLE
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-// EDGEOBJ_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_EDGEOBJ_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_EDGEOBJ_POPUP
-#endif
-{
- ItemList =
- {
- MN_NEW_ROUTING
- SEPARATOR
- MN_LINE
- MN_CONNECTION
- MN_TRANSFORM
- SEPARATOR
- MN_EDIT_POINTS
- SEPARATOR
- MN_POSITION
- MN_OBJECT_ALIGN
- MN_DISTRIBUTE
- MNSUB_CONVERT
- SEPARATOR
- MN_LEAVE_GROUP
- MN_DISMANTLE
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-// MEASUREOBJ_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_MEASUREOBJ_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_MEASUREOBJ_POPUP
-#endif
-{
- 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
-
- // #i68101#
- SEPARATOR
- MN_OBJECT_TITLE_DESCRIPTION
- MN_NAME_GROUP
- // #i68101#
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-// POLYLINEOBJ_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_POLYLINEOBJ_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_POLYLINEOBJ_POPUP
-#endif
-{
- ItemList =
- {
- MN_TRANSFORM
- MN_LINE
- 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
-
- // #i68101#
- SEPARATOR
- MN_OBJECT_TITLE_DESCRIPTION
- MN_NAME_GROUP
- // #i68101#
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-// NOSEL_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_NOSEL_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_NOSEL_POPUP
-#endif
-{
- ItemList =
- {
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- MN_SLIDE_MENU
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- MN_PAGE_MENU
-#endif
- SEPARATOR
- MN_RULER
- MN_GRID
- MN_HELPLINES
- MN_CAPTUREPOINT
- SEPARATOR
- MN_LEAVE_GROUP
- };
-};
-
-// MULTISELECTION_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_MULTISELECTION_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_MULTISELECTION_POPUP
-#endif
-{
- ItemList =
- {
- MN_TRANSFORM
- MN_LINE
- MN_AREA
- SEPARATOR
- MN_POSITION
- MN_OBJECT_ALIGN
- MN_DISTRIBUTE
- MNSUB_MIRROR
- MNSUB_CONVERT
- SEPARATOR
- MN_GROUP
- MN_UNGROUP
- MN_LEAVE_GROUP
- MNSUB_FORMEN
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- };
-};
-
-// GRAPHIC_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_GRAPHIC_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_GRAPHIC_POPUP
-#endif
-{
- ItemList =
- {
- MN_CROP
- MN_ORIGINAL_SIZE
- SEPARATOR
- MenuItem { ITEM_EXTERNAL_EDIT };
- MenuItem { ITEM_CHANGE_PICTURE };
- MenuItem { ITEM_COMPRESS_GRAPHIC };
- MenuItem { ITEM_SAVE_GRAPHIC };
- SEPARATOR
- MN_TRANSFORM
- MN_LINE
- SEPARATOR
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MNSUB_MIRROR
- MNSUB_CONVERT
- MN_BREAK
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-// OLE2_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_OLE2_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_OLE2_POPUP
-#endif
-{
- ItemList =
- {
- MN_TRANSFORM
- MN_ORIGINAL_SIZE
-
- // #i118485# Added support for Line,Area and Text
- MN_LINE
- MN_AREA
- SEPARATOR
- MN_CHAR_PARAGRAPH
- SEPARATOR
- // #i118485#
-
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
-
- // #i118485# Added support for conversions
- MNSUB_MIRROR
- MNSUB_CONVERT
- // #i118485#
-
- MN_BREAK
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- };
-};
-
-// PAGETAB_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_PAGETAB_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_PAGETAB_POPUP
-#endif
-{
- ItemList =
- {
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- MN_INSERT_SLIDE
- MN_DELETE_SLIDE
- MN_MODIFY_PAGE
-#else
- MN_INSERT_PAGE
- MN_DELETE_PAGE
-#endif
- MN_RENAME_PAGE
- };
-};
-
-// Media_POPUP
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_MEDIA_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_MEDIA_POPUP
-#endif
-{
- ItemList =
- {
- MN_TRANSFORM
- SEPARATOR
- MN_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MN_BREAK
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- };
-};
-
-// Table shape context menu
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- Menu RID_DRAW_TABLE_POPUP
-#elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
- Menu RID_GRAPHIC_TABLE_POPUP
-#endif
-{
- 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_OBJECT_ALIGN
- MN_POSITION
- MN_DISTRIBUTE
- MNSUB_CONVERT
-
-#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
- SEPARATOR
- MN_ACTION
-#endif
- SEPARATOR
- MN_STYLEDT
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 135c710..91ab0e0 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -202,76 +202,10 @@
// ResourceIDs for Popup-Menus do not need a dummy string!!!
-#define RID_DRAW_TEXTOBJ_POPUP RID_APP_START+43
-#define RID_DRAW_GEOMOBJ_POPUP RID_APP_START+44
-#define RID_DRAW_NOSEL_POPUP RID_APP_START+45
-#define RID_SLIDE_SORTER_IMPRESS_SEL_POPUP RID_APP_START+46
-#define RID_BEZIER_POPUP RID_APP_START+47
-#define RID_DRAW_LINEOBJ_POPUP RID_APP_START+48
-#define RID_DRAW_MULTISELECTION_POPUP RID_APP_START+49
-#define RID_DRAW_PAGETAB_POPUP RID_APP_START+50
-#define RID_LAYERTAB_POPUP RID_APP_START+51
-#define RID_DRAW_GRAPHIC_POPUP RID_APP_START+52
-#define RID_DRAW_OLE2_POPUP RID_APP_START+53
-#define RID_DRAW_TEXTOBJ_INSIDE_POPUP RID_APP_START+54
-#define RID_SLIDE_SORTER_IMPRESS_NOSEL_POPUP RID_APP_START+55
-#define RID_OUTLINE_POPUP RID_APP_START+56
-#define RID_DRAW_GROUPOBJ_POPUP RID_APP_START+58
-#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_POLYLINEOBJ_POPUP RID_APP_START+63
-#define RID_DRAW_3DSCENE_POPUP RID_APP_START+64
-#define RID_DRAW_3DSCENE2_POPUP RID_APP_START+65
-#define RID_DRAW_CUSTOMSHAPE_POPUP RID_APP_START+66
#define RID_TASKPANE_MASTERPAGESSELECTOR_POPUP RID_APP_START+67
#define RID_TASKPANE_LAYOUTMENU_POPUP RID_APP_START+68
-#define RID_DRAW_MEDIA_POPUP RID_APP_START+69
-
-// Draw (Graphic)
-#define RID_GRAPHIC_TEXTOBJ_POPUP RID_APP_START+70
-#define RID_GRAPHIC_GEOMOBJ_POPUP RID_APP_START+71
-#define RID_GRAPHIC_NOSEL_POPUP RID_APP_START+72
-#define RID_GRAPHIC_LINEOBJ_POPUP RID_APP_START+73
-#define RID_GRAPHIC_MULTISELECTION_POPUP RID_APP_START+74
-#define RID_GRAPHIC_PAGETAB_POPUP RID_APP_START+75
-#define RID_GRAPHIC_GRAPHIC_POPUP RID_APP_START+76
-#define RID_GRAPHIC_OLE2_POPUP RID_APP_START+77
-#define RID_GRAPHIC_GROUPOBJ_POPUP RID_APP_START+78
-#define RID_GRAPHIC_3DOBJ_POPUP RID_APP_START+79
-#define RID_GRAPHIC_MEASUREOBJ_POPUP RID_APP_START+80
-#define RID_GRAPHIC_EDGEOBJ_POPUP RID_APP_START+81
-#define RID_GRAPHIC_POLYLINEOBJ_POPUP RID_APP_START+82
-#define RID_GRAPHIC_3DSCENE_POPUP RID_APP_START+83
-#define RID_GRAPHIC_3DSCENE2_POPUP RID_APP_START+84
-#define RID_GRAPHIC_CUSTOMSHAPE_POPUP RID_APP_START+85
-#define RID_GRAPHIC_MEDIA_POPUP RID_APP_START+86
-
-#define RID_SLIDE_SORTER_DRAW_SEL_POPUP RID_APP_START+87
-#define RID_SLIDE_SORTER_DRAW_NOSEL_POPUP RID_APP_START+88
-#define RID_SLIDE_SORTER_MASTER_SEL_POPUP RID_APP_START+89
-#define RID_SLIDE_SORTER_MASTER_NOSEL_POPUP RID_APP_START+90
-
-#define RID_DRAW_TABLE_POPUP RID_APP_START+91
-#define RID_GRAPHIC_TABLE_POPUP RID_APP_START+92
-
#define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP RID_APP_START+93
-#define RID_DRAW_TABLEOBJ_INSIDE_POPUP RID_APP_START+94
-
-#define RID_DRAW_OUTLINETEXTOBJ_POPUP RID_APP_START+95
-#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP RID_APP_START+96
-
-/*
- * Do not change ResourceIDs for toolboxes without also changing the strings in
- * strings.hrc to the same IDs. A toolbox and its configuration string have to
- * have the same ResourceID!
- */
-
-#define RID_DRAW_SNAPOBJECT_POPUP RID_APP_START+390
-#define RID_DRAW_GLUEPOINT_POPUP RID_APP_START+392
-#define RID_FORM_CONTROL_POPUP RID_APP_START+394
-
#define RID_GRAPHICSTYLEFAMILY RID_APP_START+395
#define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396
More information about the Libreoffice-commits
mailing list