diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-18 16:32:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-18 18:05:27 +0200 |
| commit | 512d1ad386da6a8695be24b27414619dcdf4f657 (patch) | |
| tree | 7ea25be19e6bb340f0277fe9f4fd5226ff4cb203 /include | |
| parent | f387d3ae8e5c675f45d92f5d8acfc61d9fda7533 (diff) | |
merge last entry of cntids.hrc into sfxsids.hrc
Change-Id: I78ba63d5d455ef9fe2e4c6cf2f67d88c921100d1
Reviewed-on: https://gerrit.libreoffice.org/40143
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/cntids.hrc | 29 | ||||
| -rw-r--r-- | include/sfx2/sfxsids.hrc | 2 |
2 files changed, 1 insertions, 30 deletions
diff --git a/include/sfx2/cntids.hrc b/include/sfx2/cntids.hrc deleted file mode 100644 index 01861396db47..000000000000 --- a/include/sfx2/cntids.hrc +++ /dev/null @@ -1,29 +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_CNTIDS_HRC -#define INCLUDED_SFX2_CNTIDS_HRC - -#include <svl/solar.hrc> - -#define SID_DELETE (SID_SFX_START + 713) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index eff5e36acbac..eeb793619fab 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -20,7 +20,6 @@ #define INCLUDED_SFX2_SFXSIDS_HRC #include <svl/solar.hrc> -#include <sfx2/cntids.hrc> #include <svl/memberid.hrc> // Please be careful: @@ -374,6 +373,7 @@ #define SID_CUT (SID_SFX_START + 710) #define SID_COPY (SID_SFX_START + 711) #define SID_PASTE (SID_SFX_START + 712) +#define SID_DELETE (SID_SFX_START + 713) #define SID_BACKSPACE (SID_SFX_START + 714) #define SID_FORMATPAINTBRUSH (SID_SFX_START + 715) |