[Libreoffice-commits] core.git: 2 commits - helpcontent2 sc/AllLangResTarget_sc.mk sc/inc sc/source
Caolán McNamara
caolanm at redhat.com
Wed Mar 6 06:52:59 PST 2013
helpcontent2 | 2
sc/AllLangResTarget_sc.mk | 1
sc/inc/sc.hrc | 1
sc/source/ui/inc/namedefdlg.hrc | 49 ------------
sc/source/ui/inc/namedefdlg.hxx | 1
sc/source/ui/src/namedefdlg.src | 154 ----------------------------------------
6 files changed, 1 insertion(+), 207 deletions(-)
New commits:
commit 96857802bd70aaa8111cf84367ca016cb8d1f06b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 6 14:36:07 2013 +0000
remove .src remnants
Change-Id: Icd3df6c154e1eac0d7ba47c449c3fdc6ae388879
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 59191dc..b58eba4 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -71,7 +71,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/simpref.src \
sc/source/ui/src/solveroptions.src \
sc/source/ui/src/namedlg.src \
- sc/source/ui/src/namedefdlg.src \
sc/source/ui/src/miscdlgs.src \
sc/source/ui/src/tabopdlg.src \
sc/source/ui/src/scstring.src \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0b19621..180e6da 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1000,7 +1000,6 @@
#define RID_SCDLG_COLORROW (SC_DIALOGS_START + 71)
#define RID_SCDLG_NAMES_PASTE (SC_DIALOGS_START + 72)
#define RID_SCDLG_NAMES_CREATE (SC_DIALOGS_START + 73)
-#define RID_SCDLG_NAMES_DEFINE (SC_DIALOGS_START + 75)
#define RID_SCDLG_CHAR (SC_DIALOGS_START + 76)
#define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77)
diff --git a/sc/source/ui/inc/namedefdlg.hrc b/sc/source/ui/inc/namedefdlg.hrc
deleted file mode 100644
index ec3e772..0000000
--- a/sc/source/ui/inc/namedefdlg.hrc
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2011 Markus Mohrhard <markus.mohrhard at googlemail.com> (initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "sc.hrc"
-
-#define BTN_ADD 1
-#define BTN_CANCEL 2
-#define FT_NAME 3
-#define FT_RANGE 4
-#define FT_SCOPE 5
-#define FT_INFO 6
-#define ED_NAME 7
-#define ED_RANGE 8
-#define LB_SCOPE 9
-#define BTN_PRINTAREA 10
-#define BTN_CRITERIA 11
-#define BTN_ROWHEADER 12
-#define BTN_COLHEADER 13
-#define FL_DIV 15
-#define STR_DEFAULT_INFO 19
-#define RB_RANGE 20
-#define BTN_MORE 21
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx
index 8aaa937..52d3494 100644
--- a/sc/source/ui/inc/namedefdlg.hxx
+++ b/sc/source/ui/inc/namedefdlg.hxx
@@ -27,7 +27,6 @@
*/
#include "anyrefdg.hxx"
-#include "namedefdlg.hrc"
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
deleted file mode 100644
index 6d2e0d3..0000000
--- a/sc/source/ui/src/namedefdlg.src
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2011 Markus Mohrhard <markus.mohrhard at googlemail.com> (initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "namedefdlg.hrc"
-
-ModelessDialog RID_SCDLG_NAMES_DEFINE
-{
- OutputSize = TRUE ;
- HelpId = CMD_FID_ADD_NAME ;
- Hide = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 225 , 116 ) ;
- Text [ en-US ] = "Define Name" ;
- Moveable = TRUE ;
- Closeable = TRUE;
- PushButton BTN_ADD
- {
- Pos = MAP_APPFONT( 115, 96 );
- Size = MAP_APPFONT( 50, 15 );
- TabStop = TRUE;
- Text [en-US] = "Add";
- };
- PushButton BTN_CANCEL
- {
- Pos = MAP_APPFONT( 170, 96 );
- Size = MAP_APPFONT ( 50, 15 );
- TabStop = TRUE;
- Text [en-US] = "Cancel";
- };
- CheckBox BTN_MORE
- {
- Pos = MAP_APPFONT( 5, 81 );
- Size = MAP_APPFONT( 80, 15 );
- Text [en-US] = "Range Options";
- };
- FixedText FT_INFO
- {
- Pos = MAP_APPFONT( 5, 5 );
- Size = MAP_APPFONT( 215, 15 );
- };
- FixedText FT_NAME
- {
- Pos = MAP_APPFONT( 5, 27 );
- Size = MAP_APPFONT( 50, 13 );
- Text [en-US] = "Name";
- };
- FixedText FT_RANGE
- {
- Pos = MAP_APPFONT( 5, 45 );
- Size = MAP_APPFONT( 50, 13 );
- Text [en-US] = "Range";
- };
- FixedText FT_SCOPE
- {
- Pos = MAP_APPFONT( 5, 63 );
- Size = MAP_APPFONT( 50, 13 );
- Text [en-US] = "Scope";
- };
- Edit ED_NAME
- {
- Border = TRUE;
- Pos = MAP_APPFONT( 60, 25 );
- Size = MAP_APPFONT( 160, 13 );
- TabStop = TRUE;
- };
- Edit ED_RANGE
- {
- Border = TRUE;
- Pos = MAP_APPFONT( 60, 43 );
- Size = MAP_APPFONT( 145, 13 );
- TabStop = TRUE;
- };
- ImageButton RB_RANGE
- {
- Pos = MAP_APPFONT ( 205 , 43 ) ;
- Size = MAP_APPFONT ( 15 , 13 ) ;
- TabStop = TRUE ;
- };
- CheckBox BTN_PRINTAREA
- {
- HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA";
- Pos = MAP_APPFONT ( 5 , 94 ) ;
- Size = MAP_APPFONT ( 90 , 10 ) ;
- Text [ en-US ] = "~Print range" ;
- TabStop = TRUE ;
- };
- CheckBox BTN_CRITERIA
- {
- HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA";
- Pos = MAP_APPFONT ( 5 , 107 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "~Filter" ;
- TabStop = TRUE ;
- };
- CheckBox BTN_ROWHEADER
- {
- HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER";
- Pos = MAP_APPFONT ( 120, 107 ) ;
- Size = MAP_APPFONT ( 92 , 10 ) ;
- Text [ en-US ] = "Repeat ~row" ;
- TabStop = TRUE ;
- };
- CheckBox BTN_COLHEADER
- {
- HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER";
- Pos = MAP_APPFONT ( 120 , 94 ) ;
- Size = MAP_APPFONT ( 92 , 10 ) ;
- Text [ en-US ] = "Repeat ~column" ;
- TabStop = TRUE ;
- };
- ListBox LB_SCOPE
- {
- Border = TRUE;
- Pos = MAP_APPFONT ( 60 , 61 );
- Size = MAP_APPFONT ( 160 , 80 );
- TabStop = TRUE;
- DropDown = TRUE;
- };
- FixedLine FL_DIV
- {
- Pos = MAP_APPFONT( 0, 91 );
- Size = MAP_APPFONT(225, 3 );
- };
- String STR_DEFAULT_INFO
- {
- Text [en-US] = "Define the name and range or formula expression.";
- };};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3a9e5d88398cd621800d355c68c1dd152b031a4a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 6 14:46:35 2013 +0000
Updated core
Project: help 44a39c4833aef3499030d046f153bb1d27e84027
diff --git a/helpcontent2 b/helpcontent2
index 071306b..44a39c4 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 071306b8f2e8d419a76ba2d493b7b8377fde2eff
+Subproject commit 44a39c4833aef3499030d046f153bb1d27e84027
More information about the Libreoffice-commits
mailing list