diff options
Diffstat (limited to 'svx/source/unodialogs')
19 files changed, 331 insertions, 124 deletions
diff --git a/svx/source/unodialogs/inc/buttongroup.hrc b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc index b99403b57e1f..b99403b57e1f 100644..100755 --- a/svx/source/unodialogs/inc/buttongroup.hrc +++ b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src new file mode 100755 index 000000000000..9c94496a1747 --- /dev/null +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src @@ -0,0 +1,293 @@ +/************************************************************************* + * + * 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 "chinese_dictionarydialog.hrc" +#include "chinese_translationdialog.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 ) +}; + +//----------------------------------------------------------------------------- +//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) ) + + CheckBox CB_USE_VARIANTS + { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_USE_VARIANTS"; + Pos = MAP_APPFONT( T_COL_3, T_ROW_4 ); + Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_3 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ) ; + + Text [ en-US ] = "~Use Taiwan, Hong Kong SAR, and Macao SAR character variants"; + }; + + 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_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index fb018fff4056..e83787168746 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -94,7 +94,7 @@ String DictionaryList::getPropertyTypeName( sal_Int16 nConversionPropertyType ) if(!m_pPropertyTypeNameListBox || !m_pPropertyTypeNameListBox->GetEntryCount()) return String(); - USHORT nPos = static_cast<USHORT>( nConversionPropertyType )-1; + sal_uInt16 nPos = static_cast<sal_uInt16>( nConversionPropertyType )-1; if(nPos<m_pPropertyTypeNameListBox->GetEntryCount()) return m_pPropertyTypeNameListBox->GetEntry(nPos); return m_pPropertyTypeNameListBox->GetEntry(0); @@ -113,7 +113,7 @@ String DictionaryList::makeTabString( const DictionaryEntry& rEntry ) const void DictionaryList::initDictionaryControl( const Reference< linguistic2::XConversionDictionary>& xDictionary , ListBox* pPropertyTypeNameListBox ) { - SetWindowBits( WB_VSCROLL ); + SetStyle( WB_VSCROLL | WB_TABSTOP ); SetSelectionMode( SINGLE_SELECTION ); SetBorderStyle( WINDOW_BORDER_MONO ); SetHighlightRange(); @@ -257,7 +257,7 @@ bool DictionaryList::hasTerm( const rtl::OUString& rTerm ) const } void DictionaryList::addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping - , sal_Int16 nConversionPropertyType, ULONG nPos ) + , sal_Int16 nConversionPropertyType, sal_uIntPtr nPos ) { if( hasTerm( rTerm ) ) return; @@ -283,9 +283,9 @@ void DictionaryList::deleteEntryOnPos( sal_Int32 nPos ) } } -ULONG DictionaryList::deleteEntries( const rtl::OUString& rTerm ) +sal_uIntPtr DictionaryList::deleteEntries( const rtl::OUString& rTerm ) { - ULONG nPos = LIST_APPEND; + sal_uIntPtr nPos = LIST_APPEND; for( sal_Int32 nN=GetRowCount(); nN--; ) { DictionaryEntry* pCurEntry = getEntryOnPos( nN ); @@ -352,7 +352,7 @@ void DictionaryList::Resize() m_pHeaderBar->SetSizePixel( aBarSize ); } -void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ ) +void DictionaryList::sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ) { m_nSortColumnIndex=nSortColumnIndex; if( nSortColumnIndex<3 ) @@ -369,7 +369,7 @@ void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ ) GetModel()->SetSortMode(SortNone); } -USHORT DictionaryList::getSortColumn() const +sal_uInt16 DictionaryList::getSortColumn() const { return m_nSortColumnIndex; } @@ -390,8 +390,8 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR if(pLeftItem != NULL && pRightItem != NULL) { - USHORT nLeftKind=pLeftItem->IsA(); - USHORT nRightKind=pRightItem->IsA(); + sal_uInt16 nLeftKind=pLeftItem->IsA(); + sal_uInt16 nRightKind=pRightItem->IsA(); if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) @@ -409,12 +409,12 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR return eCompare; } -SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const +SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const { SvLBoxItem* pItem = NULL; if( pEntry ) { - USHORT nCount = pEntry->ItemCount(); + sal_uInt16 nCount = pEntry->ItemCount(); nColumn++; if( nTreeFlags & TREEFLAG_CHKBTN ) nColumn++; @@ -788,12 +788,12 @@ IMPL_LINK( ChineseDictionaryDialog, ModifyHdl, void*, EMPTYARG ) { if( m_aCB_Reverse.IsChecked() ) { - ULONG nPos = rReverse.deleteEntries( pE->m_aMapping ); + sal_uIntPtr nPos = rReverse.deleteEntries( pE->m_aMapping ); nPos = rReverse.deleteEntries( aMapping ); rReverse.addEntry( aMapping, aTerm, nConversionPropertyType, nPos ); } - ULONG nPos = rActive.deleteEntries( aTerm ); + sal_uIntPtr nPos = rActive.deleteEntries( aTerm ); rActive.addEntry( aTerm, aMapping, nConversionPropertyType, nPos ); } } @@ -866,7 +866,7 @@ IMPL_LINK( ChineseDictionaryDialog, HeaderBarClick, void*, EMPTYARG ) { if(m_pHeaderBar) { - USHORT nId = m_pHeaderBar->GetCurItemId(); + sal_uInt16 nId = m_pHeaderBar->GetCurItemId(); HeaderBarItemBits nBits = m_pHeaderBar->GetItemBits(nId); if( nBits & HIB_CLICKABLE ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc index 5c4c8e2bf049..5c4c8e2bf049 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index e268dbff01b4..892d5b793620 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -93,14 +93,14 @@ public: bool hasTerm( const rtl::OUString& rTerm ) const; void addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping - , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, ULONG nPos = LIST_APPEND ); - ULONG deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted + , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, sal_uIntPtr nPos = LIST_APPEND ); + sal_uIntPtr deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted void deleteEntryOnPos( sal_Int32 nPos ); DictionaryEntry* getEntryOnPos( sal_Int32 nPos ) const; DictionaryEntry* getFirstSelectedEntry() const; - void sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ ); - USHORT getSortColumn() const; + void sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ); + sal_uInt16 getSortColumn() const; virtual void Resize(); @@ -110,7 +110,7 @@ private: DECL_LINK( CompareHdl, SvSortData* ); StringCompare ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pRight ); - SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const; + SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const; public: ::com::sun::star::uno::Reference< @@ -122,7 +122,7 @@ private: std::vector< DictionaryEntry* > m_aToBeDeleted; - USHORT m_nSortColumnIndex; + sal_uInt16 m_nSortColumnIndex; }; class ChineseDictionaryDialog : public ModalDialog diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src index 76ec3f39eb43..46c6a7b341d1 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src @@ -66,6 +66,7 @@ ModalDialog DLG_CHINESEDICTIONARY { + HelpID = "svx:ModalDialog:DLG_CHINESEDICTIONARY"; //HelpId = ; Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT ); OutputSize = TRUE; @@ -79,6 +80,7 @@ ModalDialog DLG_CHINESEDICTIONARY 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 ) ; @@ -93,6 +95,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; 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 ) ; @@ -107,6 +110,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; 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 ) ; @@ -120,6 +124,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; 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 ) ; @@ -154,6 +159,7 @@ ModalDialog DLG_CHINESEDICTIONARY 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 ); @@ -161,6 +167,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; 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 ); @@ -168,6 +175,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; 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 ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc index 4545ef26fc5b..4545ef26fc5b 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc index e2b67ab7df9f..e2b67ab7df9f 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index dbc47e20aebb..dbc47e20aebb 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index 21988292a2e2..21988292a2e2 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index f6990c71db1e..250b660cacec 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -63,7 +63,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) , m_aFL_Commonterms( this, TextConversionDlgs_ResId( FL_COMMONTERMS ) ) , m_aCB_Translate_Commonterms( this, TextConversionDlgs_ResId( CB_TRANSLATE_COMMONTERMS ) ) , m_aPB_Editterms( this, TextConversionDlgs_ResId( PB_EDITTERMS ) ) - , m_aFL_Bottomline( this, TextConversionDlgs_ResId( FL_BOTTOMLINE ) ) + , m_aFL_Bottomline( this, TextConversionDlgs_ResId( T_FL_BOTTOMLINE ) ) , m_aBP_OK( this, TextConversionDlgs_ResId( PB_OK ) ) , m_aBP_Cancel( this, TextConversionDlgs_ResId( PB_CANCEL ) ) , m_aBP_Help( this, TextConversionDlgs_ResId( PB_HELP ) ) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc index 5e593ef467a3..f7607cf087dd 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc @@ -35,10 +35,9 @@ #define CB_USE_VARIANTS 1 #define CB_TRANSLATE_COMMONTERMS 2 -#define CB_REVERSE 3 #define FL_DIRECTION 1 #define FL_COMMONTERMS 2 -#define FL_BOTTOMLINE 3 +#define T_FL_BOTTOMLINE 3 #endif diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 44c97f666f5b..44c97f666f5b 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src index 397466a7dc68..b99d3e7c745a 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src @@ -58,6 +58,7 @@ ModalDialog DLG_CHINESETRANSLATION { + HelpID = "svx:ModalDialog:DLG_CHINESETRANSLATION"; //HelpId = ; Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT ); OutputSize = TRUE; @@ -78,6 +79,7 @@ ModalDialog DLG_CHINESETRANSLATION CheckBox CB_USE_VARIANTS { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_USE_VARIANTS"; Pos = MAP_APPFONT( COL_3, ROW_4 ); Size = MAP_APPFONT ( FULL_WIDTH - COL_3 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ) ; @@ -93,6 +95,7 @@ ModalDialog DLG_CHINESETRANSLATION CheckBox CB_TRANSLATE_COMMONTERMS { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS"; Pos = MAP_APPFONT( COL_2, ROW_6 ); Size = MAP_APPFONT ( COL_4 - COL_2, RSC_CD_CHECKBOX_HEIGHT ) ; @@ -101,6 +104,7 @@ ModalDialog DLG_CHINESETRANSLATION PushButton PB_EDITTERMS { + HelpID = "svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS"; Pos = MAP_APPFONT( COL_4, ROW_6-(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_CHECKBOX_HEIGHT)/2 ); Size = MAP_APPFONT( EDITBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); diff --git a/svx/source/unodialogs/textconversiondlgs/makefile.mk b/svx/source/unodialogs/textconversiondlgs/makefile.mk deleted file mode 100644 index b5013ca9d165..000000000000 --- a/svx/source/unodialogs/textconversiondlgs/makefile.mk +++ /dev/null @@ -1,90 +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. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=svx -TARGET=textconversiondlgs -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE - -LOCALIZE_ME=chinese_direction_tmpl.hrc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/services.obj\ - $(SLO)$/resid.obj\ - $(SLO)$/chinese_dictionarydialog.obj\ - $(SLO)$/chinese_translationdialog.obj\ - $(SLO)$/chinese_translation_unodialog.obj - -SRS1NAME=$(TARGET) -SRC1FILES= \ - chinese_translationdialog.src\ - chinese_dictionarydialog.src - -RESLIB1NAME=$(TARGET) -RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs - -.IF "$(GUI)" == "OS2" -SHL1TARGET= txcnvdlg -.ELSE -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -.ENDIF -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(TOOLSLIB) \ - $(TKLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) - -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1IMPLIB= i$(TARGET) -SHL1DEPN= $(SHL1LIBS) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - - -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk - -$(SRS)$/$(TARGET).srs: $(INCCOM)$/chinese_direction.hrc -$(SLO)$/chinese_dictionarydialog.obj: $(INCCOM)$/chinese_direction.hrc -$(SLO)$/chinese_translationdialog.obj: $(INCCOM)$/chinese_direction.hrc - diff --git a/svx/source/unodialogs/textconversiondlgs/resid.cxx b/svx/source/unodialogs/textconversiondlgs/resid.cxx index 54c5548683f2..6a3b1ed3b95e 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/resid.cxx +++ b/svx/source/unodialogs/textconversiondlgs/resid.cxx @@ -43,7 +43,7 @@ static ResMgr* getTextConversionResMgr() pMgr = ResMgr::CreateResMgr( "textconversiondlgs" ); return pMgr; } -TextConversionDlgs_ResId::TextConversionDlgs_ResId(USHORT nId) +TextConversionDlgs_ResId::TextConversionDlgs_ResId(sal_uInt16 nId) : ResId( nId, *getTextConversionResMgr() ) { } diff --git a/svx/source/unodialogs/textconversiondlgs/resid.hxx b/svx/source/unodialogs/textconversiondlgs/resid.hxx index ca70a203ea9c..17c4ce341008 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/resid.hxx +++ b/svx/source/unodialogs/textconversiondlgs/resid.hxx @@ -42,7 +42,7 @@ namespace textconversiondlgs class TextConversionDlgs_ResId : public ResId { public: - TextConversionDlgs_ResId(USHORT nId); + TextConversionDlgs_ResId(sal_uInt16 nId); }; //............................................................................. diff --git a/svx/source/unodialogs/textconversiondlgs/resids.hrc b/svx/source/unodialogs/textconversiondlgs/resids.hrc index 0c2e3965295d..0c2e3965295d 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/resids.hrc +++ b/svx/source/unodialogs/textconversiondlgs/resids.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index f12445c21857..330a069140c2 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -48,20 +48,13 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, g_entries_unodialogs_chinesetranslation ); -} -//================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( |