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 /include | |
parent | e175eb3cedded28909247f4d46f2c17ff2f58be2 (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 'include')
-rw-r--r-- | include/editeng/editids.hrc | 1 | ||||
-rw-r--r-- | include/editeng/editrids.hrc | 1 | ||||
-rw-r--r-- | include/editeng/memberids.hrc | 1 | ||||
-rw-r--r-- | include/formula/compiler.hrc | 1 | ||||
-rw-r--r-- | include/sfx2/sfx.hrc | 16 | ||||
-rw-r--r-- | include/sfx2/sfxsids.hrc | 13 | ||||
-rw-r--r-- | include/svl/memberid.hrc | 2 | ||||
-rw-r--r-- | include/svtools/controldims.hrc | 1 | ||||
-rw-r--r-- | include/svtools/svtools.hrc | 7 | ||||
-rw-r--r-- | include/svx/dialogs.hrc | 12 | ||||
-rw-r--r-- | include/svx/svdstr.hrc | 2 | ||||
-rw-r--r-- | include/svx/svxids.hrc | 18 | ||||
-rw-r--r-- | include/svx/svxitems.hrc | 1 | ||||
-rw-r--r-- | include/vcl/fpicker.hrc | 1 |
14 files changed, 0 insertions, 77 deletions
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc index 880461787e37..793c7e6501fd 100644 --- a/include/editeng/editids.hrc +++ b/include/editeng/editids.hrc @@ -138,7 +138,6 @@ #define SID_ATTR_BRUSH ( SID_EDIT_START + 3 ) #define SID_ATTR_BRUSH_CHAR ( SID_EDIT_START + 4 ) - #define SID_FIELD ( SID_EDIT_START + 7 ) #define SID_ATTR_FRAMEDIRECTION ( SID_EDIT_START + 8 ) #define SID_ATTR_PARA ( SID_EDIT_START + 9 ) diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc index a17f5a0790bb..014c9f9a40b1 100644 --- a/include/editeng/editrids.hrc +++ b/include/editeng/editrids.hrc @@ -329,7 +329,6 @@ #define RID_SVXITEMS_COLOR_FIELD (RID_EDIT_START + 286) #define RID_SVXITEMS_COLOR_FIELDTEXT (RID_EDIT_START + 287) - #define RID_SVXITEMS_PARASNAPTOGRID_ON (RID_EDIT_START + 288) #define RID_SVXITEMS_PARASNAPTOGRID_OFF (RID_EDIT_START + 289) diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.hrc index 28a831a14c5c..1e9e623a8466 100644 --- a/include/editeng/memberids.hrc +++ b/include/editeng/memberids.hrc @@ -33,7 +33,6 @@ #define MID_LINESPACE 0x3b #define MID_LINE_STYLE 0x90 - //NameOrIndex #define MID_NAME 16 #define MID_GRAFURL 32 diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 6d642ae2d190..bd1ad39d7c23 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -485,7 +485,6 @@ #define SC_OPCODE_NONE 0xFFFF - #endif /* FORMULA_COMPILER_HRC */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index ad533aa26641..4c529946a5a9 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -27,8 +27,6 @@ #define RID_GROUPS_SFXOFFSET 32700 #define RID_GROUPS_END 32767 - - #define EVENT_SFX_START 5000 // EVENT_SFX_END 9999 @@ -74,14 +72,11 @@ #define SFX_EVENT_SAVEDOCFAILED (EVENT_SFX_START + 28) #define SFX_EVENT_SAVETODOCFAILED (EVENT_SFX_START + 29) - // Events for Controls etc. #define SFX_EVENT_MOUSEOVER_OBJECT ( EVENT_SFX_START + 100 ) #define SFX_EVENT_MOUSECLICK_OBJECT ( EVENT_SFX_START + 101 ) #define SFX_EVENT_MOUSEOUT_OBJECT ( EVENT_SFX_START + 102 ) - - #define RID_SFX_APP_START (RID_SFX_START + 256) #define RID_SFX_MENU_START (RID_SFX_START + 768) // RID_SFX_CONFIG_START (RID_SFX_START + 1536) @@ -100,8 +95,6 @@ // RID_SFX_TPLCOMPONENT_START (RID_SFX_START + 6800) // RID_SFX_HELPCOMPONENT_START (RID_SFX_START + 7000) - - #define SFX_OBJECTBAR_APPLICATION 0 #define SFX_OBJECTBAR_OBJECT 1 #define SFX_OBJECTBAR_TOOLS 2 @@ -115,7 +108,6 @@ // temporary due to compatibility - #define MSG_QUERY_LASTVERSION RID_SFX_START #define RID_APPLICATION RID_SFX_START @@ -128,8 +120,6 @@ #define RID_APPTITLE (RID_SFX_START+4) - - #define DLG_STYLE_DESIGNER (RID_SFX_START+8) #define RID_SFX_INCORRECT_PASSWORD (RID_SFX_START+216) @@ -155,7 +145,6 @@ #define STR_MB (RID_SFX_START+113) #define STR_GB (RID_SFX_START+114) - #define STR_STANDARD_SHORTCUT (RID_SFX_START+117) #define STR_REPAIREDDOCUMENT (RID_SFX_START+118) #define STR_ERRUNOEVENTBINDUNG (RID_SFX_START+119) @@ -181,14 +170,11 @@ #define SFX_FILE_THUMBNAIL_MATH (RID_SFX_START+167) #define SFX_FILE_THUMBNAIL_DEFAULT (RID_SFX_START+168) - - // group ids // !! If you add a new group, please change sfxbasecontroller.cxx and // !! com.sun.star.frame.CommandGroup accordingly! - #define GID_INTERN (RID_GROUPS_SFXOFFSET+ 0) #define GID_APPLICATION (RID_GROUPS_SFXOFFSET+ 1) #define GID_DOCUMENT (RID_GROUPS_SFXOFFSET+ 2) @@ -217,8 +203,6 @@ #define GID_CONTROLS (RID_GROUPS_SFXOFFSET+25) #define GID_NAVIGATION (RID_GROUPS_SFXOFFSET+26) - - #define RID_OPTIONS_START (SID_LIB_START + 2000) // RID_OPTIONS_END (RID_OPTIONS_START + 100) diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 17381b3baecb..1257b580f59b 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -27,7 +27,6 @@ // Changing just one part here doesn't add new // docking windows automatically! - #define SID_DOCKWIN_0 SID_DOCKWIN_START #define SID_DOCKWIN_1 SID_DOCKWIN_START+1 #define SID_DOCKWIN_2 SID_DOCKWIN_START+2 @@ -39,12 +38,8 @@ #define SID_DOCKWIN_8 SID_DOCKWIN_START+8 #define SID_DOCKWIN_9 SID_DOCKWIN_START+9 - - #define SID_UNKNOWN SID_SFX_START - - // default-ids for application #define SID_QUITAPP (SID_SFX_START + 300) #define SID_ABOUT (SID_SFX_START + 301) @@ -286,7 +281,6 @@ // SID_SFX_free_START (SID_SFX_START + 1728) // SID_SFX_free_END (SID_SFX_START + 3999) - #define SID_OPEN_NEW_VIEW (SID_SFX_START + 520) // FREE, was SID_VIEW_ZOOM_MODE // FREE, was SID_VIEW_POS_SIZE @@ -538,7 +532,6 @@ #define SID_ATTR_YEAR2000 (SID_OPTIONS_START + 87) #define SID_ATTR_APPLYCHARUNIT (SID_OPTIONS_START + 88) - // PathTabPage #define SID_ATTR_PATHGROUP (SID_OPTIONS_START + 10) #define SID_ATTR_PATHNAME (SID_OPTIONS_START + 11) @@ -703,8 +696,6 @@ #define ID_VAL_ZOOM (SID_SD_START+234) #define SID_SIZE_OPTIMAL (SID_SD_START+99) - - #define SID_ZOOM_OPTIMAL (SID_SIZE_OPTIMAL) #define SID_ZOOM_ENTIRE_PAGE (SID_SIZE_PAGE) #define SID_ZOOM_PAGE_WIDTH (SID_SVX_START + 1420) @@ -714,8 +705,6 @@ #define SID_ZOOM_150_PERCENT (SID_SVX_START + 1423) #define SID_ZOOM_200_PERCENT (SID_SVX_START + 1424) - - // SfxScriptOrganizerItem #define MID_SCRIPT_ORGANIZER_LANGUAGE 1 // Don't use zero for MID's. It's forbidden to do it! @@ -725,12 +714,10 @@ #define FN_XFORMS_INIT (SID_SW_START + 1053) #define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) - #define SID_RESTORE_EDITING_VIEW (SID_SFX_START + 1663) #endif // #ifndef _SFXSIDS_HRC - // SfxSecurityPage related stuff #define FN_EDIT2 (SID_SW_START + 1800) diff --git a/include/svl/memberid.hrc b/include/svl/memberid.hrc index 4d501b5ae2ab..ef5639523e8e 100644 --- a/include/svl/memberid.hrc +++ b/include/svl/memberid.hrc @@ -20,7 +20,6 @@ #ifndef _MEMBERID_HRC #define _MEMBERID_HRC - #define MID_X 1 #define MID_Y 2 #define MID_RECT_LEFT 3 @@ -55,7 +54,6 @@ #define MID_SEARCH_TRANSLITERATEFLAGS 18 #define MID_SEARCH_COMMAND 19 - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/controldims.hrc b/include/svtools/controldims.hrc index 0bacbbff1bae..6f624343da6a 100644 --- a/include/svtools/controldims.hrc +++ b/include/svtools/controldims.hrc @@ -20,7 +20,6 @@ #ifndef _SVT_CONTROLDIMS_HRC_ #define _SVT_CONTROLDIMS_HRC_ - // From: Dialogue Specification and Guidelines - Visual Design V1.3 // by Christian Jansen diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc index 83ecedb860d2..64a4e7437983 100644 --- a/include/svtools/svtools.hrc +++ b/include/svtools/svtools.hrc @@ -24,7 +24,6 @@ #define RID_SVTOOLS_BITMAP_START (RID_SVTOOLS_START + 0) #define RID_SVTOOLS_IMAGELIST_START (RID_SVTOOLS_START + 0) - // various unsorted stuff #define STR_SVT_AUTOMATIC_COLOR (RID_SVTOOLS_START+16) @@ -251,21 +250,16 @@ #define STR_LOGICAL_FIELD_NAMES (STR_SVT_ADDRESSTEMPLATE_START+32) #define STR_SVT_ADDRESSTEMPLATE_END (STR_LOGICAL_FIELD_NAMES) - - - // dialogs #define DLG_LOGIN (RID_SVTOOLS_START+113) #define DLG_ADDRESSBOOKSOURCE (RID_SVTOOLS_START+114) - // bitmaps #define BMP_PLUGIN (RID_SVTOOLS_BITMAP_START + 3) #define BMP_LIST_ADD (RID_SVTOOLS_BITMAP_START + 4) - // image lists #define RID_SVTOOLS_IMAGELIST_BIG (RID_SVTOOLS_IMAGELIST_START + 1) @@ -284,7 +278,6 @@ #define WARNINGBOX_INVALIDJAVASETTINGS_MAC (RID_SVTOOLS_START+25) #define ERRORBOX_JVMCREATIONFAILED_MAC (RID_SVTOOLS_START+26) - // images #define RID_IMG_TREENODE_COLLAPSED (RID_SVTOOLS_START + 0) #define RID_IMG_TREENODE_EXPANDED (RID_SVTOOLS_START + 1) diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index f35a97f1ed96..27562670edf6 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -87,7 +87,6 @@ #define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59) #define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296) - // why extra defines for pages that already exist? #define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE (RID_SVX_START + 998) #define RID_SCH_TransformTabDLG_SVXPAGE_SLANT (RID_SVX_START + 999) @@ -136,8 +135,6 @@ #define SID_SD_TP_MISC (RID_OFA_START + 231) #define RID_SC_TP_DEFAULTS (RID_OFA_START + 253) - - // ResId's fuer Dialoge aus StarDraw #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) @@ -284,7 +281,6 @@ #define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 247) #define RID_SVXSTR_RULER_TAB_DECIMAL (RID_SVX_START + 248) - // Close (in TabDialog line/aria) #define RID_SVXSTR_CLOSE (RID_SVX_START + 260) @@ -371,7 +367,6 @@ #define RID_SVXSTR_GRAFMODE_MONO (RID_SVX_START + 522) #define RID_SVXSTR_GRAFMODE_WATERMARK (RID_SVX_START + 523) - // Strings for Plugin-Filedialog #define STR_INSERT_VIDEO_EXTFILTER_IVF (RID_SVX_START + 524) #define STR_INSERT_VIDEO_EXTFILTER_AVI (RID_SVX_START + 525) @@ -991,7 +986,6 @@ // !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!! #define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1271) - // if we have _a_lot_ time, we should group the resource ids by type, instead // of grouping them by semantics. The reason is that resource ids have to be // unique relative to a fixed type (you can't have two dialogs with the same @@ -1000,14 +994,10 @@ // I suggest sticking to per-type ids instead of per-semantic ids, this is // better maintainable (IMO), and does not waste that much ids - // "Window" resource ids - - // "ModalDialog" resource ids - // "Menu" resource ids #define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 ) @@ -1021,8 +1011,6 @@ #define RID_SVXPAGE_DOCRECOVERY_SAVE ( RID_SVX_START + 8 ) #define RID_SVXPAGE_DOCRECOVERY_RECOVER ( RID_SVX_START + 9 ) - - // !!!! double defined ID's (see below) !!! #define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101) diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc index 2b20fdf3bd42..90ef6975ca89 100644 --- a/include/svx/svdstr.hrc +++ b/include/svx/svdstr.hrc @@ -323,12 +323,10 @@ #define STR_UndoObjDescription (STR_UndoBegin +18) #define STR_UndoEnd (STR_UndoObjDescription) - #define STR_LayerBegin (STR_UndoEnd+1) #define STR_StandardLayerName (STR_LayerBegin +0) #define STR_LayerEnd (STR_StandardLayerName) - #define STR_ItemBegin (STR_LayerEnd+1) #define STR_ItemValBegin (STR_ItemBegin) #define STR_ItemValON (STR_ItemValBegin + 0) diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index ec38491ea821..cec1a0ee9f14 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -32,10 +32,8 @@ #undef SID_INSERT_FRAME #endif - // Member-Id's - #define MID_APPFLAG 0x20 #define MID_AUTOBREAK 0x21 #define MID_BREAKxxx 0x22 @@ -90,15 +88,12 @@ // Event-Id's Block 2 - #define SVX_EVENT_IMAGE_LOAD (SID_LIB_START) #define SVX_EVENT_IMAGE_ABORT (SID_LIB_START + 1) #define SVX_EVENT_IMAGE_ERROR (SID_LIB_START + 2) - // Function-Id's - // Function-Id's #define FID_SVX_START (SID_LIB_START + 500) @@ -111,20 +106,16 @@ #define FID_SEARCH_SEARCHSET (FID_SVX_START + 4) #define FID_SEARCH_REPLACESET (FID_SVX_START + 5) - // SFX-Id's - #define SID_POLY_MERGE (SID_SFX_START + 679) #define SID_POLY_SUBSTRACT (SID_SFX_START + 680) #define SID_POLY_INTERSECT (SID_SFX_START + 681) #define SID_POLY_FORMEN (SID_SFX_START + 682) #define SID_DISTRIBUTE_DLG (SID_SFX_START + 683) - // Basic IDE-Id's - #define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 ) #define SID_BASICIDE_ADDWATCH ( SID_BASICIDE_START + 1 ) #define SID_BASICIDE_CHOOSEMACRO ( SID_BASICIDE_START + 2 ) @@ -167,18 +158,14 @@ #define SID_BASICIDE_IMAGESTART ( SID_BASICIDE_START + 50 ) #define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) - // StarBase-Id's - #define SID_SBA_BRW_UPDATE (SID_SBA_START+100) // Daten in Felder #define SID_SBA_BRW_INSERT (SID_SBA_START+101) // Daten in Text #define SID_SBA_BRW_MERGE (SID_SBA_START+102) // Serienbrief - // SD-Id's - #define SID_RULER (SID_SD_START+40) #define SID_BEZIER_CONVERT (SID_SD_START+65) #define SID_BEZIER_ELIMINATE_POINTS (SID_SD_START+30) @@ -225,7 +212,6 @@ #define ID_VAL_USELASTCOLUMNSTYLE (SID_SD_START+327) #define ID_VAL_USEBANDINGCOLUMNSTYLE (SID_SD_START+328) - // Writer-Id's #define FN_EDIT (SID_SW_START + 100) @@ -260,13 +246,11 @@ #define FN_PGPREVIEW (SID_SW_START + 1250) #define FN_SHOW_MULTIPLE_PAGES (FN_PGPREVIEW + 2) - // Svx-Id's // When adding new entries here, note that other SID_SVX_START entries exist in // include/editeng/editids.hrc and include/sfx2/sfxsids.hrc so don't use the // same id for two different attributes - // CAUTION! Range <1 .. 22> used by EditEngine (!) #define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 ) @@ -1021,10 +1005,8 @@ // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id #define SID_SVX_FIRSTFREE (SID_OFFER_IMPORT + 1) - // Overflow check for slot IDs - #if SID_SVX_FIRSTFREE > SID_SVX_END #error Resource-Ueberlauf in #line, #file #endif diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc index 44a68ebdbd9f..aa46f5757957 100644 --- a/include/svx/svxitems.hrc +++ b/include/svx/svxitems.hrc @@ -111,7 +111,6 @@ #error Resource-Ueberlauf in #line, #file #endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/fpicker.hrc b/include/vcl/fpicker.hrc index 01f6fd0fe921..387b38981f85 100644 --- a/include/vcl/fpicker.hrc +++ b/include/vcl/fpicker.hrc @@ -28,6 +28,5 @@ #define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION (STR_SVT_FILEPICKER_START+13) #define STR_SVT_ALREADYEXISTOVERWRITE (STR_SVT_FILEPICKER_START+14) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |