[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source include/svtools

[Jan Holesovsky]

 cui/AllLangResTarget_cui.mk    |    1 -
 cui/source/inc/cuires.hrc      |    1 -
 cui/source/options/optgdlg.src |   28 ----------------------------
 include/svtools/apearcfg.hxx   |    2 +-
 4 files changed, 1 insertion(+), 31 deletions(-)

New commits:
commit b846677427015231d4b377bbcae9ae3618baf1cf
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Apr 11 09:21:52 2016 +0200

    RID_SVXSTR_LANGUAGE_RESTART is not needed any more.
    
    Change-Id: I426026938c4cf0e6af22be11dca8e68f991004c0

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 364fa37..8d5ece0 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
     cui/source/options/optcolor.src \
     cui/source/options/optdict.src \
     cui/source/options/optfltr.src \
-    cui/source/options/optgdlg.src \
     cui/source/options/optinet2.src \
     cui/source/options/optjava.src \
     cui/source/options/optlingu.src \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 658401d..e46e4a1 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -27,7 +27,6 @@
 
 // RID_SVX_START + 0 unused
 #define RID_SVXSTR_OPTIONS_RESTART          (RID_SVX_START + 1)
-#define RID_SVXSTR_LANGUAGE_RESTART         (RID_SVX_START + 2)
 
 #define RID_CUIIMG_HARDDISK                 (RID_SVX_START + 4)
 #define RID_CUIIMG_LIB                      (RID_SVX_START + 5)
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
deleted file mode 100644
index 206fb3a..0000000
--- a/cui/source/options/optgdlg.src
+++ /dev/null
@@ -1,28 +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 .
- */
-
-#include <cuires.hrc>
-#include "helpid.hrc"
-
-String RID_SVXSTR_LANGUAGE_RESTART
-{
-    Text [ en-US ] = "The language setting of the user interface has been updated and will take effect the next time you start %PRODUCTNAME %PRODUCTVERSION";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx
index 3b9dd1d..c4ae370 100644
--- a/include/svtools/apearcfg.hxx
+++ b/include/svtools/apearcfg.hxx
@@ -31,7 +31,7 @@ typedef enum {
     NoSnap
 } SnapType;
 
-typedef enum { // MUST match the order chosen in ListBox LB_DRAG_MODE in optgdlg.src
+typedef enum {
     DragFullWindow,
     DragFrame,
     DragSystemDep