From 512d1ad386da6a8695be24b27414619dcdf4f657 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 18 Jul 2017 16:32:52 +0100 Subject: merge last entry of cntids.hrc into sfxsids.hrc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I78ba63d5d455ef9fe2e4c6cf2f67d88c921100d1 Reviewed-on: https://gerrit.libreoffice.org/40143 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/tabpages/backgrnd.cxx | 1 - dbaccess/source/ui/app/app.src | 1 - .../source/ui/querydesign/TableWindowTitle.cxx | 1 - dbaccess/source/ui/querydesign/query.src | 1 - dbaccess/source/ui/relationdesign/relation.src | 1 - include/sfx2/cntids.hrc | 29 ---------------------- include/sfx2/sfxsids.hrc | 2 +- 7 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 include/sfx2/cntids.hrc diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index d0363ee70994..9673b8e02017 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index d42dc79b1e47..82b118b0e801 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "dbu_app.hrc" -#include #include "browserids.hxx" #include "dbaccess_helpid.hrc" diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index c7a15524694b..06e67b7f7c9b 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -25,7 +25,6 @@ #include #include #include "dbustrings.hrc" -#include #include "TableWindowListBox.hxx" #include "TableConnection.hxx" #include "dbu_qry.hrc" diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index 41ad25620ac0..6dfe7c0aa48d 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "dbu_qry.hrc" -#include #include "browserids.hxx" #include "dbaccess_helpid.hrc" diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src index 65087f516058..d40689dc433c 100644 --- a/dbaccess/source/ui/relationdesign/relation.src +++ b/dbaccess/source/ui/relationdesign/relation.src @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "dbu_rel.hrc" -#include #include "browserids.hxx" #include "dbaccess_helpid.hrc" 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 - -#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 -#include #include // 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) -- cgit