diff options
Diffstat (limited to 'cui/source/options')
34 files changed, 22 insertions, 83 deletions
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 9ea41a5161c7..202866e284f9 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -13,7 +13,6 @@ #include <osl/thread.h> #include "svtools/treelistentry.hxx" #include <unotools/securityoptions.hxx> -#include <cuires.hrc> #include "certpath.hxx" #include "dialmgr.hxx" diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 4e8666cdac1a..d1ff39a6fb19 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -21,7 +21,6 @@ #include <tools/stream.hxx> #include "cfgchart.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> #include <strings.hrc> #define ROW_COLOR_COUNT 12 diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index ae3a2538d386..e076e3ca2311 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -23,8 +23,7 @@ #include <vcl/builderfactory.hxx> #include "connpoolsettings.hxx" #include <svl/eitem.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <strings.hrc> #include <dialmgr.hxx> diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index 0b3bf50120df..8ee9ac426723 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -33,8 +33,6 @@ #include "cuisrchdlg.hxx" -#include <cuires.hrc> - #include <svl/srchitem.hxx> #include <svx/pageitem.hxx> #include <dialmgr.hxx> diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index df307e814396..a2590311aae3 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -21,10 +21,9 @@ #include "dbregistersettings.hxx" #include "connpooloptions.hxx" #include <svl/filenotation.hxx> -#include "helpid.hrc" +#include "helpids.h" #include <svtools/editbrowsebox.hxx> #include "svtools/treelistentry.hxx" -#include <cuires.hrc> #include <strings.hrc> #include <bitmaps.hlst> #include <vcl/field.hxx> diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 6bb15f5b3aae..c7ab9a2983e9 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <comphelper/processfactory.hxx> -#include <cuires.hrc> #include <strings.hrc> #include <svl/filenotation.hxx> #include <vcl/layout.hxx> diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 103d03fc3ef4..d667c943dd8e 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -27,8 +27,7 @@ #include <svtools/fontsubstconfig.hxx> #include "fontsubs.hxx" #include <dialmgr.hxx> -#include "helpid.hrc" -#include <cuires.hrc> +#include "helpids.h" #include <o3tl/make_unique.hxx> /*********************************************************************/ diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index fe0e37aae829..517fb17a683f 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -19,7 +19,6 @@ #include <optaccessibility.hxx> #include <dialmgr.hxx> -#include <cuires.hrc> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <officecfg/Office/Common.hxx> diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index f814ad27e3b7..2c011898d484 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -24,7 +24,6 @@ #include <editeng/unolingu.hxx> #include <o3tl/any.hxx> #include <dialmgr.hxx> -#include <cuires.hrc> #include <i18nlangtag/mslangid.hxx> #include <svl/asiancfg.hxx> #include <com/sun/star/lang/Locale.hpp> diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 632ccb923404..9795c1d9dd4f 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -21,7 +21,6 @@ #include <basic/codecompletecache.hxx> #include <iostream> #include <officecfg/Office/BasicIDE.hxx> -#include <cuires.hrc> SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet) diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 00ba47e4e0b9..975f1d64e3ec 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -18,7 +18,6 @@ */ #include <unotools/pathoptions.hxx> -#include <cuires.hrc> #include "optchart.hxx" #include <dialmgr.hxx> #include <vcl/builderfactory.hxx> diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 1a64c728eddb..7d70a458dc79 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -35,10 +35,9 @@ #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> #include <svx/svxdlg.hxx> -#include <helpid.hrc> +#include <helpids.h> #include <dialmgr.hxx> #include "optcolor.hxx" -#include <cuires.hrc> #include <strings.hrc> #include <svx/dlgutil.hxx> diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 4f258008d0cb..ca8e9137ae8b 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -19,7 +19,6 @@ #include "optctl.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> #include <svl/ctloptions.hxx> // class SvxCTLOptionsPage ----------------------------------------------------- diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 9f0f8bd434a4..9d1bfcf90825 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -33,7 +33,6 @@ #include <svx/dialogs.hrc> #include <linguistic/misc.hxx> -#include <cuires.hrc> #include <strings.hrc> #include "optdict.hxx" #include <dialmgr.hxx> diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 6964977d3a39..cd39dcac4e54 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -21,8 +21,7 @@ #include <unotools/moduleoptions.hxx> #include <unotools/fltrcfg.hxx> #include "optfltr.hxx" -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include <dialmgr.hxx> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 180f6f185bfa..84ecbb97fb83 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -54,7 +54,6 @@ #include <svx/xpool.hxx> #include <svx/dlgutil.hxx> #include "cuitabarea.hxx" -#include <cuires.hrc> #include <editeng/unolingu.hxx> #include <editeng/langitem.hxx> #include <comphelper/processfactory.hxx> diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 991041917020..7f9e975007eb 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -26,7 +26,6 @@ #include <vcl/edit.hxx> #include <vcl/settings.hxx> -#include <cuires.hrc> #include <unotools/useroptions.hxx> #include "cuioptgenrl.hxx" #include <dialmgr.hxx> diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 2f449abbddd3..2b47d835870f 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -20,8 +20,7 @@ #include <svtools/langtab.hxx> #include <svtools/htmlcfg.hxx> #include "opthtml.hxx" -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <dialmgr.hxx> #include <sal/macros.h> diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index db2ff453dbd4..434462ca04a7 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -49,8 +49,7 @@ #include <dialmgr.hxx> #include "optinet2.hxx" #include <svx/svxdlg.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <svx/ofaitem.hxx> #include <sfx2/htmlmode.hxx> #include <svx/svxids.hrc> diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 8141a5b4ccc0..1fc450aa1217 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -31,8 +31,7 @@ #include <officecfg/Office/Common.hxx> #include <svtools/miscopt.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <strings.hrc> #include <vcl/svapp.hxx> #include <vcl/help.hxx> diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index bbe587a61a67..0c709cc57aa8 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -19,7 +19,6 @@ #include <unotools/searchopt.hxx> #include <i18nutil/transliteration.hxx> -#include <cuires.hrc> #include <dialmgr.hxx> #include <optjsearch.hxx> diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 1c85f8469c07..0f4d942194a6 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -56,8 +56,7 @@ #include <editeng/optitems.hxx> #include "optlingu.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <strings.hrc> #include <ucbhelper/content.hxx> diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 27cb5b48f383..be9d6606c881 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -54,8 +54,7 @@ #include "cuitabarea.hxx" #include "optmemory.hxx" #include <svx/ofaitem.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include <dialmgr.hxx> #include <limits> diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 0fb1e1a172ee..731f385976be 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -#include <cuires.hrc> #include <strings.hrc> #include <dialmgr.hxx> #include "optopencl.hxx" diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 08b0243a6f02..683683cd8e74 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -34,8 +34,7 @@ #include "optpath.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> -#include "helpid.hrc" +#include "helpids.h" #include "strings.hrc" #include <comphelper/configuration.hxx> #include <comphelper/processfactory.hxx> diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index fc9fb88fa9be..763d902cbd03 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -19,10 +19,6 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> - -#include "optsave.hrc" -#include <cuires.hrc> - #include "optsave.hxx" #include <dialmgr.hxx> #include <comphelper/processfactory.hxx> @@ -36,6 +32,7 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/XFlushable.hpp> +#include <sfx2/sfxsids.hrc> #include <sfx2/docfilt.hxx> #include <vcl/fixed.hxx> #include <unotools/configitem.hxx> diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc deleted file mode 100644 index 485d35ed7765..000000000000 --- a/cui/source/options/optsave.hrc +++ /dev/null @@ -1,35 +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_CUI_SOURCE_OPTIONS_OPTSAVE_HRC -#define INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HRC - -// defines ------------------------------------------------------------------ - -#define APP_WRITER 0 -#define APP_WRITER_WEB 1 -#define APP_WRITER_GLOBAL 2 -#define APP_CALC 3 -#define APP_IMPRESS 4 -#define APP_DRAW 5 -#define APP_MATH 6 -#define APP_COUNT 7 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index b30d8c6f0c41..f6957eede0c9 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -26,6 +26,15 @@ #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> +#define APP_WRITER 0 +#define APP_WRITER_WEB 1 +#define APP_WRITER_GLOBAL 2 +#define APP_CALC 3 +#define APP_IMPRESS 4 +#define APP_DRAW 5 +#define APP_MATH 6 +#define APP_COUNT 7 + namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index fef9e395d7f9..e5576efbcb4d 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -23,7 +23,6 @@ #include <svl/zforlist.hxx> #include "optupdt.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> #include <comphelper/processfactory.hxx> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 9594e6c644c0..60228c8a9550 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -28,7 +28,6 @@ #include <vcl/graphicfilter.hxx> #include <vcl/mnemonic.hxx> #include <dialmgr.hxx> -#include "cuires.hrc" #include "strings.hrc" #include "personalization.hrc" diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index d849d3e77056..0b9d6dd7c94e 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -19,7 +19,6 @@ #include <unotools/securityoptions.hxx> #include <dialmgr.hxx> -#include <cuires.hrc> #include "securityoptions.hxx" namespace diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 685d2a49e2a0..f3f75e8c60cb 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -22,10 +22,9 @@ #include <svx/dialogs.hrc> -#include "cuires.hrc" #include "strings.hrc" #include "treeopt.hrc" -#include "helpid.hrc" +#include "helpids.h" #include "cfgchart.hxx" #include "connpoolconfig.hxx" diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index b1db289d4b13..ea206fb44fd8 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -9,7 +9,6 @@ #include <officecfg/Office/Common.hxx> #include <svx/svxdlg.hxx> -#include <cuires.hrc> #include <comphelper/sequence.hxx> #include "tsaurls.hxx" diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index b7717221c8af..f6b3aa614f80 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -19,7 +19,6 @@ #include "webconninfo.hxx" #include <dialmgr.hxx> -#include <cuires.hrc> #include <sal/macros.h> #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/task/PasswordContainer.hpp> |