basctl/inc/basidesh.hrc | 2 basctl/source/basicide/basdoc.cxx | 2 basctl/source/basicide/basidesh.cxx | 2 basctl/source/basicide/basidesh.src | 4 include/sfx2/objface.hxx | 6 - include/sfx2/sfx.hrc | 1 include/sfx2/shell.hxx | 12 +- include/svx/fmresids.hrc | 2 sc/inc/sc.hrc | 21 ---- sc/source/ui/app/scmod.cxx | 2 sc/source/ui/docshell/docsh.cxx | 2 sc/source/ui/drawfunc/chartsh.cxx | 2 sc/source/ui/drawfunc/drawsh.cxx | 2 sc/source/ui/drawfunc/drformsh.cxx | 2 sc/source/ui/drawfunc/drtxtob.cxx | 2 sc/source/ui/drawfunc/graphsh.cxx | 2 sc/source/ui/drawfunc/mediash.cxx | 2 sc/source/ui/drawfunc/oleobjsh.cxx | 2 sc/source/ui/src/sc.src | 7 - sc/source/ui/src/scstring.src | 75 ---------------- sc/source/ui/view/auditsh.cxx | 2 sc/source/ui/view/cellsh.cxx | 2 sc/source/ui/view/editsh.cxx | 2 sc/source/ui/view/formatsh.cxx | 2 sc/source/ui/view/pgbrksh.cxx | 2 sc/source/ui/view/pivotsh.cxx | 2 sc/source/ui/view/prevwsh.cxx | 2 sc/source/ui/view/tabvwsh.cxx | 2 sd/inc/glob.hrc | 18 +-- sd/source/core/glob.src | 53 ----------- sd/source/ui/app/sdmod.cxx | 2 sd/source/ui/dlg/PaneShells.cxx | 4 sd/source/ui/docshell/docshell.cxx | 2 sd/source/ui/docshell/grdocsh.cxx | 2 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2 sd/source/ui/table/tableobjectbar.cxx | 2 sd/source/ui/view/GraphicObjectBar.cxx | 2 sd/source/ui/view/MediaObjectBar.cxx | 2 sd/source/ui/view/ViewShellBase.cxx | 2 sd/source/ui/view/drbezob.cxx | 3 sd/source/ui/view/drtxtob.cxx | 3 sd/source/ui/view/drvwshrg.cxx | 5 - sd/source/ui/view/outlnvsh.cxx | 2 sd/source/ui/view/presvish.cxx | 2 sfx2/source/appl/app.hrc | 2 sfx2/source/appl/app.src | 5 - sfx2/source/appl/appmisc.cxx | 2 sfx2/source/appl/module.cxx | 2 sfx2/source/control/objface.cxx | 14 +- sfx2/source/dialog/templdlg.cxx | 17 ++- sfx2/source/doc/objserv.cxx | 2 sfx2/source/view/viewfrm.cxx | 2 sfx2/source/view/viewsh.cxx | 2 starmath/source/document.cxx | 2 starmath/source/smmod.cxx | 2 starmath/source/smres.src | 4 starmath/source/view.cxx | 2 svx/source/form/fmshell.cxx | 2 svx/source/form/fmstring.src | 4 svx/source/toolbars/extrusionbar.cxx | 2 svx/source/toolbars/fontworkbar.cxx | 2 sw/source/ui/app/app.src | 5 - sw/source/ui/shells/shells.src | 48 ---------- sw/source/ui/web/web.src | 8 - sw/source/uibase/app/apphdl.cxx | 2 sw/source/uibase/app/docsh.cxx | 2 sw/source/uibase/inc/app.hrc | 3 sw/source/uibase/inc/shells.hrc | 16 --- sw/source/uibase/inc/web.hrc | 2 sw/source/uibase/misc/glshell.cxx | 4 sw/source/uibase/shells/annotsh.cxx | 2 sw/source/uibase/shells/basesh.cxx | 2 sw/source/uibase/shells/beziersh.cxx | 2 sw/source/uibase/shells/drawsh.cxx | 2 sw/source/uibase/shells/drformsh.cxx | 2 sw/source/uibase/shells/drwbassh.cxx | 2 sw/source/uibase/shells/drwtxtsh.cxx | 2 sw/source/uibase/shells/frmsh.cxx | 2 sw/source/uibase/shells/grfsh.cxx | 2 sw/source/uibase/shells/listsh.cxx | 2 sw/source/uibase/shells/mediash.cxx | 2 sw/source/uibase/shells/navsh.cxx | 2 sw/source/uibase/shells/olesh.cxx | 2 sw/source/uibase/shells/tabsh.cxx | 2 sw/source/uibase/shells/textsh.cxx | 2 sw/source/uibase/uiview/pview.cxx | 2 sw/source/uibase/uiview/srcview.cxx | 2 sw/source/uibase/uiview/view0.cxx | 2 sw/source/uibase/web/wdocsh.cxx | 2 sw/source/uibase/web/wformsh.cxx | 2 sw/source/uibase/web/wfrmsh.cxx | 2 sw/source/uibase/web/wgrfsh.cxx | 2 sw/source/uibase/web/wlistsh.cxx | 2 sw/source/uibase/web/wolesh.cxx | 2 sw/source/uibase/web/wtabsh.cxx | 2 sw/source/uibase/web/wtextsh.cxx | 2 sw/source/uibase/web/wview.cxx | 2 97 files changed, 117 insertions(+), 369 deletions(-)
New commits: commit 8c041824b67caa53d3f7f96803b7a69ced6614b5 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Nov 25 13:39:28 2014 +0000 all these ids and their associated resources were unnecessary Change-Id: I3f538668c9c5f1727b8cf49ab72fd5879e12f156 diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc index d6cf84d..3403c79 100644 --- a/basctl/inc/basidesh.hrc +++ b/basctl/inc/basidesh.hrc @@ -52,7 +52,7 @@ #define RID_STR_FILTER_ALLFILES ( RID_BASICIDE_START + 4 ) // free #define RID_STR_CANNOTCLOSE ( RID_BASICIDE_START + 13 ) -#define RID_STR_IDENAME ( RID_BASICIDE_START + 14 ) +// free #define RID_STR_INITIDE ( RID_BASICIDE_START + 15 ) #define RID_STR_STACKNAME ( RID_BASICIDE_START + 16 ) #define RID_STR_WATCHNAME ( RID_BASICIDE_START + 17 ) diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 3875f5b..85bb35a 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -26,10 +26,6 @@ #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; -String RID_STR_IDENAME -{ - Text = "BasicIDE" ; -}; String RID_STR_FILTER_ALLFILES { Text [ en-US ] = "<All>" ; diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 98fffe2..e184a30 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -106,7 +106,6 @@ // temporary due to compatibility -#define RID_APPLICATION RID_SFX_START #define RID_DEFAULTIMAGELIST_SC (RID_SFX_START+15) #define RID_DEFAULTIMAGELIST_LC (RID_SFX_START+17) diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc index 63e8319..f4e177a 100644 --- a/include/svx/fmresids.hrc +++ b/include/svx/fmresids.hrc @@ -94,7 +94,7 @@ #define RID_STR_QRY_REMOVE_ATTRIBUTE (RID_FORMS_START + 7) #define RID_STR_QRY_REMOVE_ELEMENT (RID_FORMS_START + 8) #define RID_STR_QRY_REMOVE_INSTANCE (RID_FORMS_START + 9) -#define RID_STR_FORMSHELL (RID_FORMS_START + 10) + #define RID_STR_STDFORMNAME (RID_FORMS_START + 11) #define RID_STR_REC_TEXT (RID_FORMS_START + 12) #define RID_STR_REC_FROM_TEXT (RID_FORMS_START + 13) diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 1f95e32..f76a45a 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -755,13 +755,8 @@ #define SCSTR_APDTABLE (STR_START + 27) #define SCSTR_RENAMETAB (STR_START + 28) #define STR_INSERTGRAPHIC (STR_START + 29) -#define SCSTR_DOCSHELL (STR_START + 32) -#define SCSTR_TABVIEWSHELL (STR_START + 33) -#define SCSTR_EDITSHELL (STR_START + 34) -#define SCSTR_DRAWSHELL (STR_START + 35) -#define SCSTR_DRAWTEXTSHELL (STR_START + 36) + #define SCSTR_NEWTABLE (STR_START + 37) -#define SCSTR_PREVIEWSHELL (STR_START + 38) #define SCSTR_PROTECTDOC (STR_START + 39) #define SCSTR_UNPROTECTDOC (STR_START + 40) @@ -771,7 +766,6 @@ #define SCSTR_PASSWORDOPT (STR_START + 44) #define SCSTR_WRONGPASSWORD (STR_START + 45) -#define SCSTR_PIVOTSHELL (STR_START + 46) #define SCSTR_END (STR_START + 47) #define SCSTR_STAT_PRINT (STR_START + 48) @@ -787,8 +781,6 @@ #define SCSTR_CFG_SPELLCHECK (STR_START + 56) #define SCSTR_CFG_PRINT (STR_START + 57) -#define SCSTR_AUDITSHELL (STR_START + 58) - #define SCSTR_CHARSET_USER (STR_START + 59) #define SCSTR_COLUMN_USER (STR_START + 60) #define SCSTR_FIELDSEP (STR_START + 61) @@ -801,14 +793,6 @@ #define SCSTR_CFG_NAVIPI (STR_START + 67) -#define SCSTR_DRAWFORMSHELL (STR_START + 70) -#define SCSTR_CELLSHELL (STR_START + 71) -#define SCSTR_FORMATSHELL (STR_START + 72) -#define SCSTR_OLEOBJECTSHELL (STR_START + 73) -#define SCSTR_CHARTSHELL (STR_START + 74) -#define SCSTR_GRAPHICSHELL (STR_START + 75) -#define SCSTR_PAGEBREAKSHELL (STR_START + 76) - #define SCSTR_GRFILTER_OPENERROR (STR_START + 77) #define SCSTR_GRFILTER_IOERROR (STR_START + 78) #define SCSTR_GRFILTER_FORMATERROR (STR_START + 79) @@ -1006,8 +990,7 @@ #define STR_TITLE_AUTHOR (STR_START + 442) #define STR_TITLE_DATE (STR_START + 443) #define STR_UNKNOWN_USER_CONFLICT (STR_START + 444) -#define RID_SC_NAME (STR_START + 445) -#define STR_END (RID_SC_NAME) +#define STR_END (STR_UNKNOWN_USER_CONFLICT) #define BMP_START (STR_END) diff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.src index 1fbb98d..9c79709 100644 --- a/sc/source/ui/src/sc.src +++ b/sc/source/ui/src/sc.src @@ -19,13 +19,6 @@ #include "sc.hrc" -// App-Titel------------------------------------------------------ - -String RID_SC_NAME -{ - Text [ en-US ] = "%PRODUCTNAME Calc" ; -}; - // About-Dialog -------------------------------------------------------------- // Icons & Bitmaps: ---------------------------------------------------------- diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index ffa400b..8b9c6e1 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -31,81 +31,6 @@ String SCSTR_SHORT_SCDOC_NAME Text [ en-US ] = "Spreadsheet" ; }; -String SCSTR_DOCSHELL -{ - Text [ en-US ] = "Sheet" ; -}; - -String SCSTR_TABVIEWSHELL -{ - Text [ en-US ] = "Cells" ; -}; - -String SCSTR_CELLSHELL -{ - Text [ en-US ] = "Functions for Cells"; -}; - -String SCSTR_FORMATSHELL -{ - Text [ en-US ] = "Formats for Cells"; -}; - -String SCSTR_DRAWSHELL -{ - Text [ en-US ] = "Image Objects" ; -}; - -String SCSTR_DRAWTEXTSHELL -{ - Text [ en-US ] = "Text Objects" ; -}; - -String SCSTR_DRAWFORMSHELL -{ - Text [ en-US ] = "Form Objects"; -}; - -String SCSTR_CHARTSHELL -{ - Text [ en-US ] = "Chart Objects"; -}; - -String SCSTR_OLEOBJECTSHELL -{ - Text [ en-US ] = "OLE Objects"; -}; - -String SCSTR_GRAPHICSHELL -{ - Text [ en-US ] = "Image"; -}; - -String SCSTR_PAGEBREAKSHELL -{ - Text [ en-US ] = "Pagebreak"; -}; - -String SCSTR_EDITSHELL -{ - Text [ en-US ] = "Text editing" ; -}; - -String SCSTR_PREVIEWSHELL -{ - Text [ en-US ] = "Print Preview" ; -}; - -String SCSTR_PIVOTSHELL -{ - Text [ en-US ] = "Pivot Tables" ; -}; - -String SCSTR_AUDITSHELL -{ - Text [ en-US ] = "Detective Fill Mode" ; -}; - String STR_ROWHEIGHT { Text [ en-US ] = "Height" ; diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 483b826..bfcdc50 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -42,12 +42,8 @@ #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_OUTLINEVIEWSHELL RID_GLOB_START+21 -#define STR_DRAWVIEWSHELL RID_GLOB_START+22 -#define STR_TEXTOBJECTBARSHELL RID_GLOB_START+23 #define STR_STDOBJECTBARSHELL RID_GLOB_START+24 -#define STR_BEZIEROBJECTBARSHELL RID_GLOB_START+25 -#define RID_SD_NAME RID_GLOB_START+26 + #define STR_LAYOUT_TITLE RID_GLOB_START+27 #define STR_LAYOUT_OUTLINE RID_GLOB_START+28 #define STR_LAYOUT_BACKGROUNDOBJECTS RID_GLOB_START+29 @@ -109,24 +105,22 @@ #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_GRAFOBJECTBARSHELL RID_GLOB_START+94 + #define STR_POWERPOINT_IMPORT RID_GLOB_START+95 -#define STR_PRESVIEWSHELL RID_GLOB_START+98 #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_3DOBJECTBARSHELL RID_GLOB_START+104 #define STR_FONTWORKOBJECTBARSHELL RID_GLOB_START+105 -#define STR_SLIDESORTERVIEWSHELL RID_GLOB_START+106 + #define STR_SIDEBARVIEWSHELL RID_GLOB_START+107 #define STR_MASTERPAGESSELECTOR RID_GLOB_START+108 #define STR_SIDEBAR_LAYOUTMENU RID_GLOB_START+109 -#define STR_MEDIAOBJECTBARSHELL RID_GLOB_START+110 + #define STR_PAGE_NAME RID_GLOB_START+111 #define STR_SLIDE_NAME RID_GLOB_START+112 -#define STR_LEFT_IMPRESS_PANE_SHELL RID_GLOB_START+113 -#define STR_LEFT_DRAW_PANE_SHELL RID_GLOB_START+114 + #define STR_ENTER_PIN RID_GLOB_START+115 #define STR_TOOL_PANEL_SHELL RID_GLOB_START+116 @@ -142,7 +136,7 @@ #define RID_SLIDESHOW_CONTEXTMENU RID_GLOB_START+223 #define DLG_TABLEDESIGNPANE RID_GLOB_START+224 -#define STR_TABLEOBJECTBARSHELL RID_GLOB_START+225 + #define RID_TABPAGE_PARA_NUMBERING RID_GLOB_START+226 #define STR_CUSTOMANIMATIONPANE RID_GLOB_START+227 #define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228 diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src index 5de4ee0..5d6113e 100644 --- a/sd/source/core/glob.src +++ b/sd/source/core/glob.src @@ -151,38 +151,14 @@ String STR_PRESOBJ_TABLE { Text [ en-US ] = "Double-click to add a Spreadsheet" ; }; -String STR_OUTLINEVIEWSHELL -{ - Text [ en-US ] = "Outline View" ; -}; -String STR_DRAWVIEWSHELL -{ - Text [ en-US ] = "Drawing View" ; -}; -String STR_PRESVIEWSHELL -{ - Text [ en-US ] = "Presentation mode" ; -}; String STR_PREVIEWVIEWSHELL { Text [ en-US ] = "Preview Window"; }; -String STR_TEXTOBJECTBARSHELL -{ - Text [ en-US ] = "Text Mode" ; -}; String STR_STDOBJECTBARSHELL { Text [ en-US ] = "Document Mode" ; }; -String STR_BEZIEROBJECTBARSHELL -{ - Text [ en-US ] = "Bézier mode" ; -}; -String RID_SD_NAME -{ - Text [ en-US ] = "%PRODUCTNAME Impress" ; -}; String STR_GLUEPOINTSOBJECTBARSHELL { Text [ en-US ] = "Glue Points Mode" ; @@ -326,41 +302,12 @@ String STR_PSEUDOSHEET_NOTES { Text [ en-US ] = "Notes" ; }; -String STR_GRAFOBJECTBARSHELL -{ - Text [ en-US ] = "Graphics mode" ; -}; - -String STR_MEDIAOBJECTBARSHELL -{ - Text [ en-US ] = "Media Playback" ; -}; - -String STR_TABLEOBJECTBARSHELL -{ - Text [ en-US ] = "Table" ; -}; - -String STR_SLIDESORTERVIEWSHELL -{ - Text [ en-US ] = "Slide Sorter" ; -}; String STR_TOOL_PANEL_SHELL { Text [ en-US ] = "Tool Panel" ; }; -String STR_LEFT_IMPRESS_PANE_SHELL -{ - Text [ en-US ] = "Slides" ; -}; - -String STR_LEFT_DRAW_PANE_SHELL -{ - Text [ en-US ] = "Pages" ; -}; - String STR_TASKPANEVIEWSHELL { Text [ en-US ] = "Tasks" ; diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc index 801fe40..1b16e8c 100644 --- a/sfx2/source/appl/app.hrc +++ b/sfx2/source/appl/app.hrc @@ -97,8 +97,6 @@ #define RID_SECURITY_WARNING_TITLE (RID_SFX_APP_START + 181) -#define RID_DESKTOP (RID_SFX_APP_START + 184) - #define RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE (RID_SFX_APP_START + 186) #define RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN (RID_SFX_APP_START + 187) #define STR_QUERY_CANCELCHECKOUT (RID_SFX_APP_START + 188) diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index 0c606fd..e7e1cb5 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -331,11 +331,6 @@ String RID_SECURITY_WARNING_TITLE Text [ en-US ] = "Security Warning" ; }; -String RID_DESKTOP -{ - Text = "%PRODUCTNAME" ; -}; - String RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE { Text [ en-US ] = "Saving will remove all existing signatures.\nDo you want to continue saving the document?" ; diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 68c74d6..6f7a2e6 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -35,10 +35,6 @@ String RID_FONTBOLD { Text [ en-US ] = "Bold" ; }; -String RID_APPLICATION -{ - Text = "StarMath" ; -}; String RID_OBJECTNAME { Text = "SMath3" ; diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src index bf0fdd0..b40cbf6 100644 --- a/svx/source/form/fmstring.src +++ b/svx/source/form/fmstring.src @@ -70,10 +70,6 @@ Resource RID_RSC_TABWIN_PREFIX Text [ en-US ] = "SQL"; }; }; -String RID_STR_FORMSHELL -{ - Text = "Form Shell"; -}; String RID_STR_STDFORMNAME { Text [ en-US ]= "Form"; diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index c1ec4eb..c4fee49 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -31,11 +31,6 @@ #include "shells.hrc" #include "helpid.h" -String RID_SW_NAME -{ - Text = "%PRODUCTNAME Writer" ; -}; - String STR_PRINT_MERGE_MACRO { Text [ en-US ] = "Print form letters" ; diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index 3b2aa69..4bb18b3 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -115,54 +115,6 @@ String STR_PAGE_COUNT_CUSTOM { Text [ en-US ] = "Page %1 of %2 (Page %3)" ; }; -String STR_SHELLNAME_TEXT -{ - Text [ en-US ] = "Text" ; -}; -String STR_SHELLNAME_TABLE -{ - Text [ en-US ] = "Table" ; -}; -String STR_SHELLNAME_FRAME -{ - Text [ en-US ] = "Frame" ; -}; -String STR_SHELLNAME_GRAPHIC -{ - Text [ en-US ] = "Image" ; -}; -String STR_SHELLNAME_OBJECT -{ - Text [ en-US ] = "Object" ; -}; -String STR_SHELLNAME_LIST -{ - Text [ en-US ] = "List" ; -}; -String STR_SHELLNAME_DRAW -{ - Text [ en-US ] = "Drawing" ; -}; -String STR_SHELLNAME_DRAWFORM -{ - Text [ en-US ] = "Forms" ; -}; -String STR_SHELLNAME_BEZIER -{ - Text [ en-US ] = "Bézier" ; -}; -String STR_SHELLNAME_DRAW_TEXT -{ - Text [ en-US ] = "Draw text" ; -}; -String STR_SHELLNAME_MEDIA -{ - Text [ en-US ] = "Media" ; -}; -String STR_SHELLNAME_NAVIGATION -{ - Text [ en-US ] = "Navigation" ; -}; //Strings for gallery/background String STR_SWBG_PARAGRAPH { diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src index a28d30c..21910fd 100644 --- a/sw/source/ui/web/web.src +++ b/sw/source/ui/web/web.src @@ -40,14 +40,6 @@ String STR_WRITER_WEBDOC_FULLTYPE { Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION HTML Document"; }; -String STR_SHELLNAME_WEBTEXT -{ - Text [ en-US ] = "Text/Web" ; -}; -String STR_SHELLNAME_WEBFRAME -{ - Text [ en-US ] = "Frame/Web" ; -}; String RID_WEBTOOLS_TOOLBOX { Text [ en-US ] = "Main Toolbar/Web" ; diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc index 6239955..ff5e12d 100644 --- a/sw/source/uibase/inc/app.hrc +++ b/sw/source/uibase/inc/app.hrc @@ -25,9 +25,6 @@ #define STR_CANTCREATE (RC_APP_BEGIN + 4) #define STR_CANTOPEN (RC_APP_BEGIN + 5) -// For the interface because the RID_APP_BEGIN is now Desktop. -#define RID_SW_NAME ( RC_APP_BEGIN + 8) - #define STR_UNBENANNT (RC_APP_BEGIN + 13) #define STR_VERSION (RC_APP_BEGIN + 14) #define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15) diff --git a/sw/source/uibase/inc/shells.hrc b/sw/source/uibase/inc/shells.hrc index 7af1b8c..685b0e2 100644 --- a/sw/source/uibase/inc/shells.hrc +++ b/sw/source/uibase/inc/shells.hrc @@ -45,18 +45,7 @@ #define RID_OLE_TOOLBOX (RC_SHELLS_BEGIN + 22) #define RID_TOOLS_TOOLBOX (RC_SHELLS_BEGIN + 23) -#define STR_SHELLNAME_TEXT (RC_SHELLS_BEGIN + 24) -#define STR_SHELLNAME_TABLE (RC_SHELLS_BEGIN + 25) -#define STR_SHELLNAME_FRAME (RC_SHELLS_BEGIN + 26) -#define STR_SHELLNAME_GRAPHIC (RC_SHELLS_BEGIN + 27) -#define STR_SHELLNAME_OBJECT (RC_SHELLS_BEGIN + 28) -#define STR_SHELLNAME_LIST (RC_SHELLS_BEGIN + 29) -#define STR_SHELLNAME_DRAW (RC_SHELLS_BEGIN + 30) -#define STR_SHELLNAME_DRAW_TEXT (RC_SHELLS_BEGIN + 31) -#define STR_SHELLNAME_MEDIA (RC_SHELLS_BEGIN + 32) - #define RID_BEZIER_TOOLBOX (RC_SHELLS_BEGIN + 33) -#define STR_SHELLNAME_BEZIER (RC_SHELLS_BEGIN + 34) #define STR_SWBG_PARAGRAPH (RC_SHELLS_BEGIN + 37) #define STR_SWBG_GRAPHIC (RC_SHELLS_BEGIN + 38) @@ -69,7 +58,6 @@ #define STR_SWBG_HEADER (RC_SHELLS_BEGIN + 45) #define STR_SWBG_FOOTER (RC_SHELLS_BEGIN + 46) -#define STR_SHELLNAME_DRAWFORM (RC_SHELLS_BEGIN + 48) #define STR_REDLINE_FORMATED (RC_SHELLS_BEGIN + 50) #define STR_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 51) @@ -85,9 +73,7 @@ #define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61) -#define STR_SHELLNAME_NAVIGATION (RC_SHELLS_BEGIN + 62) - -#define SHELLS_ACT_END STR_SHELLNAME_NAVIGATION +#define SHELLS_ACT_END RID_MEDIA_TOOLBOX #if SHELLS_ACT_END > RC_SHELLS_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/uibase/inc/web.hrc b/sw/source/uibase/inc/web.hrc index bf279f9..1c06a00 100644 --- a/sw/source/uibase/inc/web.hrc +++ b/sw/source/uibase/inc/web.hrc @@ -26,8 +26,6 @@ #define RID_WEBTEXT_TOOLBOX (RC_WEB_BEGIN + 3) #define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4) #define STR_WRITER_WEBDOC_FULLTYPE_40 (RC_WEB_BEGIN + 5) -#define STR_SHELLNAME_WEBTEXT (RC_WEB_BEGIN + 6) -#define STR_SHELLNAME_WEBFRAME (RC_WEB_BEGIN + 7) #define RID_WEBFRAME_TOOLBOX (RC_WEB_BEGIN + 8) #define STR_WRITER_WEBDOC_FULLTYPE_50 (RC_WEB_BEGIN + 9) #define RID_WEBGRAPHIC_TOOLBOX (RC_WEB_BEGIN + 10) commit 83078214196b071cf1d8e5796803b6ebc1bc9de4 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Nov 25 10:12:55 2014 +0000 We now only need one bit of information here whether there *is* an id, or whether there is not an id. An id of 0 seems to be used as a flag that an interface is some sort of superclass which can be subclassed by something else and have its toolbars etc reused. Convert this to a bool so we don't need an a resource id for each one and just drop the third arg for the normal "final" case and use a different define for the inheritable case Change-Id: I98380f03d73d57bf8cba02d339097e384518abaa diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index aa78bea..3dd04bf 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -39,7 +39,7 @@ TYPEINIT1(DocShell, SfxObjectShell); SFX_IMPL_OBJECTFACTORY( DocShell, SvGlobalName(), SFXOBJECTSHELL_STD_NORMAL, "sbasic" ) -SFX_IMPL_INTERFACE(basctl_DocShell, SfxObjectShell, IDEResId(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(basctl_DocShell, SfxObjectShell) void basctl_DocShell::InitInterface_Impl() { diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index aeb2acb..efb602f 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -136,7 +136,7 @@ SFX_IMPL_NAMED_VIEWFACTORY( Shell, "Default" ) SFX_VIEW_REGISTRATION( DocShell ); } -SFX_IMPL_INTERFACE(basctl_Shell, SfxViewShell, IDEResId(RID_STR_IDENAME)) +SFX_IMPL_INTERFACE(basctl_Shell, SfxViewShell) void basctl_Shell::InitInterface_Impl() { diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index db88e6f..c4a4206 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -40,14 +40,14 @@ friend class SfxSlotPool; SfxSlot* pSlots; // SlotMap sal_uInt16 nCount; // number of slots in SlotMap SfxInterfaceId nClassId; // Id of interface - ResId aNameResId; // ResId of external interface name + bool bSuperClass; // Whether children inherit its toolbars etc SfxInterface_Impl* pImpData; SfxSlot* operator[]( sal_uInt16 nPos ) const; public: SfxInterface( const char *pClass, - const ResId& rResId, + bool bSuperClass, SfxInterfaceId nClassId, const SfxInterface* pGeno, SfxSlot &rMessages, sal_uInt16 nMsgCount ); @@ -62,7 +62,7 @@ public: const SfxSlot* GetSlot( const OUString& rCommand ) const; const char* GetClassName() const { return pName; } - bool HasName() const { return 0 != aNameResId.GetId(); } + bool UseAsSuperClass() const { return bSuperClass; } const SfxInterface* GetGenoType() const { return pGenoType; } diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 6e4ef36..2baa19f 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -570,16 +570,16 @@ inline void SfxShell::SetPool static void RegisterInterface(SfxModule* pMod=NULL); \ virtual SfxInterface* GetInterface() const SAL_OVERRIDE; -#define SFX_IMPL_INTERFACE(Class,SuperClass,NameResId) \ +#define SFX_TMPL_INTERFACE(Class,SuperClass,Abstract) \ \ SfxInterface* Class::pInterface = 0; \ - SfxInterface* Class::GetStaticInterface() \ + SfxInterface* Class::GetStaticInterface() \ { \ if ( !pInterface ) \ { \ pInterface = \ new SfxInterface( \ - #Class, NameResId, GetInterfaceId(), \ + #Class, Abstract, GetInterfaceId(), \ SuperClass::GetStaticInterface(), \ a##Class##Slots_Impl[0], \ (sal_uInt16) (sizeof(a##Class##Slots_Impl) / sizeof(SfxSlot) ) ); \ @@ -598,6 +598,12 @@ inline void SfxShell::SetPool GetStaticInterface()->Register(pMod); \ } +#define SFX_IMPL_INTERFACE(Class,SuperClass) \ +SFX_TMPL_INTERFACE(Class,SuperClass,false) \ + +#define SFX_IMPL_SUPERCLASS_INTERFACE(Class,SuperClass) \ +SFX_TMPL_INTERFACE(Class,SuperClass,true) \ + #define SFX_POSITION_MASK 0x000F #define SFX_VISIBILITY_MASK 0xFFF0 #define SFX_VISIBILITY_UNVISIBLE 0x0000 // Never visible diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 1f45e96..9472644 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -119,7 +119,7 @@ static sal_uInt16 nIdleCount = 0; -SFX_IMPL_INTERFACE(ScModule, SfxShell, ScResId(RID_SC_NAME)) +SFX_IMPL_INTERFACE(ScModule, SfxShell) void ScModule::InitInterface_Impl() { diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 84fd54c..1dd391c 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -169,7 +169,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)"; #define ScDocShell #include "scslots.hxx" -SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell, ScResId(SCSTR_DOCSHELL)) +SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell) void ScDocShell::InitInterface_Impl() { diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index e222a0b..84a26ce 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -45,7 +45,7 @@ using namespace css::uno; namespace drawing = com::sun::star::drawing; -SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell, ScResId(SCSTR_CHARTSHELL)) +SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell) void ScChartShell::InitInterface_Impl() { diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 1bae28d..9fb1f24 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -62,7 +62,7 @@ TYPEINIT1( ScDrawShell, SfxShell ); -SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL)) +SFX_IMPL_INTERFACE(ScDrawShell, SfxShell) void ScDrawShell::InitInterface_Impl() { diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index b3d1383..5ecefc4 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.cxx @@ -40,7 +40,7 @@ #define ScDrawFormShell #include "scslots.hxx" -SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell, ScResId(SCSTR_DRAWFORMSHELL)) +SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell) void ScDrawFormShell::InitInterface_Impl() { diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index a8410a4..06f5d7b 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -81,7 +81,7 @@ using namespace ::com::sun::star; -SFX_IMPL_INTERFACE(ScDrawTextObjectBar, SfxShell, ScResId(SCSTR_DRAWTEXTSHELL)) +SFX_IMPL_INTERFACE(ScDrawTextObjectBar, SfxShell) void ScDrawTextObjectBar::InitInterface_Impl() { diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index 6ee703e..5284efb 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -64,7 +64,7 @@ public: } }; -SFX_IMPL_INTERFACE(ScGraphicShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL)) +SFX_IMPL_INTERFACE(ScGraphicShell, ScDrawShell) void ScGraphicShell::InitInterface_Impl() { diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index 66e969a..13cd959 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -35,7 +35,7 @@ #define ScMediaShell #include "scslots.hxx" -SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL)) +SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell) void ScMediaShell::InitInterface_Impl() { diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index 7b08485..5fc452e 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -40,7 +40,7 @@ #define ScOleObjectShell #include "scslots.hxx" -SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell, ScResId(SCSTR_OLEOBJECTSHELL)) +SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell) void ScOleObjectShell::InitInterface_Impl() { diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index 80ccc5f..d341175 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -36,7 +36,7 @@ TYPEINIT1( ScAuditingShell, SfxShell ); -SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL)) +SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell) void ScAuditingShell::InitInterface_Impl() { diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index f670fd3..8c4ba99 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -64,7 +64,7 @@ TYPEINIT1( ScCellShell, ScFormatShell ); -SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell, ScResId(SCSTR_CELLSHELL)) +SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell) void ScCellShell::InitInterface_Impl() { diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 0703589..cb4c17a 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -82,7 +82,7 @@ using namespace ::com::sun::star; TYPEINIT1( ScEditShell, SfxShell ); -SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL)) +SFX_IMPL_INTERFACE(ScEditShell, SfxShell) void ScEditShell::InitInterface_Impl() { diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 9a556ec..a026d38 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -119,7 +119,7 @@ SvxCellVerJustify lclConvertSlotToVAlign( sal_uInt16 nSlot ) TYPEINIT1( ScFormatShell, SfxShell ); -SFX_IMPL_INTERFACE(ScFormatShell, SfxShell, ScResId(SCSTR_FORMATSHELL)) +SFX_IMPL_INTERFACE(ScFormatShell, SfxShell) void ScFormatShell::InitInterface_Impl() { diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index 8f2e7da..89b3222 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -36,7 +36,7 @@ TYPEINIT1( ScPageBreakShell, SfxShell ); -SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell, ScResId(SCSTR_PAGEBREAKSHELL)) +SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell) void ScPageBreakShell::InitInterface_Impl() { diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index 3e425cc..613484a 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -45,7 +45,7 @@ TYPEINIT1( ScPivotShell, SfxShell ); -SFX_IMPL_INTERFACE(ScPivotShell, SfxShell, ScResId(SCSTR_PIVOTSHELL)) +SFX_IMPL_INTERFACE(ScPivotShell, SfxShell) void ScPivotShell::InitInterface_Impl() { diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 5d36224..8582b56 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -85,7 +85,7 @@ using namespace com::sun::star; TYPEINIT1( ScPreviewShell, SfxViewShell ); -SFX_IMPL_INTERFACE(ScPreviewShell, SfxViewShell, ScResId(SCSTR_PREVIEWSHELL)) +SFX_IMPL_INTERFACE(ScPreviewShell, SfxViewShell) void ScPreviewShell::InitInterface_Impl() { diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index c7070da..c22278b 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -46,7 +46,7 @@ TYPEINIT2(ScTabViewShell,SfxViewShell,SfxListener); -SFX_IMPL_INTERFACE(ScTabViewShell, SfxViewShell, ScResId(SCSTR_TABVIEWSHELL)) +SFX_IMPL_INTERFACE(ScTabViewShell, SfxViewShell) void ScTabViewShell::InitInterface_Impl() { diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index facf4e4..909213a 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -59,7 +59,7 @@ TYPEINIT1( SdModule, SfxModule ); #define SdModule #include "sdslots.hxx" -SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(RID_SD_NAME)) +SFX_IMPL_INTERFACE(SdModule, SfxModule) void SdModule::InitInterface_Impl() { diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index 48fd31a..59f066d 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -36,7 +36,7 @@ SFX_SLOTMAP(LeftImpressPaneShell) { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; -SFX_IMPL_INTERFACE(LeftImpressPaneShell, SfxShell, SdResId(STR_LEFT_IMPRESS_PANE_SHELL)) +SFX_IMPL_INTERFACE(LeftImpressPaneShell, SfxShell) void LeftImpressPaneShell::InitInterface_Impl() { @@ -62,7 +62,7 @@ SFX_SLOTMAP(LeftDrawPaneShell) { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; -SFX_IMPL_INTERFACE(LeftDrawPaneShell, SfxShell, SdResId(STR_LEFT_DRAW_PANE_SHELL)) +SFX_IMPL_INTERFACE(LeftDrawPaneShell, SfxShell) void LeftDrawPaneShell::InitInterface_Impl() { diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index a46ec7c..b20911c 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -72,7 +72,7 @@ using namespace sd; #define DrawDocShell #include "sdslots.hxx" -SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(DrawDocShell, SfxObjectShell); void DrawDocShell::InitInterface_Impl() { diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index 21c49d9..a2fb7cf 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -43,7 +43,7 @@ namespace sd { TYPEINIT1(GraphicDocShell, DrawDocShell); -SFX_IMPL_INTERFACE(GraphicDocShell, SfxObjectShell, SdResId(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(GraphicDocShell, SfxObjectShell) void GraphicDocShell::InitInterface_Impl() { diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 708bbb8..b63c3ff 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -81,7 +81,7 @@ using ::sfx2::sidebar::EnumContext; namespace sd { namespace slidesorter { -SFX_IMPL_INTERFACE(SlideSorterViewShell, SfxShell, SdResId(STR_SLIDESORTERVIEWSHELL)) +SFX_IMPL_INTERFACE(SlideSorterViewShell, SfxShell) void SlideSorterViewShell::InitInterface_Impl() { diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 942a0ca..71df3df 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -76,7 +76,7 @@ void RegisterInterfaces(SfxModule* pMod) TYPEINIT1( TableObjectBar, SfxShell ); -SFX_IMPL_INTERFACE(TableObjectBar, SfxShell, SdResId(STR_TABLEOBJECTBARSHELL)) +SFX_IMPL_INTERFACE(TableObjectBar, SfxShell) void TableObjectBar::InitInterface_Impl() { diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index b4c77a5..3de3a18 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -54,7 +54,7 @@ namespace sd { // - GraphicObjectBar - -SFX_IMPL_INTERFACE(GraphicObjectBar, SfxShell, SdResId(STR_GRAFOBJECTBARSHELL)) +SFX_IMPL_INTERFACE(GraphicObjectBar, SfxShell) void GraphicObjectBar::InitInterface_Impl() { diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index 5d904ce..b688312 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -52,7 +52,7 @@ namespace sd { TYPEINIT1( MediaObjectBar, SfxShell ); -SFX_IMPL_INTERFACE(MediaObjectBar, SfxShell, SdResId(STR_MEDIAOBJECTBARSHELL)) +SFX_IMPL_INTERFACE(MediaObjectBar, SfxShell) void MediaObjectBar::InitInterface_Impl() { diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index f2b51b9..d79b256 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -221,7 +221,7 @@ TYPEINIT1(ViewShellBase, SfxViewShell); SfxViewFactory* ViewShellBase::pFactory; -SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(ViewShellBase, SfxViewShell) void ViewShellBase::InitInterface_Impl() { diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index 4a263d7..a52dd57 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -54,8 +54,7 @@ namespace sd { /** * Declare default interface (Slotmap must not be empty) */ - -SFX_IMPL_INTERFACE(BezierObjectBar, ::SfxShell, SdResId(STR_BEZIEROBJECTBARSHELL)) +SFX_IMPL_INTERFACE(BezierObjectBar, ::SfxShell) void BezierObjectBar::InitInterface_Impl() { diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 2c8e7a0..ee31d49 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -76,8 +76,7 @@ namespace sd { * Declare default interface (Slotmap must not be empty, therefore enter * something that (hopefully) never occurs. */ - -SFX_IMPL_INTERFACE(TextObjectBar, SfxShell, SdResId(STR_TEXTOBJECTBARSHELL)) +SFX_IMPL_INTERFACE(TextObjectBar, SfxShell) void TextObjectBar::InitInterface_Impl() { diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index b4fe5de..75d0c17 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -59,7 +59,7 @@ namespace sd { * Declare SFX-Slotmap and Standardinterface */ -SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) +SFX_IMPL_INTERFACE(DrawViewShell, SfxShell) void DrawViewShell::InitInterface_Impl() { @@ -84,8 +84,7 @@ void DrawViewShell::InitInterface_Impl() TYPEINIT1( DrawViewShell, ViewShell ); // SdGraphicViewShell - -SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH... +SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell) void GraphicViewShell::InitInterface_Impl() { diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 328db05..76628fa 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -106,7 +106,7 @@ namespace sd { /** * Declare SFX-Slotmap and standard interface */ -SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL)) +SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell) void OutlineViewShell::InitInterface_Impl() { diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index a36d3a0..34b0c57 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star::presentation; namespace sd { -SFX_IMPL_INTERFACE(PresentationViewShell, DrawViewShell, SdResId( STR_PRESVIEWSHELL ) ) +SFX_IMPL_INTERFACE(PresentationViewShell, DrawViewShell) void PresentationViewShell::InitInterface_Impl() { diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 73d38e3..fa87870 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -89,7 +89,7 @@ using namespace ::com::sun::star::container; #define SFX_ITEMTYPE_STATBAR 4 -SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP)) +SFX_IMPL_INTERFACE(SfxApplication,SfxShell) void SfxApplication::InitInterface_Impl() { diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 424880e..c58c2d8 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -134,7 +134,7 @@ ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, bool bBig ) TYPEINIT1(SfxModule, SfxShell); -SFX_IMPL_INTERFACE(SfxModule, SfxShell, SfxResId(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(SfxModule, SfxShell) void SfxModule::InitInterface_Impl() { diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 706258f..6e261e4 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -104,14 +104,14 @@ static SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, sal_uInt32 nRes // constuctor, registeres a new unit SfxInterface::SfxInterface( const char *pClassName, - const ResId& rNameResId, + bool bUsableSuperClass, SfxInterfaceId nId, const SfxInterface* pParent, SfxSlot &rSlotMap, sal_uInt16 nSlotCount ): pName(pClassName), pGenoType(pParent), nClassId(nId), - aNameResId(rNameResId.GetId(),*rNameResId.GetResMgr()), + bSuperClass(bUsableSuperClass), pImpData(0) { pImpData = new SfxInterface_Impl; @@ -394,7 +394,7 @@ SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, sal_uInt32 nResId, sal sal_uInt32 SfxInterface::GetObjectBarId(sal_uInt16 nNo) const { - bool bGenoType = (pGenoType != 0 && !pGenoType->HasName()); + bool bGenoType = (pGenoType != 0 && pGenoType->UseAsSuperClass()); if ( bGenoType ) { // Are there toolbars in the super class? @@ -413,7 +413,7 @@ sal_uInt32 SfxInterface::GetObjectBarId(sal_uInt16 nNo) const sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const { - bool bGenoType = (pGenoType != 0 && !pGenoType->HasName()); + bool bGenoType = (pGenoType != 0 && pGenoType->UseAsSuperClass()); if ( bGenoType ) { // Are there toolbars in the super class? @@ -432,7 +432,7 @@ sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const sal_uInt16 SfxInterface::GetObjectBarCount() const { - if (pGenoType && ! pGenoType->HasName()) + if (pGenoType && pGenoType->UseAsSuperClass()) return pImpData->aObjectBars.size() + pGenoType->GetObjectBarCount(); else return pImpData->aObjectBars.size(); @@ -520,7 +520,7 @@ const ResId& SfxInterface::GetStatusBarResId() const sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const { - bool bGenoType = (pGenoType != 0 && !pGenoType->HasName()); + bool bGenoType = (pGenoType != 0 && pGenoType->UseAsSuperClass()); if ( bGenoType ) { // Are there toolbars in the super class? @@ -539,7 +539,7 @@ sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const bool SfxInterface::IsObjectBarVisible(sal_uInt16 nNo) const { - bool bGenoType = (pGenoType != 0 && !pGenoType->HasName()); + bool bGenoType = (pGenoType != 0 && pGenoType->UseAsSuperClass()); if ( bGenoType ) { // Are there toolbars in the super class? diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index f3bb547..30e9164 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -116,7 +116,7 @@ using namespace ::com::sun::star::task; #define SfxObjectShell #include "sfxslots.hxx" -SFX_IMPL_INTERFACE(SfxObjectShell, SfxShell, SfxResId(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(SfxObjectShell, SfxShell) void SfxObjectShell::InitInterface_Impl() { diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index b2a1b28..e84c617 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -145,7 +145,7 @@ using ::com::sun::star::container::XIndexContainer; #include "sfxslots.hxx" #undef SfxViewFrame -SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(SfxViewFrame,SfxShell) void SfxViewFrame::InitInterface_Impl() { diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index a5f04e0..be8f9fa 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -293,7 +293,7 @@ SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const nFlags) , m_pController(0) {} -SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(SfxViewShell,SfxShell) void SfxViewShell::InitInterface_Impl() { diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 0282214..4b460ae 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -107,7 +107,7 @@ using namespace ::com::sun::star::uno; TYPEINIT1( SmDocShell, SfxObjectShell ); -SFX_IMPL_INTERFACE(SmDocShell, SfxObjectShell, SmResId(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(SmDocShell, SfxObjectShell) void SmDocShell::InitInterface_Impl() { diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index a214af3..7373ae6 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -155,7 +155,7 @@ const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rU return aRes; } -SFX_IMPL_INTERFACE(SmModule, SfxModule, SmResId(RID_APPLICATION)) +SFX_IMPL_INTERFACE(SmModule, SfxModule) void SmModule::InitInterface_Impl() { diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index d4fe21e..12e67f9 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -929,7 +929,7 @@ struct SmViewShell_Impl TYPEINIT1( SmViewShell, SfxViewShell ); -SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(SmViewShell, SfxViewShell) void SmViewShell::InitInterface_Impl() { diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 91fb513..914b81b 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -166,7 +166,7 @@ const sal_uInt32 FM_UI_FEATURE_TB_MORECONTROLS = 0x00000100; const sal_uInt32 FM_UI_FEATURE_TB_FORMDESIGN = 0x00000200; const sal_uInt32 FM_UI_FEATURE_SHOW_DATANAVIGATOR = 0x00000400; -SFX_IMPL_INTERFACE(FmFormShell, SfxShell, SVX_RES(RID_STR_FORMSHELL)) +SFX_IMPL_INTERFACE(FmFormShell, SfxShell) void FmFormShell::InitInterface_Impl() { diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 814acfd..45cb140 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -54,7 +54,7 @@ SFX_SLOTMAP(ExtrusionBar) { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; -SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell, SVX_RES(RID_SVX_EXTRUSION_BAR)) +SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell) void ExtrusionBar::InitInterface_Impl() { diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 1f3a89e..6dfbfa0 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -172,7 +172,7 @@ SFX_SLOTMAP(FontworkBar) { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; -SFX_IMPL_INTERFACE(FontworkBar, SfxShell, SVX_RES(RID_SVX_FONTWORK_BAR)) +SFX_IMPL_INTERFACE(FontworkBar, SfxShell) void FontworkBar::InitInterface_Impl() { diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 6db25ae..3f9d862 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -115,7 +115,7 @@ using namespace ::com::sun::star; #include <shells.hrc> -SFX_IMPL_INTERFACE(SwModule, SfxModule, SW_RES(RID_SW_NAME) ) +SFX_IMPL_INTERFACE(SwModule, SfxModule) void SwModule::InitInterface_Impl() { diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 23e3155..29670f3 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -126,7 +126,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; using namespace ::com::sun::star::container; -SFX_IMPL_INTERFACE(SwDocShell, SfxObjectShell, SW_RES(0) ) +SFX_IMPL_SUPERCLASS_INTERFACE(SwDocShell, SfxObjectShell) void SwDocShell::InitInterface_Impl() { diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx index 0721437..31905b2 100644 --- a/sw/source/uibase/misc/glshell.cxx +++ b/sw/source/uibase/misc/glshell.cxx @@ -56,13 +56,13 @@ using namespace ::com::sun::star; -SFX_IMPL_INTERFACE(SwGlosDocShell, SwDocShell, SW_RES(0) ) +SFX_IMPL_SUPERCLASS_INTERFACE(SwGlosDocShell, SwDocShell) void SwGlosDocShell::InitInterface_Impl() { } -SFX_IMPL_INTERFACE(SwWebGlosDocShell, SwWebDocShell, SW_RES(0) ) +SFX_IMPL_SUPERCLASS_INTERFACE(SwWebGlosDocShell, SwWebDocShell) void SwWebGlosDocShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index b746f48..8c38710 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -136,7 +136,7 @@ using namespace ::com::sun::star::i18n; #include <sfx2/msg.hxx> #include <swslots.hxx> -SFX_IMPL_INTERFACE(SwAnnotationShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT)) +SFX_IMPL_INTERFACE(SwAnnotationShell, SfxShell) void SwAnnotationShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 16b666e..c2cfbea 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -144,7 +144,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; -SFX_IMPL_INTERFACE(SwBaseShell, SfxShell, SW_RES(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(SwBaseShell, SfxShell) void SwBaseShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx index a9d5903..f272e32 100644 --- a/sw/source/uibase/shells/beziersh.cxx +++ b/sw/source/uibase/shells/beziersh.cxx @@ -43,7 +43,7 @@ #include <unomid.h> -SFX_IMPL_INTERFACE(SwBezierShell, SwBaseShell, SW_RES(STR_SHELLNAME_BEZIER)) +SFX_IMPL_INTERFACE(SwBezierShell, SwBaseShell) void SwBezierShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index 6ee669d..2b0aab0 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -75,7 +75,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAW)) +SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell) void SwDrawShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx index 2c04eb5..9d2916d 100644 --- a/sw/source/uibase/shells/drformsh.cxx +++ b/sw/source/uibase/shells/drformsh.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star; -SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFORM)) +SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell) void SwDrawFormShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index 991a46b..a2a6c72 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star; -SFX_IMPL_INTERFACE(SwDrawBaseShell, SwBaseShell, SW_RES(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(SwDrawBaseShell, SwBaseShell) void SwDrawBaseShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index a3807e8..92a20bc 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -81,7 +81,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::i18n; -SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT)) +SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell) void SwDrawTextShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index dcea131..678d5f7 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -108,7 +108,7 @@ static const SwFrmFmt* lcl_GetFrmFmtByName(SwWrtShell& rSh, const OUString& rNam #include <sfx2/msg.hxx> #include "swslots.hxx" -SFX_IMPL_INTERFACE(SwFrameShell, SwBaseShell, SW_RES(STR_SHELLNAME_FRAME)) +SFX_IMPL_INTERFACE(SwFrameShell, SwBaseShell) void SwFrameShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index 4fb5744..140ed1d 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -97,7 +97,7 @@ namespace }; } -SFX_IMPL_INTERFACE(SwGrfShell, SwBaseShell, SW_RES(STR_SHELLNAME_GRAPHIC)) +SFX_IMPL_INTERFACE(SwGrfShell, SwBaseShell) void SwGrfShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx index 5d3ab97..ad16286 100644 --- a/sw/source/uibase/shells/listsh.cxx +++ b/sw/source/uibase/shells/listsh.cxx @@ -51,7 +51,7 @@ #include <IDocumentOutlineNodes.hxx> -SFX_IMPL_INTERFACE(SwListShell, SwBaseShell, SW_RES(STR_SHELLNAME_LIST)) +SFX_IMPL_INTERFACE(SwListShell, SwBaseShell) void SwListShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx index feafe2c..404778b 100644 --- a/sw/source/uibase/shells/mediash.cxx +++ b/sw/source/uibase/shells/mediash.cxx @@ -69,7 +69,7 @@ #include "swabstdlg.hxx" #include <boost/scoped_ptr.hpp> -SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell, SW_RES(STR_SHELLNAME_MEDIA)) +SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell) void SwMediaShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx index 4073dca..0043e21 100644 --- a/sw/source/uibase/shells/navsh.cxx +++ b/sw/source/uibase/shells/navsh.cxx @@ -29,7 +29,7 @@ #include <unomid.h> #include "navmgr.hxx" -SFX_IMPL_INTERFACE(SwNavigationShell, SwBaseShell, SW_RES(STR_SHELLNAME_NAVIGATION)) +SFX_IMPL_INTERFACE(SwNavigationShell, SwBaseShell) void SwNavigationShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx index 2bb5d97..f0e3fe6 100644 --- a/sw/source/uibase/shells/olesh.cxx +++ b/sw/source/uibase/shells/olesh.cxx @@ -37,7 +37,7 @@ #include <sfx2/msg.hxx> #include <swslots.hxx> -SFX_IMPL_INTERFACE(SwOleShell, SwFrameShell, SW_RES(STR_SHELLNAME_OBJECT)) +SFX_IMPL_INTERFACE(SwOleShell, SwFrameShell) void SwOleShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index d4fe26b..e7962dd 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -91,7 +91,7 @@ using ::editeng::SvxBorderLine; using namespace ::com::sun::star; -SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell, SW_RES(STR_SHELLNAME_TABLE)) +SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell) void SwTableShell::InitInterface_Impl() { diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 3d7bf34..ffe5dd3 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -116,7 +116,7 @@ using namespace ::com::sun::star; #include <unomid.h> #include <boost/scoped_ptr.hpp> -SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_TEXT)) +SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell) void SwTextShell::InitInterface_Impl() { diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index f979782..a397bb9 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -89,7 +89,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreview, "PrintPreview") SFX_VIEW_REGISTRATION(SwGlobalDocShell); } -SFX_IMPL_INTERFACE(SwPagePreview, SfxViewShell, SW_RES(RID_PVIEW_TOOLBOX)) +SFX_IMPL_INTERFACE(SwPagePreview, SfxViewShell) void SwPagePreview::InitInterface_Impl() { diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 15e7c05..b54333d 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -115,7 +115,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView") SFX_VIEW_REGISTRATION(SwWebDocShell); } -SFX_IMPL_INTERFACE(SwSrcView, SfxViewShell, SW_RES(0) ) +SFX_IMPL_SUPERCLASS_INTERFACE(SwSrcView, SfxViewShell) void SwSrcView::InitInterface_Impl() { diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index 4777d66..45f10c6 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -88,7 +88,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default") } } -SFX_IMPL_INTERFACE(SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) ) +SFX_IMPL_INTERFACE(SwView, SfxViewShell) void SwView::InitInterface_Impl() { diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx index 8510133..afe8718 100644 --- a/sw/source/uibase/web/wdocsh.cxx +++ b/sw/source/uibase/web/wdocsh.cxx @@ -38,7 +38,7 @@ #include <unomid.h> -SFX_IMPL_INTERFACE(SwWebDocShell, SfxObjectShell, SW_RES(0) ) +SFX_IMPL_SUPERCLASS_INTERFACE(SwWebDocShell, SfxObjectShell) void SwWebDocShell::InitInterface_Impl() { diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx index f831965..2d1c24f 100644 --- a/sw/source/uibase/web/wformsh.cxx +++ b/sw/source/uibase/web/wformsh.cxx @@ -36,7 +36,7 @@ #define SwWebDrawFormShell #include "swslots.hxx" -SFX_IMPL_INTERFACE(SwWebDrawFormShell, SwDrawFormShell, SW_RES(0)) +SFX_IMPL_SUPERCLASS_INTERFACE(SwWebDrawFormShell, SwDrawFormShell) void SwWebDrawFormShell::InitInterface_Impl() { diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx index 07572f7..cb49a40 100644 --- a/sw/source/uibase/web/wfrmsh.cxx +++ b/sw/source/uibase/web/wfrmsh.cxx @@ -35,7 +35,7 @@ #include <sfx2/msg.hxx> #include "swslots.hxx" -SFX_IMPL_INTERFACE(SwWebFrameShell, SwFrameShell, SW_RES(STR_SHELLNAME_WEBFRAME)) +SFX_IMPL_INTERFACE(SwWebFrameShell, SwFrameShell) void SwWebFrameShell::InitInterface_Impl() { diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx index 54f59a1..24e83a5 100644 --- a/sw/source/uibase/web/wgrfsh.cxx +++ b/sw/source/uibase/web/wgrfsh.cxx @@ -38,7 +38,7 @@ #define SwWebGrfShell #include "swslots.hxx" -SFX_IMPL_INTERFACE(SwWebGrfShell, SwGrfShell, SW_RES(STR_SHELLNAME_GRAPHIC)) +SFX_IMPL_INTERFACE(SwWebGrfShell, SwGrfShell) void SwWebGrfShell::InitInterface_Impl() { diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx index efda0b9..ad487d4 100644 --- a/sw/source/uibase/web/wlistsh.cxx +++ b/sw/source/uibase/web/wlistsh.cxx @@ -34,7 +34,7 @@ #define SwWebListShell #include "swslots.hxx" -SFX_IMPL_INTERFACE(SwWebListShell, SwListShell, SW_RES(STR_SHELLNAME_LIST)) +SFX_IMPL_INTERFACE(SwWebListShell, SwListShell) void SwWebListShell::InitInterface_Impl() { diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx index e10f082..01c03a1 100644 --- a/sw/source/uibase/web/wolesh.cxx +++ b/sw/source/uibase/web/wolesh.cxx @@ -35,7 +35,7 @@ #define SwWebOleShell #include "swslots.hxx" -SFX_IMPL_INTERFACE(SwWebOleShell, SwOleShell, SW_RES(STR_SHELLNAME_OBJECT)) +SFX_IMPL_INTERFACE(SwWebOleShell, SwOleShell) void SwWebOleShell::InitInterface_Impl() { diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx index 0d3c20c..c42fab2 100644 --- a/sw/source/uibase/web/wtabsh.cxx +++ b/sw/source/uibase/web/wtabsh.cxx @@ -38,7 +38,7 @@ #include "svx/svxids.hrc" #include "swslots.hxx" -SFX_IMPL_INTERFACE(SwWebTableShell, SwTableShell, SW_RES(STR_SHELLNAME_TABLE)) +SFX_IMPL_INTERFACE(SwWebTableShell, SwTableShell) void SwWebTableShell::InitInterface_Impl() { diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx index 077e942..b45bdc1 100644 --- a/sw/source/uibase/web/wtextsh.cxx +++ b/sw/source/uibase/web/wtextsh.cxx @@ -41,7 +41,7 @@ #include <sfx2/msg.hxx> #include "swslots.hxx" -SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_WEBTEXT)) +SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell) void SwWebTextShell::InitInterface_Impl() { diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx index 027fa05..c8dffd7 100644 --- a/sw/source/uibase/web/wview.cxx +++ b/sw/source/uibase/web/wview.cxx @@ -72,7 +72,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default") SFX_VIEW_REGISTRATION(SwWebDocShell); } -SFX_IMPL_INTERFACE(SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) ) +SFX_IMPL_INTERFACE(SwWebView, SwView) void SwWebView::InitInterface_Impl() { commit f676e9a604bed14865e5c9a277fda0d7b564085d Author: Caolán McNamara <caol...@redhat.com> Date: Tue Nov 25 10:28:27 2014 +0000 tidy up this deref before check code Change-Id: Icd9ff99616c452bd16ffc3dc8ab0981d75a386a2 diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index aa9bac7..72c5a18 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -716,14 +716,17 @@ void SfxCommonTemplateDialog_Impl::ReadResource() pCurObjShell = pViewFrame->GetObjectShell(); pModule = pCurObjShell ? pCurObjShell->GetModule() : NULL; ResMgr* pMgr = pModule ? pModule->GetResMgr() : NULL; - ResId aFamId( DLG_STYLE_DESIGNER, *pMgr ); - aFamId.SetRT(RSC_SFX_STYLE_FAMILIES); - m_pStyleFamiliesId = new ResId( aFamId.GetId(), *pMgr ); - m_pStyleFamiliesId->SetRT(RSC_SFX_STYLE_FAMILIES); - if( !pMgr || !pMgr->IsAvailable( aFamId ) ) + if (pMgr) + { + ResId aFamId( DLG_STYLE_DESIGNER, *pMgr ); + aFamId.SetRT(RSC_SFX_STYLE_FAMILIES); + m_pStyleFamiliesId = new ResId( aFamId.GetId(), *pMgr ); + m_pStyleFamiliesId->SetRT(RSC_SFX_STYLE_FAMILIES); + if (pMgr->IsAvailable(aFamId)) + pStyleFamilies = new SfxStyleFamilies( aFamId ); + } + if (!pStyleFamilies) pStyleFamilies = new SfxStyleFamilies; - else - pStyleFamilies = new SfxStyleFamilies( aFamId ); nActFilter = pCurObjShell ? static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pCurObjShell ) ) : SFXSTYLEBIT_ALL; if ( pCurObjShell && SFXSTYLEBIT_ALL == nActFilter )
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits