cui/source/dialogs/gallery.src | 22 - cui/source/inc/gallery.hrc | 1 dbaccess/source/ui/control/dbtreelistbox.cxx | 1 dbaccess/source/ui/control/tabletree.cxx | 1 dbaccess/source/ui/control/tabletree.hrc | 31 - dbaccess/source/ui/control/tabletree.src | 18 dbaccess/source/ui/inc/dbu_resource.hrc | 9 dbaccess/source/ui/querydesign/query.src | 15 dbaccess/source/ui/tabledesign/table.src | 5 extensions/source/bibliography/bib.hrc | 1 extensions/source/bibliography/sections.hrc | 6 extensions/source/bibliography/sections.src | 21 - include/svtools/sores.hxx | 3 include/svx/dialogs.hrc | 3 sd/source/ui/app/menuids_tmpl.src | 65 --- sd/source/ui/app/popup.src | 46 -- sd/source/ui/inc/res_bmp.hrc | 3 sfx2/source/doc/doc.hrc | 5 sfx2/source/doc/doc.src | 30 - starmath/inc/starmath.hrc | 1 starmath/source/smres.src | 42 -- svtools/source/dialogs/so3res.src | 23 - svx/AllLangResTarget_svx.mk | 2 svx/AllLangResTarget_textconversiondlgs.mk | 2 svx/source/mnuctrls/mnuctrls.src | 71 --- svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src | 197 ---------- svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src | 15 svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc | 42 -- sw/AllLangResTarget_sw.mk | 2 sw/inc/chrdlg.hrc | 2 sw/inc/dbui.hrc | 1 sw/source/ui/app/mn.src | 16 sw/source/ui/chrdlg/chardlg.src | 46 -- sw/source/ui/chrdlg/drpcps.src | 47 -- sw/source/ui/dbui/dbui.src | 34 - sw/source/ui/inc/popup.hrc | 1 36 files changed, 15 insertions(+), 815 deletions(-)
New commits: commit f42daec5c72c78e40150cbf0f0d01f38db556264 Author: Thomas Arnhold <tho...@arnhold.org> Date: Fri Jul 5 15:10:33 2013 +0200 cleanup src files Those items are unused. Change-Id: If4fce0f91309d2ca09cbb636d4a5d9f86f38eb9a diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index 033370d..93505da 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -24,28 +24,6 @@ #define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; -TabDialog RID_SVXTABDLG_GALLERY -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Properties of " ; - Moveable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - PageList = - { - PageItem - { - Identifier = RID_SVXTABPAGE_GALLERY_GENERAL ; - Text [ en-US ] = "General" ; - }; - }; - }; -}; - -/******************************************************************************/ - TabDialog RID_SVXTABDLG_GALLERYTHEME { OutputSize = TRUE ; diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc index 3612ed8..c9e8ed7 100644 --- a/cui/source/inc/gallery.hrc +++ b/cui/source/inc/gallery.hrc @@ -19,7 +19,6 @@ #include <cuires.hrc> // Gallery TabDialogs/TabPages -#define RID_SVXTABDLG_GALLERY (RID_CUI_GALLERY_START ) #define RID_SVXTABDLG_GALLERYTHEME (RID_CUI_GALLERY_START + 2) #define RID_SVXDLG_GALLERY_TITLE (RID_CUI_GALLERY_START + 82) diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index b0d5e15..d5c8816 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -32,7 +32,6 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <vcl/help.hxx> -#include "tabletree.hrc" #include <dbaccess/IController.hxx> #include <framework/actiontriggerhelper.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 7d635e3..2868460 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -19,7 +19,6 @@ #include "tabletree.hxx" -#include "tabletree.hrc" #include "imageprovider.hxx" #include "moduledbu.hxx" #include "dbu_control.hrc" diff --git a/dbaccess/source/ui/control/tabletree.hrc b/dbaccess/source/ui/control/tabletree.hrc deleted file mode 100644 index 3734a66..0000000 --- a/dbaccess/source/ui/control/tabletree.hrc +++ /dev/null @@ -1,31 +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 _DBAUI_TABLETREE_HRC_ -#define _DBAUI_TABLETREE_HRC_ - -//------------------------------------------------------------------------ -//- menu ids - -#define MID_SORT_ASCENDING 1 -#define MID_SORT_DECENDING 2 - -#endif // _DBAUI_TABLETREE_HRC_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src index 162a1bb..fc26f06 100644 --- a/dbaccess/source/ui/control/tabletree.src +++ b/dbaccess/source/ui/control/tabletree.src @@ -18,26 +18,8 @@ */ #include "dbu_control.hrc" -#include "tabletree.hrc" #include "browserids.hxx" -Menu MENU_TABLETREE_POPUP -{ - ItemList = - { - MenuItem - { - Identifier = MID_SORT_ASCENDING; - Text [ en-US ] = "Sort Ascending"; - }; - MenuItem - { - Identifier = MID_SORT_DECENDING; - Text [ en-US ] = "Sort Descending"; - }; - }; -}; - String STR_COULDNOTCREATE_DRIVERMANAGER { Text [ en-US ] = "Cannot connect to the SDBC driver manager (#servicename#)."; diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index cf4aa1f..f5333af 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -153,15 +153,7 @@ #define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2 #define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3 -#define ERR_QRY_AMB_FIELD RID_ERRORBOX_START + 4 - // FREE -#define ERR_INVALID_LISTBOX_ENTRY RID_ERRORBOX_START + 6 -// FREE #define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8 -#define ERR_QRY_NOSTATEMENT RID_ERRORBOX_START + 9 -#define ERR_QRY_NOCRITERIA RID_ERRORBOX_START + 10 - - //======================================================================== // query boxes @@ -218,7 +210,6 @@ //======================================================================== // menus -#define MENU_TABLETREE_POPUP RID_MENU_START + 0 #define RID_SBA_GRID_COLCTXMENU RID_MENU_START + 2 #define RID_SBA_GRID_ROWCTXMENU RID_MENU_START + 3 #define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5 diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index 92f0a11..08a728b 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -275,11 +275,6 @@ String STR_QRY_NATIVE Text [ en-US ] = "The statement will not be applied when querying in the SQL dialect of the database." ; }; -ErrorBox ERR_QRY_AMB_FIELD -{ - Message [ en-US ] = "Field name not found or not unique" ; -}; - String STR_QRY_ILLEGAL_JOIN { Text [ en-US ] = "Join could not be processed" ; @@ -305,16 +300,6 @@ String STR_QUERYDESIGN_NO_VIEW_ASK Text [ en-US ] = "Do you want to create a query instead?"; }; -ErrorBox ERR_QRY_NOSTATEMENT -{ - Message [ en-US ] = "No query could be created."; -}; - -ErrorBox ERR_QRY_NOCRITERIA -{ - Message [ en-US ] = "No query could be created because no fields were selected."; -}; - /* The menubar resource has become obsolete - you can now find the menubar definition at: <project>/uiconfig/dbquery/menubar/menubar.xml */ diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src index a842d23..0410b0b 100644 --- a/dbaccess/source/ui/tabledesign/table.src +++ b/dbaccess/source/ui/tabledesign/table.src @@ -141,11 +141,6 @@ Control RID_DB_TAB_EDITOR HelpId = HID_TABDESIGN_BACKGROUND ; }; -ErrorBox ERR_INVALID_LISTBOX_ENTRY -{ - Message [ en-US ] = "The text you entered is not a list element. " ; -}; - Menu RID_TABLEDESIGNROWPOPUPMENU { ItemList = diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index e1644f4..a464de7 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -40,7 +40,6 @@ //Menu(100) #define RID_BIB_MENU (RID_BIB_CONTROLS + 100) -#define RID_POPUP_ME_VIEW (RID_BIB_MENU +50) // Strings (500) #define RID_BIB_STRING (RID_BIB_START + 200) diff --git a/extensions/source/bibliography/sections.hrc b/extensions/source/bibliography/sections.hrc index cc8998a..308da32 100644 --- a/extensions/source/bibliography/sections.hrc +++ b/extensions/source/bibliography/sections.hrc @@ -69,12 +69,6 @@ #define ED_COUNTRY 11 #define ED_ZIP 12 - -//Popup SectionControl -#define PU_INSERT 1 -#define PU_REMOVE 2 -#define PU_CHG_NAME 3 - #define ST_TYPE_ARTICLE 40 #define ST_TYPE_BOOK 41 #define ST_TYPE_BOOKLET 42 diff --git a/extensions/source/bibliography/sections.src b/extensions/source/bibliography/sections.src index 62e7dc3..d6fbac8 100644 --- a/extensions/source/bibliography/sections.src +++ b/extensions/source/bibliography/sections.src @@ -334,27 +334,6 @@ TabPage RID_TP_GENERAL }; Text [ en-US ] = "General"; }; -Menu RID_POPUP_ME_VIEW -{ - ItemList = - { - MenuItem - { - Identifier = PU_INSERT; - Text [ en-US ] = "Insert Section..."; - }; - MenuItem - { - Identifier = PU_REMOVE; - Text [ en-US ] = "Delete Section..."; - }; - MenuItem - { - Identifier = PU_CHG_NAME; - Text [ en-US ] = "Modify Name..."; - }; - }; -}; String ST_IDENTIFIER { diff --git a/include/svtools/sores.hxx b/include/svtools/sores.hxx index 71e6359..8e9093a 100644 --- a/include/svtools/sores.hxx +++ b/include/svtools/sores.hxx @@ -25,9 +25,6 @@ #define STR_UNKNOWN_SOURCE 32027 #define BMP_PLUGIN 32000 -#define MB_PLUGIN 32000 -#define MI_PLUGIN 32000 -#define MI_PLUGIN_DEACTIVATE 1 // Sot Format Strings #define STR_FORMAT_START 32100 diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 1172df7..2e54ba4 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -175,9 +175,6 @@ #define RID_SVXFLOAT3D_FIX_G (RID_SVX_START + 78) #define RID_SVXFLOAT3D_FIX_B (RID_SVX_START + 84) -// ResId's for the FontMenu controls -#define RID_MN_FONTSIZE (RID_SVX_START + 80) - // ResId for zoom popup menu #define RID_SVXMNU_ZOOM (RID_SVX_START + 82) diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src index b28c018..4806f78 100644 --- a/sd/source/ui/app/menuids_tmpl.src +++ b/sd/source/ui/app/menuids_tmpl.src @@ -1047,71 +1047,6 @@ Text [ en-US ] = "~Snap Lines";\ }; -#define MN_CONTROL_SHOW_BROWSER\ - MenuItem\ - {\ - Identifier = SID_SHOW_BROWSER ; \ - HelpId = CMD_SID_SHOW_BROWSER ; \ - Text [ en-US ] = "Propert~ies..." ; \ - }; - -#define MN_CONVERT_TO_1BIT_THRESHOLD\ - MenuItem\ - {\ - Identifier = SID_CONVERT_TO_1BIT_THRESHOLD ; \ - HelpId = CMD_SID_CONVERT_TO_1BIT_THRESHOLD ; \ - Text [ en-US ] = "1Bit ~Threshold" ; \ - }; - -#define MN_CONVERT_TO_1BIT_MATRIX\ - MenuItem\ - {\ - Identifier = SID_CONVERT_TO_1BIT_MATRIX ; \ - HelpId = CMD_SID_CONVERT_TO_1BIT_MATRIX ; \ - Text [ en-US ] = "1 Bit ~Dithering" ; \ - }; - -#define MN_CONVERT_TO_4BIT_GRAYS\ - MenuItem\ - {\ - Identifier = SID_CONVERT_TO_4BIT_GRAYS ; \ - HelpId = CMD_SID_CONVERT_TO_4BIT_GRAYS ; \ - Text [ en-US ] = "4 Bit G~rayscales" ; \ - }; - -#define MN_CONVERT_TO_4BIT_COLORS\ - MenuItem\ - {\ - Identifier = SID_CONVERT_TO_4BIT_COLORS ; \ - HelpId = CMD_SID_CONVERT_TO_4BIT_COLORS ; \ - Text [ en-US ] = "4 Bit ~Color Palette" ; \ - }; - -#define MN_CONVERT_TO_8BIT_GRAYS\ - MenuItem\ - {\ - Identifier = SID_CONVERT_TO_8BIT_GRAYS ; \ - HelpId = CMD_SID_CONVERT_TO_8BIT_GRAYS ; \ - Text [ en-US ] = "8 Bit Gr~ayscales" ; \ - }; - -#define MN_CONVERT_TO_8BIT_COLORS\ - MenuItem\ - {\ - Identifier = SID_CONVERT_TO_8BIT_COLORS ; \ - HelpId = CMD_SID_CONVERT_TO_8BIT_COLORS ; \ - Text [ en-US ] = "8 Bit C~olor Palette" ; \ - }; - -#define MN_CONVERT_TO_24BIT\ - MenuItem\ - {\ - Identifier = SID_CONVERT_TO_24BIT ; \ - HelpId = CMD_SID_CONVERT_TO_24BIT ; \ - Text [ en-US ] = "24 Bit ~True Colors" ; \ - }; - - #define MNSUB_CONVERT \ MenuItem\ {\ diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src index a57a110..527a572 100644 --- a/sd/source/ui/app/popup.src +++ b/sd/source/ui/app/popup.src @@ -207,20 +207,6 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP }; }; -Menu RID_DRAW_CONTROL_POPUP -{ - ItemList = - { - MN_TRANSFORM - MN_CONTROL_SHOW_BROWSER - SEPARATOR - MN_POSITION - MN_OBJECT_ALIGN - SEPARATOR - MN_LEAVE_GROUP - MN_DISMANTLE - }; -}; Menu RID_FORM_CONTROL_POPUP { ItemList = @@ -348,23 +334,6 @@ Menu RID_SLIDE_SORTER_MASTER_NOSEL_POPUP }; }; -Menu RID_MASTERPAGE_POPUP -{ - ItemList = - { - MN_SET_DEFAULT - SEPARATOR - MN_LINE - MN_AREA - MN_TRANSFORM - SEPARATOR - MN_CHAR_PARAGRAPH - // MN_PRESENTATIONOBJECT - SEPARATOR - MN_POSITION - }; -}; - Menu RID_OUTLINE_POPUP { @@ -395,21 +364,6 @@ Menu RID_BEZIER_POPUP }; -Menu RID_DRAW_BMP_CONVERT_POPUP -{ - ItemList = - { - MN_CONVERT_TO_1BIT_THRESHOLD - MN_CONVERT_TO_1BIT_MATRIX - MN_CONVERT_TO_4BIT_GRAYS - MN_CONVERT_TO_4BIT_COLORS - MN_CONVERT_TO_8BIT_GRAYS - MN_CONVERT_TO_8BIT_COLORS - MN_CONVERT_TO_24BIT - }; -}; - - Menu RID_LAYERTAB_POPUP { ItemList = diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index efdd47a..a2a2b03 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -202,12 +202,10 @@ #define RID_DRAW_TEXTOBJ_INSIDE_POPUP RID_APP_START+54 #define RID_SLIDE_SORTER_IMPRESS_NOSEL_POPUP RID_APP_START+55 #define RID_OUTLINE_POPUP RID_APP_START+56 -#define RID_MASTERPAGE_POPUP RID_APP_START+57 #define RID_DRAW_GROUPOBJ_POPUP RID_APP_START+58 #define RID_DRAW_3DOBJ_POPUP RID_APP_START+59 #define RID_DRAW_MEASUREOBJ_POPUP RID_APP_START+60 #define RID_DRAW_EDGEOBJ_POPUP RID_APP_START+61 -#define RID_DRAW_BMP_CONVERT_POPUP RID_APP_START+62 #define RID_DRAW_POLYLINEOBJ_POPUP RID_APP_START+63 #define RID_DRAW_3DSCENE_POPUP RID_APP_START+64 #define RID_DRAW_3DSCENE2_POPUP RID_APP_START+65 @@ -259,7 +257,6 @@ #define RID_DRAW_SNAPOBJECT_POPUP RID_APP_START+390 #define RID_DRAW_GLUEPOINT_POPUP RID_APP_START+392 -#define RID_DRAW_CONTROL_POPUP RID_APP_START+393 #define RID_FORM_CONTROL_POPUP RID_APP_START+394 #define RID_GRAPHICSTYLEFAMILY RID_APP_START+395 diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc index 0ccbede..7bc96e5 100644 --- a/sfx2/source/doc/doc.hrc +++ b/sfx2/source/doc/doc.hrc @@ -55,7 +55,6 @@ #define STR_PRINT_STYLES (RID_SFX_DOC_START+ 20) #define STR_PRINT_STYLES_HEADER (RID_SFX_DOC_START+ 21) -#define MSG_PRINT_ERROR (RID_SFX_DOC_START+ 22) #define STR_BACKUP_COPY (RID_SFX_DOC_START+ 23) #define MSG_CANT_OPEN_TEMPLATE (RID_SFX_DOC_START+ 25) #define MSG_VIEW_OPEN_CANT_SAVE (RID_SFX_DOC_START+ 26) @@ -65,13 +64,9 @@ #define STR_ERROR_DELETE_TEMPLATE (RID_SFX_DOC_START+ 30) #define STR_ERROR_MOVE_TEMPLATE (RID_SFX_DOC_START+ 32) -#define MSG_ERROR_RESCAN (RID_SFX_DOC_START+ 33) #define STR_ERROR_SAVE_TEMPLATE (RID_SFX_DOC_START+ 34) #define MSG_ERROR_RENAME_TEMPLATE (RID_SFX_DOC_START+ 34) -#define MSG_ERROR_RENAME_TEMPLATE_REGION (RID_SFX_DOC_START+ 35) #define STR_CONFIG (RID_SFX_DOC_START+ 37) -#define MSG_ERROR_EMPTY_NAME (RID_SFX_DOC_START+ 37) -#define MSG_ERROR_UNIQ_NAME (RID_SFX_DOC_START+ 38) #define STR_QUERY_DEFAULT_TEMPLATE (RID_SFX_DOC_START+ 39) #define MSG_QUERY_RESET_DEFAULT_TEMPLATE (RID_SFX_DOC_START+ 39) #define MSG_TEMPLATE_DIR_NOT_EXIST (RID_SFX_DOC_START+ 40) diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src index c1341cd..d1a8558 100644 --- a/sfx2/source/doc/doc.src +++ b/sfx2/source/doc/doc.src @@ -75,12 +75,6 @@ Bitmap BMP_STYLES_FAMILY2 { File = "styfam2.bmp" ; }; Bitmap BMP_STYLES_FAMILY3 { File = "styfam3.bmp" ; }; Bitmap BMP_STYLES_FAMILY4 { File = "styfam4.bmp" ; }; -ErrorBox MSG_PRINT_ERROR -{ - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "The print job could not be started." ; -}; String STR_BACKUP_COPY { Text [ en-US ] = "Copy" ; @@ -115,12 +109,6 @@ String STR_ERROR_MOVE_TEMPLATE { Text [ en-US ] = "Error moving template \"$1\"." ; }; -ErrorBox MSG_ERROR_RESCAN -{ - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "The update could not be saved." ; -}; String STR_ERROR_SAVE_TEMPLATE { Text [ en-US ] = "Error saving template " ; @@ -131,24 +119,6 @@ ErrorBox MSG_ERROR_RENAME_TEMPLATE DEFBUTTON = WB_DEF_OK ; Message [ en-US ] = "Error renaming template." ; }; -ErrorBox MSG_ERROR_RENAME_TEMPLATE_REGION -{ - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "Error renaming template category." ; -}; -ErrorBox MSG_ERROR_EMPTY_NAME -{ - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "Please specify a name." ; -}; -ErrorBox MSG_ERROR_UNIQ_NAME -{ - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "Please specify a unique name.\nEntries must not be case specific." ; -}; String STR_QUERY_DEFAULT_TEMPLATE { Text [ en-US ] = "Should the template \"$(TEXT)\" become the default template?" ; diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 192f22e..0459731 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -89,7 +89,6 @@ #define RID_UNDOFORMATNAME (RID_APP_START + 504) #define RID_COMMANDMENU (RID_APP_START + 701) #define RID_VIEWMENU (RID_APP_START + 702) -#define RID_FONTMENU (RID_APP_START + 704) #define RID_TOOLBOXWINDOW (RID_APP_START + 801) #define RID_CMDBOXWINDOW (RID_APP_START + 802) #define RID_FONTREGULAR (RID_APP_START + 804) diff --git a/starmath/source/smres.src b/starmath/source/smres.src index de4427f..b9979ce 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -426,48 +426,6 @@ Menu RID_VIEWMENU }; }; -Menu RID_FONTMENU -{ - ItemList = - { - MenuItem - { - Identifier = 1 ; - Text [ en-US ] = "Variables" ; - }; - MenuItem - { - Identifier = 2 ; - Text [ en-US ] = "Functions" ; - }; - MenuItem - { - Identifier = 3 ; - Text [ en-US ] = "Numbers" ; - }; - MenuItem - { - Identifier = 4 ; - Text [ en-US ] = "Text" ; - }; - MenuItem - { - Identifier = 5 ; - Text [ en-US ] = "Serif" ; - }; - MenuItem - { - Identifier = 6 ; - Text [ en-US ] = "Sans" ; - }; - MenuItem - { - Identifier = 7 ; - Text [ en-US ] = "Fixed" ; - }; - }; -}; - #define CMDBOXWINDOW_TEXT \ Text [ en-US ] = "Commands" ; \ diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src index 82bb505..bc92074 100644 --- a/svtools/source/dialogs/so3res.src +++ b/svtools/source/dialogs/so3res.src @@ -189,29 +189,6 @@ Bitmap BMP_PLUGIN { File = "plugin.png" ; }; -Menu MB_PLUGIN -{ - ItemList = - { - MenuItem MI_PLUGIN ; - }; - ExtraData = { 1 ; 0 ; 0 ; }; //Um InPlace Menu zu bentzen -}; -MenuItem MI_PLUGIN -{ - Identifier = MI_PLUGIN ; - SubMenu = Menu - { - ItemList = - { - MenuItem - { - Identifier = MI_PLUGIN_DEACTIVATE ; - Text [ en-US ] = "Deactivate" ; - }; - }; - }; -}; String STR_UNKNOWN_SOURCE { Text [ en-US ] = "Unknown source" ; diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 11f0418..adc7f97 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -69,7 +69,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/form/formshell.src \ svx/source/items/svxerr.src \ svx/source/items/svxitems.src \ - svx/source/mnuctrls/mnuctrls.src \ svx/source/sidebar/EmptyPanel.src \ svx/source/sidebar/area/AreaPropertyPanel.src \ svx/source/sidebar/graphic/GraphicPropertyPanel.src \ @@ -93,7 +92,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ )) $(eval $(call gb_SrsTarget_add_nonlocalized_files,svx/res,\ - svx/source/mnuctrls/mnuctrls.src \ svx/source/unodraw/unodraw.src \ )) diff --git a/svx/source/mnuctrls/mnuctrls.src b/svx/source/mnuctrls/mnuctrls.src deleted file mode 100644 index 9e15bb4..0000000 --- a/svx/source/mnuctrls/mnuctrls.src +++ /dev/null @@ -1,71 +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 <svx/dialogs.hrc> - -Menu RID_MN_FONTSIZE { - ItemList = { - MenuItem { - Text = "6"; - Identifier = 6; - }; - MenuItem { - Text = "8"; - Identifier = 8; - }; - MenuItem { - Text = "10"; - Identifier = 10; - }; - MenuItem { - Text = "12"; - Identifier = 12; - }; - MenuItem { - Text = "14"; - Identifier = 14; - }; - MenuItem { - Text = "18"; - Identifier = 18; - }; - MenuItem { - Text = "24"; - Identifier = 24; - }; - MenuItem { - Text = "36"; - Identifier = 36; - }; - MenuItem { - Text = "48"; - Identifier = 48; - }; - MenuItem { - Text = "60"; - Identifier = 60; - }; - MenuItem { - Text = "72"; - Identifier = 72; - }; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index ceeb41b..c73c913 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -68,9 +68,7 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/app/error.src \ sw/source/ui/app/mn.src \ sw/source/ui/chrdlg/ccoll.src \ - sw/source/ui/chrdlg/chardlg.src \ sw/source/ui/chrdlg/chrdlg.src \ - sw/source/ui/chrdlg/drpcps.src \ sw/source/ui/chrdlg/paradlg.src \ sw/source/ui/config/mailconfigpage.src \ sw/source/ui/config/optcomp.src \ diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc index 2100675..9280ead 100644 --- a/sw/inc/chrdlg.hrc +++ b/sw/inc/chrdlg.hrc @@ -23,8 +23,6 @@ #include "rcid.hrc" #define DLG_PARA (RC_CHRDLG_BEGIN + 2) -#define DLG_DROPCAPS (RC_CHRDLG_BEGIN + 8) -#define DLG_DRAWCHAR (RC_CHRDLG_BEGIN + 9) #define DLG_DRAWPARA (RC_CHRDLG_BEGIN + 10) // Tabpages -> now in globals.hrc diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc index 6b356b0..c88c526 100644 --- a/sw/inc/dbui.hrc +++ b/sw/inc/dbui.hrc @@ -24,7 +24,6 @@ // Dialoge -------------------------------------------------------------------- -#define DLG_DBSELECTION (RC_DBUI_BEGIN) #define DLG_PRINTMONITOR (RC_DBUI_BEGIN + 1) #define DLG_AP_INSERT_DB_SEL (RC_DBUI_BEGIN + 2) diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index e8175e2..fb2c31e 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -1140,14 +1140,6 @@ Menu MN_DRWTXT_POPUPMENU }; }; -#define MN_REDCOMMENT \ - MenuItem\ - {\ - Identifier = FN_DELETE_COMMENT ;\ - HelpId = CMD_FN_DELETE_COMMENT ;\ - Text [ en-US ] = "Delete ~Changes Note" ;\ - };\ - Menu MN_ANNOTATION_POPUPMENU { ItemList = @@ -1182,14 +1174,6 @@ Menu MN_ANNOTATION_BUTTON }; }; -Menu MN_REDCOMMENT_BUTTON -{ - ItemList = - { - MN_REDCOMMENT - }; -}; - String MN_GRF_POPUPMENU { Text [ en-US ] = "Graphic" ; diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src deleted file mode 100644 index bdad1b2..0000000 --- a/sw/source/ui/chrdlg/chardlg.src +++ /dev/null @@ -1,46 +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 "globals.hrc" -#include "chrdlg.hrc" -#include "helpid.h" - -TabDialog DLG_DRAWCHAR -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Font" ; - Moveable = TRUE ; - Closeable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - PageList = - { - PageItem - { - Identifier = TP_CHAR_STD ; - Text [ en-US ] = "Font" ; - PageResID = TP_CHAR_STD ; - }; - }; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/drpcps.src b/sw/source/ui/chrdlg/drpcps.src deleted file mode 100644 index 6436ad0..0000000 --- a/sw/source/ui/chrdlg/drpcps.src +++ /dev/null @@ -1,47 +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 "globals.hrc" -#include "chrdlg.hrc" -#include "helpid.h" - // TabDialog **************************************************************** -TabDialog DLG_DROPCAPS -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Drop Caps" ; - Moveable = TRUE ; - TabControl 1 - { - OutputSize = TRUE ; - PageList = - { - PageItem - { - Identifier = TP_DROPCAPS ; - Text [ en-US ] = "Drop Caps" ; - PageResID = TP_DROPCAPS ; - }; - }; - }; -}; - - // ********************************************************************** EOF - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src index 664e5ab..2c244ff 100644 --- a/sw/source/ui/dbui/dbui.src +++ b/sw/source/ui/dbui/dbui.src @@ -20,40 +20,6 @@ #include "dbui.hrc" #include "helpid.h" -ModalDialog DLG_DBSELECTION -{ - HelpID = "sw:ModalDialog:DLG_DBSELECTION"; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 168 , 132 ) ; - Moveable = TRUE ; - Control TLB_DBLIST - { - Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 100 , 120 ) ; - }; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 112 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Disable = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 112 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 112 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - Text [ en-US ] = "Database Selection" ; -}; // DLG_PRINTMONITOR ------------------------------------------------------ ModelessDialog DLG_PRINTMONITOR { diff --git a/sw/source/ui/inc/popup.hrc b/sw/source/ui/inc/popup.hrc index b263d2e..88ed692 100644 --- a/sw/source/ui/inc/popup.hrc +++ b/sw/source/ui/inc/popup.hrc @@ -35,7 +35,6 @@ #define MN_MEDIA_POPUPMENU (RC_POPUPS_BEGIN + 10) #define MN_ANNOTATION_POPUPMENU (RC_POPUPS_BEGIN + 14) #define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 15) -#define MN_REDCOMMENT_BUTTON (RC_POPUPS_BEGIN + 17) #define MN_HEADERFOOTER_BUTTON (RC_POPUPS_BEGIN + 18) #define MN_PAGEBREAK_BUTTON (RC_POPUPS_BEGIN + 19) commit 83ece8c46b2076a2ac2ca05e6ea280d6aca66c73 Author: Thomas Arnhold <tho...@arnhold.org> Date: Fri Jul 5 13:17:42 2013 +0200 remove duplicate dialog chinese_dialogs.src now had the same content as chinese_dictionarydialog.src. Change-Id: I15bf07352e3da1e8720b3a68ad2f862438df185d diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk index 2cfce3e..c47443f 100644 --- a/svx/AllLangResTarget_textconversiondlgs.mk +++ b/svx/AllLangResTarget_textconversiondlgs.mk @@ -28,7 +28,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,textconversiondlgs,\ $(eval $(call gb_SrsTarget_SrsTarget,svx/textconversiondlgs)) $(eval $(call gb_SrsTarget_add_files,svx/textconversiondlgs,\ - svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src \ + svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src \ )) # vim: set noet sw=4 ts=4: diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src deleted file mode 100644 index f52afb0..0000000 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src +++ /dev/null @@ -1,197 +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 "chinese_dictionarydialog.hrc" - -#include <svtools/controldims.hrc> - -#define DIRECTION_RADIOBUTTONS( D_XPOS, D_YPOS, D_FULLWIDTH ) \ -RadioButton RB_TO_SIMPLIFIED \ -{ \ - Pos = MAP_APPFONT( D_XPOS, D_YPOS ); \ - Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \ - Text [ en-US ] = "~Traditional Chinese to simplified Chinese"; \ -}; \ -RadioButton RB_TO_TRADITIONAL \ -{ \ - Pos = MAP_APPFONT( D_XPOS, D_YPOS + RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y ); \ - Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \ - Text [ en-US ] = "~Simplified Chinese to traditional Chinese"; \ -}; - -//----------------------------------------------------------------------------- -//defines for positions and sizes: - -#define FULL_WIDTH (245) -#define FULL_HEIGHT (165) - -#define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) -#define ROW_2 (ROW_1+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y) -#define ROW_3 (ROW_2+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y) -#define ROW_4 (ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_GROUP_Y) -#define ROW_5 (ROW_4+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define ROW_6 (ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_CTRL_DESC_Y) - -#define ROW_5a (ROW_5+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define ROW_5b (ROW_5a+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y) - -#define ROW_8 (FULL_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT) -#define ROW_7 (ROW_8-RSC_CD_FIXEDLINE_HEIGHT-2) - -#define LIST_HEIGHT (ROW_7-RSC_SP_CTRL_Y-ROW_6) - -#define COL_WIDTH 60 -#define BUTTONCOL_WIDTH 40 -#define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_FLGR_SPACE_X) -#define COL_2 (COL_1+COL_WIDTH+1) -#define COL_3 (COL_2+COL_WIDTH+1) -#define COL_4 (FULL_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-BUTTONCOL_WIDTH) - -#define REST_COL_WIDTH (COL_4-COL_3-RSC_SP_CTRL_GROUP_X) - -//----------------------------------------------------------------------------- - -ModalDialog DLG_CHINESEDICTIONARY -{ - HelpID = "svx:ModalDialog:DLG_CHINESEDICTIONARY"; - //HelpId = ; - Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT ); - OutputSize = TRUE; - Closeable = TRUE ; - Moveable = TRUE ; - SVLook = TRUE; - - Text [ en-US ] = "Edit Dictionary"; - - DIRECTION_RADIOBUTTONS( COL_1, ROW_1, FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT ) - - CheckBox CB_REVERSE - { - HelpID = "svx:CheckBox:DLG_CHINESEDICTIONARY:CB_REVERSE"; - Pos = MAP_APPFONT ( COL_1, ROW_3 ) ; - Size = MAP_APPFONT ( FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT , RSC_CD_CHECKBOX_HEIGHT ) ; - - Text [ en-US ] = "Reverse mapping"; - }; - - FixedText FT_TERM - { - Pos = MAP_APPFONT ( COL_1 , ROW_4 ) ; - Size = MAP_APPFONT ( COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "Term"; - }; - Edit ED_TERM - { - HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_TERM"; - Border = TRUE ; - Pos = MAP_APPFONT ( COL_1 , ROW_5 ) ; - Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; - }; - - - FixedText FT_MAPPING - { - Pos = MAP_APPFONT ( COL_2 , ROW_4 ) ; - Size = MAP_APPFONT ( COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "Mapping"; - }; - Edit ED_MAPPING - { - HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_MAPPING"; - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , ROW_5 ) ; - Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; - }; - - FixedText FT_PROPERTY - { - Pos = MAP_APPFONT ( COL_3 , ROW_4 ) ; - Size = MAP_APPFONT ( REST_COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "Property"; - }; - ListBox LB_PROPERTY - { - HelpID = "svx:ListBox:DLG_CHINESEDICTIONARY:LB_PROPERTY"; - Border = TRUE ; - Pos = MAP_APPFONT ( COL_3 , ROW_5 ) ; - Size = MAP_APPFONT ( REST_COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; - DropDown = TRUE ; - - stringlist [ en-US ] = - { - < "Other" ; Default ; > ; - < "Foreign" ; > ; - < "First name" ; > ; - < "Last name" ; > ; - < "Title" ; > ; - < "Status" ; > ; - < "Place name" ; > ; - < "Business" ; > ; - < "Adjective" ; > ; - < "Idiom" ; > ; - < "Abbreviation" ; > ; - < "Numerical" ; > ; - < "Noun" ; > ; - < "Verb" ; > ; - < "Brand name" ; > ; - }; - }; - - Control CT_MAPPINGLIST - { - Pos = MAP_APPFONT ( COL_1, ROW_6 ) ; - Size = MAP_APPFONT ( COL_4 - COL_1 - RSC_SP_CTRL_GROUP_X, LIST_HEIGHT ) ; - TabStop = TRUE ; - }; - - PushButton PB_ADD - { - HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_ADD"; - Pos = MAP_APPFONT( COL_4, ROW_5 ); - Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); - - Text [ en-US ] = "~Add"; - }; - PushButton PB_MODIFY - { - HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_MODIFY"; - Pos = MAP_APPFONT( COL_4, ROW_5a ); - Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); - - Text [ en-US ] = "~Modify"; - }; - PushButton PB_DELETE - { - HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_DELETE"; - Pos = MAP_APPFONT( COL_4, ROW_5b ); - Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); - - Text [ en-US ] = "~Delete"; - }; - - FixedLine FL_BOTTOMLINE - { - Pos = MAP_APPFONT ( 0 , ROW_7 ) ; - Size = MAP_APPFONT ( FULL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ; - }; - - BUTTONS_OK_CANCEL_HELP_ABREAST( FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, ROW_8 ) -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src index 82ee86f..f52afb0 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src @@ -18,10 +18,23 @@ */ #include "chinese_dictionarydialog.hrc" -#include "chinese_direction.hrc" #include <svtools/controldims.hrc> +#define DIRECTION_RADIOBUTTONS( D_XPOS, D_YPOS, D_FULLWIDTH ) \ +RadioButton RB_TO_SIMPLIFIED \ +{ \ + Pos = MAP_APPFONT( D_XPOS, D_YPOS ); \ + Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \ + Text [ en-US ] = "~Traditional Chinese to simplified Chinese"; \ +}; \ +RadioButton RB_TO_TRADITIONAL \ +{ \ + Pos = MAP_APPFONT( D_XPOS, D_YPOS + RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y ); \ + Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \ + Text [ en-US ] = "~Simplified Chinese to traditional Chinese"; \ +}; + //----------------------------------------------------------------------------- //defines for positions and sizes: diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc deleted file mode 100644 index 9315073..0000000 --- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc +++ /dev/null @@ -1,42 +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 _TEXTCONVERSIONDLGS_CHINESE_DIRECTION_HRC -#define _TEXTCONVERSIONDLGS_CHINESE_DIRECTION_HRC - -#include "chinese_direction_ids.hrc" -#include <svtools/controldims.hrc> - -#define DIRECTION_RADIOBUTTONS( D_XPOS, D_YPOS, D_FULLWIDTH ) \ -RadioButton RB_TO_SIMPLIFIED \ -{ \ - Pos = MAP_APPFONT( D_XPOS, D_YPOS ); \ - Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \ - Text [ en-US ] = "~Traditional Chinese to simplified Chinese"; \ -}; \ -RadioButton RB_TO_TRADITIONAL \ -{ \ - Pos = MAP_APPFONT( D_XPOS, D_YPOS + RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y ); \ - Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \ - Text [ en-US ] = "~Simplified Chinese to traditional Chinese"; \ -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits