[Libreoffice-commits] core.git: 3 commits - cui/AllLangResTarget_cui.mk cui/source svx/source sw/source
Thomas Arnhold
thomas at arnhold.org
Sun Aug 17 04:43:05 PDT 2014
cui/AllLangResTarget_cui.mk | 1
cui/source/inc/cuires.hrc | 25 -------
cui/source/options/optpath.src | 116 ------------------------------------
cui/source/options/treeopt.src | 8 --
svx/source/src/app.hrc | 3
sw/source/uibase/shells/textsh1.cxx | 2
6 files changed, 1 insertion(+), 154 deletions(-)
New commits:
commit 1120312c83c2350f9428de3f11072adae56f9e3f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Aug 17 12:15:36 2014 +0200
Hyperlink dialog: Don't close if it's already open
Steps to reproduce:
1) Writer. Insert -> Hyperlink. Leave the dialog open.
2) Click into the writer document and type a link "http://google.de/", this
will get converted to a hyperlink.
3) Now right-click on the hyperlink and choose "Edit Hyperlink" from the
context menu. The Hyperlink dialog will close.
The Hyperlink dialog should stay open and not close, if you want to
edit the hyperlink.
This commit fixes this.
Change-Id: I125c12733790632008cad1a9fc2d13bf16487381
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index eb351c9..9ef3ae4 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -808,7 +808,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
}
break;
case FN_EDIT_HYPERLINK:
- GetView().GetViewFrame()->ToggleChildWindow(SID_HYPERLINK_DIALOG);
+ GetView().GetViewFrame()->SetChildWindow(SID_HYPERLINK_DIALOG, true);
break;
case FN_REMOVE_HYPERLINK:
{
commit 4376c524a3cb7016285f869b96b4657f4be006bd
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Aug 17 11:50:31 2014 +0200
remove unused strings
Change-Id: I1665bb72203964be071835547c50440f86e1761d
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 3a9fca5..f14d8e9 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -107,8 +107,6 @@
#define RID_SVXPAGE_COLOR (RID_SVX_START + 60)
#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 )
#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
-#define RID_RIDER_SLL_SITE (RID_OFA_START + 100)//?
-#define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)//?
// options
#define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298)
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index d509970..6df8d82 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -177,13 +177,5 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
};
};
};
-String RID_RIDER_SLL_SITE
-{
- Text [ en-US ] = "Site certificates" ;
-};
-String RID_RIDER_SLL_PERSONAL
-{
- Text [ en-US ] = "Personal certificates" ;
-};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index 42190c2..beee99a 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -84,9 +84,6 @@
#define RID_STR_DATE (RID_OFA_START + 108)
#define RID_DESKTOP (RID_OFA_START + 109)
-#define RID_RIDER_SLL_SITE (RID_OFA_START + 100)
-#define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)
-
// "Uberlaufkontrolle der HID's
#define ACT_HID_END HID_OFA_TP_MEMORY
#if ACT_HID_END > HID_OFA_END
commit b11d0a4d2b3b65a9ca06fd1de4ec4502eef2baa9
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Aug 17 11:46:49 2014 +0200
remove unused optpath.src
all definitions are not used and the file is never included.
Change-Id: If88fab7843122bf6b5649808ea16c5fe0cc30b12
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 10bf5e6..2023160 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/optinet2.src \
cui/source/options/optjava.src \
cui/source/options/optlingu.src \
- cui/source/options/optpath.src \
cui/source/options/personalization.src \
cui/source/options/treeopt.src \
cui/source/tabpages/border.src \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 914841c..3a9fca5 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -142,29 +142,6 @@
#define RID_SVXBMP_LOCK (RID_SVX_START + 118)
#define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026)
#define RID_SVXPAGE_BASICIDE_OPTIONS (RID_SVX_START + 209)
-#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //?
-#define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//?
-#define RID_SVXSTR_KEY_LINGUISTIC_DIR (RID_SVX_START + 1016)//?
-#define RID_SVXSTR_KEY_USERCONFIG_PATH (RID_SVX_START + 1023)//?
-#define RID_SVXSTR_KEY_FILTER_PATH (RID_SVX_START + 1012)//?
-#define RID_SVXSTR_KEY_ADDINS_PATH (RID_SVX_START + 1003)//?
-#define RID_SVXSTR_KEY_FAVORITES_DIR (RID_SVX_START + 1011)//?
-#define RID_SVXSTR_KEY_PLUGINS_PATH (RID_SVX_START + 1019)//?
-#define RID_SVXSTR_KEY_TEMP_PATH (RID_SVX_START + 1021)//?
-#define RID_SVXSTR_KEY_STORAGE_DIR (RID_SVX_START + 1020)//?
-#define RID_SVXSTR_KEY_GALLERY_DIR (RID_SVX_START + 1013)//?
-#define RID_SVXSTR_KEY_HELP_DIR (RID_SVX_START + 1015)//?
-#define RID_SVXSTR_KEY_GLOSSARY_PATH (RID_SVX_START + 1005)//?
-#define RID_SVXSTR_KEY_TEMPLATE_PATH (RID_SVX_START + 1022)//?
-#define RID_SVXSTR_KEY_MODULES_PATH (RID_SVX_START + 1017)//?
-#define RID_SVXSTR_KEY_BACKUP_PATH (RID_SVX_START + 1006)//?
-#define RID_SVXSTR_KEY_PALETTE_PATH (RID_SVX_START + 1018)//?
-#define RID_SVXSTR_KEY_CONFIG_DIR (RID_SVX_START + 1009)//?
-#define RID_SVXSTR_KEY_WORK_PATH (RID_SVX_START + 1024)//?
-#define RID_SVXSTR_KEY_GRAPHICS_PATH (RID_SVX_START + 1014)//?
-#define RID_SVXSTR_KEY_BASIC_PATH (RID_SVX_START + 1007)//?
-#define RID_SVXSTR_KEY_BITMAP_PATH (RID_SVX_START + 1008)//?
-#define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025)//?
// dialogs
#define STR_MODIFY (RID_SVX_START + 336)//from optdict.src
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
deleted file mode 100644
index 95f5203..0000000
--- a/cui/source/options/optpath.src
+++ /dev/null
@@ -1,116 +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 <sfx2/sfx.hrc>
-#include "helpid.hrc"
-
-String RID_SVXSTR_KEY_CONFIG_DIR
-{
- Text [ en-US ] = "Configuration" ;
-};
-String RID_SVXSTR_KEY_WORK_PATH
-{
- Text [ en-US ] = "My Documents" ;
-};
-String RID_SVXSTR_KEY_GRAPHICS_PATH
-{
- Text [ en-US ] = "Images" ;
-};
-String RID_SVXSTR_KEY_BITMAP_PATH
-{
- Text [ en-US ] = "Icons" ;
-};
-String RID_SVXSTR_KEY_BASIC_PATH
-{
- Text = "BASIC" ;
-};
-String RID_SVXSTR_KEY_PALETTE_PATH
-{
- Text [ en-US ] = "Palettes" ;
-};
-String RID_SVXSTR_KEY_BACKUP_PATH
-{
- Text [ en-US ] = "Backups" ;
-};
-String RID_SVXSTR_KEY_MODULES_PATH
-{
- Text [ en-US ] = "Modules" ;
-};
-String RID_SVXSTR_KEY_TEMPLATE_PATH
-{
- Text [ en-US ] = "Templates" ;
-};
-String RID_SVXSTR_KEY_GLOSSARY_PATH
-{
- Text [ en-US ] = "AutoText";
-};
-String RID_SVXSTR_KEY_DICTIONARY_PATH
-{
- Text [ en-US ] = "Dictionaries" ;
-};
-String RID_SVXSTR_KEY_HELP_DIR
-{
- Text [ en-US ] = "Help" ;
-};
-String RID_SVXSTR_KEY_GALLERY_DIR
-{
- Text [ en-US ] = "Gallery" ;
-};
-String RID_SVXSTR_KEY_STORAGE_DIR
-{
- Text [ en-US ] = "Message Storage" ;
-};
-String RID_SVXSTR_KEY_TEMP_PATH
-{
- Text [ en-US ] = "Temporary files";
-};
-String RID_SVXSTR_KEY_PLUGINS_PATH
-{
- Text [ en-US ] = "Plug-ins";
-};
-String RID_SVXSTR_KEY_FAVORITES_DIR
-{
- Text [ en-US ] = "Folder Bookmarks";
-};
-String RID_SVXSTR_KEY_FILTER_PATH
-{
- Text [ en-US ] = "Filters";
-};
-String RID_SVXSTR_KEY_ADDINS_PATH
-{
- Text [ en-US ] = "Add-ins";
-};
-String RID_SVXSTR_KEY_USERCONFIG_PATH
-{
- Text [ en-US ] = "User Configuration";
-};
-String RID_SVXSTR_KEY_USERDICTIONARY_DIR
-{
- Text [ en-US ] = "User-defined dictionaries";
-};
-String RID_SVXSTR_KEY_AUTOCORRECT_DIR
-{
- Text [ en-US ] = "AutoCorrect";
-};
-String RID_SVXSTR_KEY_LINGUISTIC_DIR
-{
- Text [ en-US ] = "Writing aids";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list