[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 26 08:57:05 PST 2012
sw/AllLangResTarget_sw.mk | 1
sw/inc/globals.hrc | 10 +++++----
sw/source/ui/app/app.src | 6 +++++
sw/source/ui/fldui/javaedit.cxx | 2 -
sw/source/ui/fldui/javaedit.hrc | 24 ----------------------
sw/source/ui/fldui/javaedit.src | 35 ---------------------------------
sw/uiconfig/swriter/ui/insertscript.ui | 3 +-
7 files changed, 15 insertions(+), 66 deletions(-)
New commits:
commit 0052235753832c28e66e367c8bff244dcf7affb7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 26 16:53:00 2012 +0000
set default script text in .ui
and move last javascript string into global strings
Change-Id: I51f0e18e77ab1696d5b70c98698b81ac6122f970
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 5bb8873..f970dad 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -138,7 +138,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/fldui/fldui.src \
sw/source/ui/fldui/fldvar.src \
sw/source/ui/fldui/inpdlg.src \
- sw/source/ui/fldui/javaedit.src \
sw/source/ui/fmtui/tmpdlg.src \
sw/source/ui/frmdlg/column.src \
sw/source/ui/frmdlg/cption.src \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 34ba270..4473eb4 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -54,13 +54,15 @@
#define STR_TOP_BASE (RC_GLOBALS_BEGIN + 30)
#define STR_BOTTOM_BASE (RC_GLOBALS_BEGIN + 31)
#define STR_CENTER_BASE (RC_GLOBALS_BEGIN + 32)
-#define STR_TOP (RC_GLOBALS_BEGIN + 33)
-#define STR_BOTTOM (RC_GLOBALS_BEGIN + 34)
-#define STR_CENTER_HORI (RC_GLOBALS_BEGIN + 35)
-#define STR_CENTER_VERT (RC_GLOBALS_BEGIN + 36)
+#define STR_TOP (RC_GLOBALS_BEGIN + 33)
+#define STR_BOTTOM (RC_GLOBALS_BEGIN + 34)
+#define STR_CENTER_HORI (RC_GLOBALS_BEGIN + 35)
+#define STR_CENTER_VERT (RC_GLOBALS_BEGIN + 36)
#define STR_LOAD_HTML_DOC (RC_GLOBALS_BEGIN + 37)
+#define STR_JAVA_EDIT (RC_GLOBALS_BEGIN + 38)
+
// DIALOGS -----------------------------------------------------------
#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 75c5340..f3f2762 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -224,6 +224,12 @@ String STR_LOAD_HTML_DOC
Text [ en-US ] = "Name and Path of the HTML Document" ;
};
+String STR_JAVA_EDIT
+{
+ Text [ en-US ] = "Edit Script" ;
+};
+
+
InfoBox MSG_ERROR_SEND_MAIL
{
BUTTONS = WB_OK ;
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 956fbe0..d11c374 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -43,7 +43,7 @@
#include <javaedit.hxx>
#include <fldui.hrc>
-#include <javaedit.hrc>
+#include <globals.hrc>
using namespace ::com::sun::star;
diff --git a/sw/source/ui/fldui/javaedit.hrc b/sw/source/ui/fldui/javaedit.hrc
deleted file mode 100644
index 4c72168..0000000
--- a/sw/source/ui/fldui/javaedit.hrc
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 _SW_JAVAEDIT_HRC
-#define _SW_JAVAEDIT_HRC
-
-#define STR_JAVA_EDIT 17
-
-#endif
-
diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src
deleted file mode 100644
index 5c4d8e7..0000000
--- a/sw/source/ui/fldui/javaedit.src
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "javaedit.hrc"
-#include "fldui.hrc"
-#include "helpid.h"
-
-String STR_JAVA_EDIT
-{
- Text [ en-US ] = "Edit Script" ;
-};
diff --git a/sw/uiconfig/swriter/ui/insertscript.ui b/sw/uiconfig/swriter/ui/insertscript.ui
index 765c503..4fcc093 100644
--- a/sw/uiconfig/swriter/ui/insertscript.ui
+++ b/sw/uiconfig/swriter/ui/insertscript.ui
@@ -35,6 +35,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
+ <property name="text" translatable="yes">JavaScript</property>
<property name="invisible_char_set">True</property>
</object>
<packing>
@@ -54,7 +55,6 @@
<property name="halign">start</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">text</property>
</object>
@@ -107,6 +107,7 @@
<property name="halign">start</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">url</property>
</object>
More information about the Libreoffice-commits
mailing list