summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorAdam Kasztenny <adamkasztenny@gmail.com>2016-12-12 19:54:50 -0500
committerMichael Stahl <mstahl@redhat.com>2016-12-13 12:02:16 +0000
commit69d11029d6c72078381f33918574c5a0e043e217 (patch)
treef7fc9d71189455acb7255b8b2a25c19836f598ae /sfx2/source
parentef65c40518c6f4671f9528edade9947092e10ac0 (diff)
tdf#95416 Fix an include for sfx2
This .hrc file was used in multiple places. Change-Id: I603c6d35da2e870d8586f081ccd2672065ade5db Reviewed-on: https://gerrit.libreoffice.org/31928 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/control/emojiview.cxx2
-rw-r--r--sfx2/source/control/templatedefaultview.cxx2
-rw-r--r--sfx2/source/control/templatelocalview.cxx2
-rw-r--r--sfx2/source/control/templatesearchview.cxx2
-rw-r--r--sfx2/source/doc/doc.hrc138
5 files changed, 4 insertions, 142 deletions
diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx
index 6494002fa9ef..36b185cf9a1b 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -25,7 +25,7 @@
#include <fstream>
#include <streambuf>
-#include "../doc/doc.hrc"
+#include <doc.hrc>
#include <vcl/builderfactory.hxx>
using namespace ::com::sun::star;
diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx
index 219c533ff0eb..26d3f808da27 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -14,7 +14,7 @@
#include <vcl/builderfactory.hxx>
#include <sfx2/app.hxx>
-#include "../doc/doc.hrc"
+#include <doc.hrc>
#define MNI_OPEN 1
#define MNI_EDIT 2
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 6603a3ca6266..9bb058093a72 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -34,7 +34,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include "../doc/doc.hrc"
+#include <doc.hrc>
#include "templateview.hrc"
#define MNI_OPEN 1
diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx
index 8403143d34b8..3b1a6fb31b6d 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -14,7 +14,7 @@
#include <tools/urlobj.hxx>
#include <vcl/layout.hxx>
-#include "../doc/doc.hrc"
+#include <doc.hrc>
#include <vcl/builderfactory.hxx>
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
deleted file mode 100644
index 388cdf621dbf..000000000000
--- a/sfx2/source/doc/doc.hrc
+++ /dev/null
@@ -1,138 +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_DOC_DOC_HRC
-#define INCLUDED_SFX2_SOURCE_DOC_DOC_HRC
-
-#include <sfx2/sfx.hrc>
-
-// #defines *****************************************************************
-
-#define RID_SFX_DOC_END (RID_SFX_DIALOG_START-1)
-
-#define STR_NODEFPRINTER (RID_SFX_DOC_START+ 0)
-#define STR_ERROR_PRINTER_BUSY (RID_SFX_DOC_START+ 1)
-#define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 2)
-
-#define STR_TEMPLATE_FILTER (RID_SFX_DOC_START+ 28)
-
-#define STR_SAVEDOC (RID_SFX_DOC_START+ 45)
-#define STR_SAVEASDOC (RID_SFX_DOC_START+ 47)
-
-#define STR_CLOSEDOC (RID_SFX_DOC_START+ 49)
-#define STR_SAVEACOPY (RID_SFX_DOC_START+ 55)
-
-#define STR_AUTOMATICVERSION (RID_SFX_DOC_START+ 68)
-
-#define STR_DOCTYPENAME_SW (RID_SFX_DOC_START+ 69)
-#define STR_DOCTYPENAME_SWWEB (RID_SFX_DOC_START+ 70)
-#define STR_DOCTYPENAME_SWGLOB (RID_SFX_DOC_START+ 71)
-#define STR_DOCTYPENAME_SC (RID_SFX_DOC_START+ 72)
-#define STR_DOCTYPENAME_SI (RID_SFX_DOC_START+ 73)
-#define STR_DOCTYPENAME_SD (RID_SFX_DOC_START+ 74)
-#define STR_DOCTYPENAME_MESSAGE (RID_SFX_DOC_START+ 75)
-#define RID_STR_NEW_TASK (RID_SFX_DOC_START+ 76)
-
-#define TEMPLATE_LONG_NAMES_ARY (RID_SFX_DOC_START+ 81)
-#define TEMPLATE_SHORT_NAMES_ARY (RID_SFX_DOC_START+ 82)
-#define RID_CNT_STR_WAITING (RID_SFX_DOC_START+ 83)
-
-#define STR_EXPORTBUTTON (RID_SFX_DOC_START+93)
-
-#define STR_LABEL_FILEFORMAT (RID_SFX_DOC_START+96)
-
-// some icons are commented out since they are removed
-#define BMP_128X128_CALC_DOC (RID_SFX_DOC_START+99)
-#define BMP_128X128_DRAW_DOC (RID_SFX_DOC_START+102)
-#define BMP_128X128_IMPRESS_DOC (RID_SFX_DOC_START+104)
-#define BMP_128X128_MATH_DOC (RID_SFX_DOC_START+107)
-#define BMP_128X128_WRITER_DOC (RID_SFX_DOC_START+108)
-
-#define STR_HIDDENINFO_CONTAINS (RID_SFX_DOC_START+110)
-#define STR_HIDDENINFO_RECORDCHANGES (RID_SFX_DOC_START+111)
-#define STR_HIDDENINFO_NOTES (RID_SFX_DOC_START+112)
-#define STR_HIDDENINFO_DOCVERSIONS (RID_SFX_DOC_START+113)
-#define STR_HIDDENINFO_FIELDS (RID_SFX_DOC_START+114)
-#define STR_HIDDENINFO_LINKDATA (RID_SFX_DOC_START+115)
-#define STR_HIDDENINFO_CONTINUE_SAVING (RID_SFX_DOC_START+116)
-#define STR_HIDDENINFO_CONTINUE_PRINTING (RID_SFX_DOC_START+117)
-#define STR_HIDDENINFO_CONTINUE_SIGNING (RID_SFX_DOC_START+118)
-#define STR_HIDDENINFO_CONTINUE_CREATEPDF (RID_SFX_DOC_START+119)
-
-#define STR_NEW_FILENAME_SAVE (RID_SFX_DOC_START+121)
-#define STR_ERROR_DELETE_TEMPLATE_DIR (RID_SFX_DOC_START+123)
-#define STR_DOCINFO_INFOFIELD (RID_SFX_DOC_START+124)
-
-#define STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN (RID_SFX_DOC_START+125)
-#define STR_XMLSEC_ODF12_EXPECTED (RID_SFX_DOC_START+126)
-
-#define STR_QRYTEMPL_MESSAGE (RID_SFX_DOC_START+127)
-#define STR_QRYTEMPL_UPDATE_BTN (RID_SFX_DOC_START+128)
-#define STR_QRYTEMPL_KEEP_BTN (RID_SFX_DOC_START+129)
-
-#define STR_ACTION_SORT_NAME (RID_SFX_DOC_START+130)
-#define STR_ACTION_REFRESH (RID_SFX_DOC_START+131)
-#define STR_ACTION_DEFAULT (RID_SFX_DOC_START+132)
-#define STR_MOVE_NEW (RID_SFX_DOC_START+133)
-#define STR_INPUT_NEW (RID_SFX_DOC_START+134)
-#define STR_REPOSITORY_LOCAL (RID_SFX_DOC_START+135)
-#define STR_REPOSITORY_NEW (RID_SFX_DOC_START+136)
-#define STR_MSG_ERROR_LOCAL_MOVE (RID_SFX_DOC_START+137)
-#define STR_MSG_ERROR_REMOTE_MOVE (RID_SFX_DOC_START+138)
-#define STR_MSG_ERROR_EXPORT (RID_SFX_DOC_START+139)
-#define STR_MSG_ERROR_IMPORT (RID_SFX_DOC_START+140)
-#define STR_MSG_ERROR_DELETE_TEMPLATE (RID_SFX_DOC_START+141)
-#define STR_MSG_ERROR_DELETE_FOLDER (RID_SFX_DOC_START+142)
-#define STR_MSG_ERROR_REPOSITORY_NAME (RID_SFX_DOC_START+143)
-#define STR_MSG_ERROR_SELECT_FOLDER (RID_SFX_DOC_START+144)
-#define STR_INPUT_TEMPLATE_NEW (RID_SFX_DOC_START+145)
-#define STR_QMSG_SEL_FOLDER_DELETE (RID_SFX_DOC_START+146)
-#define STR_QMSG_TEMPLATE_OVERWRITE (RID_SFX_DOC_START+147)
-#define STR_QMSG_SEL_TEMPLATE_DELETE (RID_SFX_DOC_START+148)
-#define IMG_ACTION_SORT (RID_SFX_DOC_START+149)
-#define IMG_ACTION_REFRESH (RID_SFX_DOC_START+150)
-
-#define STR_OPEN (RID_SFX_DOC_START+151)
-#define STR_EDIT_TEMPLATE (RID_SFX_DOC_START+152)
-#define STR_DEFAULT_TEMPLATE (RID_SFX_DOC_START+153)
-#define STR_RENAME (RID_SFX_DOC_START+154)
-#define STR_DELETE (RID_SFX_DOC_START+155)
-#define STR_PROPERTIES (RID_SFX_DOC_START+156)
-#define STR_RENAME_TEMPLATE (RID_SFX_DOC_START+157)
-
-#define STR_CATEGORY_NEW (RID_SFX_DOC_START+158)
-#define STR_CATEGORY_SELECT (RID_SFX_DOC_START+100)
-#define STR_CATEGORY_DELETE (RID_SFX_DOC_START+101)
-#define STR_CREATE_ERROR (RID_SFX_DOC_START+103)
-#define STR_ERROR_SAVEAS (RID_SFX_DOC_START+105)
-#define STR_CATEGORY_RENAME (RID_SFX_DOC_START+109)
-#define STR_TEMPLATE_SELECTION (RID_SFX_DOC_START+120)
-#define STR_RESET_DEFAULT (RID_SFX_DOC_START+122)
-#define STR_TEMPLATE_TOOLTIP (RID_SFX_DOC_START+169)
-#define STR_MSG_EXPORT_SUCCESS (RID_SFX_DOC_START+170)
-#define STR_MSG_QUERY_COPY (RID_SFX_DOC_START+171)
-
-// please update to the last id
-#define ACT_SFX_DOC_END STR_MSG_QUERY_COPY
-#if ACT_SFX_DOC_END > RID_SFX_DOC_END
-#error resource overflow in #line, #file
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */