summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-05-18 16:56:16 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-05-19 20:04:22 +0200
commit3db8d606d5cdb5f0569a4263d4793c17920d0ae1 (patch)
treee8b5e1e6275c4ccc0cd55c94e39ae7d8bc598e4e /sd
parente175eb3cedded28909247f4d46f2c17ff2f58be2 (diff)
hrc and src files: squeeze multiple newlines
for i in `find . -name *.src -or -name *.hrc`; do FILE=$(cat -s "$i"); echo "$FILE" > "$i"; done Change-Id: I2bac5ad3e1eb3c566e5c867ccf45893a19e1561e
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/app.hrc1
-rw-r--r--sd/inc/glob.hrc1
-rw-r--r--sd/source/core/glob.src1
-rw-r--r--sd/source/filter/html/pubdlg.src1
-rw-r--r--sd/source/ui/app/menuids_tmpl.src5
-rw-r--r--sd/source/ui/app/popup.src11
-rw-r--r--sd/source/ui/app/popup2_tmpl.src22
-rw-r--r--sd/source/ui/app/res_bmp.src2
-rw-r--r--sd/source/ui/app/tbxids_tmpl.src3
-rw-r--r--sd/source/ui/inc/pubdlg.hrc15
-rw-r--r--sd/source/ui/inc/res_bmp.hrc1
-rw-r--r--sd/source/ui/inc/strings.hrc2
12 files changed, 0 insertions, 65 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index aa15783071f7..ef8631f9e662 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -395,7 +395,6 @@
#define SID_EDIT_HYPERLINK (SID_SD_START+382)
-
#define SID_OUTPUT_QUALITY_CONTRAST (SID_SD_START+400)
#define SID_PREVIEW_QUALITY_CONTRAST (SID_SD_START+401)
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 8a764af0347b..3e2d4a41228d 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -133,7 +133,6 @@
#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
#define RID_ANNOTATIONS_START RID_GLOB_START+200
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index 0e6f235b963e..bebd5d65c55c 100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
@@ -386,7 +386,6 @@ String STR_POOLSHEET_ARROW
Text [ en-US ] = "Arrow" ;
};
-
String STR_LOAD_DOC
{
Text [ en-US ] = "Load Document" ;
diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src
index 21a46aea5dd9..7bfc21ecc31d 100644
--- a/sd/source/filter/html/pubdlg.src
+++ b/sd/source/filter/html/pubdlg.src
@@ -80,7 +80,6 @@ ModalDialog DLG_PUBLISHING
Text [ en-US ] = "Select an existing design or create a new one";
};
-
// Page 2, type of publishing
FixedLine PAGE2_TITEL
{
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index 9a5c5c6fab49..30ee1adb2844 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -111,7 +111,6 @@
Text [ en-US ] = "~Page Setup..." ; \
};
-
#define MN_INSERT_SLIDE \
MenuItem\
{\
@@ -165,7 +164,6 @@
Text [ en-US ] = "Display Objects from Master" ; \
};
-
#define MN_PAGE_MENU \
MenuItem\
{\
@@ -237,8 +235,6 @@
Text [ en-US ] = "D~elete Master" ; \
};
-
-
#define MN_DELETE_PAGE \
MenuItem\
{\
@@ -830,7 +826,6 @@
Text [ en-US ] = "~Delete" ; \
};
-
#define MN_SET_DEFAULT\
MenuItem\
{\
diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src
index 527a572465b1..7f8692f35924 100644
--- a/sd/source/ui/app/popup.src
+++ b/sd/source/ui/app/popup.src
@@ -230,8 +230,6 @@ Menu RID_FORM_CONTROL_POPUP
};
};
-
-
Menu RID_DRAW_SNAPOBJECT_POPUP
{
ItemList =
@@ -242,7 +240,6 @@ Menu RID_DRAW_SNAPOBJECT_POPUP
};
};
-
Menu RID_DRAW_GLUEPOINT_POPUP
{
ItemList =
@@ -266,7 +263,6 @@ Menu RID_DRAW_GLUEPOINT_POPUP
};
};
-
Menu RID_SLIDE_SORTER_IMPRESS_SEL_POPUP
{
ItemList =
@@ -285,7 +281,6 @@ Menu RID_SLIDE_SORTER_IMPRESS_SEL_POPUP
};
};
-
Menu RID_SLIDE_SORTER_IMPRESS_NOSEL_POPUP
{
ItemList =
@@ -304,7 +299,6 @@ Menu RID_SLIDE_SORTER_DRAW_SEL_POPUP
};
};
-
Menu RID_SLIDE_SORTER_DRAW_NOSEL_POPUP
{
ItemList =
@@ -325,7 +319,6 @@ Menu RID_SLIDE_SORTER_MASTER_SEL_POPUP
};
};
-
Menu RID_SLIDE_SORTER_MASTER_NOSEL_POPUP
{
ItemList =
@@ -334,7 +327,6 @@ Menu RID_SLIDE_SORTER_MASTER_NOSEL_POPUP
};
};
-
Menu RID_OUTLINE_POPUP
{
ItemList =
@@ -354,7 +346,6 @@ Menu RID_OUTLINE_POPUP
};
};
-
Menu RID_BEZIER_POPUP
{
ItemList =
@@ -363,7 +354,6 @@ Menu RID_BEZIER_POPUP
};
};
-
Menu RID_LAYERTAB_POPUP
{
ItemList =
@@ -441,7 +431,6 @@ Menu RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP
Text [ en-US ] = "Apply to ~Selected Slides";
};
-
SEPARATOR
MenuItem
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index 0cb12a0e64de..e5d23ab09f92 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-
#include "menuids3.src"
#ifndef SD_POPUP
@@ -26,9 +24,6 @@
#include "menuids.src"
#endif
-
-
-
// TEXTOBJ_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_TEXTOBJ_POPUP
@@ -69,7 +64,6 @@
};
};
-
// OUTLINETEXTOBJ_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_OUTLINETEXTOBJ_POPUP
@@ -111,7 +105,6 @@
};
};
-
// GEOMOBJ_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_GEOMOBJ_POPUP
@@ -154,7 +147,6 @@
};
};
-
// Customshape POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_CUSTOMSHAPE_POPUP
@@ -199,7 +191,6 @@
};
};
-
// 3DOSCENE_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_3DSCENE_POPUP
@@ -237,7 +228,6 @@
};
};
-
// 3DOSCENE2_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_3DSCENE2_POPUP
@@ -276,7 +266,6 @@
};
};
-
// 3DOBJ_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_3DOBJ_POPUP
@@ -314,7 +303,6 @@
};
};
-
// GROUPOBJ_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_GROUPOBJ_POPUP
@@ -354,7 +342,6 @@
};
};
-
// LINEOBJ_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_LINEOBJ_POPUP
@@ -395,7 +382,6 @@
};
};
-
// EDGEOBJ_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_EDGEOBJ_POPUP
@@ -438,7 +424,6 @@
};
};
-
// MEASUREOBJ_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_MEASUREOBJ_POPUP
@@ -481,8 +466,6 @@
};
};
-
-
// POLYLINEOBJ_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_POLYLINEOBJ_POPUP
@@ -525,7 +508,6 @@
};
};
-
// NOSEL_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_NOSEL_POPUP
@@ -555,7 +537,6 @@
};
};
-
// MULTISELECTION_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_MULTISELECTION_POPUP
@@ -595,7 +576,6 @@
};
};
-
// GRAPHIC_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_GRAPHIC_POPUP
@@ -708,7 +688,6 @@
};
};
-
// Media_POPUP
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_MEDIA_POPUP
@@ -739,7 +718,6 @@
};
};
-
// Table shape context menu
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
Menu RID_DRAW_TABLE_POPUP
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 6596db03f0ca..c68e9ada945a 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -336,8 +336,6 @@ Bitmap BMP_WAIT_ICON
File = "waiticon.bmp";
};
-
-
Bitmap BMP_FADE_EFFECT_INDICATOR
{
File = "fade_effect_indicator.bmp";
diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src
index 57dd9cba545d..218225a198fa 100644
--- a/sd/source/ui/app/tbxids_tmpl.src
+++ b/sd/source/ui/app/tbxids_tmpl.src
@@ -259,7 +259,6 @@
Hide = TRUE; \
};
-
// Object bar
#define TBI_FORMAT_BEZIER_EDIT_RC \
@@ -326,8 +325,6 @@
Hide = TRUE; \
};
-
-
// Option bar
#define TBI_FORMAT_BEZIER_EDIT \
diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc
index 83f393396f04..9e2ea15ddf46 100644
--- a/sd/source/ui/inc/pubdlg.hrc
+++ b/sd/source/ui/inc/pubdlg.hrc
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#define PAGE1_TITEL 2
#define PAGE1_NEW_DESIGN 3
#define PAGE1_OLD_DESIGN 4
@@ -25,8 +24,6 @@
#define PAGE1_DEL_DESIGN 6
#define PAGE1_DESC 7
-
-
#define PAGE2_TITEL 21
#define PAGE2_STANDARD 22
#define PAGE2_FRAMES 23
@@ -61,8 +58,6 @@
#define PAGE2_CGI 48
#define PAGE2_VERT 49
-
-
#define PAGE3_TITEL_1 51
#define PAGE3_PNG 51
#define PAGE3_GIF 52
@@ -78,8 +73,6 @@
#define PAGE3_VERT 62
#define PAGE3_HIDDEN_SLIDES 63
-
-
#define PAGE4_TITEL_1 66
#define PAGE4_AUTHOR_TXT 67
#define PAGE4_AUTHOR 68
@@ -92,14 +85,10 @@
#define PAGE4_DOWNLOAD 75
#define PAGE4_CREATED 76
-
-
#define PAGE5_TITEL 81
#define PAGE5_TEXTONLY 82
#define PAGE5_BUTTONS 83
-
-
#define PAGE6_TITEL 101
#define PAGE6_DEFAULT 102
#define PAGE6_USER 103
@@ -111,8 +100,6 @@
#define PAGE6_DOCCOLORS 109
#define PAGE6_PREVIEW 111
-
-
#define BUT_LAST 200
#define BUT_NEXT 201
#define BUT_FINISH 202
@@ -120,8 +107,6 @@
#define BUT_HELP 204
#define BOTTOM_LINE 205
-
-
#define DLG_PUBLISHING 739
/* 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 79896d165fc2..23a401474a7d 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -252,7 +252,6 @@
#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
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index dcc60424cf49..276e3a0b670d 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -253,7 +253,6 @@
#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)
@@ -287,7 +286,6 @@
#define STR_NEW_CUSTOMSHOW (RID_APP_START+512)
#define STR_COPY_CUSTOMSHOW (RID_APP_START+513)
-
#define STR_BREAK_METAFILE (RID_APP_START+521)
#define STR_BREAK_FAIL (RID_APP_START+522)