summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-01-22 14:19:34 (GMT)
committerCaolán McNamara <caolanm@redhat.com>2013-01-22 16:57:45 (GMT)
commit805433ed483b62dbb1bef3301e26bd28ca544c35 (patch)
tree7d4acb93bd1562d5f934108c4efeb68c496a81a2
parent125ff276ae727ef5c1283e364693064a57c4f4b4 (diff)
Tutorial step #8 clean unused .src|.hrc remainders
1. Remove the DLG_CHINESETRANSLATION dialog from the .src 1.1. Remove the .src from AllLangResTarget_<module>.mk if that that .src is now empty. 1.2. Remove from any .hrc files any defines which are now unused due to removing that .src hunk 1.3. Remove any .hrc files which are now empty and remove any #includes of those Change-Id: I872f97e4d3ec7404f4d8978c32e397bb20e96783
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src81
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx1
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc34
-rw-r--r--svx/source/unodialogs/textconversiondlgs/resids.hrc1
4 files changed, 0 insertions, 117 deletions
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src
index 288208f..1ca4753 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src
@@ -17,7 +17,6 @@
*/
#include "chinese_dictionarydialog.hrc"
-#include "chinese_translationdialog.hrc"
#include <svtools/controldims.hrc>
@@ -193,83 +192,3 @@ ModalDialog DLG_CHINESEDICTIONARY
BUTTONS_OK_CANCEL_HELP_ABREAST( FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, ROW_8 )
};
-
-//-----------------------------------------------------------------------------
-//defines for positions and sizes:
-
-#define T_FULL_WIDTH (220)
-#define T_FULL_HEIGHT (120)
-#define T_EDITBUTTON_WIDTH (75)
-
-#define T_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT)
-#define T_COL_2 (T_COL_1+RSC_SP_FLGR_SPACE_X)
-#define T_COL_3 (T_COL_2+RSC_SP_CHK_TEXTINDENT)
-#define T_COL_4 (T_FULL_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-T_EDITBUTTON_WIDTH)
-
-#define T_ROW_1 (RSC_SP_DLG_INNERBORDER_TOP)
-#define T_ROW_2 (T_ROW_1+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y)
-#define T_ROW_3 (T_ROW_2+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y)
-#define T_ROW_4 (T_ROW_3+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define T_ROW_5 (T_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y)
-#define T_ROW_6 (T_ROW_5+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y)
-
-#define T_ROW_8 (T_FULL_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT)
-#define T_ROW_7 (T_ROW_8-RSC_CD_FIXEDLINE_HEIGHT-2)
-
-//-----------------------------------------------------------------------------
-
-ModalDialog DLG_CHINESETRANSLATION
-{
- HelpID = "svx:ModalDialog:DLG_CHINESETRANSLATION";
- //HelpId = ;
- Size = MAP_APPFONT( T_FULL_WIDTH, T_FULL_HEIGHT );
- OutputSize = TRUE;
- Closeable = TRUE ;
- Moveable = TRUE ;
- SVLook = TRUE;
-
- Text [ en-US ] = "Chinese Conversion";
-
- FixedLine FL_DIRECTION
- {
- Pos = MAP_APPFONT ( T_COL_1 , T_ROW_1 ) ;
- Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "Conversion direction";
- };
-
- DIRECTION_RADIOBUTTONS( T_COL_2, T_ROW_2, (T_FULL_WIDTH - T_COL_2 - RSC_SP_DLG_INNERBORDER_RIGHT) )
-
- FixedLine FL_COMMONTERMS
- {
- Pos = MAP_APPFONT ( T_COL_1 , T_ROW_5 ) ;
- Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "Common terms";
- };
-
- CheckBox CB_TRANSLATE_COMMONTERMS
- {
- HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS";
- Pos = MAP_APPFONT( T_COL_2, T_ROW_6 );
- Size = MAP_APPFONT ( T_COL_4 - T_COL_2, RSC_CD_CHECKBOX_HEIGHT ) ;
-
- Text [ en-US ] = "Translate ~common terms";
- };
-
- PushButton PB_EDITTERMS
- {
- HelpID = "svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS";
- Pos = MAP_APPFONT( T_COL_4, T_ROW_6-(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_CHECKBOX_HEIGHT)/2 );
- Size = MAP_APPFONT( T_EDITBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-
- Text [ en-US ] = "~Edit Terms...";
- };
-
- FixedLine T_FL_BOTTOMLINE
- {
- Pos = MAP_APPFONT ( 0 , T_ROW_7 ) ;
- Size = MAP_APPFONT ( T_FULL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
- };
-
- BUTTONS_OK_CANCEL_HELP_ABREAST( T_FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, T_ROW_8 )
-};
-
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index 34c11fa..d38eab3 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -19,7 +19,6 @@
#include "chinese_translationdialog.hxx"
-#include "chinese_translationdialog.hrc"
#include "resid.hxx"
#include "chinese_dictionarydialog.hxx"
#include <com/sun/star/i18n/TextConversionOption.hpp>
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
deleted file mode 100644
index 336cc4c..0000000
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
+++ /dev/null
@@ -1,34 +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 _TEXTCONVERSIONDLGS_CHINESE_TRANSLATIONDLG_HRC
-#define _TEXTCONVERSIONDLGS_CHINESE_TRANSLATIONDLG_HRC
-
-#include "resids.hrc"
-#include "buttongroup.hrc"
-#include "chinese_direction_ids.hrc"
-
-#define PB_EDITTERMS 1
-
-#define CB_USE_VARIANTS 1
-#define CB_TRANSLATE_COMMONTERMS 2
-
-#define FL_DIRECTION 1
-#define FL_COMMONTERMS 2
-#define T_FL_BOTTOMLINE 3
-
-#endif
diff --git a/svx/source/unodialogs/textconversiondlgs/resids.hrc b/svx/source/unodialogs/textconversiondlgs/resids.hrc
index 14f1141..ade936f 100644
--- a/svx/source/unodialogs/textconversiondlgs/resids.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/resids.hrc
@@ -18,7 +18,6 @@
#ifndef _TEXTCONVERSIONDLGS_RESID_HRC
#define _TEXTCONVERSIONDLGS_RESID_HRC
-#define DLG_CHINESETRANSLATION 300
#define DLG_CHINESEDICTIONARY 301
#endif