helpcontent2 | 2 +- uui/source/ids.hrc | 3 +++ uui/source/passworddlg.cxx | 1 - uui/source/passworddlg.hrc | 40 ---------------------------------------- uui/source/passworddlg.src | 1 - 5 files changed, 4 insertions(+), 43 deletions(-)
New commits: commit 586245eb1fb5a5a65f907056285be68ce56d1a50 Author: Jan Holesovsky <[email protected]> Date: Wed Mar 26 14:59:23 2014 +0100 Revert the unwanted submodule change. Change-Id: I725d89c5c36ce898f7340b270a40d875a13a839c diff --git a/helpcontent2 b/helpcontent2 index 2dad754..2b799e2 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2dad7542c215024cd26ae42030e01ab772f2f9d5 +Subproject commit 2b799e21a07d93f7b997bb1f3fa85e8cffb19356 commit 57ee15e5f1ae299e2344e2bbee0da085a434bf2d Author: Jan Holesovsky <[email protected]> Date: Wed Mar 26 09:05:20 2014 +0100 These strings are now global resources, define them accordingly. Change-Id: Ia68249242850ef3d82cc56ceae7e5ef84dd08b5b diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index 06653b9..cc2d35e 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -70,6 +70,9 @@ #define STR_SAME_NAME_USED (RID_UUI_START + 60) #define STR_ENTER_SIMPLE_PASSWORD (RID_UUI_START + 61) #define STR_CONFIRM_SIMPLE_PASSWORD (RID_UUI_START + 62) +#define STR_TITLE_CREATE_PASSWORD (RID_UUI_START + 63) +#define STR_TITLE_ENTER_PASSWORD (RID_UUI_START + 64) +#define STR_PASSWORD_MISMATCH (RID_UUI_START + 65) #define ERRCODE_UUI_IO_ABORT (ERRCODE_AREA_UUI + 0) #define ERRCODE_UUI_IO_ACCESSDENIED (ERRCODE_AREA_UUI + 1) diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index 91e05e0..19c08e0 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -18,7 +18,6 @@ */ #include "passworddlg.hxx" -#include "passworddlg.hrc" #include "ids.hrc" #include <vcl/msgbox.hxx> diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc deleted file mode 100644 index 4e60bba..0000000 --- a/uui/source/passworddlg.hrc +++ /dev/null @@ -1,40 +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 PASSWORDDLG_HRC -#define PASSWORDDLG_HRC - -// local identifiers -#define BTN_PASSWORD_OK 1 -#define ED_PASSWORD 2 -#define FT_PASSWORD 3 -#define FT_CONFIRM_PASSWORD 4 -#define ED_CONFIRM_PASSWORD 5 -#define FL_FIXED_LINE_1 6 -#define BTN_PASSWORD_HELP 7 -#define BTN_PASSWORD_CANCEL 8 - -#define STR_TITLE_CREATE_PASSWORD 9 -#define STR_TITLE_ENTER_PASSWORD 10 -#define STR_PASSWORD_MISMATCH 11 - - -#endif // PASSWORDDLG_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src index bbbb874..b07346b 100644 --- a/uui/source/passworddlg.src +++ b/uui/source/passworddlg.src @@ -20,7 +20,6 @@ #define __RSC #include <ids.hrc> -#include <passworddlg.hrc> String STR_ENTER_PASSWORD_TO_OPEN { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
