[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py sd/inc sd/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Mar 16 07:12:54 UTC 2017
bin/find-unused-defines-in-hrc-files.py | 7 +
sd/inc/glob.hrc | 18 ---
sd/source/core/glob.src | 52 ----------
sd/source/ui/accessibility/accessibility.hrc | 3
sd/source/ui/accessibility/accessibility.src | 15 ---
sd/source/ui/animations/CustomAnimation.hrc | 7 -
sd/source/ui/animations/CustomAnimation.src | 35 -------
sd/source/ui/annotations/annotations.hrc | 1
sd/source/ui/annotations/annotations.src | 5 -
sd/source/ui/app/res_bmp.src | 18 ---
sd/source/ui/app/strings.src | 131 ---------------------------
sd/source/ui/inc/res_bmp.hrc | 4
sd/source/ui/inc/strings.hrc | 39 --------
sd/source/ui/view/DocumentRenderer.src | 12 --
14 files changed, 6 insertions(+), 341 deletions(-)
New commits:
commit 2b3c57887aeeaa592d693df23dbab98552434cb3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Mar 15 15:16:55 2017 +0200
remove unused defines from HRC files in sd
Change-Id: I2cbb6257aa65e45f3e46b64a8f00e36aecd95564
Reviewed-on: https://gerrit.libreoffice.org/35219
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/bin/find-unused-defines-in-hrc-files.py b/bin/find-unused-defines-in-hrc-files.py
index 59d917a..acf5157 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -78,6 +78,7 @@ exclusionSet = set([
"STR_UPDATE_ALL",
"STR_UPDATE_INDEX",
"STR_UPDATE_LINK",
+ "BMP_PLACEHOLDER_",
])
@@ -125,10 +126,12 @@ with a.stdout as txt:
# these are used in calculations in other .hrc files
if "sw/inc/rcid.hrc:" in line2: found_reason_to_exclude = True
# calculations
- if "sw/source/uibase/inc/ribbar.hrc:" in line2 and "ST_" in line2: found_reason_to_exclude = True
- if "sw/source/uibase/inc/ribbar.hrc:" in line2 and "STR_IMGBTN_" in line2: found_reason_to_exclude = True
+ if "sw/source/uibase/inc/ribbar.hrc:" in line2 and "ST_" in idName: found_reason_to_exclude = True
+ if "sw/source/uibase/inc/ribbar.hrc:" in line2 and "STR_IMGBTN_" in idName: found_reason_to_exclude = True
if "sw/source/core/undo/undo.hrc:" in line2: found_reason_to_exclude = True
if "sw/inc/poolfmt.hrc:" in line2: found_reason_to_exclude = True
+ # not sure about these, looks suspicious
+ if "sd/source/ui/app/strings.src:" in line2 and idName.endswith("_TOOLBOX"): found_reason_to_exclude = True
if not found_reason_to_exclude:
sys.stdout.write(idName + '\n')
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index da77cce..beaadc4 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -42,7 +42,6 @@
#define BMP_PRESOBJ_CHART RID_GLOB_START+16
#define BMP_PRESOBJ_ORGCHART RID_GLOB_START+17
#define BMP_PRESOBJ_TABLE RID_GLOB_START+18
-#define STR_STDOBJECTBARSHELL RID_GLOB_START+24
#define STR_LAYOUT_TITLE RID_GLOB_START+27
#define STR_LAYOUT_OUTLINE RID_GLOB_START+28
@@ -57,8 +56,6 @@
#define STR_PRESOBJ_MPOUTLLAYER5 RID_GLOB_START+37
#define STR_PRESOBJ_MPOUTLLAYER6 RID_GLOB_START+38
#define STR_PRESOBJ_MPOUTLLAYER7 RID_GLOB_START+39
-#define STR_PRESOBJ_MPOUTLLAYER8 RID_GLOB_START+40
-#define STR_PRESOBJ_MPOUTLLAYER9 RID_GLOB_START+41
#define STR_PRESOBJ_MPNOTESTITLE RID_GLOB_START+42
#define STR_PRESOBJ_MPNOTESTEXT RID_GLOB_START+43
#define STR_PRESOBJ_NOTESTEXT RID_GLOB_START+44
@@ -66,10 +63,8 @@
#define STR_STANDARD_STYLESHEET_NAME RID_GLOB_START+46
#define STR_NOTES RID_GLOB_START+47
#define STR_HANDOUT RID_GLOB_START+48
-#define STR_MASTERPAGE RID_GLOB_START+49
#define STR_UNDO_MOVEPAGES RID_GLOB_START+52
-#define STR_NOT_ENOUGH_MEMORY RID_GLOB_START+53
#define STR_LAYOUT_SUBTITLE RID_GLOB_START+54
#define STR_POOLSHEET_OBJWITHARROW RID_GLOB_START+55
#define STR_POOLSHEET_OBJWITHSHADOW RID_GLOB_START+56
@@ -85,7 +80,6 @@
#define STR_POOLSHEET_HEADLINE1 RID_GLOB_START+66
#define STR_POOLSHEET_HEADLINE2 RID_GLOB_START+67
#define STR_POOLSHEET_MEASURE RID_GLOB_START+68
-#define STR_POOLSHEET_ARROW RID_GLOB_START+69
#define STR_POOLSHEET_BANDED_CELL RID_GLOB_START+70
#define STR_POOLSHEET_HEADER RID_GLOB_START+71
@@ -101,25 +95,18 @@
#define STR_PSEUDOSHEET_BACKGROUND RID_GLOB_START+83
#define STR_PSEUDOSHEET_NOTES RID_GLOB_START+84
#define STR_PSEUDOSHEET_SUBTITLE RID_GLOB_START+85
-#define STR_GLUEPOINTSOBJECTBARSHELL RID_GLOB_START+90
-#define STR_EMPTY_STYLESHEET_NAME RID_GLOB_START+91
#define STR_LAYER_MEASURELINES RID_GLOB_START+92
#define STR_LAYOUT_DEFAULT_TITLE_NAME RID_GLOB_START+93
#define STR_POWERPOINT_IMPORT RID_GLOB_START+95
#define STR_LOAD_DOC RID_GLOB_START+99
#define STR_SAVE_DOC RID_GLOB_START+100
-#define STR_PREVIEWVIEWSHELL RID_GLOB_START+101
#define RID_SD_ERRHDL RID_GLOB_START+102
#define STR_PAGE_NAME RID_GLOB_START+111
#define STR_SLIDE_NAME RID_GLOB_START+112
#define STR_ENTER_PIN RID_GLOB_START+115
-#define STR_TOOL_PANEL_SHELL RID_GLOB_START+116
-
-#define STR_TASKPANEVIEWSHELL RID_GLOB_START+117
-#define STR_TASKPANELAYOUTMENU RID_GLOB_START+118
#define RID_CUSTOMANIMATION_START RID_GLOB_START+120
// RID_CUSTOMANIMATION_END RID_GLOB_START+199
@@ -129,11 +116,6 @@
#define STR_UNDO_SLIDE_PARAMS RID_GLOB_START+222
#define RID_SLIDESHOW_CONTEXTMENU RID_GLOB_START+223
-#define DLG_TABLEDESIGNPANE RID_GLOB_START+224
-
-#define STR_CUSTOMANIMATIONPANE RID_GLOB_START+227
-#define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228
-
#define STR_DEAUTHORISE_CLIENT RID_GLOB_START+229
#define STR_MASTERSLIDE_NAME RID_GLOB_START+230
#define STR_MASTERPAGE_NAME RID_GLOB_START+231
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index 0f8629f..c4a3b87 100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
@@ -63,10 +63,6 @@ String STR_MASTERPAGE_NAME
{
Text [ en-US ] = "Master Page";
};
-String STR_MASTERPAGE
-{
- Text [ en-US ] = "Background" ;
-};
String STR_NOTES
{
Text [ en-US ] = "(Notes)" ;
@@ -107,14 +103,6 @@ String STR_PRESOBJ_MPOUTLLAYER7
{
Text [ en-US ] = "Seventh Outline Level" ;
};
-String STR_PRESOBJ_MPOUTLLAYER8
-{
- Text [ en-US ] = "Eighth Outline Level" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER9
-{
- Text [ en-US ] = "Ninth Outline Level" ;
-};
String STR_PRESOBJ_MPNOTESTITLE
{
Text [ en-US ] = "Click to move the slide" ;
@@ -159,18 +147,6 @@ String STR_PRESOBJ_TABLE
{
Text [ en-US ] = "Double-click to add a Spreadsheet" ;
};
-String STR_PREVIEWVIEWSHELL
-{
- Text [ en-US ] = "Preview Window";
-};
-String STR_STDOBJECTBARSHELL
-{
- Text [ en-US ] = "Document Mode" ;
-};
-String STR_GLUEPOINTSOBJECTBARSHELL
-{
- Text [ en-US ] = "Glue Points Mode" ;
-};
/* do not translate */
String STR_LAYOUT_TITLE
{
@@ -212,10 +188,6 @@ String STR_UNDO_MOVEPAGES
{
Text [ en-US ] = "Move slides" ;
};
-String STR_NOT_ENOUGH_MEMORY
-{
- Text [ en-US ] = "Not enough memory!\nThe action will be aborted." ;
-};
/* do not translate */
String STR_LAYOUT_SUBTITLE
{
@@ -282,10 +254,6 @@ String STR_POOLSHEET_HEADLINE2
{
Text [ en-US ] = "Heading2" ;
};
-String STR_EMPTY_STYLESHEET_NAME
-{
- Text [ en-US ] = "Blank template" ;
-};
String STR_PSEUDOSHEET_TITLE
{
Text [ en-US ] = "Title" ;
@@ -311,31 +279,11 @@ String STR_PSEUDOSHEET_NOTES
Text [ en-US ] = "Notes" ;
};
-String STR_TOOL_PANEL_SHELL
-{
- Text [ en-US ] = "Tool Panel" ;
-};
-
-String STR_TASKPANEVIEWSHELL
-{
- Text [ en-US ] = "Tasks" ;
-};
-
-String STR_TASKPANELAYOUTMENU
-{
- Text [ en-US ] = "Layout" ;
-};
-
String STR_POWERPOINT_IMPORT
{
Text [ en-US ] = "PowerPoint Import";
};
-String STR_POOLSHEET_ARROW
-{
- Text [ en-US ] = "Arrow" ;
-};
-
String STR_LOAD_DOC
{
Text [ en-US ] = "Load Document" ;
diff --git a/sd/source/ui/accessibility/accessibility.hrc b/sd/source/ui/accessibility/accessibility.hrc
index c2c7c43..b14413a 100644
--- a/sd/source/ui/accessibility/accessibility.hrc
+++ b/sd/source/ui/accessibility/accessibility.hrc
@@ -73,9 +73,6 @@
#define SID_SD_A11Y_P_DATE_N_STYLE (SID_SD_A11Y_START + 44)
#define SID_SD_A11Y_P_NUMBER_N_STYLE (SID_SD_A11Y_START + 45)
-#define SID_SD_A11Y_I_PREVIEW_N (SID_SD_A11Y_START + 46)
-#define SID_SD_A11Y_I_PREVIEW_D (SID_SD_A11Y_START + 47)
-#define SID_SD_A11Y_I_PREVIEW_SUFFIX (SID_SD_A11Y_START + 48)
#define SID_SD_A11Y_D_PRESENTATION_READONLY (SID_SD_A11Y_START + 49)
#endif
diff --git a/sd/source/ui/accessibility/accessibility.src b/sd/source/ui/accessibility/accessibility.src
index 6d2572f..a3511d9 100644
--- a/sd/source/ui/accessibility/accessibility.src
+++ b/sd/source/ui/accessibility/accessibility.src
@@ -253,21 +253,6 @@ String SID_SD_A11Y_P_NUMBER_N_STYLE
Text [ en-US ] = "Number";
};
-String SID_SD_A11Y_I_PREVIEW_N
-{
- Text [ en-US ] = "Preview View";
-};
-
-String SID_SD_A11Y_I_PREVIEW_D
-{
- Text [ en-US ] = "This is where you print preview pages.";
-};
-
-String SID_SD_A11Y_I_PREVIEW_SUFFIX
-{
- Text [ en-US ] = "(Preview mode)";
-};
-
String SID_SD_A11Y_D_PRESENTATION_READONLY
{
Text [ en-US ] = "(read-only)";
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
index 1c5c142..f6a6b05 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -66,13 +66,6 @@
#define STR_CUSTOMANIMATION_SCALE_PROPERTY RID_CUSTOMANIMATION_START+25
#define STR_CUSTOMANIMATION_SAMPLE RID_CUSTOMANIMATION_START+26
#define STR_CUSTOMANIMATION_BROWSE_SOUND RID_CUSTOMANIMATION_START+27
-#define STR_CUSTOMANIMATION_1_SPOKES RID_CUSTOMANIMATION_START+28
-#define STR_CUSTOMANIMATION_2_SPOKES RID_CUSTOMANIMATION_START+29
-#define STR_CUSTOMANIMATION_3_SPOKES RID_CUSTOMANIMATION_START+30
-#define STR_CUSTOMANIMATION_4_SPOKES RID_CUSTOMANIMATION_START+31
-#define STR_CUSTOMANIMATION_8_SPOKES RID_CUSTOMANIMATION_START+32
-#define STR_CUSTOMANIMATION_INSTANT RID_CUSTOMANIMATION_START+33
-#define STR_CUSTOMANIMATION_GRADUAL RID_CUSTOMANIMATION_START+34
#define STR_CUSTOMANIMATION_TRIGGER RID_CUSTOMANIMATION_START+35
#define STR_CUSTOMANIMATION_LIST_HELPTEXT RID_CUSTOMANIMATION_START+36
#define STR_CUSTOMANIMATION_USERPATH RID_CUSTOMANIMATION_START+37
diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src
index 156166c..c955cad 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -314,41 +314,6 @@ String STR_CUSTOMANIMATION_SAMPLE
Text [ en-US ] = "Sample";
};
-String STR_CUSTOMANIMATION_1_SPOKES
-{
- Text [ en-US ] = "1 Spoke";
-};
-
-String STR_CUSTOMANIMATION_2_SPOKES
-{
- Text [ en-US ] = "2 Spokes";
-};
-
-String STR_CUSTOMANIMATION_3_SPOKES
-{
- Text [ en-US ] = "3 Spokes";
-};
-
-String STR_CUSTOMANIMATION_4_SPOKES
-{
- Text [ en-US ] = "4 Spokes";
-};
-
-String STR_CUSTOMANIMATION_8_SPOKES
-{
- Text [ en-US ] = "8 Spokes";
-};
-
-String STR_CUSTOMANIMATION_INSTANT
-{
- Text [ en-US ] = "Instant";
-};
-
-String STR_CUSTOMANIMATION_GRADUAL
-{
- Text [ en-US ] = "Gradual";
-};
-
String STR_CUSTOMANIMATION_TRIGGER
{
Text [ en-US ] = "Trigger";
diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc
index 813c624..246c911 100644
--- a/sd/source/ui/annotations/annotations.hrc
+++ b/sd/source/ui/annotations/annotations.hrc
@@ -34,7 +34,6 @@
#define STR_ANNOTATION_UNDO_DELETE (RID_ANNOTATIONS_START+9)
#define STR_ANNOTATION_UNDO_MOVE (RID_ANNOTATIONS_START+10)
#define STR_ANNOTATION_UNDO_EDIT (RID_ANNOTATIONS_START+11)
-#define STR_ANNOTATION_UNDO_REPLY (RID_ANNOTATIONS_START+12)
#define STR_ANNOTATION_REPLY (RID_ANNOTATIONS_START+13)
// menus
diff --git a/sd/source/ui/annotations/annotations.src b/sd/source/ui/annotations/annotations.src
index 3704915..3fd1b68 100644
--- a/sd/source/ui/annotations/annotations.src
+++ b/sd/source/ui/annotations/annotations.src
@@ -191,11 +191,6 @@ String STR_ANNOTATION_UNDO_EDIT
Text [ en-US ] = "Edit Comment";
};
-String STR_ANNOTATION_UNDO_REPLY
-{
- Text [ en-US ] = "Reply to Comment";
-};
-
String STR_ANNOTATION_REPLY
{
Text [ en-US ] = "Reply to %1" ;
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index f5168a3..ff5be0a 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -267,19 +267,6 @@ Bitmap BMP_GRAPHIC
File = "graphic.png" ;
};
-String STR_STYLE_FILTER_USED
-{
- Text [ en-US ] = "Applied Styles" ;
-};
-String STR_STYLE_FILTER_USERDEF
-{
- Text [ en-US ] = "Custom Styles" ;
-};
-String STR_STYLE_FILTER_ALL
-{
- Text [ en-US ] = "All Styles" ;
-};
-
StringArray RID_GRAPHICSTYLEFAMILY
{
ItemList [ en-US ] =
@@ -355,11 +342,6 @@ Bitmap BMP_CUSTOM_ANIMATION_INDICATOR
File = "click_16.png";
};
-Bitmap BMP_COMMENTS_INDICATOR
-{
- File = "comments_indicator.png";
-};
-
// Presenter Screen bitmaps:
Bitmap BMP_PRESENTERSCREEN_BORDER_LEFT
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 092c18a..1ca79ff 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -52,10 +52,6 @@ String STR_SLIDE_OBJ_TOOLBOX
{
Text [ en-US ] = "Slide Object Bar" ;
};
-String STR_BEZIER_TOOLBOX
-{
- Text [ en-US ] = "Bézier Object Bar" ;
-};
String STR_GLUEPOINTS_TOOLBOX
{
Text [ en-US ] = "Glue Point Object Bar" ;
@@ -84,10 +80,6 @@ String STR_UNDO_SLIDE_PARAMS
{
Text [ en-US ] = "Slide parameter" ;
};
-String STR_UNDO_SLIDE_MOVE
-{
- Text [ en-US ] = "Move slide" ;
-};
String STR_UNDO_CUT
{
Text [ en-US ] = "Cut" ;
@@ -104,18 +96,6 @@ String STR_INSERTGRAPHIC
{
Text [ en-US ] = "Insert Image" ;
};
-String STR_SLOW
-{
- Text [ en-US ] = "Slow" ;
-};
-String STR_MEDIUM
-{
- Text [ en-US ] = "Medium" ;
-};
-String STR_FAST
-{
- Text [ en-US ] = "Fast" ;
-};
String STR_UNDO_BEZCLOSE
{
Text [ en-US ] = "Close Polygon" ;
@@ -181,10 +161,6 @@ String STR_AUTOLAYOUT_2CONTENT_CONTENT
{
Text [ en-US ] = "Title, 2 Content and Content" ;
};
-String STR_AUTOLAYOUT_CONTENT_OVER_2CONTENT
-{
- Text [ en-US ] = "Title, Content over 2 Content" ;
-};
String STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT
{
Text [ en-US ] = "Title, 2 Content over Content" ;
@@ -278,14 +254,6 @@ String STR_EXPORT_HTML_NAME
{
Text [ en-US ] = "Web Page";
};
-String STR_EXPORT_HTML_FILTER
-{
- Text = "*.html;*.htm" ;
-};
-String STR_EXPORT_DIALOG_TITLE
-{
- Text [ en-US ] = "Export" ;
-};
String STR_HTMLEXP_DEFAULT_EXTENSION
{
Text = ".html";
@@ -442,10 +410,6 @@ String STR_WARN_PRINTFORMAT_FAILURE
{
Text [ en-US ] = "The document format could not be set on the specified printer." ;
};
-String STR_REMOVE_LINK
-{
- Text [ en-US ] = "This image is linked to a document. \nDo you want to unlink the image in order to edit it?" ;
-};
String STR_IMPORT_GRFILTER_OPENERROR
{
Text [ en-US ] = "Image file cannot be opened" ;
@@ -494,18 +458,10 @@ String STR_UNDO_MODIFY_PAGE
{
Text [ en-US ] = "Slide layout" ;
};
-String STR_STATSTR_PRINT
-{
- Text [ en-US ] = "Printing..." ;
-};
String STR_UNDO_INSERT_FILE
{
Text [ en-US ] = "Insert file" ;
};
-String STR_SCALE_OBJS_TO_PAGE
-{
- Text [ en-US ] = "Should the image be scaled to the new slide format?" ;
-};
String STR_UNDO_INSERT_SPECCHAR
{
Text [ en-US ] = "Insert special character" ;
@@ -526,22 +482,6 @@ String STR_UNDO_ORIGINALSIZE
{
Text [ en-US ] = "Original Size" ;
};
-String STR_PRINT_DRAWING
-{
- Text [ en-US ] = " (Drawing)" ;
-};
-String STR_PRINT_NOTES
-{
- Text [ en-US ] = " (Notes)" ;
-};
-String STR_PRINT_HANDOUT
-{
- Text [ en-US ] = " (Handout)" ;
-};
-String STR_PRINT_OUTLINE
-{
- Text [ en-US ] = " (Outline)" ;
-};
String STR_WARN_SCALE_FAIL
{
Text [ en-US ] = "The specified scale is invalid.\nDo you want to enter a new one?" ;
@@ -574,14 +514,6 @@ String STR_CLICK_ACTION_DOCUMENT
{
Text [ en-US ] = "Go to document" ;
};
-String STR_CLICK_ACTION_VANISH
-{
- Text [ en-US ] = "Fade object" ;
-};
-String STR_CLICK_ACTION_INVISIBLE
-{
- Text [ en-US ] = "Hide object" ;
-};
String STR_CLICK_ACTION_SOUND
{
Text [ en-US ] = "Play audio" ;
@@ -631,10 +563,6 @@ String STR_EFFECTDLG_MACRO
Text [ en-US ] = "Macro" ;
};
// Strings for animation effects
-String STR_EFFECT_NONE
-{
- Text [ en-US ] = "No Effect" ;
-};
String STR_INSERT_TEXT
{
Text [ en-US ] = "Insert Text" ;
@@ -947,16 +875,6 @@ String STR_PRES_PAUSE
Text [ en-US ] = "Pause..." ;
};
-String STR_WIZARD_ORIGINAL
-{
- Text [ en-US ] = "<Original>";
-};
-
-String STR_ISLOADING
-{
- Text [ en-US ] = "Loading...";
-};
-
String STR_DRAW_GRAF_TOOLBOX
{
Text [ en-US ] = "Image Object Bar" ;
@@ -1107,38 +1025,6 @@ String STR_LEFT_PANE_DRAW_TITLE
{
Text [ en-US ] = "Pages";
};
-String STR_RIGHT_PANE_TITLE
-{
- Text [ en-US ] = "Tasks";
-};
-String STR_TASKPANEL_MASTER_PAGE_TITLE
-{
- Text [ en-US ] = "Master Pages";
-};
-String STR_TASKPANEL_MASTER_PAGE_MENU_TITLE
-{
- Text [ en-US ] = "View";
-};
-String STR_TASKPANEL_MASTER_PAGE_MENU_LOCK
-{
- Text [ en-US ] = "~Dock Task Pane";
-};
-String STR_TASKPANEL_MASTER_PAGE_MENU_UNLOCK
-{
- Text [ en-US ] = "~Undock Task Pane";
-};
-String STR_TASKPANEL_CURRENT_MASTER_PAGES_TITLE
-{
- Text [ en-US ] = "Used in This Presentation";
-};
-String STR_TASKPANEL_RECENT_MASTER_PAGES_TITLE
-{
- Text [ en-US ] = "Recently Used";
-};
-String STR_TASKPANEL_ALL_MASTER_PAGES_TITLE
-{
- Text [ en-US ] = "Available for Use";
-};
String STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION
{
Text [ en-US ] = "Preview not available";
@@ -1163,18 +1049,6 @@ String STR_CELL_STYLE_FAMILY
{
Text [ en-US ] = "Cell Styles";
};
-String DLG_TABLEDESIGNPANE
-{
- Text [ en-US ] = "Table Designs";
-};
-String STR_CUSTOMANIMATIONPANE
-{
- Text [ en-US ] = "Animation";
-};
-String STR_SLIDE_TRANSITION_PANE
-{
- Text [ en-US ] = "Slide Transition";
-};
String STR_NAVIGATOR_SHOW_NAMED_SHAPES
{
Text [ en-US ] = "Named shapes";
@@ -1192,11 +1066,6 @@ String STR_SET_BACKGROUND_PICTURE
Text [ en-US ] = "Set Background Image for Slide ..." ;
};
-String STR_ACC_DIALOG_DESC
-{
- Text [ en-US ] = "Select a template from which to import page designs." ;
-};
-
String RID_ANNOTATIONS_START
{
Text [ en-US ] = "Comments";
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 7df365e..79e05cb 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -19,8 +19,6 @@
#include "sfx2/sfx.hrc"
#include "cfgids.hxx"
-#define IMAGE_MASK_STDCOLOR Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
-
// Bitmaps for Tree-ListBox in Effects-TabDialog
#define BMP_PAGE RID_APP_START+42
#define BMP_PAGEOBJS RID_APP_START+43
@@ -47,8 +45,6 @@
#define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331
#define BMP_CUSTOM_ANIMATION_INDICATOR RID_SD_START+332
-#define BMP_COMMENTS_INDICATOR RID_SD_START+338
-
#define BMP_LAYOUT_EMPTY RID_SD_START+340
#define BMP_LAYOUT_HEAD01 RID_SD_START+342
#define BMP_LAYOUT_HEAD02 RID_SD_START+344
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 0de7b7b..2582ab3 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -23,7 +23,6 @@
#define STR_INSERTPAGE (RID_APP_START+35)
#define STR_INSERTLAYER (RID_APP_START+37)
#define STR_MODIFYLAYER (RID_APP_START+38)
-#define STR_UNDO_SLIDE_MOVE (RID_APP_START+41)
#define STR_UNDO_REPLACE (RID_APP_START+42)
/*
@@ -68,10 +67,6 @@
#define STR_ASK_DELETE_ALL_PICTURES (RID_APP_START+92)
#define STR_WARN_PAGE_EXISTS (RID_APP_START+93)
-#define STR_SLOW (RID_APP_START+112)
-#define STR_MEDIUM (RID_APP_START+113)
-#define STR_FAST (RID_APP_START+114)
-
#define STR_SLIDE_SORTER_MODE (RID_APP_START+121)
#define STR_NORMAL_MODE (RID_APP_START+122)
#define STR_OUTLINE_MODE (RID_APP_START+123)
@@ -103,8 +98,6 @@
#define STR_POPUP_DELETE_SNAPLINE (RID_APP_START+160)
#define STR_POPUP_DELETE_SNAPPOINT (RID_APP_START+161)
-#define STR_SCALE_OBJS_TO_PAGE (RID_APP_START+162)
-
#define STR_EYEDROPPER (RID_APP_START+163)
#define STR_UNDO_MORPHING (RID_APP_START+164)
@@ -121,7 +114,6 @@
#define STR_SLIDE_TOOLBOX RID_SLIDE_TOOLBOX
#define STR_DRAW_OBJ_TOOLBOX RID_DRAW_OBJ_TOOLBOX
#define STR_SLIDE_OBJ_TOOLBOX RID_SLIDE_OBJ_TOOLBOX
-#define STR_BEZIER_TOOLBOX RID_BEZIER_TOOLBOX
#define STR_DRAW_TEXT_TOOLBOX RID_DRAW_TEXT_TOOLBOX
#define STR_OUTLINE_TOOLBOX RID_OUTLINE_TOOLBOX
#define STR_GLUEPOINTS_TOOLBOX RID_GLUEPOINTS_TOOLBOX
@@ -141,7 +133,6 @@
#define STR_AUTOLAYOUT_2CONTENT (RID_APP_START+215)
#define STR_AUTOLAYOUT_CONTENT_2CONTENT (RID_APP_START+217)
#define STR_AUTOLAYOUT_2CONTENT_CONTENT (RID_APP_START+218)
-#define STR_AUTOLAYOUT_CONTENT_OVER_2CONTENT (RID_APP_START+219)
#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT (RID_APP_START+220)
#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT (RID_APP_START+221)
#define STR_AUTOLAYOUT_4CONTENT (RID_APP_START+222)
@@ -161,8 +152,6 @@
#define STR_TRANSFORM (RID_APP_START+240)
#define STR_EXPORT_HTML_NAME (RID_APP_START+244)
-#define STR_EXPORT_HTML_FILTER (RID_APP_START+245)
-#define STR_EXPORT_DIALOG_TITLE (RID_APP_START+261)
#define STR_TWAIN_NO_SOURCE_UNX (RID_APP_START+262)
#define STR_UNDO_DELETEPAGES (RID_APP_START+265)
#define STR_UNDO_INSERTPAGES (RID_APP_START+266)
@@ -195,7 +184,6 @@
#define STR_DELETE_PAGES (RID_APP_START+332)
#define STR_WARN_PRINTFORMAT_FAILURE (RID_APP_START+333)
-#define STR_REMOVE_LINK (RID_APP_START+334)
#define STR_IMPORT_GRFILTER_OPENERROR (RID_APP_START+335)
#define STR_IMPORT_GRFILTER_IOERROR (RID_APP_START+336)
@@ -210,17 +198,13 @@
#define STR_ASK_FOR_CONVERT_TO_BEZIER (RID_APP_START+347)
#define STR_UNDO_CHANGE_PRES_OBJECT (RID_APP_START+349)
#define STR_UNDO_MODIFY_PAGE (RID_APP_START+350)
-#define STR_STATSTR_PRINT (RID_APP_START+351)
+// empty
#define STR_UNDO_INSERT_FILE (RID_APP_START+352)
#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START+353)
#define STR_UNDO_SET_PRESLAYOUT (RID_APP_START+354)
#define STR_PLAY (RID_APP_START+356)
#define STR_STOP (RID_APP_START+357)
#define STR_UNDO_ORIGINALSIZE (RID_APP_START+359)
-#define STR_PRINT_DRAWING (RID_APP_START+361)
-#define STR_PRINT_NOTES (RID_APP_START+362)
-#define STR_PRINT_HANDOUT (RID_APP_START+363)
-#define STR_PRINT_OUTLINE (RID_APP_START+364)
#define STR_WARN_SCALE_FAIL (RID_APP_START+365)
// strings for click-effects (Keep the sequence)
@@ -231,8 +215,6 @@
#define STR_CLICK_ACTION_LASTPAGE (RID_APP_START+370)
#define STR_CLICK_ACTION_BOOKMARK (RID_APP_START+371)
#define STR_CLICK_ACTION_DOCUMENT (RID_APP_START+372)
-#define STR_CLICK_ACTION_VANISH (RID_APP_START+373)
-#define STR_CLICK_ACTION_INVISIBLE (RID_APP_START+374)
#define STR_CLICK_ACTION_SOUND (RID_APP_START+375)
#define STR_CLICK_ACTION_VERB (RID_APP_START+376)
#define STR_CLICK_ACTION_PROGRAM (RID_APP_START+377)
@@ -254,8 +236,6 @@
* See also: res_bmp.hrc, popup.src
*/
-#define STR_EFFECT_NONE (RID_APP_START+400)
-
#define STR_INSERT_TEXT (RID_APP_START+432)
#define STR_SLIDE_SINGULAR (RID_APP_START+433)
#define STR_SLIDE_PLURAL (RID_APP_START+434)
@@ -318,10 +298,6 @@
#define STR_PRES_SOFTEND (RID_APP_START+550)
#define STR_PRES_PAUSE (RID_APP_START+551)
-#define STR_WIZARD_ORIGINAL (RID_APP_START+552)
-
-#define STR_ISLOADING (RID_APP_START+554)
-
#define STR_WEBVIEW_SAVE (RID_APP_START+555)
#define STR_UNDO_APPLY_3D_FAVOURITE (RID_APP_START+556)
@@ -380,14 +356,6 @@
#define STR_LEFT_PANE_DRAW_TITLE (RID_APP_START+700)
#define STR_LEFT_PANE_IMPRESS_TITLE (RID_APP_START+701)
-#define STR_RIGHT_PANE_TITLE (RID_APP_START+702)
-#define STR_TASKPANEL_MASTER_PAGE_TITLE (RID_APP_START+703)
-#define STR_TASKPANEL_MASTER_PAGE_MENU_TITLE (RID_APP_START+704)
-#define STR_TASKPANEL_MASTER_PAGE_MENU_LOCK (RID_APP_START+705)
-#define STR_TASKPANEL_MASTER_PAGE_MENU_UNLOCK (RID_APP_START+706)
-#define STR_TASKPANEL_CURRENT_MASTER_PAGES_TITLE (RID_APP_START+708)
-#define STR_TASKPANEL_RECENT_MASTER_PAGES_TITLE (RID_APP_START+709)
-#define STR_TASKPANEL_ALL_MASTER_PAGES_TITLE (RID_APP_START+710)
#define STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION (RID_APP_START+711)
#define STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION (RID_APP_START+712)
#define STR_TASKPANEL_LAYOUT_MENU_TITLE (RID_APP_START+713)
@@ -409,8 +377,6 @@
#define STRING_DRAG_AND_DROP_PAGES (RID_APP_START+727)
#define STRING_DRAG_AND_DROP_SLIDES (RID_APP_START+728)
-#define STR_ACC_DIALOG_DESC (RID_APP_START+729)
-
#define STR_PHOTO_ALBUM_EMPTY_WARNING (RID_APP_START+730)
#define STR_PHOTO_ALBUM_TEXTBOX (RID_APP_START+731)
@@ -418,7 +384,6 @@
#define STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS (RID_APP_START+733)
#define STR_IMPRESS_PRINT_UI_GROUP_NAME (RID_APP_START+734)
-#define STR_IMPRESS_PRINT_UI_PRINT_CONTENT (RID_APP_START+735)
#define STR_IMPRESS_PRINT_UI_PRINT_GROUP (RID_APP_START+736)
#define STR_IMPRESS_PRINT_UI_CONTENT (RID_APP_START+737)
#define STR_IMPRESS_PRINT_UI_CONTENT_CHOICES (RID_APP_START+738)
@@ -430,7 +395,6 @@
#define STR_IMPRESS_PRINT_UI_IS_PRINT_NAME (RID_APP_START+744)
#define STR_IMPRESS_PRINT_UI_IS_PRINT_DATE (RID_APP_START+745)
#define STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN (RID_APP_START+746)
-#define STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP (RID_APP_START+747)
#define STR_IMPRESS_PRINT_UI_QUALITY (RID_APP_START+748)
#define STR_IMPRESS_PRINT_UI_QUALITY_CHOICES (RID_APP_START+749)
#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS (RID_APP_START+750)
@@ -440,7 +404,6 @@
#define STR_IMPRESS_PRINT_UI_PAGE_SIDES (RID_APP_START+754)
#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE (RID_APP_START+755)
#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST (RID_APP_START+756)
-#define STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP (RID_APP_START+757)
#define STR_IMPRESS_PRINT_UI_PAPER_TRAY (RID_APP_START+758)
#define STR_IMPRESS_PRINT_UI_PAGE_RANGE (RID_APP_START+759)
#define STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE (RID_APP_START+760)
diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src
index 7e7e7ee..c5c6852 100644
--- a/sd/source/ui/view/DocumentRenderer.src
+++ b/sd/source/ui/view/DocumentRenderer.src
@@ -24,10 +24,6 @@ String STR_IMPRESS_PRINT_UI_GROUP_NAME
{
Text [en-US] = "%PRODUCTNAME %s";
};
-String STR_IMPRESS_PRINT_UI_PRINT_CONTENT
-{
- Text [ en-US ] = "Print content";
-};
String STR_IMPRESS_PRINT_UI_PRINT_GROUP
{
Text [ en-US ] = "Print";
@@ -95,10 +91,6 @@ String STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN
{
Text [ en-US ] = "Hidden pages";
};
-String STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP
-{
- Text [ en-US ] = "Output options";
-};
String STR_IMPRESS_PRINT_UI_QUALITY
{
Text [ en-US ] = "Color";
@@ -158,10 +150,6 @@ StringArray STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST
};
};
-String STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP
-{
- Text [ en-US ] = "Paper tray";
-};
String STR_IMPRESS_PRINT_UI_PAPER_TRAY
{
Text [ en-US ] = "~Use only paper tray from printer preferences";
More information about the Libreoffice-commits
mailing list