diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2014-05-18 16:56:16 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-05-19 20:04:22 +0200 |
commit | 3db8d606d5cdb5f0569a4263d4793c17920d0ae1 (patch) | |
tree | e8b5e1e6275c4ccc0cd55c94e39ae7d8bc598e4e /svx | |
parent | fdo#77891 fix python crash when in GUI mode, target WinXP with VS2012 (diff) | |
download | core-3db8d606d5cdb5f0569a4263d4793c17920d0ae1.tar.gz core-3db8d606d5cdb5f0569a4263d4793c17920d0ae1.zip |
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 'svx')
-rw-r--r-- | svx/inc/globlmn_tmpl.hrc | 6 | ||||
-rw-r--r-- | svx/source/accessibility/accessibility.src | 3 | ||||
-rw-r--r-- | svx/source/dialog/bmpmask.src | 2 | ||||
-rw-r--r-- | svx/source/dialog/contdlg.hrc | 5 | ||||
-rw-r--r-- | svx/source/dialog/contdlg.src | 1 | ||||
-rw-r--r-- | svx/source/dialog/docrecovery.hrc | 1 | ||||
-rw-r--r-- | svx/source/dialog/imapdlg.hrc | 6 | ||||
-rw-r--r-- | svx/source/dialog/imapdlg.src | 2 | ||||
-rw-r--r-- | svx/source/dialog/prtqry.src | 1 | ||||
-rw-r--r-- | svx/source/dialog/sdstring.src | 22 | ||||
-rw-r--r-- | svx/source/engine3d/float3d.src | 1 | ||||
-rw-r--r-- | svx/source/items/svxitems.src | 1 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.src | 1 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextPropertyPanel.src | 3 | ||||
-rw-r--r-- | svx/source/src/app.hrc | 1 | ||||
-rw-r--r-- | svx/source/src/app.src | 1 | ||||
-rw-r--r-- | svx/source/stbctrls/stbctrls.src | 1 | ||||
-rw-r--r-- | svx/source/svdraw/svdstr.src | 7 | ||||
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.src | 1 |
19 files changed, 0 insertions, 66 deletions
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index 9ba061fcc8d8..6a650fabfba2 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -128,7 +128,6 @@ Command = CMD_SID_SET_SUB_SCRIPT; \ Text [ en-US ] = "Su~bscript"; \ - #define ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT \ Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ Command = ".uno:LeftPara" ; \ @@ -239,7 +238,6 @@ Command = ".uno:ToggleObjectBezierMode" ; \ Text [ en-US ] = "Edit ~Points" ;\ - #define ITEM_EDIT_PASTE \ Identifier = SID_PASTE ; \ Command = ".uno:Paste" ; \ @@ -275,7 +273,6 @@ Command = ".uno:Zoom" ; \ Text [ en-US ] = "~Zoom..." ; \ - #define ITEM_FORMAT_NUMBERING \ MenuItem\ {\ @@ -283,7 +280,6 @@ Text [ en-US ] = "~Bullets and Numbering..." ; \ }; - #define ITEM_POLY_MERGE \ MenuItem\ {\ @@ -323,7 +319,6 @@ };\ }; - /*------------------------------------------------------------------------ Context Menus ------------------------------------------------------------------------*/ @@ -517,7 +512,6 @@ Command = CMD_SID_OPEN_SMARTTAGMENU; \ Text [ en-US ] = "Open ~Smart Tag Menu" ; \ - #endif // #ifndef _GLOBLMN_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src index 56b85cb28bdb..66722c87d262 100644 --- a/svx/source/accessibility/accessibility.src +++ b/svx/source/accessibility/accessibility.src @@ -64,7 +64,6 @@ String RID_SVXSTR_A11Y_AND Text [ en-US ] = "and" ; }; - // SvxRectCtl String RID_SVXSTR_RECTCTL_ACC_CORN_NAME @@ -87,7 +86,6 @@ String RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR Text [ en-US ] = "Selection of a major angle." ; }; - String RID_SVXSTR_RECTCTL_ACC_CHLD_LT { Text [ en-US ] = "Top left" ; @@ -133,7 +131,6 @@ String RID_SVXSTR_RECTCTL_ACC_CHLD_RB Text [ en-US ] = "Bottom right" ; }; - String RID_SVXSTR_RECTCTL_ACC_CHLD_A000 { Text [ en-US ] = "0 degrees" ; diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index 4d613641b27f..53f59d45d45b 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -22,10 +22,8 @@ #include "bmpmask.hrc" #include "helpid.hrc" - #define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; - // RID_SVXDLG_BMPMASK ---------------------------------------------------- DockingWindow RID_SVXDLG_BMPMASK { diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc index aec18aa74e5e..cae14d19a6e8 100644 --- a/svx/source/dialog/contdlg.hrc +++ b/svx/source/dialog/contdlg.hrc @@ -18,14 +18,11 @@ */ #include <svx/dialogs.hrc> - // ImapDlg dialog #define RID_SVX_CONTOURDLG_START RID_SVX_CONTOUR_START - /******************************************************************************/ - #define RID_SVXDLG_CONTOUR (RID_SVX_CONTOURDLG_START) #define TBX1 1 @@ -58,8 +55,6 @@ #define CD_IMAPDLG 1300 - /******************************************************************************/ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src index 43f3f4d2a638..e3dd2dc4d576 100644 --- a/svx/source/dialog/contdlg.src +++ b/svx/source/dialog/contdlg.src @@ -155,7 +155,6 @@ FloatingWindow RID_SVXDLG_CONTOUR Identifier = TBI_REDO ; HelpId = HID_CONTDLG_REDO ; - Text [ en-US ] = "Redo " ; }; ToolBoxItem diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc index 288a125d8956..7ede1369699c 100644 --- a/svx/source/dialog/docrecovery.hrc +++ b/svx/source/dialog/docrecovery.hrc @@ -41,7 +41,6 @@ #define FL_SAVE_BOTTOM 8 #define BT_SAVE_OK 9 - #define SAVE_WIDTH 290 #define SAVE_HEIGHT 238 #define SAVE_TITLEWINHEIGHT 36 diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc index bcc2569e880a..c290b6ea7900 100644 --- a/svx/source/dialog/imapdlg.hrc +++ b/svx/source/dialog/imapdlg.hrc @@ -18,14 +18,11 @@ */ #include <svx/dialogs.hrc> - // ImapDlg-Dialog #define RID_SVX_IMAPDLG_START RID_SVX_IMAP_START - /******************************************************************************/ - #define RID_SVXDLG_IMAP (RID_SVX_IMAPDLG_START) #define RID_SVXCTL_IMAP (RID_SVX_IMAPDLG_START + 7) @@ -63,7 +60,6 @@ /******************************************************************************/ - #define RID_SVXMN_IMAP (RID_SVX_IMAPDLG_START + 1) #define MN_URL 1 @@ -79,11 +75,9 @@ /******************************************************************************/ - #define RID_SVXCTL_FT_TARGET (RID_SVX_IMAPDLG_START + 3) #define RID_SVXCTL_CBB_TARGET (RID_SVX_IMAPDLG_START + 4) - /******************************************************************************/ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src index 486217ae0a28..9bc815b26984 100644 --- a/svx/source/dialog/imapdlg.src +++ b/svx/source/dialog/imapdlg.src @@ -230,7 +230,6 @@ ModelessDialog RID_SVXDLG_IMAP HScroll = TRUE ; }; - #define IMAPDLG_IDLIST \ IdList = \ { \ @@ -344,5 +343,4 @@ Menu RID_SVXMN_IMAP /******************************************************************************/ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/prtqry.src b/svx/source/dialog/prtqry.src index d49d65702edd..57fe9f976041 100644 --- a/svx/source/dialog/prtqry.src +++ b/svx/source/dialog/prtqry.src @@ -19,7 +19,6 @@ #include <svx/dialogs.hrc> - String RID_SVXSTR_QRY_PRINT_TITLE { Text [ en-US ] = "Printing selection"; diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index f4387bc36591..9fad4bcff161 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -185,7 +185,6 @@ String STR_INSERT_VIDEO_TITLE Text [ en-US ] = "Insert video" ; }; - // BM: some additional standard colors String RID_SVXSTR_COLOR_VIOLET @@ -347,11 +346,8 @@ String RID_SVXSTR_LINECAP_SQUARE Text [ en-US ] = "Line cap square"; }; - - // Reference-strings for standardcolor-table - /* do not translate */ String RID_SVXSTR_COLOR_BLACK_DEF { @@ -484,11 +480,8 @@ String RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF Text = "Blue classic" ; }; - - // Reference-strings for standard-gradient-table - /* do not translate */ String RID_SVXSTR_GRDT0_DEF { @@ -1249,11 +1242,8 @@ String RID_SVXSTR_GRDT69 Text [ en-US ] = "Green Gradient"; }; - - // Reference-strings for standard-hatch-table - /* do not translate */ String RID_SVXSTR_HATCH0_DEF { @@ -1355,11 +1345,8 @@ String RID_SVXSTR_HATCH10 Text [ en-US ] = "Hatching" ; }; - - // Reference-strings for standard-bitmap-table - /* do not translate */ String RID_SVXSTR_BMP0_DEF { @@ -1562,10 +1549,8 @@ String RID_SVXSTR_BMP21 Text [ en-US ] = "Bitmap"; }; - // Reference-strings for standard-dash-table - /* do not translate */ String RID_SVXSTR_DASH0_DEF { @@ -1687,11 +1672,8 @@ String RID_SVXSTR_DASH12 Text [ en-US ] = "Line Style"; }; - - // Reference-strings for standard-line-end-table - /* do not translate */ String RID_SVXSTR_LEND0_DEF { @@ -1885,11 +1867,8 @@ String RID_SVXSTR_LEND20 Text [ en-US ] = "Arrowhead"; }; - - // Reference-strings for standard transparence gradients - /* do not translate */ String RID_SVXSTR_TRASNGR0_DEF { @@ -1901,7 +1880,6 @@ String RID_SVXSTR_TRASNGR0 Text [ en-US ] = "Transparency"; }; - // RID_SVXSTR_FIELDUNIT_TABLE -------------------------------------------- StringArray RID_SVXSTR_FIELDUNIT_TABLE diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index a2618aa1d6e3..6ce305325316 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -49,7 +49,6 @@ #define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }; - DockingWindow RID_SVXFLOAT_3D { HelpID = CMD_SID_3D_WIN ; diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src index 587d97a35026..3121ea9f5b9b 100644 --- a/svx/source/items/svxitems.src +++ b/svx/source/items/svxitems.src @@ -87,7 +87,6 @@ StringArray RID_ATTR_NAMES }; }; - String RID_SVXITEMS_EXTRAS_CHARCOLOR { Text [ en-US ] = "Font color" ; diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src index 09525909cdc8..b24b1ec1a915 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.src +++ b/svx/source/sidebar/area/AreaPropertyPanel.src @@ -188,7 +188,6 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR SpinSize = 5 ; }; - ToolBox BTN_LEFT_SECOND { Border = FALSE ; diff --git a/svx/source/sidebar/text/TextPropertyPanel.src b/svx/source/sidebar/text/TextPropertyPanel.src index b8f60b929863..62811f617079 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.src +++ b/svx/source/sidebar/text/TextPropertyPanel.src @@ -20,7 +20,6 @@ #include <sfx2/sidebar/ResourceDefinitions.hrc> #include "helpid.hrc" - Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE { OutputSize = TRUE; @@ -47,7 +46,6 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE Text [ en-US ] = "~More Options..."; }; - Image IMG_SINGLE { ImageBitmap = Bitmap{File = "symphony/line1.bmp";}; @@ -180,7 +178,6 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE }; - Control RID_POPUPPANEL_TEXTPAGE_SPACING { OutputSize = TRUE; diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index e94b4f3ee4c6..68afcee64aff 100644 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -131,7 +131,6 @@ #error Resource-Ueberlauf bei den HIDs der OFA #endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/src/app.src b/svx/source/src/app.src index e33edf7fbbb5..b2e90d23554d 100644 --- a/svx/source/src/app.src +++ b/svx/source/src/app.src @@ -20,7 +20,6 @@ #include <svx/svxids.hrc> #include "app.hrc" - String RID_APPTITLE { Text = "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION" ; diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src index c4908e383e7b..a9e98a7c775c 100644 --- a/svx/source/stbctrls/stbctrls.src +++ b/svx/source/stbctrls/stbctrls.src @@ -289,7 +289,6 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED MaskColor = STD_MASKCOLOR; }; - Image RID_SVXBMP_SLIDERBUTTON { ImageBitmap = Bitmap diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index 957c2aeeff51..364749a015fc 100644 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -440,7 +440,6 @@ String STR_ObjNamePluralGRAFMACLNK Text [ en-US ] = "Linked Mac graphics" ; }; - // Svg support String STR_ObjNameSingulGRAFSVG @@ -452,7 +451,6 @@ String STR_ObjNamePluralGRAFSVG Text [ en-US ] = "SVGs" ; }; - String STR_ObjNameSingulOLE2 { Text [ en-US ] = "embedded object (OLE)" ; @@ -545,7 +543,6 @@ String STR_ObjNameSingulPlural Text [ en-US ] = "draw object(s)" ; }; - // New in 537: names for 3D objects String STR_ObjNameSingulCube3d { @@ -622,7 +619,6 @@ String STR_ObjNamePluralSphere3d Text [ en-US ] = "spheres"; }; - String STR_EditWithCopy { Text [ en-US ] = "with copy" ; @@ -1110,7 +1106,6 @@ String STR_StandardLayerName Text [ en-US ] = "Standard" ; }; - String STR_ItemValON { Text [ en-US ] = "on" ; @@ -1331,7 +1326,6 @@ String STR_ItemValCIRC_ARC Text [ en-US ] = "Arc" ; }; - String STR_ItemNam_SHADOW { Text [ en-US ] = "Shadow" ; @@ -1561,7 +1555,6 @@ String STR_ItemNam_SHEARANGLE Text [ en-US ] = "Shear angle" ; }; - // Now: bitmaps: Bitmap BMAP_GrafikEi { File = "grafikei.png" ; }; Bitmap BMAP_GrafikDe { File = "grafikde.png" ; }; diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src index 3600a28cc02c..cb7afff74e17 100644 --- a/svx/source/tbxctrls/extrusioncontrols.src +++ b/svx/source/tbxctrls/extrusioncontrols.src @@ -198,7 +198,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH }; }; - DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING { HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_LIGHTING"; |