From fe18f5d51fcbdf1f331440265ba1b8866d03e459 Mon Sep 17 00:00:00 2001 From: Huzaifa Iftikhar Date: Wed, 21 Dec 2016 01:54:00 +0530 Subject: tdf#95416 Fix an include for 2 files in unopkg Change-Id: Id1fa09b6db6c90cd727182133e5f9f39383aa5e5 Reviewed-on: https://gerrit.libreoffice.org/32255 Tested-by: Jenkins Reviewed-by: jan iversen --- desktop/inc/dp_gui.hrc | 94 +++++++++++++++++++++++++ desktop/inc/dp_gui_shared.hxx | 48 +++++++++++++ desktop/source/deployment/gui/dp_gui.hrc | 94 ------------------------- desktop/source/deployment/gui/dp_gui_shared.hxx | 48 ------------- desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 4 +- desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 2 +- 6 files changed, 145 insertions(+), 145 deletions(-) create mode 100644 desktop/inc/dp_gui.hrc create mode 100644 desktop/inc/dp_gui_shared.hxx delete mode 100644 desktop/source/deployment/gui/dp_gui.hrc delete mode 100644 desktop/source/deployment/gui/dp_gui_shared.hxx diff --git a/desktop/inc/dp_gui.hrc b/desktop/inc/dp_gui.hrc new file mode 100644 index 000000000000..b970d44865f5 --- /dev/null +++ b/desktop/inc/dp_gui.hrc @@ -0,0 +1,94 @@ +/* -*- 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_DP_GUI_HRC +#define INCLUDED_DP_GUI_HRC + +#include "deployment.hrc" +#include "helpid.hrc" + +#define RID_STR_WARNING_VERSION_LESS (RID_DEPLOYMENT_GUI_START + 3) +#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 4) +#define RID_STR_WARNING_VERSION_EQUAL (RID_DEPLOYMENT_GUI_START + 5) +#define RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 6) +#define RID_STR_WARNING_VERSION_GREATER (RID_DEPLOYMENT_GUI_START + 7) +#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 8) +#define RID_STR_WARNING_INSTALL_EXTENSION (RID_DEPLOYMENT_GUI_START + 9) + +#define RID_DLG_UPDATE_NORMALALERT (RID_DEPLOYMENT_GUI_START + 11) +#define RID_DLG_UPDATE_NONE (RID_DEPLOYMENT_GUI_START + 13) +#define RID_DLG_UPDATE_NOINSTALLABLE (RID_DEPLOYMENT_GUI_START + 14) +#define RID_DLG_UPDATE_FAILURE (RID_DEPLOYMENT_GUI_START + 15) +#define RID_DLG_UPDATE_UNKNOWNERROR (RID_DEPLOYMENT_GUI_START + 16) +#define RID_DLG_UPDATE_NODESCRIPTION (RID_DEPLOYMENT_GUI_START + 17) +#define RID_DLG_UPDATE_NOINSTALL (RID_DEPLOYMENT_GUI_START + 18) +#define RID_DLG_UPDATE_NODEPENDENCY (RID_DEPLOYMENT_GUI_START + 19) +#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER (RID_DEPLOYMENT_GUI_START + 20) +#define RID_DLG_UPDATE_BROWSERBASED (RID_DEPLOYMENT_GUI_START + 21) +#define RID_DLG_UPDATE_VERSION (RID_DEPLOYMENT_GUI_START + 22) +#define RID_DLG_UPDATE_IGNORE (RID_DEPLOYMENT_GUI_START + 23) +#define RID_DLG_UPDATE_ENABLE (RID_DEPLOYMENT_GUI_START + 24) +#define RID_DLG_UPDATE_IGNORE_ALL (RID_DEPLOYMENT_GUI_START + 25) +#define RID_DLG_UPDATE_IGNORED_UPDATE (RID_DEPLOYMENT_GUI_START + 36) + +#define RID_DLG_UPDATE_INSTALL_INSTALLING (RID_DEPLOYMENT_GUI_START + 37) +#define RID_DLG_UPDATE_INSTALL_FINISHED (RID_DEPLOYMENT_GUI_START + 38) +#define RID_DLG_UPDATE_INSTALL_NO_ERRORS (RID_DEPLOYMENT_GUI_START + 39) +#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED (RID_DEPLOYMENT_GUI_START + 40) +#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD (RID_DEPLOYMENT_GUI_START + 41) +#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION (RID_DEPLOYMENT_GUI_START + 42) +#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED (RID_DEPLOYMENT_GUI_START + 43) +#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL (RID_DEPLOYMENT_GUI_START + 44) + +#define RID_IMG_WARNING (RID_DEPLOYMENT_GUI_START+56) +#define RID_IMG_LOCKED (RID_DEPLOYMENT_GUI_START+58) +#define RID_IMG_EXTENSION (RID_DEPLOYMENT_GUI_START+60) +#define RID_IMG_SHARED (RID_DEPLOYMENT_GUI_START+62) + +#define RID_STR_ADD_PACKAGES (RID_DEPLOYMENT_GUI_START+70) + +#define RID_CTX_ITEM_REMOVE (RID_DEPLOYMENT_GUI_START+80) +#define RID_CTX_ITEM_ENABLE (RID_DEPLOYMENT_GUI_START+81) +#define RID_CTX_ITEM_DISABLE (RID_DEPLOYMENT_GUI_START+82) +#define RID_CTX_ITEM_CHECK_UPDATE (RID_DEPLOYMENT_GUI_START+83) +//There is a gap here + +#define RID_STR_ADDING_PACKAGES (RID_DEPLOYMENT_GUI_START+85) +#define RID_STR_REMOVING_PACKAGES (RID_DEPLOYMENT_GUI_START+86) +#define RID_STR_ENABLING_PACKAGES (RID_DEPLOYMENT_GUI_START+87) +#define RID_STR_DISABLING_PACKAGES (RID_DEPLOYMENT_GUI_START+88) +#define RID_STR_ACCEPT_LICENSE (RID_DEPLOYMENT_GUI_START+89) + +#define RID_STR_ERROR_UNKNOWN_STATUS (RID_DEPLOYMENT_GUI_START+92) +#define RID_STR_CLOSE_BTN (RID_DEPLOYMENT_GUI_START+93) +#define RID_STR_EXIT_BTN (RID_DEPLOYMENT_GUI_START+94) +#define RID_STR_NO_ADMIN_PRIVILEGE (RID_DEPLOYMENT_GUI_START+95) +#define RID_STR_ERROR_MISSING_DEPENDENCIES (RID_DEPLOYMENT_GUI_START+96) +#define RID_STR_ERROR_MISSING_LICENSE (RID_DEPLOYMENT_GUI_START+97) +#define RID_STR_SHOW_LICENSE_CMD (RID_DEPLOYMENT_GUI_START+98) + +#define RID_STR_UNSUPPORTED_PLATFORM (RID_DEPLOYMENT_GUI_START+101) +#define RID_STR_WARNING_REMOVE_EXTENSION (RID_DEPLOYMENT_GUI_START+103) +#define RID_STR_WARNING_REMOVE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+104) +#define RID_STR_WARNING_ENABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+105) +#define RID_STR_WARNING_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106) + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/dp_gui_shared.hxx b/desktop/inc/dp_gui_shared.hxx new file mode 100644 index 000000000000..bd175cb3bfa5 --- /dev/null +++ b/desktop/inc/dp_gui_shared.hxx @@ -0,0 +1,48 @@ +/* -*- 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_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX +#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX + +#include +#include + + +namespace dp_gui { + +struct DeploymentGuiResMgr : + public ::rtl::StaticWithInit< ResMgr *, DeploymentGuiResMgr > { + ResMgr * operator () () { + return ResMgr::CreateResMgr( "deploymentgui" ); + } +}; + +class DpGuiResId : public ResId +{ +public: + explicit DpGuiResId( sal_uInt16 nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {} +}; + +#define DPGUI_RESSTR(i) DpGuiResId(i).toString() + +} // namespace dp_gui + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc deleted file mode 100644 index b970d44865f5..000000000000 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ /dev/null @@ -1,94 +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_DP_GUI_HRC -#define INCLUDED_DP_GUI_HRC - -#include "deployment.hrc" -#include "helpid.hrc" - -#define RID_STR_WARNING_VERSION_LESS (RID_DEPLOYMENT_GUI_START + 3) -#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 4) -#define RID_STR_WARNING_VERSION_EQUAL (RID_DEPLOYMENT_GUI_START + 5) -#define RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 6) -#define RID_STR_WARNING_VERSION_GREATER (RID_DEPLOYMENT_GUI_START + 7) -#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 8) -#define RID_STR_WARNING_INSTALL_EXTENSION (RID_DEPLOYMENT_GUI_START + 9) - -#define RID_DLG_UPDATE_NORMALALERT (RID_DEPLOYMENT_GUI_START + 11) -#define RID_DLG_UPDATE_NONE (RID_DEPLOYMENT_GUI_START + 13) -#define RID_DLG_UPDATE_NOINSTALLABLE (RID_DEPLOYMENT_GUI_START + 14) -#define RID_DLG_UPDATE_FAILURE (RID_DEPLOYMENT_GUI_START + 15) -#define RID_DLG_UPDATE_UNKNOWNERROR (RID_DEPLOYMENT_GUI_START + 16) -#define RID_DLG_UPDATE_NODESCRIPTION (RID_DEPLOYMENT_GUI_START + 17) -#define RID_DLG_UPDATE_NOINSTALL (RID_DEPLOYMENT_GUI_START + 18) -#define RID_DLG_UPDATE_NODEPENDENCY (RID_DEPLOYMENT_GUI_START + 19) -#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER (RID_DEPLOYMENT_GUI_START + 20) -#define RID_DLG_UPDATE_BROWSERBASED (RID_DEPLOYMENT_GUI_START + 21) -#define RID_DLG_UPDATE_VERSION (RID_DEPLOYMENT_GUI_START + 22) -#define RID_DLG_UPDATE_IGNORE (RID_DEPLOYMENT_GUI_START + 23) -#define RID_DLG_UPDATE_ENABLE (RID_DEPLOYMENT_GUI_START + 24) -#define RID_DLG_UPDATE_IGNORE_ALL (RID_DEPLOYMENT_GUI_START + 25) -#define RID_DLG_UPDATE_IGNORED_UPDATE (RID_DEPLOYMENT_GUI_START + 36) - -#define RID_DLG_UPDATE_INSTALL_INSTALLING (RID_DEPLOYMENT_GUI_START + 37) -#define RID_DLG_UPDATE_INSTALL_FINISHED (RID_DEPLOYMENT_GUI_START + 38) -#define RID_DLG_UPDATE_INSTALL_NO_ERRORS (RID_DEPLOYMENT_GUI_START + 39) -#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED (RID_DEPLOYMENT_GUI_START + 40) -#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD (RID_DEPLOYMENT_GUI_START + 41) -#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION (RID_DEPLOYMENT_GUI_START + 42) -#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED (RID_DEPLOYMENT_GUI_START + 43) -#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL (RID_DEPLOYMENT_GUI_START + 44) - -#define RID_IMG_WARNING (RID_DEPLOYMENT_GUI_START+56) -#define RID_IMG_LOCKED (RID_DEPLOYMENT_GUI_START+58) -#define RID_IMG_EXTENSION (RID_DEPLOYMENT_GUI_START+60) -#define RID_IMG_SHARED (RID_DEPLOYMENT_GUI_START+62) - -#define RID_STR_ADD_PACKAGES (RID_DEPLOYMENT_GUI_START+70) - -#define RID_CTX_ITEM_REMOVE (RID_DEPLOYMENT_GUI_START+80) -#define RID_CTX_ITEM_ENABLE (RID_DEPLOYMENT_GUI_START+81) -#define RID_CTX_ITEM_DISABLE (RID_DEPLOYMENT_GUI_START+82) -#define RID_CTX_ITEM_CHECK_UPDATE (RID_DEPLOYMENT_GUI_START+83) -//There is a gap here - -#define RID_STR_ADDING_PACKAGES (RID_DEPLOYMENT_GUI_START+85) -#define RID_STR_REMOVING_PACKAGES (RID_DEPLOYMENT_GUI_START+86) -#define RID_STR_ENABLING_PACKAGES (RID_DEPLOYMENT_GUI_START+87) -#define RID_STR_DISABLING_PACKAGES (RID_DEPLOYMENT_GUI_START+88) -#define RID_STR_ACCEPT_LICENSE (RID_DEPLOYMENT_GUI_START+89) - -#define RID_STR_ERROR_UNKNOWN_STATUS (RID_DEPLOYMENT_GUI_START+92) -#define RID_STR_CLOSE_BTN (RID_DEPLOYMENT_GUI_START+93) -#define RID_STR_EXIT_BTN (RID_DEPLOYMENT_GUI_START+94) -#define RID_STR_NO_ADMIN_PRIVILEGE (RID_DEPLOYMENT_GUI_START+95) -#define RID_STR_ERROR_MISSING_DEPENDENCIES (RID_DEPLOYMENT_GUI_START+96) -#define RID_STR_ERROR_MISSING_LICENSE (RID_DEPLOYMENT_GUI_START+97) -#define RID_STR_SHOW_LICENSE_CMD (RID_DEPLOYMENT_GUI_START+98) - -#define RID_STR_UNSUPPORTED_PLATFORM (RID_DEPLOYMENT_GUI_START+101) -#define RID_STR_WARNING_REMOVE_EXTENSION (RID_DEPLOYMENT_GUI_START+103) -#define RID_STR_WARNING_REMOVE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+104) -#define RID_STR_WARNING_ENABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+105) -#define RID_STR_WARNING_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx deleted file mode 100644 index bd175cb3bfa5..000000000000 --- a/desktop/source/deployment/gui/dp_gui_shared.hxx +++ /dev/null @@ -1,48 +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_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX -#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX - -#include -#include - - -namespace dp_gui { - -struct DeploymentGuiResMgr : - public ::rtl::StaticWithInit< ResMgr *, DeploymentGuiResMgr > { - ResMgr * operator () () { - return ResMgr::CreateResMgr( "deploymentgui" ); - } -}; - -class DpGuiResId : public ResId -{ -public: - explicit DpGuiResId( sal_uInt16 nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {} -}; - -#define DPGUI_RESSTR(i) DpGuiResId(i).toString() - -} // namespace dp_gui - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index afd58d754a77..db83877a5ed7 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -18,8 +18,8 @@ */ -#include "../../deployment/gui/dp_gui.hrc" -#include "../../deployment/gui/dp_gui_shared.hxx" +#include "dp_gui.hrc" +#include "dp_gui_shared.hxx" #include "unopkg_shared.h" #include #include diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index c36a90b21c73..eaab73088c24 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -22,7 +22,7 @@ #include "deployment.hrc" #include "unopkg_shared.h" #include "dp_identifier.hxx" -#include "../../deployment/gui/dp_gui.hrc" +#include "dp_gui.hrc" #include "lockfile.hxx" #include #include -- cgit