diff options
Diffstat (limited to 'sw/source/uibase')
30 files changed, 31 insertions, 31 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 6db25aea7dd3..3f9d862da737 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 23e315555c50..29670f3d091a 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 07214372c9d9..31905b260106 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 b746f48f4e5b..8c38710ab2bb 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 16b666ef46fb..c2cfbea258cf 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 a9d59035609d..f272e32d9998 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 6ee669d8ecef..2b0aab006f03 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 2c04eb52d245..9d2916dd53d4 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 991a46ba88ed..a2a6c72c930a 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 a3807e81996c..92a20bc8b45c 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 dcea1310aa3b..678d5f724852 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 4fb574449078..140ed1d2146d 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 5d3ab97078a6..ad16286fe139 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 feafe2c5a518..404778bde475 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 4073dca09855..0043e21c940c 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 2bb5d9769686..f0e3fe68d7d2 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 d4fe26b330ee..e7962dde182b 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 3d7bf34209e7..ffe5dd381c77 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 f97978286f9e..a397bb9dadc8 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 15e7c05a3ed6..b54333dad3be 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 4777d66d01df..45f10c6205dc 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 85101332066e..afe87184981f 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 f83196549454..2d1c24f2aa7e 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 07572f72ca15..cb49a405a11f 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 54f59a1b85dc..24e83a5a7cff 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 efda0b9afbdb..ad487d4c5c27 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 e10f0824555b..01c03a1c7255 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 0d3c20c97409..c42fab259d00 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 077e9425b33e..b45bdc17e395 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 027fa051219a..c8dffd7261a2 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() { |