diff options
Diffstat (limited to 'sfx2/source')
46 files changed, 49 insertions, 112 deletions
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 35a6f2966575..18bc6a73a0ad 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -59,7 +59,6 @@ #include "workwin.hxx" #include <sfx2/fcontnr.hxx> #include "sfx2/strings.hrc" -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" #include <sfx2/templdlg.hxx> #include <sfx2/module.hxx> @@ -81,13 +80,11 @@ using namespace ::com::sun::star::container; #define SfxApplication #include "sfxslots.hxx" -#define SFX_ITEMTYPE_STATBAR 4 - SFX_IMPL_INTERFACE(SfxApplication,SfxShell) void SfxApplication::InitInterface_Impl() { - GetStaticInterface()->RegisterStatusBar(SFX_ITEMTYPE_STATBAR); + GetStaticInterface()->RegisterStatusBar(StatusBarId::GenericStatusBar); GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_0); GetStaticInterface()->RegisterChildWindow(SID_DOCKWIN_1); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 1c8e1c6fd5c3..0d155e3b29f5 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -102,7 +102,6 @@ #include "sfxtypes.hxx" #include <sfx2/tabdlg.hxx> #include "arrdecl.hxx" -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" #include <sfx2/passwd.hxx> #include <sfx2/sfxresid.hxx> @@ -115,7 +114,7 @@ #include "sfxpicklist.hxx" #include "imestatuswindow.hxx" #include <sfx2/sfxdlg.hxx> -#include <sfx2/dialogs.hrc> +#include <sfx2/sfxsids.hrc> #include "sorgitm.hxx" #include <sfx2/sfxhelp.hxx> #include <sfx2/zoomitem.hxx> @@ -604,7 +603,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if ( pFact ) { - ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( nullptr, RID_DEFAULTABOUT )); + ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( nullptr, SID_ABOUT )); pDlg->Execute(); bDone = true; } diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 110a07d129c6..16dbcf563006 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -29,7 +29,6 @@ #include <sfx2/docfac.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/tabdlg.hxx> #include <svl/intitem.hxx> #include <tools/diagnose_ex.h> diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 76e667314656..1e0c55907283 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -32,8 +32,7 @@ #include <svtools/treelistentry.hxx> #include "sfx2/strings.hrc" -#include "newhelp.hrc" -#include "helpid.hrc" +#include "helpids.h" #include "bitmaps.hlst" #include <rtl/ustrbuf.hxx> diff --git a/sfx2/source/appl/newhelp.hrc b/sfx2/source/appl/newhelp.hrc deleted file mode 100644 index 0965e5380357..000000000000 --- a/sfx2/source/appl/newhelp.hrc +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HRC -#define INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HRC - -// context menu ids -#define MID_OPEN 1 -#define MID_RENAME 2 -#define MID_DELETE 3 - -#endif - -// ******************************************************************* EOF - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index c9ee6c2df7e2..c2d752e9c86f 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -38,6 +38,11 @@ #include "srchdlg.hxx" +// context menu ids +#define MID_OPEN 1 +#define MID_RENAME 2 +#define MID_DELETE 3 + namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } } namespace com { namespace sun { namespace star { namespace text { class XTextRange; } } } } diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index c1aceedb3663..4509e7299c91 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -43,7 +43,6 @@ #include "sfxtypes.hxx" #include <sfx2/request.hxx> #include <sfx2/sfxsids.hrc> -#include <sfx2/sfx.hrc> #include <sfx2/event.hxx> #include <sfx2/objsh.hxx> #include <sfx2/bindings.hxx> diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index de328cbbb96f..a1f0823a5b7e 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -21,6 +21,7 @@ #include <comphelper/processfactory.hxx> #include <sfx2/docfile.hxx> +#include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> #include <sfx2/app.hxx> #include "workwin.hxx" @@ -1428,14 +1429,13 @@ void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW ) void SfxWorkWindow::ResetStatusBar_Impl() { - aStatBar.nId = 0; + aStatBar.eId = StatusBarId::None; } - -void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId ) +void SfxWorkWindow::SetStatusBar_Impl(StatusBarId eId) { - if ( nResId && bShowStatusBar && IsVisible_Impl() ) - aStatBar.nId = sal::static_int_cast<sal_uInt16>(nResId); + if (eId != StatusBarId::None && bShowStatusBar && IsVisible_Impl()) + aStatBar.eId = eId; } void SfxWorkWindow::UpdateStatusBar_Impl() @@ -1448,8 +1448,8 @@ void SfxWorkWindow::UpdateStatusBar_Impl() // No status bar, if no ID is required or when in FullScreenView or // if disabled - if ( aStatBar.nId && IsDockingAllowed() && bInternalDockingAllowed && bShowStatusBar && - !bIsFullScreen ) + if (aStatBar.eId != StatusBarId::None && IsDockingAllowed() && bInternalDockingAllowed && bShowStatusBar && + !bIsFullScreen) { // Id has changed, thus create a suitable Statusbarmanager, this takes // over the current status bar; diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index f49cbd8e0b5f..4ed8f4755b8b 100644 --- a/sfx2/source/bastyp/frmhtml.cxx +++ b/sfx2/source/bastyp/frmhtml.cxx @@ -21,8 +21,6 @@ #include <svtools/htmltokn.h> #include <svtools/asynclink.hxx> -#include <sfx2/sfx.hrc> - #include <sfx2/frmhtml.hxx> #include <sfx2/docfile.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 1469e91ceacc..f25562df5647 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -35,7 +35,6 @@ #include <sfx2/docfile.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/objsh.hxx> -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" #include "strings.hxx" diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 15e1f9151f76..6784846f62c5 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -50,7 +50,6 @@ #include "sfxtypes.hxx" #include "workwin.hxx" #include <sfx2/unoctitm.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/sfxuno.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 2437fa49efd5..5e9f12f7fc35 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1312,7 +1312,7 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne if ( xImp->bQuiet || xImp->bNoUI || (xImp->pFrame && xImp->pFrame->GetObjectShell()->IsPreview()) ) return; - sal_uInt32 nStatBarId=0; + StatusBarId eStatBarId = StatusBarId::None; SfxSlotPool* pSlotPool = &SfxSlotPool::GetSlotPool( GetFrame() ); sal_uInt16 nTotCount = xImp->aStack.size(); @@ -1407,11 +1407,9 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne if ( bIsMDIApp || bIsIPOwner ) { - sal_uInt32 nId = pIFace ? pIFace->GetStatusBarId() : 0; - if ( nId ) - { - nStatBarId = nId; - } + StatusBarId eId = pIFace ? pIFace->GetStatusBarId() : StatusBarId::None; + if (eId != StatusBarId::None) + eStatBarId = eId; } } @@ -1440,10 +1438,10 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne pActDispatcher = pActDispatcher->xImp->pParent; } - if ( bIsTaskActive && nStatBarId && xImp->pFrame ) + if (bIsTaskActive && eStatBarId != StatusBarId::None && xImp->pFrame) { // internal frames also may control statusbar - xImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl( nStatBarId ); + xImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl(eStatBarId); } } } diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index 59262504626d..e1733d0f71d9 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -31,7 +31,6 @@ #include "arrdecl.hxx" #include <sfx2/module.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> SfxSlotPool::SfxSlotPool(SfxSlotPool *pParent) diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 2a12149cc6b3..d990763f140d 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -76,12 +76,12 @@ struct SfxInterface_Impl SfxObjectUIArr_Impl aObjectBars; // registered ObjectBars SfxObjectUIArr_Impl aChildWindows; // registered ChildWindows OUString aPopupName; // registered PopupMenu - sal_uInt32 nStatBarResId; // registered StatusBar + StatusBarId eStatBarResId; // registered StatusBar SfxModule* pModule; bool bRegistered; SfxInterface_Impl() - : nStatBarResId(0) + : eStatBarResId(StatusBarId::None) , pModule(nullptr) , bRegistered(false) { @@ -382,9 +382,9 @@ void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, SfxShellFe pImplData->aChildWindows.push_back(pUI); } -void SfxInterface::RegisterStatusBar(sal_uInt32 nResId) +void SfxInterface::RegisterStatusBar(StatusBarId eId) { - pImplData->nStatBarResId = nResId; + pImplData->eStatBarResId = eId; } sal_uInt32 SfxInterface::GetChildWindowId (sal_uInt16 nNo) const @@ -440,12 +440,12 @@ const OUString& SfxInterface::GetPopupMenuName() const return pImplData->aPopupName; } -sal_uInt32 SfxInterface::GetStatusBarId() const +StatusBarId SfxInterface::GetStatusBarId() const { - if (pImplData->nStatBarResId == 0 && pGenoType) + if (pImplData->eStatBarResId == StatusBarId::None && pGenoType) return pGenoType->GetStatusBarId(); else - return pImplData->nStatBarResId; + return pImplData->eStatBarResId; } SfxShellFeature SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 21bd87a0b5ea..5eb0ba522d0c 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -21,7 +21,6 @@ #include <sfx2/recentdocsview.hxx> #include <sfx2/templatelocalview.hxx> #include <sfx2/app.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/sfxresid.hxx> #include <unotools/historyoptions.hxx> #include <vcl/builderfactory.hxx> diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index d114c1d46728..ddad76bb09de 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -19,7 +19,7 @@ #include "backingwindow.hxx" -#include <helpid.hrc> +#include <helpids.h> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 9602469ad3fa..fb2a4831f326 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -65,7 +65,6 @@ #include <comphelper/storagehelper.hxx> #include "documentfontsdialog.hxx" -#include <sfx2/sfx.hrc> #include "dinfdlg.hrc" #include "sfx2/strings.hrc" #include "strings.hxx" diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 9c046d23ec4d..f4ebace14fbd 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -69,7 +69,7 @@ #include <vcl/graphicfilter.hxx> #include <unotools/viewoptions.hxx> #include <unotools/moduleoptions.hxx> -#include <svtools/helpid.hrc> +#include <svtools/helpids.h> #include <comphelper/docpasswordrequest.hxx> #include <comphelper/docpasswordhelper.hxx> #include <ucbhelper/content.hxx> @@ -88,7 +88,7 @@ #include "filtergrouping.hxx" #include <sfx2/request.hxx> #include "filedlgimpl.hxx" -#include <helpid.hrc> +#include <helpids.h> #include <sfx2/strings.hrc> #include <rtl/strbuf.hxx> #include <comphelper/sequence.hxx> diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 7b81b834fb72..d55171a913bf 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -20,7 +20,6 @@ #include "filtergrouping.hxx" #include <sfx2/fcontnr.hxx> #include <sfx2/filedlghelper.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> #include <sfx2/docfac.hxx> #include <sfx2/sfxresid.hxx> diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index b093718f4e86..ec6814edce9c 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -16,8 +16,8 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/infobar.hxx> +#include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/viewsh.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index c463872fef36..af5f69ba2f20 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -37,7 +37,6 @@ #include <sfx2/templdlg.hxx> #include "templdgi.hxx" -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" #include <svl/style.hxx> diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 3ebca4245826..c99aeb6c7c8a 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -21,11 +21,10 @@ #include <sfx2/bindings.hxx> #include <sfx2/navigat.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> #include <sfx2/app.hxx> #include <sfx2/sfxresid.hxx> -#include "helpid.hrc" +#include "helpids.h" SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR ); diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 160c6d462c9c..cdac7d87d1ea 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -22,7 +22,6 @@ #include <sfx2/sfxresid.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> #include <sfx2/objsh.hxx> #include <sfx2/viewsh.hxx> diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index f9de799edc6b..44f3118c6c6a 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -40,7 +40,7 @@ #include "uitest/sfx_uiobject.hxx" #include "sfx2/strings.hrc" -#include "helpid.hrc" +#include "helpids.h" using namespace ::com::sun::star::uno; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index ba9985aefa29..152bb1ab2843 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -50,14 +50,13 @@ #include <sfx2/tplpitem.hxx> #include <sfx2/sfxresid.hxx> -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" #include "arrdecl.hxx" #include <sfx2/docfilt.hxx> #include <sfx2/docfac.hxx> #include <sfx2/doctempl.hxx> #include <sfx2/module.hxx> -#include "helpid.hrc" +#include "helpids.h" #include "bitmaps.hlst" #include "appdata.hxx" #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index e016d111a18b..44fd583c81d9 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -26,7 +26,6 @@ #include "tplcitem.hxx" #include "templdgi.hxx" -#include <sfx2/sfx.hrc> #include "sfx2/strings.hrc" // Constructor diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index ac67301c11eb..54f212ee58f8 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -32,7 +32,6 @@ #include <comphelper/sequenceashashmap.hxx> #include <comphelper/configurationhelper.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/docfilt.hxx> #include <sfx2/docfac.hxx> #include <sfx2/viewfac.hxx> diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index 422e3ea62842..2d59de087943 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -27,7 +27,6 @@ #include <sfx2/objsh.hxx> #include <sfx2/app.hxx> #include "objshimp.hxx" -#include <sfx2/sfx.hrc> #include <sfx2/event.hxx> #include <comphelper/seqstream.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 581ab76a44ec..febf5fbfe728 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -93,7 +93,6 @@ #include <sfx2/objsh.hxx> #include "objshimp.hxx" #include <sfx2/event.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> @@ -104,7 +103,7 @@ #include "helper.hxx" #include "sfx2/strings.hrc" #include "workwin.hxx" -#include "helpid.hrc" +#include "helpids.h" #include "sfx2/strings.hrc" #include <sfx2/sfxdlg.hxx> #include "appbaslib.hxx" diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 929008cd1136..2924a4f43598 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -95,7 +95,7 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> -#include "helpid.hrc" +#include "helpids.h" #include "guisaveas.hxx" #include <sfx2/saveastemplatedlg.hxx> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 6e3617421b07..8b25c10f7fe1 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -91,7 +91,7 @@ #include <basic/basmgr.hxx> #include <svtools/strings.hrc> #include <sfx2/QuerySaveDocument.hxx> -#include "helpid.hrc" +#include "helpids.h" #include <sfx2/msg.hxx> #include "appbaslib.hxx" #include <sfx2/sfxbasemodel.hxx> diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index 7315e98f9344..c21b73ba7f71 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -21,7 +21,7 @@ #include "querytemplate.hxx" #include <sfx2/sfxresid.hxx> #include "sfx2/strings.hrc" -#include "helpid.hrc" +#include "helpids.h" #include <vcl/svapp.hxx> namespace sfx2 diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index eb07fd640874..5df92d9175d4 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -105,7 +105,6 @@ #include <eventsupplier.hxx> #include <sfx2/evntconf.hxx> #include <sfx2/strings.hrc> -#include <sfx2/sfx.hrc> #include <sfx2/app.hxx> #include "appdata.hxx" #include <sfx2/docfac.hxx> diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index c71405547eb1..117d1a7c4635 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <osl/diagnose.h> -#include <sfx2/sfx.hrc> SfxPoolItem* SvxZoomItem::CreateDefault() { return new SvxZoomItem; } diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpids.h index 1edcd1da3fdb..96395079b7c9 100644 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpids.h @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SFX2_SOURCE_INC_HELPID_HRC -#define INCLUDED_SFX2_SOURCE_INC_HELPID_HRC +#ifndef INCLUDED_SFX2_SOURCE_INC_HELPIDS_H +#define INCLUDED_SFX2_SOURCE_INC_HELPIDS_H #define HID_TEMPLATE_FMT "SFX2_HID_TEMPLATE_FMT" #define HID_TEMPLATE_FILTER "SFX2_HID_TEMPLATE_FILTER" diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 6f1eb124f1b2..bb4e50db7025 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -31,8 +31,8 @@ #include <rtl/ustring.hxx> #include <o3tl/typed_flags_set.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/childwin.hxx> +#include <sfx2/objface.hxx> #include <sfx2/shell.hxx> #include <sfx2/ctrlitem.hxx> #include <sfx2/toolbarids.hxx> @@ -58,19 +58,17 @@ struct SfxObjectBar_Impl {} }; - // This struct makes all relevant Information available of the status bar struct SfxStatBar_Impl { - sal_uInt16 nId; + StatusBarId eId; SfxStatBar_Impl() : - nId(0) + eId(StatusBarId::None) {} }; - enum class SfxChildVisibility { NOT_VISIBLE = 0, @@ -296,7 +294,7 @@ public: // Methods for StatusBar void ResetStatusBar_Impl(); - void SetStatusBar_Impl(sal_uInt32 nResId); + void SetStatusBar_Impl(StatusBarId eResId); void UpdateStatusBar_Impl(); css::uno::Reference< css::task::XStatusIndicator > GetStatusIndicator(); css::uno::Reference< css::frame::XFrame > GetFrameInterface(); diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index da0820aa208d..784ebd37a3ec 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -39,7 +39,6 @@ #include <comphelper/processfactory.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index 126d304c21f7..c5be03bc17ec 100644 --- a/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -22,7 +22,7 @@ #include <sfx2/sidebar/SidebarChildWindow.hxx> #include <sfx2/sidebar/SidebarDockingWindow.hxx> #include <sfx2/sfxsids.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <sfx2/dockwin.hxx> namespace sfx2 { namespace sidebar { diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 12c977e8e5b0..aeee94b41201 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -39,7 +39,6 @@ #include <sfx2/dispatch.hxx> #include <sfx2/unoctitm.hxx> #include <sfx2/objsh.hxx> -#include <sfx2/sfx.hrc> #include <comphelper/processfactory.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 22a2d3e82c5f..0bfcf1bcdff3 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -72,14 +72,13 @@ #include <sfx2/viewfrm.hxx> #include "sfxtypes.hxx" #include <sfx2/sfxresid.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/module.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfac.hxx> #include <sfx2/frmhtmlw.hxx> #include <sfx2/app.hxx> #include <sfx2/unoctitm.hxx> -#include "helpid.hrc" +#include "helpids.h" #include "workwin.hxx" #include <ctrlfactoryimpl.hxx> diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 55ba2249327d..b122fb669d92 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -22,7 +22,6 @@ #include <vcl/fixed.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/classificationhelper.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> #include <sfx2/sfxresid.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx index 41759086a5f6..497b4c2ba4f8 100644 --- a/sfx2/source/view/classificationhelper.cxx +++ b/sfx2/source/view/classificationhelper.cxx @@ -28,7 +28,6 @@ #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> #include <cppuhelper/implbase.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/strings.hrc> #include <sfx2/sfxresid.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 93283f639f88..7e699c13c053 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -30,7 +30,6 @@ #include <sfx2/frame.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> #include <sfx2/sfxuno.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 53a677c71836..c74166027e8d 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -59,7 +59,6 @@ #include <sfx2/unoctitm.hxx> #include <sfx2/childwin.hxx> #include <sfx2/sfxsids.hrc> -#include <sfx2/sfx.hrc> #include <sfx2/sfxresid.hxx> #include <workwin.hxx> #include <sfx2/objface.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 5ddcb71e8765..a22aae8818e6 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -124,7 +124,6 @@ using ::com::sun::star::container::XIndexContainer; #include <sfx2/msgpool.hxx> #include "viewimp.hxx" #include <sfx2/sfxbasecontroller.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/frmdescr.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/progress.hxx> diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index f50f7b8f3cfc..49e5ae6b34d4 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -50,7 +50,7 @@ #include <toolkit/awt/vclxdevice.hxx> -#include "helpid.hrc" +#include "helpids.h" using namespace com::sun::star; using namespace com::sun::star::uno; |