diff options
Diffstat (limited to 'sw/source/uibase/shells')
22 files changed, 39 insertions, 39 deletions
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 2b432510ae08..bd55da92d18d 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -88,7 +88,7 @@ #include <cmdid.h> #include <globals.hrc> -#include <shells.hrc> +#include <strings.hrc> #include <breakit.hxx> #include "annotsh.hxx" #include "view.hxx" diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 5ef7c73dd101..e5196985f47f 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -87,8 +87,8 @@ #include <swwait.hxx> #include <cmdid.h> #include <globals.hrc> -#include <shells.hrc> -#include <statstr.hrc> +#include <strings.hrc> +#include <strings.hrc> #include <globals.h> #include <unotxdoc.hxx> #include <fmtinfmt.hxx> @@ -103,7 +103,7 @@ #include <instable.hxx> #include <svx/fmshell.hxx> #include <SwRewriter.hxx> -#include <comcore.hrc> +#include <strings.hrc> #include <unomid.h> #include <svx/galleryitem.hxx> #include <com/sun/star/gallery/GalleryItemType.hpp> diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx index 5be7208b3383..a3ef6109fece 100644 --- a/sw/source/uibase/shells/beziersh.cxx +++ b/sw/source/uibase/shells/beziersh.cxx @@ -35,7 +35,7 @@ #include "globals.hrc" #include "drawbase.hxx" #include "beziersh.hxx" -#include "shells.hrc" +#include "strings.hrc" #define SwBezierShell #include <sfx2/msg.hxx> #include "swslots.hxx" diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index 8a9b33502201..41c3e0627c0d 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -55,7 +55,7 @@ #include "cmdid.h" #include "globals.hrc" #include "helpid.h" -#include "shells.hrc" +#include "strings.hrc" #include "drwbassh.hxx" #include "drawsh.hxx" diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx index e56af623a61d..f9eeee21e137 100644 --- a/sw/source/uibase/shells/drformsh.cxx +++ b/sw/source/uibase/shells/drformsh.cxx @@ -40,7 +40,7 @@ #include "cmdid.h" #include "globals.hrc" #include "helpid.h" -#include "shells.hrc" +#include "strings.hrc" #include "drwbassh.hxx" #include "drformsh.hxx" #include <svl/urihelper.hxx> diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index 4c31ff70f659..b9a0b3bf3bdb 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -49,7 +49,7 @@ #include <svx/svdogrp.hxx> #include <svx/svdpage.hxx> #include <svx/svditer.hxx> -#include <shells.hrc> +#include <strings.hrc> #define SwDrawBaseShell #include <sfx2/msg.hxx> #include <swslots.hxx> diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index aaf8c256861d..6744d94b2494 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -84,7 +84,7 @@ #include <langhelper.hxx> #include <chrdlgmodes.hxx> #include <pardlg.hxx> -#include <shells.hrc> +#include <strings.hrc> #include <string.h> #include <swdtflvr.hxx> #include <swmodule.hxx> diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 9117bb622cf8..b7ae1f342e66 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -56,7 +56,7 @@ #include <cmdid.h> #include <helpid.h> #include <globals.hrc> -#include <shells.hrc> +#include <strings.hrc> #define SwDrawTextShell #include <sfx2/msg.hxx> diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 81ef6cf89e75..1e5bab8a6c78 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -73,7 +73,7 @@ #include <cmdid.h> #include <cfgitems.hxx> #include <globals.hrc> -#include <shells.hrc> +#include <strings.hrc> #include "swabstdlg.hxx" #include "misc.hrc" @@ -771,16 +771,16 @@ void SwFrameShell::GetState(SfxItemSet& rSet) { case SID_OBJECT_ALIGN_UP : case FN_FRAME_ALIGN_VERT_TOP: - sNewLabel = SwResId(STR_TOP_BASE); + sNewLabel = SwResId(STR_FRMUI_TOP_BASE); break; case SID_OBJECT_ALIGN_MIDDLE : case FN_FRAME_ALIGN_VERT_CENTER: - sNewLabel = SwResId(STR_CENTER_BASE); + sNewLabel = SwResId(STR_FRMUI_CENTER_BASE); break; case SID_OBJECT_ALIGN_DOWN : case FN_FRAME_ALIGN_VERT_BOTTOM: if(!bHtmlMode) - sNewLabel = SwResId(STR_BOTTOM_BASE); + sNewLabel = SwResId(STR_FRMUI_BOTTOM_BASE); else rSet.DisableItem( nWhich ); break; diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index 5a7fa6afcc82..d52e03d489bd 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -63,7 +63,7 @@ #include <usrpref.hxx> #include <edtwin.hxx> #include <swwait.hxx> -#include <shells.hrc> +#include <strings.hrc> #include <svx/extedit.hxx> #include <svx/graphichelper.hxx> #include <doc.hxx> diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx index 9c96068e8290..c5eec11bec03 100644 --- a/sw/source/uibase/shells/grfshex.cxx +++ b/sw/source/uibase/shells/grfshex.cxx @@ -24,7 +24,7 @@ #include <textsh.hxx> #include <viewopt.hxx> #include <swundo.hxx> -#include <shells.hrc> +#include <strings.hrc> #include <caption.hxx> #include <vcl/graphicfilter.hxx> #include <sfx2/htmlmode.hxx> @@ -40,7 +40,7 @@ #include <svx/svdpagv.hxx> #include <SwStyleNameMapper.hxx> #include <sfx2/filedlghelper.hxx> -#include <poolfmt.hrc> +#include <strings.hrc> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> @@ -50,7 +50,7 @@ // -> #111827# #include <SwRewriter.hxx> -#include <comcore.hrc> +#include <strings.hrc> // <- #111827# using namespace ::com::sun::star; diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx index e0020792b613..2e6127ba6522 100644 --- a/sw/source/uibase/shells/listsh.cxx +++ b/sw/source/uibase/shells/listsh.cxx @@ -38,7 +38,7 @@ #include "frmatr.hxx" #include "helpid.h" #include "globals.hrc" -#include "shells.hrc" +#include "strings.hrc" #include "uinums.hxx" #include "listsh.hxx" #include "poolfmt.hxx" diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx index f040a234db90..1e67a043dd40 100644 --- a/sw/source/uibase/shells/mediash.cxx +++ b/sw/source/uibase/shells/mediash.cxx @@ -54,7 +54,7 @@ #include <usrpref.hxx> #include <edtwin.hxx> #include <swwait.hxx> -#include <shells.hrc> +#include <strings.hrc> #include <sfx2/objface.hxx> #include <vcl/EnumContext.hxx> diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx index 073f22a7820c..abba5d41c97b 100644 --- a/sw/source/uibase/shells/navsh.cxx +++ b/sw/source/uibase/shells/navsh.cxx @@ -22,7 +22,7 @@ #include "helpid.h" #include "globals.hrc" #include "navsh.hxx" -#include "shells.hrc" +#include "strings.hrc" #define SwNavigationShell #include "swslots.hxx" #include <unomid.h> diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx index 9fe17add5af6..5fec60d3f947 100644 --- a/sw/source/uibase/shells/olesh.cxx +++ b/sw/source/uibase/shells/olesh.cxx @@ -30,7 +30,7 @@ #include <olesh.hxx> #include <cmdid.h> -#include <shells.hrc> +#include <strings.hrc> #define SwOleShell #include <sfx2/msg.hxx> diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index b39292ede61c..4c7046985101 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -73,7 +73,7 @@ #include <app.hrc> #include <dialog.hrc> -#include <shells.hrc> +#include <strings.hrc> #include <cmdid.h> #include <globals.hrc> #include <helpid.h> diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx index 73da9c9b145f..da6a3621576c 100644 --- a/sw/source/uibase/shells/textdrw.cxx +++ b/sw/source/uibase/shells/textdrw.cxx @@ -32,7 +32,7 @@ #include <swundo.hxx> #include <basesh.hxx> -#include <poolfmt.hrc> +#include <strings.hrc> #include <docsh.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 40fbf5a0b5dc..16408fe5e708 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -59,7 +59,7 @@ #include <fldmgr.hxx> #include <uitool.hxx> #include <cmdid.h> -#include <shells.hrc> +#include <strings.hrc> #include <sfx2/app.hxx> #include <svx/dialogs.hrc> #include "swabstdlg.hxx" @@ -80,30 +80,30 @@ static OUString lcl_BuildTitleWithRedline( const SwRangeRedline *pRedline ) { const OUString sTitle(SwResId(STR_REDLINE_COMMENT)); - sal_uInt16 nResId = 0; + const char* pResId = nullptr; switch( pRedline->GetType() ) { case nsRedlineType_t::REDLINE_INSERT: - nResId = STR_REDLINE_INSERTED; + pResId = STR_REDLINE_INSERTED; break; case nsRedlineType_t::REDLINE_DELETE: - nResId = STR_REDLINE_DELETED; + pResId = STR_REDLINE_DELETED; break; case nsRedlineType_t::REDLINE_FORMAT: case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: - nResId = STR_REDLINE_FORMATED; + pResId = STR_REDLINE_FORMATED; break; case nsRedlineType_t::REDLINE_TABLE: - nResId = STR_REDLINE_TABLECHG; + pResId = STR_REDLINE_TABLECHG; break; case nsRedlineType_t::REDLINE_FMTCOLL: - nResId = STR_REDLINE_FMTCOLLSET; + pResId = STR_REDLINE_FMTCOLLSET; break; default: return sTitle; } - return sTitle + SwResId( nResId ); + return sTitle + SwResId(pResId); } void SwTextShell::ExecField(SfxRequest &rReq) diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 2fb8186ac545..cea962a2408e 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -87,7 +87,7 @@ #include <modcfg.hxx> #include <column.hxx> #include <edtwin.hxx> -#include <shells.hrc> +#include <strings.hrc> #include <swerror.h> #include <unochart.hxx> @@ -98,7 +98,7 @@ #include <vcl/EnumContext.hxx> #include <swslots.hxx> #include <SwRewriter.hxx> -#include <comcore.hrc> +#include <strings.hrc> using namespace ::com::sun::star; diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 508c50232003..84f5aff3bb62 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -82,9 +82,9 @@ #include <redlndlg.hxx> #include "fldmgr.hxx" #include <globals.hrc> -#include <shells.hrc> +#include <strings.hrc> #include <app.hrc> -#include <web.hrc> +#include <strings.hrc> #include "paratr.hxx" #include <vcl/svapp.hxx> #include <sfx2/app.hxx> @@ -112,7 +112,7 @@ #include <svx/nbdtmgfact.hxx> #include <svx/nbdtmg.hxx> #include <SwRewriter.hxx> -#include <comcore.hrc> +#include <strings.hrc> #include <svx/svdmodel.hxx> #include <svx/drawitem.hxx> #include <numrule.hxx> diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx index e3200b5e6890..3e76669345a1 100644 --- a/sw/source/uibase/shells/textsh2.cxx +++ b/sw/source/uibase/shells/textsh2.cxx @@ -47,7 +47,7 @@ #include "swtypes.hxx" #include "cmdid.h" #include "swevent.hxx" -#include "shells.hrc" +#include "strings.hrc" #include "textsh.hxx" #include "swabstdlg.hxx" #include "dbui.hrc" diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index 647a733d93cd..9dd36e3a21e0 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -53,7 +53,7 @@ #include <cmdid.h> #include <globals.h> -#include <shells.hrc> +#include <strings.hrc> #include <SwStyleNameMapper.hxx> #include "swabstdlg.hxx" #include "outline.hxx" |