[Libreoffice-commits] core.git: cui/source include/sfx2 include/svx sc/inc sd/inc sfx2/doc sfx2/source svx/inc svx/source sw/inc
Caolán McNamara
caolanm at redhat.com
Tue Apr 18 13:20:00 UTC 2017
cui/source/dialogs/about.cxx | 1 -
cui/source/inc/helpid.hrc | 1 -
include/sfx2/sfxcommands.h | 34 ----------------------------------
include/svx/svxcommands.h | 1 +
sc/inc/helpids.h | 1 -
sc/inc/pch/precompiled_scui.hxx | 1 -
sc/inc/pch/precompiled_vbaobj.hxx | 1 -
sc/inc/sc.hrc | 1 -
sd/inc/helpids.h | 1 -
sfx2/doc/sfx2doc.html | 3 +--
sfx2/source/dialog/newstyle.src | 1 -
sfx2/source/inc/helpid.hrc | 2 --
svx/inc/helpid.hrc | 1 -
svx/source/dialog/srchdlg.src | 1 -
sw/inc/helpid.h | 1 -
15 files changed, 2 insertions(+), 49 deletions(-)
New commits:
commit f3ab7e1403f60ad4f9137e68241e68aa06b2fb1e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 18 14:03:26 2017 +0100
remove sfx2/sfxcommands.h
Change-Id: Ic131adc90f2891497623441dd94da2d3401a93e5
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 9384a76743dd..d7902df52d95 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -43,7 +43,6 @@
#include <svtools/optionsdrawinglayer.hxx>
#include <sfx2/sfxuno.hxx>
-#include <sfx2/sfxcommands.h>
#include "about.hxx"
#include <config_buildid.h>
#include <sfx2/app.hxx>
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index a69c6d92e7b8..479db0d2ac6c 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -20,7 +20,6 @@
#define INCLUDED_CUI_SOURCE_INC_HELPID_HRC
#include <svx/svxcommands.h>
-#include <sfx2/sfxcommands.h>
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
#define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB"
diff --git a/include/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h
deleted file mode 100644
index 6ae8b6972287..000000000000
--- a/include/sfx2/sfxcommands.h
+++ /dev/null
@@ -1,34 +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_SFXCOMMANDS_H
-#define INCLUDED_SFX2_SFXCOMMANDS_H
-
-#define CMD_SID_BROWSE_BACKWARD ".uno:BrowseBackward"
-#define CMD_SID_BROWSE_FORWARD ".uno:BrowseForward"
-#define CMD_SID_COPY ".uno:Copy"
-#define CMD_SID_EDITDOC ".uno:EditDoc"
-#define CMD_SID_WIN_FULLSCREEN ".uno:FullScreen"
-#define CMD_SID_OPENDOC ".uno:Open"
-#define CMD_SID_GALLERY_BG_BRUSH ".uno:BackgroundImage"
-#define CMD_SID_PASTE ".uno:Paste"
-#define CMD_SID_RELOAD ".uno:Reload"
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index 7ecdaa0dae8c..1f5f7c02c491 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -129,6 +129,7 @@
#define CMD_SID_FORMAT_TABLE_DLG ".uno:TableDialog"
#define CMD_SID_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog"
#define CMD_SID_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog"
+#define CMD_SID_GALLERY_BG_BRUSH ".uno:BackgroundImage"
#endif
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 87fe34b4cc97..379f9abfed2e 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sfx2/sfxcommands.h>
#include <svx/svxcommands.h>
#define HID_INSWIN_POS "SC_HID_INSWIN_POS"
diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx
index 4fa7b2d94caf..b85b551e1e4e 100644
--- a/sc/inc/pch/precompiled_scui.hxx
+++ b/sc/inc/pch/precompiled_scui.hxx
@@ -129,7 +129,6 @@
#include <sfx2/fcontnr.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/objsh.hxx>
-#include <sfx2/sfxcommands.h>
#include <sfx2/sfxresid.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx
index 123de3c041b5..9d89a17725e8 100644
--- a/sc/inc/pch/precompiled_vbaobj.hxx
+++ b/sc/inc/pch/precompiled_vbaobj.hxx
@@ -336,7 +336,6 @@
#include <sfx2/itemwrapper.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/request.hxx>
-#include <sfx2/sfxcommands.h>
#include <sfx2/sfxdlg.hxx>
#include <sfx2/viewfrm.hxx>
#include <svl/eitem.hxx>
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 659309974fb7..83852ab497f8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -23,7 +23,6 @@
#include <sfx2/sfx.hrc>
#include <svx/dialogs.hrc>
-#include "sfx2/sfxcommands.h"
#include "svx/svxcommands.h"
#include "helpids.h"
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index a65f356b831a..75adfa211381 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sfx2/sfxcommands.h>
#include <svx/svxcommands.h>
#include "sdcommands.h"
diff --git a/sfx2/doc/sfx2doc.html b/sfx2/doc/sfx2doc.html
index 4ac9f29bea2c..2c0babb23a77 100644
--- a/sfx2/doc/sfx2doc.html
+++ b/sfx2/doc/sfx2doc.html
@@ -67,7 +67,6 @@ In ./include/sfx2/sfxsids.hrc, the defines of the slot names and their numbers a
In ./officecfg/registry/data/org/openoffice/Office/UI,
there are .xcu ended xml files that define the single menu items.
They contain the US- language name and the .uno: command.<BR>
-In ./include/sfx2/sfxcommands.h, the uno command names are listed.
<BR><BR>
@@ -75,4 +74,4 @@ The resource compiler, which creates files some GetState methods refer to, is in
</P>
</BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src
index d595e553536d..6046ecab329a 100644
--- a/sfx2/source/dialog/newstyle.src
+++ b/sfx2/source/dialog/newstyle.src
@@ -19,7 +19,6 @@
#include <sfx2/sfx.hrc>
#include "dialog.hrc"
-#include <sfx2/sfxcommands.h>
String STR_QUERY_OVERWRITE
{
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index f580d851ebde..1edcd1da3fdb 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SFX2_SOURCE_INC_HELPID_HRC
#define INCLUDED_SFX2_SOURCE_INC_HELPID_HRC
-#include <sfx2/sfxcommands.h>
-
#define HID_TEMPLATE_FMT "SFX2_HID_TEMPLATE_FMT"
#define HID_TEMPLATE_FILTER "SFX2_HID_TEMPLATE_FILTER"
#define HID_TEMPLDLG_NEWBYEXAMPLE "SFX2_HID_TEMPLDLG_NEWBYEXAMPLE"
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 8312e935d7fe..d5f4e91c59df 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -21,7 +21,6 @@
#include <svx/exthelpid.hrc>
#include <svx/svxcommands.h>
-#include <sfx2/sfxcommands.h>
#define HID_BMPMASK_CTL_QCOL_1 "SVX_HID_BMPMASK_CTL_QCOL_1"
#define HID_COLOR_CTL_COLORS "SVX_HID_COLOR_CTL_COLORS"
diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index bb8f1edc61b5..ec1ca974e906 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -18,7 +18,6 @@
*/
#include <svx/dialogs.hrc>
-#include <sfx2/sfxcommands.h>
// Strings ---------------------------------------------------------------
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 0d18cd66e88d..767654727854 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -18,7 +18,6 @@
*/
#include "swcommands.h"
#include <svx/svxcommands.h>
-#include <sfx2/sfxcommands.h>
#define HID_CONFIG_SAVE "SW_HID_CONFIG_SAVE"
More information about the Libreoffice-commits
mailing list