summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svx/inc/fwdtitem.hxx10
-rw-r--r--svx/inc/opengrf.hxx38
-rw-r--r--svx/inc/optgrid.hxx7
-rw-r--r--svx/inc/verttexttbxctrl.hxx38
-rw-r--r--svx/inc/xmleohlp.hxx6
-rw-r--r--svx/inc/xmlgrhlp.hxx10
-rw-r--r--svx/inc/xpolyimp.hxx16
-rw-r--r--svx/prj/build.lst2
-rw-r--r--svx/prj/d.lst6
-rw-r--r--svx/sdi/svx.sdi8
-rw-r--r--svx/sdi/svxitems.sdi14
-rw-r--r--svx/source/accessibility/AccessibleContextBase.cxx97
-rw-r--r--svx/source/accessibility/AccessibleControlShape.cxx547
-rw-r--r--svx/source/accessibility/AccessibleEditableTextPara.cxx335
-rw-r--r--svx/source/accessibility/AccessibleEditableTextPara.hxx11
-rw-r--r--svx/source/accessibility/AccessibleImageBullet.cxx234
-rw-r--r--svx/source/accessibility/AccessibleImageBullet.hxx15
-rw-r--r--svx/source/accessibility/AccessibleParaManager.cxx7
-rwxr-xr-xsvx/source/accessibility/AccessibleShape.cxx345
-rw-r--r--svx/source/accessibility/AccessibleShapeTreeInfo.cxx19
-rw-r--r--svx/source/accessibility/AccessibleStaticTextBase.cxx135
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx247
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.cxx361
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.hxx70
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx157
-rwxr-xr-xsvx/source/accessibility/ShapeTypeHandler.cxx10
-rw-r--r--svx/source/accessibility/accessibility.src47
-rw-r--r--svx/source/accessibility/charmapacc.cxx6
-rwxr-xr-xsvx/source/accessibility/makefile.mk8
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx171
-rw-r--r--svx/source/dialog/_bmpmask.cxx31
-rw-r--r--svx/source/dialog/align.cxx155
-rw-r--r--svx/source/dialog/align.src145
-rw-r--r--svx/source/dialog/backgrnd.src141
-rw-r--r--svx/source/dialog/bbdlg.src20
-rw-r--r--svx/source/dialog/bmpmask.hrc5
-rw-r--r--svx/source/dialog/bmpmask.src30
-rw-r--r--svx/source/dialog/border.cxx184
-rw-r--r--svx/source/dialog/border.src263
-rw-r--r--svx/source/dialog/chardlg.cxx14
-rw-r--r--svx/source/dialog/chardlg.src529
-rw-r--r--svx/source/dialog/charmap.cxx122
-rw-r--r--svx/source/dialog/charmap.src498
-rw-r--r--svx/source/dialog/connect.src103
-rw-r--r--svx/source/dialog/contdlg.src27
-rw-r--r--svx/source/dialog/ctredlin.src33
-rw-r--r--svx/source/dialog/dlgctl3d.cxx16
-rw-r--r--svx/source/dialog/dlgctrl.cxx23
-rw-r--r--svx/source/dialog/dlgname.src10
-rw-r--r--svx/source/dialog/dlgutil.cxx6
-rw-r--r--svx/source/dialog/dstribut.src89
-rw-r--r--svx/source/dialog/fntctrl.cxx11
-rw-r--r--svx/source/dialog/fontwork.cxx18
-rw-r--r--svx/source/dialog/fontwork.src144
-rw-r--r--svx/source/dialog/frmdirlbox.src121
-rw-r--r--svx/source/dialog/frmsel.cxx62
-rw-r--r--svx/source/dialog/frmsel.src11
-rw-r--r--svx/source/dialog/graphctl.cxx15
-rw-r--r--svx/source/dialog/grfflt.src149
-rw-r--r--svx/source/dialog/grfpage.src242
-rw-r--r--svx/source/dialog/hdft.src117
-rw-r--r--svx/source/dialog/hldocntp.cxx29
-rw-r--r--svx/source/dialog/hldoctp.cxx7
-rw-r--r--svx/source/dialog/hlmailtp.cxx11
-rw-r--r--svx/source/dialog/hlmarkwn.src10
-rw-r--r--svx/source/dialog/hyperdlg.cxx9
-rw-r--r--svx/source/dialog/hyperdlg.src66
-rw-r--r--svx/source/dialog/hyphen.src87
-rw-r--r--svx/source/dialog/hyprlink.src78
-rw-r--r--svx/source/dialog/iconcdlg.cxx90
-rw-r--r--svx/source/dialog/iconcdlg.src26
-rw-r--r--svx/source/dialog/imapdlg.cxx6
-rw-r--r--svx/source/dialog/imapdlg.src47
-rw-r--r--svx/source/dialog/impgrf.src236
-rw-r--r--svx/source/dialog/labdlg.src19
-rw-r--r--svx/source/dialog/language.src30
-rw-r--r--svx/source/dialog/lingu.src283
-rw-r--r--svx/source/dialog/measure.src308
-rw-r--r--svx/source/dialog/numfmt.cxx23
-rw-r--r--svx/source/dialog/numfmt.src47
-rw-r--r--svx/source/dialog/numpages.cxx34
-rw-r--r--svx/source/dialog/numpages.src487
-rw-r--r--svx/source/dialog/opengrf.cxx52
-rw-r--r--svx/source/dialog/page.src65
-rw-r--r--svx/source/dialog/paragrph.src139
-rw-r--r--svx/source/dialog/passwd.src79
-rw-r--r--svx/source/dialog/postdlg.src76
-rw-r--r--svx/source/dialog/prtqry.src64
-rw-r--r--svx/source/dialog/rubydialog.cxx13
-rw-r--r--svx/source/dialog/rubydialog.src67
-rw-r--r--svx/source/dialog/ruler.src155
-rw-r--r--svx/source/dialog/sdstring.src2325
-rw-r--r--svx/source/dialog/srchdlg.src220
-rw-r--r--svx/source/dialog/srchxtra.src19
-rw-r--r--svx/source/dialog/svxruler.cxx584
-rw-r--r--svx/source/dialog/tabarea.src107
-rw-r--r--svx/source/dialog/tabline.src83
-rw-r--r--svx/source/dialog/tabstpge.src132
-rw-r--r--svx/source/dialog/test.src980
-rw-r--r--svx/source/dialog/textanim.src157
-rw-r--r--svx/source/dialog/textattr.src207
-rw-r--r--svx/source/dialog/thesdlg.cxx6
-rw-r--r--svx/source/dialog/thesdlg.src156
-rw-r--r--svx/source/dialog/tpcolor.cxx60
-rw-r--r--svx/source/dialog/tpline.cxx22
-rw-r--r--svx/source/dialog/transfrm.cxx133
-rw-r--r--svx/source/dialog/transfrm.src239
-rw-r--r--svx/source/dialog/txenctab.src529
-rw-r--r--svx/source/dialog/zoom.src103
-rw-r--r--svx/source/editeng/editeng.cxx29
-rw-r--r--svx/source/editeng/editeng.src22
-rw-r--r--svx/source/editeng/edtspell.cxx13
-rw-r--r--svx/source/editeng/impedit.cxx74
-rw-r--r--svx/source/editeng/impedit.hxx29
-rw-r--r--svx/source/editeng/impedit2.cxx359
-rw-r--r--svx/source/editeng/impedit3.cxx42
-rw-r--r--svx/source/editeng/impedit5.cxx20
-rw-r--r--svx/source/editeng/unolingu.cxx6
-rw-r--r--svx/source/engine3d/extrud3d.cxx178
-rw-r--r--svx/source/engine3d/float3d.src45
-rw-r--r--svx/source/engine3d/lathe3d.cxx220
-rw-r--r--svx/source/engine3d/obj3d.cxx34
-rw-r--r--svx/source/engine3d/string3d.src99
-rw-r--r--svx/source/engine3d/svx3ditems.cxx129
-rw-r--r--svx/source/fmcomp/fmgridif.cxx484
-rw-r--r--svx/source/fmcomp/gridcell.cxx112
-rw-r--r--svx/source/fmcomp/gridctrl.cxx45
-rw-r--r--svx/source/fmcomp/gridctrl.src336
-rw-r--r--svx/source/fmcomp/showcols.src26
-rw-r--r--svx/source/form/dbtoolsclient.cxx35
-rw-r--r--svx/source/form/filtnav.cxx50
-rw-r--r--svx/source/form/filtnav.src31
-rw-r--r--svx/source/form/fmPropBrw.cxx55
-rw-r--r--svx/source/form/fmctrler.cxx106
-rw-r--r--svx/source/form/fmexpl.src41
-rw-r--r--svx/source/form/fmitems.cxx73
-rw-r--r--svx/source/form/fmmodel.cxx55
-rw-r--r--svx/source/form/fmpgeimp.cxx12
-rw-r--r--svx/source/form/fmprop.cxx367
-rw-r--r--svx/source/form/fmsearch.src45
-rw-r--r--svx/source/form/fmservs.cxx82
-rw-r--r--svx/source/form/fmshell.cxx29
-rw-r--r--svx/source/form/fmshimp.cxx7
-rw-r--r--svx/source/form/fmsrcimp.cxx77
-rw-r--r--svx/source/form/fmstring.src3323
-rw-r--r--svx/source/form/fmtools.cxx766
-rw-r--r--svx/source/form/fmundo.cxx49
-rw-r--r--svx/source/form/fmview.cxx77
-rw-r--r--svx/source/form/fmvwimp.cxx77
-rw-r--r--svx/source/form/makefile.mk8
-rw-r--r--svx/source/form/sdbdatacolumn.cxx321
-rw-r--r--svx/source/form/tabwin.cxx94
-rw-r--r--svx/source/form/tbxform.cxx63
-rw-r--r--svx/source/form/tbxform.src71
-rw-r--r--svx/source/form/typemap.cxx18
-rw-r--r--svx/source/gallery2/galbrws1.cxx8
-rw-r--r--svx/source/gallery2/galbrws2.cxx8
-rw-r--r--svx/source/gallery2/galctrl.cxx6
-rw-r--r--svx/source/gallery2/gallery.src203
-rw-r--r--svx/source/gallery2/gallery1.cxx72
-rw-r--r--svx/source/gallery2/galtheme.cxx28
-rw-r--r--svx/source/gallery2/galtheme.src183
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx24
-rw-r--r--svx/source/inc/dbtoolsclient.hxx23
-rw-r--r--svx/source/inc/fmPropBrw.hxx5
-rw-r--r--svx/source/inc/fmctrler.hxx6
-rw-r--r--svx/source/inc/fmexpl.hrc4
-rw-r--r--svx/source/inc/fmgroup.hxx154
-rw-r--r--svx/source/inc/fmitems.hxx51
-rw-r--r--svx/source/inc/fmprop.hrc11
-rw-r--r--svx/source/inc/fmresids.hrc137
-rw-r--r--svx/source/inc/fmservs.hxx88
-rw-r--r--svx/source/inc/fmsrcimp.hxx8
-rw-r--r--svx/source/inc/fmtools.hxx410
-rw-r--r--svx/source/inc/fmundo.hxx25
-rw-r--r--svx/source/inc/fmvwimp.hxx5
-rw-r--r--svx/source/inc/sdbdatacolumn.hxx183
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx14
-rw-r--r--svx/source/inc/tabwin.hxx8
-rw-r--r--svx/source/inc/tbxform.hxx6
-rw-r--r--svx/source/items/chrtitem.cxx13
-rw-r--r--svx/source/items/frmitems.cxx8
-rw-r--r--svx/source/items/numfmtsh.cxx17
-rw-r--r--svx/source/items/numitem.cxx6
-rw-r--r--svx/source/items/svxerr.src155
-rw-r--r--svx/source/items/svxitems.src905
-rw-r--r--svx/source/items/textitem.cxx15
-rw-r--r--svx/source/msfilter/escherex.cxx87
-rw-r--r--svx/source/msfilter/eschesdo.cxx6
-rw-r--r--svx/source/msfilter/makefile.mk22
-rw-r--r--svx/source/msfilter/msashape.cxx1016
-rw-r--r--svx/source/msfilter/msashape.hxx9
-rw-r--r--svx/source/msfilter/msashape3d.cxx599
-rw-r--r--svx/source/msfilter/msashape3d.hxx114
-rw-r--r--svx/source/msfilter/msdffimp.cxx753
-rw-r--r--svx/source/msfilter/msfiltertracer.cxx188
-rw-r--r--svx/source/msfilter/msocximex.cxx182
-rw-r--r--svx/source/msfilter/msvbasic.cxx34
-rw-r--r--svx/source/options/makefile.mk5
-rw-r--r--svx/source/options/multipat.src72
-rw-r--r--svx/source/options/optaccessibility.src101
-rw-r--r--svx/source/options/optasian.src120
-rw-r--r--svx/source/options/optcolor.src96
-rw-r--r--svx/source/options/optctl.src157
-rw-r--r--svx/source/options/optdict.src225
-rw-r--r--svx/source/options/optgenrl.src138
-rw-r--r--svx/source/options/optgrid.src63
-rw-r--r--svx/source/options/optinet2.src69
-rw-r--r--svx/source/options/optjsearch.src180
-rw-r--r--svx/source/options/optlingu.cxx4
-rw-r--r--svx/source/options/optlingu.src637
-rw-r--r--svx/source/options/optpath.src28
-rw-r--r--svx/source/options/optsave.src127
-rw-r--r--svx/source/options/optspell.src51
-rw-r--r--svx/source/outliner/outliner.cxx32
-rw-r--r--svx/source/outliner/outliner.src110
-rw-r--r--svx/source/stbctrls/stbctrls.src13
-rw-r--r--svx/source/svdraw/svdattr.cxx24
-rw-r--r--svx/source/svdraw/svdcrtv.cxx32
-rw-r--r--svx/source/svdraw/svddrgmt.cxx118
-rw-r--r--svx/source/svdraw/svdedtv1.cxx14
-rw-r--r--svx/source/svdraw/svdedxv.cxx19
-rw-r--r--svx/source/svdraw/svdfppt.cxx400
-rw-r--r--svx/source/svdraw/svdhdl.cxx23
-rw-r--r--svx/source/svdraw/svdlayer.cxx7
-rw-r--r--svx/source/svdraw/svdmodel.cxx95
-rw-r--r--svx/source/svdraw/svdoattr.cxx118
-rw-r--r--svx/source/svdraw/svdobj.cxx117
-rw-r--r--svx/source/svdraw/svdograf.cxx467
-rw-r--r--svx/source/svdraw/svdoole2.cxx33
-rw-r--r--svx/source/svdraw/svdopage.cxx18
-rw-r--r--svx/source/svdraw/svdopath.cxx47
-rw-r--r--svx/source/svdraw/svdotext.cxx43
-rw-r--r--svx/source/svdraw/svdotxed.cxx30
-rw-r--r--svx/source/svdraw/svdouno.cxx29
-rw-r--r--svx/source/svdraw/svdpage.cxx18
-rw-r--r--svx/source/svdraw/svdpagv.cxx29
-rw-r--r--svx/source/svdraw/svdpntv.cxx16
-rw-r--r--svx/source/svdraw/svdsnpv.cxx15
-rw-r--r--svx/source/svdraw/svdstr.src3403
-rw-r--r--svx/source/svdraw/svdundo.cxx54
-rw-r--r--svx/source/svrtf/rtfgrf.cxx8
-rw-r--r--svx/source/svrtf/rtfitem.cxx19
-rw-r--r--svx/source/svrtf/segincr.asm72
-rw-r--r--svx/source/svrtf/svxrtf.cxx8
-rw-r--r--svx/source/svxlink/linkmgr.src45
-rw-r--r--svx/source/tbxctrls/colrctrl.src18
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx44
-rw-r--r--svx/source/tbxctrls/grafctrl.src134
-rw-r--r--svx/source/tbxctrls/itemwin.cxx8
-rw-r--r--svx/source/tbxctrls/layctrl.cxx13
-rw-r--r--svx/source/tbxctrls/lboxctrl.src40
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx19
-rw-r--r--svx/source/tbxctrls/tbcontrl.src38
-rw-r--r--svx/source/tbxctrls/tbxdraw.src131
-rw-r--r--svx/source/tbxctrls/verttexttbxctrl.cxx22
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx19
-rw-r--r--svx/source/unodraw/UnoNameItemTable.hxx6
-rw-r--r--svx/source/unodraw/unodtabl.cxx6
-rw-r--r--svx/source/unodraw/unoipset.cxx6
-rw-r--r--svx/source/unodraw/unomtabl.cxx6
-rw-r--r--svx/source/unodraw/unopage.cxx20
-rw-r--r--svx/source/unodraw/unoprov.cxx16
-rw-r--r--svx/source/unodraw/unoshap2.cxx26
-rw-r--r--svx/source/unodraw/unoshap3.cxx5
-rw-r--r--svx/source/unodraw/unoshape.cxx11
-rw-r--r--svx/source/unodraw/unoshcol.cxx8
-rw-r--r--svx/source/unodraw/unoshtxt.cxx34
-rw-r--r--svx/source/unoedit/unoedhlp.cxx23
-rw-r--r--svx/source/unoedit/unoedprx.cxx24
-rw-r--r--svx/source/unoedit/unofield.cxx7
-rw-r--r--svx/source/unoedit/unoforou.cxx6
-rw-r--r--svx/source/unoedit/unotext.cxx8
-rw-r--r--svx/source/xml/xmleohlp.cxx6
-rw-r--r--svx/source/xml/xmlxtexp.cxx8
-rw-r--r--svx/source/xoutdev/_xpoly.cxx12
-rw-r--r--svx/source/xoutdev/xpool.cxx6
-rw-r--r--svx/util/defs/wntmsci72
-rw-r--r--svx/util/makefile.mk19
-rw-r--r--svx/xml/SvxGraphCtrlAccessibleContext.xml2
280 files changed, 19684 insertions, 17667 deletions
diff --git a/svx/inc/fwdtitem.hxx b/svx/inc/fwdtitem.hxx
index f0d5235ce7aa..6cc6c5e5744f 100644
--- a/svx/inc/fwdtitem.hxx
+++ b/svx/inc/fwdtitem.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fwdtitem.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: er $ $Date: 2001-05-13 03:27:40 $
+ * last change: $Author: hr $ $Date: 2003-03-27 14:59:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -116,7 +116,7 @@ public:
void SetWidth( UINT16 nNewWidth, const USHORT nNewProp = 100 )
{
- DBG_ASSERT( GetRef() == 0, "SetValue() with pooled item" );
+ DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
nWidth = UINT16(( (UINT32)nNewWidth * nNewProp ) / 100 );
nProp = nNewProp;
}
@@ -125,13 +125,13 @@ public:
void SetWidthValue( UINT16 nNewWidth )
{
- DBG_ASSERT( GetRef() == 0, "SetValue() with pooled item" );
+ DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
nWidth = nNewWidth;
}
void SetProp( const USHORT nNewProp )
{
- DBG_ASSERT( GetRef() == 0, "SetValue() with pooled item" );
+ DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
nProp = nNewProp;
}
diff --git a/svx/inc/opengrf.hxx b/svx/inc/opengrf.hxx
index 9fea0cef9310..ddc2914dfab3 100644
--- a/svx/inc/opengrf.hxx
+++ b/svx/inc/opengrf.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: opengrf.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: gt $ $Date: 2002-10-30 10:56:23 $
+ * last change: $Author: hr $ $Date: 2003-03-27 14:59:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -67,55 +67,28 @@
#include <svtools/filter.hxx>
#endif
-struct SvxOpenGrf_Impl;
-/**
- The class SvxOpenGraphicDialog encapsulates functionality to display
- an "insert graphics" dialog, as it is used e.g. in Draw or Writer.
- The dialog has a preview graphic and a "link" checkbox, by which the user
- can decide whether the document should only store a link to the selected graphic.
- This class is intended as a bare-bones replacement for the old SvxInsertGraphicDialog,
- with basically the same functionality.
- */
+struct SvxOpenGrf_Impl;
class SvxOpenGraphicDialog
{
public:
- /// Create new "insert graphics" dialog with given title
SvxOpenGraphicDialog ( const String& rTitle );
~SvxOpenGraphicDialog ();
- /**
- Displays the dialog
+ short Execute();
- @return ERRCODE_NONE on success, ERRCODE_ABORT if user cancels, error of GraphicFilter::ImportGraphic() otherwise
- */
- ErrCode Execute();
-
- /// Set initially displayed path
void SetPath( const String& rPath );
- /// Set initially displayed path and state of the "link" checkbox
void SetPath( const String& rPath, sal_Bool bLinkState );
- /// Get displayed path
String GetPath() const;
- /**
- Load selected graphic file (error if none selected)
-
- @return ERRCODE_NONE on success, error of GraphicFilter::ImportGraphic() otherwise
- */
- ErrCode GetGraphic(Graphic&) const;
+ int GetGraphic(Graphic&) const;
- /// Enable/disable "link" checkbox
void EnableLink(sal_Bool);
- /// Set displayed "link" checkbox state
void AsLink(sal_Bool);
- /// Query displayed "link" checkbox state
sal_Bool IsAsLink() const;
- /// Query displayed filter string
String GetCurrentFilter() const;
- /// Set displayed filter (chosen from the graphic filter list)
void SetCurrentFilter(const String&);
/// Set dialog help id at FileDlgHelper
@@ -127,7 +100,6 @@ private:
SvxOpenGraphicDialog (const SvxOpenGraphicDialog&);
SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & );
- // safe pointer for impl class (no changes, automatic destruction)
const std::auto_ptr< SvxOpenGrf_Impl > mpImpl;
};
diff --git a/svx/inc/optgrid.hxx b/svx/inc/optgrid.hxx
index 225eac9aa8d3..6dbb530de9bc 100644
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/optgrid.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: optgrid.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: os $ $Date: 2002-02-01 11:13:52 $
+ * last change: $Author: hr $ $Date: 2003-03-27 14:59:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -128,7 +128,8 @@ public:
class SvxGridItem : public SvxOptionsGrid, public SfxPoolItem
{
- friend SvxGridTabPage;
+ // #i9076#
+ friend class SvxGridTabPage;
public:
SvxGridItem( USHORT nWhich) : SfxPoolItem(nWhich){};
diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/verttexttbxctrl.hxx
index 49b5b7a245af..4b1adb48b793 100644
--- a/svx/inc/verttexttbxctrl.hxx
+++ b/svx/inc/verttexttbxctrl.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: verttexttbxctrl.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: os $ $Date: 2002-09-13 13:38:29 $
+ * last change: $Author: hr $ $Date: 2003-03-27 14:59:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -84,10 +84,14 @@ public:
---------------------------------------------------------------------------*/
class SvxCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl
{
+ SfxStatusForwarder aStateForwarder;
+
public:
SFX_DECL_TOOLBOX_CONTROL();
SvxCTLTextTbxCtrl(USHORT nId, ToolBox& rTbx, SfxBindings& rBind) :
- SvxVertCTLTextTbxCtrl( nId, rTbx, rBind ){SetVert(FALSE);};
+ SvxVertCTLTextTbxCtrl( nId, rTbx, rBind ),
+ aStateForwarder( SID_CTLFONT_STATE, *this )
+ {SetVert(FALSE);};
};
/* -----------------------------12.09.2002 11:50------------------------------
@@ -95,32 +99,14 @@ public:
---------------------------------------------------------------------------*/
class SvxVertTextTbxCtrl : public SvxVertCTLTextTbxCtrl
{
+ SfxStatusForwarder aStateForwarder;
+
public:
SFX_DECL_TOOLBOX_CONTROL();
SvxVertTextTbxCtrl(USHORT nId, ToolBox& rTbx, SfxBindings& rBind) :
- SvxVertCTLTextTbxCtrl( nId, rTbx, rBind ){SetVert(TRUE);};
+ SvxVertCTLTextTbxCtrl( nId, rTbx, rBind ),
+ aStateForwarder( SID_VERTICALTEXT_STATE, *this )
+ {SetVert(TRUE);};
};
#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/inc/xmleohlp.hxx b/svx/inc/xmleohlp.hxx
index e5f668204428..8bd0da04a442 100644
--- a/svx/inc/xmleohlp.hxx
+++ b/svx/inc/xmleohlp.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmleohlp.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: cl $
+ * last change: $Author: hr $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -71,9 +71,7 @@
#ifndef _SVSTOR_HXX
#include <so3/svstor.hxx>
#endif
-#ifndef __SGI_STL_MAP
#include <map>
-#endif
#ifndef _COM_SUN_STAR_DOCUMENT_XEMBEDDEDOBJECTRESOLVER_HPP_
#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/xmlgrhlp.hxx
index 38c780fe35e4..89824095df48 100644
--- a/svx/inc/xmlgrhlp.hxx
+++ b/svx/inc/xmlgrhlp.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmlgrhlp.hxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: cl $
+ * last change: $Author: hr $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,15 +77,9 @@
#ifndef _GRFMGR_HXX
#include <goodies/grfmgr.hxx>
#endif
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
-#ifndef __SGI_STL_SET
#include <set>
-#endif
-#ifndef __SGI_STL_UTILITY
#include <utility>
-#endif
#ifndef _COM_SUN_STAR_DOCUMENT_XGRAPHICOBJECTRESOLVER_HPP_
#include <com/sun/star/document/XGraphicObjectResolver.hpp>
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index 8065b7f1a4bf..6a17a773ccc8 100644
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xpolyimp.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:01:05 $
+ * last change: $Author: hr $ $Date: 2003-03-27 14:59:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -100,9 +100,15 @@ public:
FASTBOOL operator==(const ImpXPolygon& rImpXPoly) const;
FASTBOOL operator!=(const ImpXPolygon& rImpXPoly) const { return !operator==(rImpXPoly); }
- void CheckPointDelete() { if ( bDeleteOldPoints )
- { delete pOldPointAry;
- bDeleteOldPoints = FALSE; } }
+ void CheckPointDelete()
+ {
+ if ( bDeleteOldPoints )
+ {
+ delete[] (char*)pOldPointAry;
+ bDeleteOldPoints = FALSE;
+ }
+ }
+
void Resize( USHORT nNewSize, BOOL bDeletePoints = TRUE );
void InsertSpace( USHORT nPos, USHORT nCount );
void Remove( USHORT nPos, USHORT nCount );
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 19126a58b640..d22b79fc789e 100644
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -1,4 +1,4 @@
-sx svx : connectivity linguistic NULL
+sx svx : connectivity xmloff linguistic NULL
sx svx usr1 - all sx_mkout NULL
sx svx\inc get - all sx_inc NULL
sx svx\prj get - all sx_prj NULL
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index f521a064232b..fefe69325ce0 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -1,7 +1,5 @@
touch: ..\inc\hid.lst %_DEST%\bin%_EXT%\hid.lst
-..\%__SRC%\misc\svxinter.c %_DEST%\odk\src%_EXT%\svxinter.c
..\%__SRC%\misc\svx.hid %_DEST%\bin%_EXT%\svx.hid
-..\%__SRC%\inc\svxinter.h %_DEST%\odk\inc%_EXT%\svxinter.h
..\%__SRC%\inc\svxslots.ilb %_DEST%\inc%_EXT%\svxslots.ilb
..\%__SRC%\inc\fren\svxslots.ilb %_DEST%\inc%_EXT%\fren\svxslots.ilb
..\%__SRC%\inc\dtch\svxslots.ilb %_DEST%\inc%_EXT%\dtch\svxslots.ilb
@@ -22,7 +20,6 @@ touch: ..\inc\hid.lst %_DEST%\bin%_EXT%\hid.lst
..\%__SRC%\slb\dg.lib %_DEST%\lib%_EXT%\xdg.lib
..\%__SRC%\lib\svx.lib %_DEST%\lib%_EXT%\svx.lib
..\%__SRC%\slb\svx.lib %_DEST%\lib%_EXT%\xsvx.lib
-..\%__SRC%\lib\svxinter.lib %_DEST%\odk\lib%_EXT%\svxinter.lib
..\%__SRC%\lib\svl.lib %_DEST%\lib%_EXT%\svl.lib
..\%__SRC%\lib\dl1.lib %_DEST%\lib%_EXT%\dl1.lib
..\%__SRC%\lib\dl2.lib %_DEST%\lib%_EXT%\dl2.lib
@@ -69,7 +66,6 @@ hedabu: ..\inc\akrnitem.hxx %_DEST%\inc%_EXT%\svx\akrnitem.hxx
hedabu: ..\inc\algitem.hxx %_DEST%\inc%_EXT%\svx\algitem.hxx
hedabu: ..\inc\align.hxx %_DEST%\inc%_EXT%\svx\align.hxx
hedabu: ..\inc\asiancfg.hxx %_DEST%\inc%_EXT%\svx\asiancfg.hxx
-hedabu: ..\inc\colorcfg.hxx %_DEST%\inc%_EXT%\svx\colorcfg.hxx
hedabu: ..\inc\simptabl.hxx %_DEST%\inc%_EXT%\svx\simptabl.hxx
hedabu: ..\inc\ctredlin.hxx %_DEST%\inc%_EXT%\svx\ctredlin.hxx
hedabu: ..\inc\backgrnd.hxx %_DEST%\inc%_EXT%\svx\backgrnd.hxx
@@ -538,6 +534,7 @@ hedabu: ..\inc\e3dundo.hxx %_DEST%\inc%_EXT%\svx\e3dundo.hxx
hedabu: ..\inc\anchorid.hxx %_DEST%\inc%_EXT%\svx\anchorid.hxx
hedabu: ..\inc\msdffimp.hxx %_DEST%\inc%_EXT%\svx\msdffimp.hxx
hedabu: ..\inc\msdffdef.hxx %_DEST%\inc%_EXT%\svx\msdffdef.hxx
+hedabu: ..\inc\msfiltertracer.hxx %_DEST%\inc%_EXT%\svx\msfiltertracer.hxx
hedabu: ..\inc\unoshtxt.hxx %_DEST%\inc%_EXT%\svx\unoshtxt.hxx
hedabu: ..\inc\numitem.hxx %_DEST%\inc%_EXT%\svx\numitem.hxx
hedabu: ..\inc\numpages.hxx %_DEST%\inc%_EXT%\svx\numpages.hxx
@@ -643,6 +640,7 @@ hedabu: ..\inc\ParseContext.hxx %_DEST%\inc%_EXT%\svx\ParseContext.hxx
..\xml\AccessibleGraphicShape.xml %_DEST%\xml%_EXT%\AccessibleGraphicShape.xml
..\xml\AccessibleOLEShape.xml %_DEST%\xml%_EXT%\AccessibleOLEShape.xml
..\xml\AccessibleControlShape.xml %_DEST%\xml%_EXT%\AccessibleControlShape.xml
+..\xml\AccessibleEditableTextPara.xml %_DEST%\xml%_EXT%\AccessibleEditableTextPara.xml
..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
..\%__SRC%\misc\*staticdatamembers.cxx %_DEST%\inc%_EXT%\*staticdatamembers.cxx
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 2911a198ec27..dcc8b9c9559c 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -27,7 +27,7 @@ SvxAddressItem _Address SID_ATTR_ADDRESS
//--------------------------------------------------------------------------
SfxBoolItem AbsoluteRecord SID_FM_RECORD_ABSOLUTE
-()
+(SfxInt32Item Position FN_PARAM_1)
[
/* flags: */
AutoUpdate = TRUE,
@@ -43,7 +43,7 @@ SfxBoolItem AbsoluteRecord SID_FM_RECORD_ABSOLUTE
Synchron;
/* status: */
- SlotType = FmFormInfoItem
+ SlotType = SfxInt32Item
/* config: */
AccelConfig = TRUE,
@@ -5648,7 +5648,7 @@ SfxVoidItem DefaultNumbering FN_NUM_NUMBERING_ON
//--------------------------------------------------------------------------
SfxVoidItem InsertObject SID_INSERT_OBJECT
-()
+( SfxGlobalNameItem ClassId SID_INSERT_OBJECT )
[
/* flags: */
AutoUpdate = FALSE,
@@ -11486,7 +11486,7 @@ SfxBoolItem TextRTL SID_RULER_TEXT_RIGHT_TO_LEFT
]
//--------------------------------------------------------------------------
-SfxVoidItem OpenHyperlink SID_OPEN_HYPERLINK
+SfxVoidItem OpenHyperlinkOnCursor SID_OPEN_HYPERLINK
()
[
/* flags: */
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index c2e17d0b19d3..4438c1a0d76c 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -2,9 +2,9 @@
*
* $RCSfile: svxitems.sdi,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: mba $ $Date: 2002-07-19 13:50:56 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -435,6 +435,8 @@ item BOOL SdrShadowItem;
item INT16 SdrTextFitToSizeTypeItem; // enum
item String SfxStringListItem; // serialized into one concatenated string
+item BYTE SfxGlobalNameItem;
+
//-------------------------------------------------------------------------
struct SvxCrossedOut
@@ -634,14 +636,6 @@ item Address SvxAddressItem;
//-------------------------------------------------------------------------
-struct FmFormInfo
-{
- INT32 Pos MID_POS ;
- INT32 Count MID_COUNT ;
- BOOL ReadOnly MID_READONLY ;
-};
-item FmFormInfo FmFormInfoItem ;
-
struct PageModel
{
BOOL Auto MID_AUTO;
diff --git a/svx/source/accessibility/AccessibleContextBase.cxx b/svx/source/accessibility/AccessibleContextBase.cxx
index 2903ebe51a58..1b241c435e7b 100644
--- a/svx/source/accessibility/AccessibleContextBase.cxx
+++ b/svx/source/accessibility/AccessibleContextBase.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleContextBase.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: thb $ $Date: 2002-11-29 17:56:47 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -86,6 +86,9 @@
#ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
#include <unotools/accessiblerelationsethelper.hxx>
#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
#ifndef _RTL_UUID_H_
#include <rtl/uuid.h>
@@ -119,7 +122,8 @@ AccessibleContextBase::AccessibleContextBase (
mxStateSet (NULL),
mxRelationSet (NULL),
mxParent(rxParent),
- maRole(aRole)
+ maRole(aRole),
+ mnClientId(0)
{
// Create the state set.
::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper ();
@@ -284,7 +288,7 @@ sal_Int32 SAL_CALL
*/
uno::Reference<XAccessible> SAL_CALL
AccessibleContextBase::getAccessibleChild (long nIndex)
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
{
ThrowIfDisposed ();
throw lang::IndexOutOfBoundsException (
@@ -484,14 +488,19 @@ void SAL_CALL
const uno::Reference<XAccessibleEventListener >& rxListener)
throw (uno::RuntimeException)
{
- if (rBHelper.bDisposed || rBHelper.bInDispose)
- {
- uno::Reference<uno::XInterface> x ((lang::XComponent *)this, uno::UNO_QUERY);
- rxListener->disposing (lang::EventObject (x));
- }
- else
+ if (rxListener.is())
{
- rBHelper.addListener (::getCppuType (&rxListener), rxListener);
+ if (rBHelper.bDisposed || rBHelper.bInDispose)
+ {
+ uno::Reference<uno::XInterface> x ((lang::XComponent *)this, uno::UNO_QUERY);
+ rxListener->disposing (lang::EventObject (x));
+ }
+ else
+ {
+ if (!mnClientId)
+ mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
+ comphelper::AccessibleEventNotifier::addEventListener( mnClientId, rxListener );
+ }
}
}
@@ -504,7 +513,19 @@ void SAL_CALL
throw (uno::RuntimeException)
{
ThrowIfDisposed ();
- rBHelper.removeListener (::getCppuType(&rxListener), rxListener);
+ if (rxListener.is())
+ {
+ sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, rxListener );
+ if ( !nListenerCount )
+ {
+ // no listeners anymore
+ // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+ // and at least to us not firing any events anymore, in case somebody calls
+ // NotifyAccessibleEvent, again
+ comphelper::AccessibleEventNotifier::revokeClient( mnClientId );
+ mnClientId = 0;
+ }
+ }
}
@@ -597,6 +618,15 @@ uno::Sequence<sal_Int8> SAL_CALL
void SAL_CALL AccessibleContextBase::disposing (void)
{
SetState (AccessibleStateType::DEFUNC);
+
+ ::osl::MutexGuard aGuard (maMutex);
+
+ // Send a disposing to all listeners.
+ if ( mnClientId )
+ {
+ comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this );
+ mnClientId = 0;
+ }
}
@@ -681,41 +711,8 @@ void AccessibleContextBase::CommitChange (
void AccessibleContextBase::FireEvent (const AccessibleEventObject& aEvent)
{
- // Iterate over all listeners that are registered as accessibility event
- // listeners and notify them of the specified event.
- OSL_TRACE ("FireEvent %d", aEvent.EventId);
- ::cppu::OInterfaceContainerHelper *pContainer = rBHelper.getContainer(
- ::getCppuType((const uno::Reference<XAccessibleEventListener>*)0));
- if (pContainer != NULL)
- {
- ::cppu::OInterfaceIteratorHelper I (*pContainer);
- while (I.hasMoreElements())
- {
- Reference<XAccessibleEventListener> xListener =
- static_cast<XAccessibleEventListener*>(I.next());
-
- try
- {
- xListener->notifyEvent (aEvent);
- }
- catch (lang::DisposedException e)
- {
- // DisposedExceptions from the listener might indicate a
- // broken connection to a different environment.
-
- OSL_ENSURE(e.Context.is(), "caught dispose exception with empty Context field");
- // If the exception stems from the listener then remove it
- // from the list of listeners. If the Context field of the
- // exception is empty this is interpreted to indicate the
- // listener as well.
- if (e.Context == xListener
- || !e.Context.is())
- rBHelper.removeListener (::getCppuType(&xListener), xListener);
- }
- // Other events are not caught at the moment. Might change in
- // the future if there is demand to do so.
- }
- }
+ if (mnClientId)
+ comphelper::AccessibleEventNotifier::addEvent( mnClientId, aEvent );
}
@@ -742,4 +739,10 @@ sal_Bool AccessibleContextBase::IsDisposed (void)
+void AccessibleContextBase::SetAccessibleRole( sal_Int16 _nRole )
+{
+ maRole = _nRole;
+}
+
+
} // end of namespace accessibility
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index f860e0bd002b..65a0747f79ae 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleControlShape.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: fs $ $Date: 2002-09-23 13:12:11 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -74,12 +74,21 @@
#ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_
#include <drafts/com/sun/star/accessibility/AccessibleEventId.hpp>
#endif
+#ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_
+#include <drafts/com/sun/star/accessibility/AccessibleStateType.hpp>
+#endif
+#ifndef _COM_SUN_STAR_FORM_FORMCOMPONENTTYPE_HPP_
+#include <com/sun/star/form/FormComponentType.hpp>
+#endif
#ifndef _COM_SUN_STAR_REFLECTION_XPROXYFACTORY_HPP_
#include <com/sun/star/reflection/XProxyFactory.hpp>
#endif
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx>
#endif
+#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
+#include <unotools/accessiblestatesethelper.hxx>
+#endif
#ifndef _SVDOUNO_HXX
#include "svdouno.hxx"
#endif
@@ -92,35 +101,111 @@
#ifndef _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX
#include "SvxShapeTypes.hxx"
#endif
+#ifndef SVX_ACCESSIBLE_WRAPPER_HXX
+#include "accessiblewrapper.hxx"
+#endif
#include "svdstr.hrc"
#include <algorithm>
-using namespace accessibility;
-using namespace ::rtl;
-using namespace ::com::sun::star;
+using namespace ::comphelper;
+using namespace ::accessibility;
using namespace ::drafts::com::sun::star::accessibility;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::reflection::XProxyFactory;
-using ::com::sun::star::uno::XAggregation;
-using ::com::sun::star::lang::XComponent;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::reflection;
+using namespace ::com::sun::star::drawing;
+
+//--------------------------------------------------------------------
+namespace
+{
+ //................................................................
+ const ::rtl::OUString& lcl_getNamePropertyName( )
+ {
+ static ::rtl::OUString s_sNamePropertyName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) );
+ return s_sNamePropertyName;
+ }
+ //................................................................
+ const ::rtl::OUString& lcl_getDescPropertyName( )
+ {
+ static ::rtl::OUString s_sDescPropertyDesc( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) );
+ return s_sDescPropertyDesc;
+ }
+ //................................................................
+ const ::rtl::OUString& lcl_getLabelPropertyName( )
+ {
+ static ::rtl::OUString s_sLabelPropertyLabel( RTL_CONSTASCII_USTRINGPARAM( "Label" ) );
+ return s_sLabelPropertyLabel;
+ }
+ //................................................................
+ // return the property which should be used as AccessibleName
+ const ::rtl::OUString& lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI )
+ {
+ if ( _rxPSI.is() && _rxPSI->hasPropertyByName( lcl_getLabelPropertyName() ) )
+ return lcl_getLabelPropertyName();
+ else
+ return lcl_getNamePropertyName();
+ }
+
+ //................................................................
+ // determines whether or not a state which belongs to the inner context needs to be forwarded to the "composed"
+ // context
+ sal_Bool isComposedState( const sal_Int16 _nState )
+ {
+ return ( ( AccessibleStateType::INVALID != _nState )
+ && ( AccessibleStateType::DEFUNC != _nState )
+ && ( AccessibleStateType::ICONIFIED != _nState )
+ && ( AccessibleStateType::RESIZABLE != _nState )
+ && ( AccessibleStateType::SELECTABLE != _nState )
+ && ( AccessibleStateType::SHOWING != _nState )
+ && ( AccessibleStateType::MANAGES_DESCENDANT != _nState )
+ && ( AccessibleStateType::VISIBLE != _nState )
+ );
+ }
+
+ //................................................................
+ /** determines whether the given control is in alive mode
+ */
+ inline sal_Bool isAliveMode( const Reference< XControl >& _rxControl )
+ {
+ OSL_PRECOND( _rxControl.is(), "AccessibleControlShape::isAliveMode: invalid control" );
+ return _rxControl.is() && !_rxControl->isDesignMode();
+ }
+}
-//===== internal ============================================================
+//=============================================================================
+//= AccessibleControlShape
+//=============================================================================
+//-----------------------------------------------------------------------------
AccessibleControlShape::AccessibleControlShape (
const AccessibleShapeInfo& rShapeInfo,
const AccessibleShapeTreeInfo& rShapeTreeInfo)
: AccessibleShape (rShapeInfo, rShapeTreeInfo)
- , mbListeningForName( sal_False )
- , mbListeningForDesc( sal_False )
- , mbDisposeNativeContext( sal_False )
+ , m_bListeningForName( sal_False )
+ , m_bListeningForDesc( sal_False )
+ , m_bDisposeNativeContext( sal_False )
+ , m_bMultiplexingStates( sal_False )
+ , m_pChildManager( new OWrappedAccessibleChildrenManager( getProcessServiceFactory() ) )
{
-}
-
-
+ m_pChildManager = new OWrappedAccessibleChildrenManager( getProcessServiceFactory() );
+ m_pChildManager->acquire();
+ osl_incrementInterlockedCount( &m_refCount );
+ {
+ m_pChildManager->setOwningAccessible( this );
+ }
+ osl_decrementInterlockedCount( &m_refCount );
+}
+//-----------------------------------------------------------------------------
AccessibleControlShape::~AccessibleControlShape (void)
{
+ m_pChildManager->release();
+ m_pChildManager = NULL;
+
if ( m_xControlContextProxy.is() )
m_xControlContextProxy->setDelegator( NULL );
m_xControlContextProxy.clear();
@@ -128,7 +213,7 @@ AccessibleControlShape::~AccessibleControlShape (void)
// ourself) to this proxy, and thus delete it
}
-//=============================================================================
+//-----------------------------------------------------------------------------
SdrObject* AccessibleControlShape::getSdrObject() const
{
return GetSdrObjectFromXShape (mxShape);
@@ -175,19 +260,41 @@ void AccessibleControlShape::Init()
if ( pViewWindow && pUnoObjectImpl )
{
+ // .................................................................
// get the context of the control - it will be our "inner" context
- m_xControlModes = m_xControlModes.query( pUnoObjectImpl->GetUnoControl( pViewWindow ) );
- Reference< XAccessible > xControlAccessible( m_xControlModes, uno::UNO_QUERY );
+ m_xUnoControl = pUnoObjectImpl->GetUnoControl( pViewWindow );
+ Reference< XModeChangeBroadcaster > xControlModes( m_xUnoControl, UNO_QUERY );
+ Reference< XAccessible > xControlAccessible( xControlModes, UNO_QUERY );
Reference< XAccessibleContext > xNativeControlContext;
if ( xControlAccessible.is() )
xNativeControlContext = xControlAccessible->getAccessibleContext();
OSL_ENSURE( xNativeControlContext.is(), "AccessibleControlShape::Init: no AccessibleContext for the control!" );
+ m_aControlContext = WeakReference< XAccessibleContext >( xNativeControlContext );
+
+ // .................................................................
+ // add as listener to the context - we want to multiplex some states
+ if ( isAliveMode( m_xUnoControl ) && xNativeControlContext.is() )
+ { // (but only in alive mode)
+ startStateMultiplexing( );
+ }
- // get a proxy for this context
+ // now that we have all information about our control, do some adjustments
+ adjustAccessibleRole();
+ initializeComposedState();
+
+ // some initialization for our child manager, which is used in alive mode only
+ if ( isAliveMode( m_xUnoControl ) )
+ {
+ Reference< XAccessibleStateSet > xStates( getAccessibleStateSet( ) );
+ OSL_ENSURE( xStates.is(), "AccessibleControlShape::AccessibleControlShape: no inner state set!" );
+ m_pChildManager->setTransientChildren( !xStates.is() || xStates->contains( AccessibleStateType::MANAGES_DESCENDANT ) );
+ }
+
+ // .................................................................
+ // finally, aggregate a proxy for the control context
// first a factory for the proxy
Reference< XProxyFactory > xFactory;
- xFactory = xFactory.query( ::comphelper::createProcessComponent(
- ::rtl::OUString::createFromAscii( "com.sun.star.reflection.ProxyFactory" ) ) );
+ xFactory = xFactory.query( createProcessComponent( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.reflection.ProxyFactory" ) ) ) );
OSL_ENSURE( xFactory.is(), "AccessibleControlShape::Init: could not create a proxy factory!" );
// then the proxy itself
if ( xFactory.is() && xNativeControlContext.is() )
@@ -204,46 +311,52 @@ void AccessibleControlShape::Init()
}
osl_decrementInterlockedCount( &m_refCount );
- mbDisposeNativeContext = sal_True;
+ m_bDisposeNativeContext = sal_True;
// Finally, we need to add ourself as mode listener to the control. In case the mode switches,
// we need to dispose ourself.
- m_xControlModes->addModeChangeListener( this );
+ xControlModes->addModeChangeListener( this );
}
}
}
- catch( const uno::Exception& )
+ catch( const Exception& )
{
OSL_ENSURE( sal_False, "AccessibleControlShape::Init: could not \"aggregate\" the controls XAccessibleContext!" );
}
}
-//===== XAccessible =========================================================
-
-Reference<XAccessibleContext> SAL_CALL
- AccessibleControlShape::getAccessibleContext (void)
- throw (::com::sun::star::uno::RuntimeException)
+//-----------------------------------------------------------------------------
+Reference< XAccessibleContext > SAL_CALL AccessibleControlShape::getAccessibleContext(void) throw (RuntimeException)
{
return AccessibleShape::getAccessibleContext ();
}
-//===== XServiceInfo ========================================================
-
-::rtl::OUString SAL_CALL
- AccessibleControlShape::getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException)
+//-----------------------------------------------------------------------------
+void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleControlShape"));
+ if ( !isAliveMode( m_xUnoControl ) )
+ {
+ // in design mode, we simply forward the request to the base class
+ AccessibleShape::grabFocus();
+ }
+ else
+ {
+ Reference< XWindow > xWindow( m_xUnoControl, UNO_QUERY );
+ OSL_ENSURE( xWindow.is(), "AccessibleControlShape::grabFocus: invalid control!" );
+ if ( xWindow.is() )
+ xWindow->setFocus();
+ }
}
+//-----------------------------------------------------------------------------
+::rtl::OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException)
+{
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.accessibility.AccessibleControlShape" ) );
+}
-
-
-/// Set this object's name if is different to the current name.
-::rtl::OUString
- AccessibleControlShape::CreateAccessibleBaseName (void)
- throw (::com::sun::star::uno::RuntimeException)
+//-----------------------------------------------------------------------------
+::rtl::OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeException)
{
::rtl::OUString sName;
@@ -255,7 +368,7 @@ Reference<XAccessibleContext> SAL_CALL
break;
default:
sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleControlShape"));
- uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
+ Reference< XShapeDescriptor > xDescriptor (mxShape, UNO_QUERY);
if (xDescriptor.is())
sName += ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM(": "))
+ xDescriptor->getShapeType();
@@ -268,26 +381,9 @@ Reference<XAccessibleContext> SAL_CALL
//--------------------------------------------------------------------
-namespace
-{
- //................................................................
- const ::rtl::OUString& lcl_getNamePropertyName( )
- {
- static ::rtl::OUString s_sNamePropertyName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) );
- return s_sNamePropertyName;
- }
- //................................................................
- const ::rtl::OUString& lcl_getDescPropertyName( )
- {
- static ::rtl::OUString s_sDescPropertyDesc( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) );
- return s_sDescPropertyDesc;
- }
-}
-
-//--------------------------------------------------------------------
::rtl::OUString
AccessibleControlShape::CreateAccessibleDescription (void)
- throw (::com::sun::star::uno::RuntimeException)
+ throw (RuntimeException)
{
DescriptionGenerator aDG (mxShape);
ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
@@ -300,22 +396,22 @@ namespace
if ( !sDesc.getLength() )
{ // no -> use the default
aDG.Initialize (STR_ObjNameSingulUno);
- aDG.AddProperty (OUString::createFromAscii ("ControlBackground"),
+ aDG.AddProperty (::rtl::OUString::createFromAscii ("ControlBackground"),
DescriptionGenerator::COLOR,
- OUString());
- aDG.AddProperty (OUString::createFromAscii ("ControlBorder"),
+ ::rtl::OUString());
+ aDG.AddProperty (::rtl::OUString::createFromAscii ("ControlBorder"),
DescriptionGenerator::INTEGER,
- OUString());
+ ::rtl::OUString());
}
// ensure that we are listening to the Name property
- mbListeningForDesc = ensureListeningState( mbListeningForDesc, sal_True, lcl_getDescPropertyName() );
+ m_bListeningForDesc = ensureListeningState( m_bListeningForDesc, sal_True, lcl_getDescPropertyName() );
}
break;
default:
aDG.Initialize (::rtl::OUString::createFromAscii (
"Unknown accessible control shape"));
- uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
+ Reference< XShapeDescriptor > xDescriptor (mxShape, UNO_QUERY);
if (xDescriptor.is())
{
aDG.AppendString (::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("service name=")));
@@ -331,12 +427,14 @@ IMPLEMENT_FORWARD_REFCOUNT( AccessibleControlShape, AccessibleShape )
IMPLEMENT_GET_IMPLEMENTATION_ID( AccessibleControlShape )
//--------------------------------------------------------------------
-void SAL_CALL AccessibleControlShape::propertyChange( const beans::PropertyChangeEvent& _rEvent ) throw (uno::RuntimeException)
+void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( maMutex );
// check if it is the name or the description
- if ( _rEvent.PropertyName.equals( lcl_getNamePropertyName() ) )
+ if ( _rEvent.PropertyName.equals( lcl_getNamePropertyName() )
+ || _rEvent.PropertyName.equals( lcl_getLabelPropertyName( ) )
+ )
{
SetAccessibleName (CreateAccessibleName());
}
@@ -353,9 +451,9 @@ void SAL_CALL AccessibleControlShape::propertyChange( const beans::PropertyChang
}
//--------------------------------------------------------------------
-uno::Any SAL_CALL AccessibleControlShape::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
+Any SAL_CALL AccessibleControlShape::queryInterface( const Type& _rType ) throw (RuntimeException)
{
- uno::Any aReturn = AccessibleShape::queryInterface( _rType );
+ Any aReturn = AccessibleShape::queryInterface( _rType );
if ( !aReturn.hasValue() )
{
aReturn = AccessibleControlShape_Base::queryInterface( _rType );
@@ -366,24 +464,24 @@ uno::Any SAL_CALL AccessibleControlShape::queryInterface( const uno::Type& _rTyp
}
//--------------------------------------------------------------------
-uno::Sequence< uno::Type > SAL_CALL AccessibleControlShape::getTypes() throw (uno::RuntimeException)
+Sequence< Type > SAL_CALL AccessibleControlShape::getTypes() throw (RuntimeException)
{
- uno::Sequence< uno::Type > aShapeTypes = AccessibleShape::getTypes();
- uno::Sequence< uno::Type > aOwnTypes = AccessibleControlShape_Base::getTypes();
+ Sequence< Type > aShapeTypes = AccessibleShape::getTypes();
+ Sequence< Type > aOwnTypes = AccessibleControlShape_Base::getTypes();
- uno::Sequence< uno::Type > aAggregateTypes;
- Reference< lang::XTypeProvider > xAggTypes;
- if ( ::comphelper::query_aggregation( m_xControlContextProxy, xAggTypes ) )
+ Sequence< Type > aAggregateTypes;
+ Reference< XTypeProvider > xAggTypes;
+ if ( query_aggregation( m_xControlContextProxy, xAggTypes ) )
aAggregateTypes = xAggTypes->getTypes();
- uno::Sequence< uno::Type > aAllTypes = ::comphelper::concatSequences( aShapeTypes, aOwnTypes, aAggregateTypes );
+ Sequence< Type > aAllTypes = concatSequences( aShapeTypes, aOwnTypes, aAggregateTypes );
// remove duplicates
- uno::Type* pBegin = aAllTypes.getArray();
- uno::Type* pEnd = pBegin + aAllTypes.getLength();
+ Type* pBegin = aAllTypes.getArray();
+ Type* pEnd = pBegin + aAllTypes.getLength();
while ( pBegin != pEnd )
{
- uno::Type aThisRoundType = *pBegin;
+ Type aThisRoundType = *pBegin;
if ( ++pBegin != pEnd )
{
pEnd = ::std::remove( pBegin, pEnd, aThisRoundType );
@@ -397,17 +495,53 @@ uno::Sequence< uno::Type > SAL_CALL AccessibleControlShape::getTypes() throw (un
}
//--------------------------------------------------------------------
-void SAL_CALL AccessibleControlShape::modeChanged( const util::ModeChangeEvent& _rSource ) throw (uno::RuntimeException)
+void SAL_CALL AccessibleControlShape::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException)
+{
+ if ( AccessibleEventId::ACCESSIBLE_STATE_EVENT == _rEvent.EventId )
+ {
+ // multiplex this change
+ sal_Int16 nLostState( 0 ), nGainedState( 0 );
+ _rEvent.OldValue >>= nLostState;
+ _rEvent.NewValue >>= nGainedState;
+
+ // don't multiplex states which the inner context is not resposible for
+ if ( isComposedState( nLostState ) )
+ AccessibleShape::ResetState( nLostState );
+
+ if ( isComposedState( nGainedState ) )
+ AccessibleShape::SetState( nGainedState );
+ }
+ else
+ {
+ AccessibleEventObject aTranslatedEvent( _rEvent );
+
+ {
+ ::osl::MutexGuard aGuard( maMutex );
+
+ // see if any of these notifications affect our child manager
+ m_pChildManager->handleChildNotification( _rEvent );
+
+ aTranslatedEvent.Source = *this;
+ m_pChildManager->translateAccessibleEvent( _rEvent, aTranslatedEvent );
+ }
+
+ FireEvent( aTranslatedEvent );
+ }
+}
+
+//--------------------------------------------------------------------
+void SAL_CALL AccessibleControlShape::modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException)
{
// did it come from our inner context (the real one, not it's proxy!)?
OSL_TRACE ("AccessibleControlShape::modeChanged");
- if ( _rSource.Source == m_xControlModes )
+ Reference< XControl > xSource( _rSource.Source, UNO_QUERY ); // for faster compare
+ if ( xSource.get() == m_xUnoControl.get() )
{
// If our "pseudo-aggregated" inner context does not live anymore,
// we don't want to live, too. This is accomplished by asking our
// parent to replace this object with a new one. Disposing this
- // object and sending notifications about the replacement are the
- // task of our parent.
+ // object and sending notifications about the replacement are in
+ // the responsibility of our parent.
OSL_VERIFY( mpParent->ReplaceChild ( this, mxShape, mnIndex, maShapeTreeInfo ) );
}
#ifdef _DEBUG
@@ -417,7 +551,7 @@ void SAL_CALL AccessibleControlShape::modeChanged( const util::ModeChangeEvent&
}
//--------------------------------------------------------------------
-void SAL_CALL AccessibleControlShape::disposing (const lang::EventObject& _rSource) throw (uno::RuntimeException)
+void SAL_CALL AccessibleControlShape::disposing (const EventObject& _rSource) throw (RuntimeException)
{
AccessibleShape::disposing( _rSource );
}
@@ -433,16 +567,18 @@ sal_Bool AccessibleControlShape::ensureListeningState(
try
{
- if ( !mxModelPropsMeta.is() || mxModelPropsMeta->hasPropertyByName( _rPropertyName ) )
+ if ( !m_xModelPropsMeta.is() || m_xModelPropsMeta->hasPropertyByName( _rPropertyName ) )
{
// add or revoke as listener
if ( _bNeedNewListening )
- mxControlModel->addPropertyChangeListener( _rPropertyName, static_cast< beans::XPropertyChangeListener* >( this ) );
+ m_xControlModel->addPropertyChangeListener( _rPropertyName, static_cast< XPropertyChangeListener* >( this ) );
else
- mxControlModel->removePropertyChangeListener( _rPropertyName, static_cast< beans::XPropertyChangeListener* >( this ) );
+ m_xControlModel->removePropertyChangeListener( _rPropertyName, static_cast< XPropertyChangeListener* >( this ) );
}
+ else
+ OSL_ENSURE( sal_False, "AccessibleControlShape::ensureListeningState: this property does not exist at this model!" );
}
- catch( const uno::Exception& e )
+ catch( const Exception& e )
{
e; // make compiler happy
OSL_ENSURE( sal_False, "AccessibleControlShape::ensureListeningState: could not change the listening state!" );
@@ -452,17 +588,74 @@ sal_Bool AccessibleControlShape::ensureListeningState(
}
//--------------------------------------------------------------------
-::rtl::OUString AccessibleControlShape::CreateAccessibleName (void) throw (uno::RuntimeException)
+sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) throw(RuntimeException)
+{
+ if ( !isAliveMode( m_xUnoControl ) )
+ // no special action required when in design mode
+ return AccessibleShape::getAccessibleChildCount( );
+ else
+ {
+ // in alive mode, we have the full control over our children - they are determined by the children
+ // of the context of our UNO control
+ Reference< XAccessibleContext > xControlContext( m_aControlContext );
+ OSL_ENSURE( xControlContext.is(), "AccessibleControlShape::getAccessibleChildCount: control context already dead! How this!" );
+ return xControlContext.is() ? xControlContext->getAccessibleChildCount() : 0;
+ }
+}
+
+//--------------------------------------------------------------------
+Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException)
+{
+ Reference< XAccessible > xChild;
+ if ( !isAliveMode( m_xUnoControl ) )
+ {
+ // no special action required when in design mode - let the base class handle this
+ xChild = AccessibleShape::getAccessibleChild( i );
+ }
+ else
+ {
+ // in alive mode, we have the full control over our children - they are determined by the children
+ // of the context of our UNO control
+
+ Reference< XAccessibleContext > xControlContext( m_aControlContext );
+ OSL_ENSURE( xControlContext.is(), "AccessibleControlShape::getAccessibleChildCount: control context already dead! How this!" );
+ if ( xControlContext.is() )
+ {
+ Reference< XAccessible > xInnerChild( xControlContext->getAccessibleChild( i ) );
+ OSL_ENSURE( xInnerChild.is(), "AccessibleControlShape::getAccessibleChild: control context returned nonsense!" );
+ if ( xInnerChild.is() )
+ {
+ // we need to wrap this inner child into an own implementation
+ xChild = m_pChildManager->getAccessibleWrapperFor( xInnerChild );
+ }
+ }
+ }
+ return xChild;
+}
+
+//--------------------------------------------------------------------
+Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessibleRelationSet( ) throw (RuntimeException)
{
- // check if we can obtain the "Name" property from the model
- ::rtl::OUString sName( getControlModelStringProperty( lcl_getNamePropertyName() ) );
+ // TODO
+ return AccessibleShape::getAccessibleRelationSet( );
+}
+
+//--------------------------------------------------------------------
+::rtl::OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeException)
+{
+ ensureControlModelAccess();
+
+ // check if we can obtain the "Name" resp. "Label" property from the model
+ const ::rtl::OUString& rAccNameProperty = lcl_getPreferredAccNameProperty( m_xModelPropsMeta );
+
+ ::rtl::OUString sName( getControlModelStringProperty( rAccNameProperty ) );
if ( !sName.getLength() )
{ // no -> use the default
sName = AccessibleShape::CreateAccessibleName();
}
// now that somebody first asked us for our name, ensure that we are listening to name changes on the model
- mbListeningForName = ensureListeningState( mbListeningForName, sal_True, lcl_getNamePropertyName() );
+ m_bListeningForName = ensureListeningState( m_bListeningForName, sal_True, lcl_getPreferredAccNameProperty( m_xModelPropsMeta ) );
return sName;
}
@@ -471,31 +664,39 @@ sal_Bool AccessibleControlShape::ensureListeningState(
void SAL_CALL AccessibleControlShape::disposing (void)
{
// ensure we're not listening
- mbListeningForName = ensureListeningState( mbListeningForName, sal_False, lcl_getNamePropertyName() );
- mbListeningForDesc = ensureListeningState( mbListeningForDesc, sal_False, lcl_getDescPropertyName() );
+ m_bListeningForName = ensureListeningState( m_bListeningForName, sal_False, lcl_getPreferredAccNameProperty( m_xModelPropsMeta ) );
+ m_bListeningForDesc = ensureListeningState( m_bListeningForDesc, sal_False, lcl_getDescPropertyName() );
+
+ if ( m_bMultiplexingStates )
+ stopStateMultiplexing( );
+
+ // dispose the child cache/map
+ m_pChildManager->dispose();
// release the model
- mxControlModel.clear();
- mxModelPropsMeta.clear();
+ m_xControlModel.clear();
+ m_xModelPropsMeta.clear();
+ m_aControlContext = WeakReference< XAccessibleContext >();
// forward the disposel to our inner context
- if ( mbDisposeNativeContext )
+ if ( m_bDisposeNativeContext )
{
// don't listen for mode changes anymore
- OSL_ENSURE( m_xControlModes.is(), "AccessibleControlShape::disposing: don't have an mode broadcaster anymore!" );
- if ( m_xControlModes.is() )
- m_xControlModes->removeModeChangeListener( this );
+ Reference< XModeChangeBroadcaster > xControlModes( m_xUnoControl, UNO_QUERY );
+ OSL_ENSURE( xControlModes.is(), "AccessibleControlShape::disposing: don't have an mode broadcaster anymore!" );
+ if ( xControlModes.is() )
+ xControlModes->removeModeChangeListener( this );
Reference< XComponent > xInnerComponent;
- if ( ::comphelper::query_aggregation( m_xControlContextProxy, xInnerComponent ) )
+ if ( query_aggregation( m_xControlContextProxy, xInnerComponent ) )
xInnerComponent->dispose();
// do _not_ clear m_xControlContextProxy! This has to be done in the dtor for correct ref-count handling
// no need to dispose the proxy/inner context anymore
- mbDisposeNativeContext = sal_False;
+ m_bDisposeNativeContext = sal_False;
}
- m_xControlModes.clear();
+ m_xUnoControl.clear();
// let the base do it's stuff
AccessibleShape::disposing();
@@ -504,25 +705,62 @@ void SAL_CALL AccessibleControlShape::disposing (void)
//--------------------------------------------------------------------
sal_Bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(())
{
- if ( mxControlModel.is() )
+ if ( m_xControlModel.is() )
return sal_True;
try
{
- Reference< drawing::XControlShape > xShape( mxShape, uno::UNO_QUERY );
+ Reference< XControlShape > xShape( mxShape, UNO_QUERY );
if ( xShape.is() )
- mxControlModel = mxControlModel.query( xShape->getControl() );
+ m_xControlModel = m_xControlModel.query( xShape->getControl() );
- if ( mxControlModel.is() )
- mxModelPropsMeta = mxControlModel->getPropertySetInfo();
+ if ( m_xControlModel.is() )
+ m_xModelPropsMeta = m_xControlModel->getPropertySetInfo();
}
- catch( const uno::Exception& e )
+ catch( const Exception& e )
{
e; // make compiler happy
OSL_ENSURE( sal_False, "AccessibleControlShape::ensureControlModelAccess: caught an exception!" );
}
- return mxControlModel.is();
+ return m_xControlModel.is();
+}
+
+//--------------------------------------------------------------------
+void AccessibleControlShape::startStateMultiplexing()
+{
+ OSL_PRECOND( !m_bMultiplexingStates, "AccessibleControlShape::startStateMultiplexing: already multiplexing!" );
+
+#ifdef _DEBUG
+ // we should have a control, and it should be in alive mode
+ OSL_PRECOND( isAliveMode( m_xUnoControl ),
+ "AccessibleControlShape::startStateMultiplexing: should be done in alive mode only!" );
+#endif
+ // we should have the native context of the control
+ Reference< XAccessibleEventBroadcaster > xBroadcaster( m_aControlContext.get(), UNO_QUERY );
+ OSL_ENSURE( xBroadcaster.is(), "AccessibleControlShape::startStateMultiplexing: no AccessibleEventBroadcaster on the native context!" );
+
+ if ( xBroadcaster.is() )
+ {
+ xBroadcaster->addEventListener( this );
+ m_bMultiplexingStates = sal_True;
+ }
+}
+
+//--------------------------------------------------------------------
+void AccessibleControlShape::stopStateMultiplexing()
+{
+ OSL_PRECOND( m_bMultiplexingStates, "AccessibleControlShape::stopStateMultiplexing: not multiplexing!" );
+
+ // we should have the native context of the control
+ Reference< XAccessibleEventBroadcaster > xBroadcaster( m_aControlContext.get(), UNO_QUERY );
+ OSL_ENSURE( xBroadcaster.is(), "AccessibleControlShape::stopStateMultiplexing: no AccessibleEventBroadcaster on the native context!" );
+
+ if ( xBroadcaster.is() )
+ {
+ xBroadcaster->removeEventListener( this );
+ m_bMultiplexingStates = sal_False;
+ }
}
//--------------------------------------------------------------------
@@ -531,18 +769,95 @@ sal_Bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(())
::rtl::OUString sReturn;
try
{
- if ( const_cast< AccessibleControlShape* >( this ) ->ensureControlModelAccess() )
+ if ( const_cast< AccessibleControlShape* >( this )->ensureControlModelAccess() )
{
- if ( !mxModelPropsMeta.is() || mxModelPropsMeta->hasPropertyByName( _rPropertyName ) )
+ if ( !m_xModelPropsMeta.is() || m_xModelPropsMeta->hasPropertyByName( _rPropertyName ) )
// ask only if a) the control does not have a PropertySetInfo object or b) it has, and the
// property in question is available
- mxControlModel->getPropertyValue( _rPropertyName ) >>= sReturn;
+ m_xControlModel->getPropertyValue( _rPropertyName ) >>= sReturn;
}
}
- catch( const uno::Exception& )
+ catch( const Exception& )
{
OSL_ENSURE( sal_False, "OAccessibleControlContext::getModelStringProperty: caught an exception!" );
}
return sReturn;
}
+//--------------------------------------------------------------------
+void AccessibleControlShape::adjustAccessibleRole( )
+{
+ // if we're in design mode, we are a simple SHAPE, in alive mode, we use the role of our inner context
+ if ( !isAliveMode( m_xUnoControl ) )
+ return;
+
+ // we're in alive mode -> determine the role of the inner context
+ Reference< XAccessibleContext > xNativeContext( m_aControlContext );
+ OSL_PRECOND( xNativeContext.is(), "AccessibleControlShape::adjustAccessibleRole: no inner context!" );
+ if ( xNativeContext.is() )
+ SetAccessibleRole( xNativeContext->getAccessibleRole( ) );
+}
+
+#ifdef DBG_UTIL
+//--------------------------------------------------------------------
+sal_Bool AccessibleControlShape::SetState( sal_Int16 _nState )
+{
+ OSL_ENSURE( !isAliveMode( m_xUnoControl ) || !isComposedState( _nState ),
+ "AccessibleControlShape::SetState: a state which should be determined by the control context is set from outside!" );
+ return AccessibleShape::SetState( _nState );
+}
+#endif // DBG_UTIL
+
+//--------------------------------------------------------------------
+void AccessibleControlShape::initializeComposedState()
+{
+ if ( !isAliveMode( m_xUnoControl ) )
+ // no action necessary for design mode
+ return;
+
+ // get our own state set implementation
+ ::utl::AccessibleStateSetHelper* pComposedStates =
+ static_cast< ::utl::AccessibleStateSetHelper* >( mxStateSet.get() );
+ OSL_PRECOND( pComposedStates,
+ "AccessibleControlShape::initializeComposedState: no composed set!" );
+
+ // we need to reset some states of the composed set, because the either do not apply
+ // for controls in alive mode, or are in the responsibility of the UNO-control, anyway
+ pComposedStates->RemoveState( AccessibleStateType::ENABLED ); // this is controlled by the UNO-control
+ pComposedStates->RemoveState( AccessibleStateType::FOCUSABLE ); // this is controlled by the UNO-control
+ pComposedStates->RemoveState( AccessibleStateType::SELECTABLE ); // this does not hold for an alive UNO-control
+#ifdef _DEBUG
+ // now, only states which are not in the responsibility of the UNO control should be part of this state set
+ {
+ Sequence< sal_Int16 > aInitStates = pComposedStates->getStates();
+ for ( sal_Int32 i=0; i<aInitStates.getLength(); ++i )
+ OSL_ENSURE( !isComposedState( aInitStates.getConstArray()[i] ),
+ "AccessibleControlShape::initializeComposedState: invalid initial composed state (should be controlled by the UNO-control)!" );
+ }
+#endif
+
+ // get my inner context
+ Reference< XAccessibleContext > xInnerContext( m_aControlContext );
+ OSL_PRECOND( xInnerContext.is(), "AccessibleControlShape::initializeComposedState: no inner context!" );
+ if ( xInnerContext.is() )
+ {
+ // get all states of the inner context
+ Reference< XAccessibleStateSet > xInnerStates( xInnerContext->getAccessibleStateSet() );
+ OSL_ENSURE( xInnerStates.is(), "AccessibleControlShape::initializeComposedState: no inner states!" );
+ Sequence< sal_Int16 > aInnerStates;
+ if ( xInnerStates.is() )
+ aInnerStates = xInnerStates->getStates();
+
+ // look which one are to be propagated to the composed context
+ const sal_Int16* pStates = aInnerStates.getConstArray();
+ const sal_Int16* pStatesEnd = pStates + aInnerStates.getLength();
+ for ( ; pStates != pStatesEnd; ++pStates )
+ {
+ if ( isComposedState( *pStates ) && !pComposedStates->contains( *pStates ) )
+ {
+ pComposedStates->AddState( *pStates );
+ }
+ }
+ }
+}
+
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.cxx b/svx/source/accessibility/AccessibleEditableTextPara.cxx
index 354693a4dec2..389b41e47c63 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/svx/source/accessibility/AccessibleEditableTextPara.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleEditableTextPara.cxx,v $
*
- * $Revision: 1.32 $
+ * $Revision: 1.33 $
*
- * last change: $Author: thb $ $Date: 2002-12-10 15:24:54 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -119,6 +119,10 @@
#include <drafts/com/sun/star/accessibility/AccessibleEventId.hpp>
#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
+
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
#include <unotools/accessiblestatesethelper.hxx>
#endif
@@ -154,6 +158,9 @@
#endif
#include "accessibility.hrc"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
using namespace ::com::sun::star;
@@ -168,6 +175,7 @@ using namespace ::drafts::com::sun::star::accessibility;
namespace accessibility
{
+ DBG_NAME( AccessibleEditableTextPara )
AccessibleEditableTextPara::AccessibleEditableTextPara( const uno::Reference< XAccessible >& rParent ) :
mnParagraphIndex( 0 ),
@@ -175,31 +183,63 @@ namespace accessibility
mpEditSource( NULL ),
maEEOffset( 0, 0 ),
mxParent( rParent ),
- maStateListeners( maMutex )
- {
- // Create the state set.
- ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper ();
- mxStateSet = pStateSet;
+ // well, that's strictly (UNO) exception safe, though not
+ // really robust. We rely on the fact that this member is
+ // constructed last, and that the constructor body catches
+ // exceptions, thus no chance for exceptions once the Id is
+ // fetched. Nevertheless, normally should employ RAII here...
+ mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
+ {
+#ifdef DBG_UTIL
+ DBG_CTOR( AccessibleEditableTextPara, NULL );
+ OSL_TRACE( "AccessibleEditableTextPara received ID: %d\n", mnNotifierClientId );
+#endif
- // these are always on
- pStateSet->AddState( AccessibleStateType::MULTILINE );
- pStateSet->AddState( AccessibleStateType::FOCUSABLE );
- pStateSet->AddState( AccessibleStateType::VISIBLE );
- pStateSet->AddState( AccessibleStateType::SHOWING );
- pStateSet->AddState( AccessibleStateType::ENABLED );
+ try
+ {
+ // Create the state set.
+ ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper ();
+ mxStateSet = pStateSet;
+
+ // these are always on
+ pStateSet->AddState( AccessibleStateType::MULTILINE );
+ pStateSet->AddState( AccessibleStateType::FOCUSABLE );
+ pStateSet->AddState( AccessibleStateType::VISIBLE );
+ pStateSet->AddState( AccessibleStateType::SHOWING );
+ pStateSet->AddState( AccessibleStateType::ENABLED );
+ }
+ catch( const uno::Exception& ) {}
}
AccessibleEditableTextPara::~AccessibleEditableTextPara()
{
+ DBG_DTOR( AccessibleEditableTextPara, NULL );
+
+ // sign off from event notifier
+ if( getNotifierClientId() != -1 )
+ {
+ try
+ {
+ ::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() );
+#ifdef DBG_UTIL
+ OSL_TRACE( "AccessibleEditableTextPara revoked ID: %d\n", mnNotifierClientId );
+#endif
+ }
+ catch( const uno::Exception& ) {}
+ }
}
::rtl::OUString AccessibleEditableTextPara::implGetText()
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return GetTextRange( 0, GetTextLen() );
}
::com::sun::star::lang::Locale AccessibleEditableTextPara::implGetLocale()
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
lang::Locale aLocale;
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -211,6 +251,8 @@ namespace accessibility
void AccessibleEditableTextPara::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
USHORT nStart, nEnd;
if( GetSelection( nStart, nEnd ) )
@@ -228,12 +270,16 @@ namespace accessibility
void AccessibleEditableTextPara::implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
rBoundary.startPos = 0;
rBoundary.endPos = GetTextLen();
}
void AccessibleEditableTextPara::implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
SvxTextForwarder& rCacheTF = GetTextForwarder();
sal_Int32 nParaIndex = GetParagraphIndex();
@@ -262,27 +308,30 @@ namespace accessibility
rBoundary.endPos = nTextLen;
}
+ int AccessibleEditableTextPara::getNotifierClientId() const
+ {
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
+ return mnNotifierClientId;
+ }
+
void AccessibleEditableTextPara::SetIndexInParent( sal_Int32 nIndex )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
mnIndexInParent = nIndex;
}
sal_Int32 AccessibleEditableTextPara::GetIndexInParent() const
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return mnIndexInParent;
}
void AccessibleEditableTextPara::SetParagraphIndex( sal_Int32 nIndex )
{
- uno::Any aOldDesc;
- uno::Any aOldName;
-
- try
- {
- aOldDesc <<= getAccessibleDescription();
- aOldName <<= getAccessibleName();
- }
- catch( const uno::Exception& ) {} // optional behaviour
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
sal_Int32 nOldIndex = mnParagraphIndex;
@@ -296,6 +345,15 @@ namespace accessibility
{
if( nOldIndex != nIndex )
{
+ uno::Any aOldDesc;
+ uno::Any aOldName;
+
+ try
+ {
+ aOldDesc <<= getAccessibleDescription();
+ aOldName <<= getAccessibleName();
+ }
+ catch( const uno::Exception& ) {} // optional behaviour
// index and therefore description changed
FireEvent( AccessibleEventId::ACCESSIBLE_DESCRIPTION_EVENT, uno::makeAny( getAccessibleDescription() ), aOldDesc );
FireEvent( AccessibleEventId::ACCESSIBLE_NAME_EVENT, uno::makeAny( getAccessibleName() ), aOldName );
@@ -306,28 +364,42 @@ namespace accessibility
sal_Int32 AccessibleEditableTextPara::GetParagraphIndex() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return mnParagraphIndex;
}
void AccessibleEditableTextPara::Dispose()
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
// notify listeners
- try
+ if( getNotifierClientId() != -1 )
{
- uno::Reference < XAccessibleContext > xThis = getAccessibleContext();
+ try
+ {
+ uno::Reference < XAccessibleContext > xThis = getAccessibleContext();
- lang::EventObject aEvent (xThis);
- maStateListeners.disposeAndClear( aEvent );
+ // #106234# Delegate to EventNotifier
+ ::comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( getNotifierClientId(),
+ xThis );
+#ifdef DBG_UTIL
+ OSL_TRACE( "Disposed ID: %d\n", mnNotifierClientId );
+#endif
+ }
+ catch( const uno::Exception& ) {}
}
- catch( const uno::Exception& ) {}
// drop all references
mxParent = NULL;
+ mnNotifierClientId = -1;
mpEditSource = NULL;
}
void AccessibleEditableTextPara::SetEditSource( SvxEditSourceAdapter* pEditSource )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
SvxEditSource* pOldEditSource = mpEditSource;
mpEditSource = pEditSource;
@@ -350,28 +422,37 @@ namespace accessibility
ESelection AccessibleEditableTextPara::MakeSelection( sal_Int32 nStartEEIndex, sal_Int32 nEndEEIndex )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
// check overflow
DBG_ASSERT(nStartEEIndex >= 0 && nStartEEIndex <= USHRT_MAX &&
nEndEEIndex >= 0 && nEndEEIndex <= USHRT_MAX &&
GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::MakeSelection: index value overflow");
- return ESelection( static_cast< USHORT >( GetParagraphIndex() ), static_cast< USHORT >( nStartEEIndex ),
- static_cast< USHORT >( GetParagraphIndex() ), static_cast< USHORT >( nEndEEIndex ) );
+ USHORT nParaIndex = static_cast< USHORT >( GetParagraphIndex() );
+ return ESelection( nParaIndex, static_cast< USHORT >( nStartEEIndex ),
+ nParaIndex, static_cast< USHORT >( nEndEEIndex ) );
}
ESelection AccessibleEditableTextPara::MakeSelection( sal_Int32 nEEIndex )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return MakeSelection( nEEIndex, nEEIndex+1 );
}
ESelection AccessibleEditableTextPara::MakeCursor( sal_Int32 nEEIndex )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return MakeSelection( nEEIndex, nEEIndex );
}
void AccessibleEditableTextPara::CheckIndex( sal_Int32 nIndex ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
if( nIndex < 0 || nIndex >= getCharacterCount() )
throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleEditableTextPara: character index out of bounds")),
uno::Reference< uno::XInterface >
@@ -380,6 +461,8 @@ namespace accessibility
void AccessibleEditableTextPara::CheckPosition( sal_Int32 nIndex ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
if( nIndex < 0 || nIndex > getCharacterCount() )
throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleEditableTextPara: character position out of bounds")),
uno::Reference< uno::XInterface >
@@ -388,12 +471,16 @@ namespace accessibility
void AccessibleEditableTextPara::CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
CheckPosition( nStart );
CheckPosition( nEnd );
}
sal_Bool AccessibleEditableTextPara::GetSelection( USHORT& nStartPos, USHORT& nEndPos ) SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
ESelection aSelection;
USHORT nPara = static_cast< USHORT > ( GetParagraphIndex() );
if( !GetEditViewForwarder().GetSelection( aSelection ) )
@@ -437,26 +524,36 @@ namespace accessibility
String AccessibleEditableTextPara::GetText( sal_Int32 nIndex ) SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return GetTextForwarder().GetText( MakeSelection(nIndex) );
}
String AccessibleEditableTextPara::GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return GetTextForwarder().GetText( MakeSelection(nStartIndex, nEndIndex) );
}
USHORT AccessibleEditableTextPara::GetTextLen() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return GetTextForwarder().GetTextLen( static_cast< USHORT >( GetParagraphIndex() ) );
}
sal_Bool AccessibleEditableTextPara::IsVisible() const
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return mpEditSource ? sal_True : sal_False ;
}
uno::Reference< XAccessibleText > AccessibleEditableTextPara::GetParaInterface( sal_Int32 nIndex )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
uno::Reference< XAccessible > xParent = getAccessibleParent();
if( xParent.is() )
{
@@ -474,6 +571,8 @@ namespace accessibility
SvxEditSourceAdapter& AccessibleEditableTextPara::GetEditSource() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
if( mpEditSource )
return *mpEditSource;
else
@@ -485,6 +584,8 @@ namespace accessibility
SvxAccessibleTextAdapter& AccessibleEditableTextPara::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
SvxEditSourceAdapter& rEditSource = GetEditSource();
SvxAccessibleTextAdapter* pTextForwarder = rEditSource.GetTextForwarderAdapter();
@@ -505,6 +606,8 @@ namespace accessibility
SvxViewForwarder& AccessibleEditableTextPara::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
SvxEditSource& rEditSource = GetEditSource();
SvxViewForwarder* pViewForwarder = rEditSource.GetViewForwarder();
@@ -527,6 +630,8 @@ namespace accessibility
SvxAccessibleTextEditViewAdapter& AccessibleEditableTextPara::GetEditViewForwarder( sal_Bool bCreate ) const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
SvxEditSourceAdapter& rEditSource = GetEditSource();
SvxAccessibleTextEditViewAdapter* pTextEditViewForwarder = rEditSource.GetEditViewForwarderAdapter( bCreate );
@@ -563,6 +668,8 @@ namespace accessibility
sal_Bool AccessibleEditableTextPara::HaveEditView() const
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
SvxEditSource& rEditSource = GetEditSource();
SvxEditViewForwarder* pViewForwarder = rEditSource.GetEditViewForwarder();
@@ -577,6 +684,8 @@ namespace accessibility
sal_Bool AccessibleEditableTextPara::HaveChildren()
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
"AccessibleEditableTextPara::HaveChildren: paragraph index value overflow");
@@ -585,6 +694,8 @@ namespace accessibility
sal_Bool AccessibleEditableTextPara::IsActive() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
SvxEditSource& rEditSource = GetEditSource();
SvxEditViewForwarder* pViewForwarder = rEditSource.GetEditViewForwarder();
@@ -606,11 +717,15 @@ namespace accessibility
const Point& AccessibleEditableTextPara::GetEEOffset() const
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return maEEOffset;
}
void AccessibleEditableTextPara::SetEEOffset( const Point& rOffset )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
WeakBullet::HardRefType aChild( maImageBullet.get() );
if( aChild.is() )
aChild->SetEEOffset(rOffset);
@@ -620,6 +735,8 @@ namespace accessibility
void AccessibleEditableTextPara::FireEvent(const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue) const
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
uno::Reference < XAccessibleContext > xThis( const_cast< AccessibleEditableTextPara* > (this)->getAccessibleContext() );
AccessibleEventObject aEvent(xThis, nEventId, rNewValue, rOldValue);
@@ -628,53 +745,30 @@ namespace accessibility
if( nEventId == AccessibleStateType::FOCUSED )
vcl::unohelper::NotifyAccessibleStateEventGlobally( aEvent );
- // no locking necessary, OInterfaceIteratorHelper copies listeners if someone removes/adds in between
- ::cppu::OInterfaceIteratorHelper aIter( const_cast< AccessibleEditableTextPara* >(this)->maStateListeners );
- while( aIter.hasMoreElements() )
- {
- uno::Reference < XAccessibleEventListener > xListener( aIter.next(), uno::UNO_QUERY );
-
- if( xListener.is() )
- {
- try
- {
- xListener->notifyEvent (aEvent);
- }
- catch( const lang::DisposedException& e )
- {
- // DisposedExceptions from the listener might indicate a
- // broken connection to a different environment.
-
- OSL_ENSURE(e.Context.is(), "AccessibleEditableTextPara::FireEvent: caught dispose exception with empty Context field");
- // If the exception stems from the listener then remove it
- // from the list of listeners. If the Context field of the
- // exception is empty this is interpreted to indicate the
- // listener as well.
- if (e.Context == xListener
- || !e.Context.is())
- aIter.remove();
- }
- catch( const uno::Exception& e )
- {
- DBG_WARNING1("AccessibleEditableTextPara::FireEvent: exception %s from listener",
- ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_DONTKNOW ).getStr() );
- }
- }
- }
+ // #106234# Delegate to EventNotifier
+ if( getNotifierClientId() != -1 )
+ ::comphelper::AccessibleEventNotifier::addEvent( getNotifierClientId(),
+ aEvent );
}
void AccessibleEditableTextPara::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
FireEvent( nEventId, rNewValue );
}
void AccessibleEditableTextPara::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
FireEvent( nEventId, uno::Any(), rOldValue );
}
bool AccessibleEditableTextPara::HasState( const sal_Int16 nStateId )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
if( pStateSet != NULL )
return pStateSet->contains(nStateId) ? true : false;
@@ -684,6 +778,8 @@ namespace accessibility
void AccessibleEditableTextPara::SetState( const sal_Int16 nStateId )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
if( pStateSet != NULL &&
!pStateSet->contains(nStateId) )
@@ -695,6 +791,8 @@ namespace accessibility
void AccessibleEditableTextPara::UnSetState( const sal_Int16 nStateId )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
if( pStateSet != NULL &&
pStateSet->contains(nStateId) )
@@ -706,6 +804,8 @@ namespace accessibility
sal_Bool AccessibleEditableTextPara::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, sal_Int32 nIndex )
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX,
"AccessibleEditableTextPara::GetAttributeRun: index value overflow");
@@ -717,6 +817,8 @@ namespace accessibility
uno::Any SAL_CALL AccessibleEditableTextPara::queryInterface (const uno::Type & rType) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
uno::Any aRet;
// must provide XAccesibleText by hand, since it comes publicly inherited by XAccessibleEditableText
@@ -741,6 +843,8 @@ namespace accessibility
// XAccessible
uno::Reference< XAccessibleContext > SAL_CALL AccessibleEditableTextPara::getAccessibleContext() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
// We implement the XAccessibleContext interface in the same object
return uno::Reference< XAccessibleContext > ( this );
}
@@ -748,6 +852,8 @@ namespace accessibility
// XAccessibleContext
sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleChildCount() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
return HaveChildren() ? 1 : 0;
@@ -755,6 +861,8 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
if( !HaveChildren() )
@@ -794,6 +902,8 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleParent() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
DBG_ASSERT(mxParent.is() || HasState(AccessibleStateType::DEFUNC),
"AccessibleEditableTextPara::getAccessibleParent: no frontend set, did somebody forgot to call AccessibleTextHelper::SetEventSource()?");
@@ -802,16 +912,22 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleIndexInParent() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return mnIndexInParent;
}
sal_Int16 SAL_CALL AccessibleEditableTextPara::getAccessibleRole() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return AccessibleRole::PARAGRAPH;
}
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getAccessibleDescription() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
// append first 40 characters from text, or first line, if shorter
@@ -857,6 +973,8 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
// throws if defunc
@@ -873,12 +991,16 @@ namespace accessibility
uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleEditableTextPara::getAccessibleRelationSet() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
// no relations, therefore empty
return uno::Reference< XAccessibleRelationSet >();
}
uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleEditableTextPara::getAccessibleStateSet() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
// Create a copy of the state set and return it.
@@ -892,6 +1014,8 @@ namespace accessibility
lang::Locale SAL_CALL AccessibleEditableTextPara::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
return implGetLocale();
@@ -899,17 +1023,25 @@ namespace accessibility
void SAL_CALL AccessibleEditableTextPara::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
{
- maStateListeners.addInterface( xListener );
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
+ if( getNotifierClientId() != -1 )
+ ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
}
void SAL_CALL AccessibleEditableTextPara::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
{
- maStateListeners.removeInterface( xListener );
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
+ if( getNotifierClientId() != -1 )
+ ::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
}
// XAccessibleComponent
sal_Bool SAL_CALL AccessibleEditableTextPara::contains( const awt::Point& aTmpPoint ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -924,6 +1056,8 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleAt( const awt::Point& _aPoint ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
if( HaveChildren() )
@@ -957,6 +1091,8 @@ namespace accessibility
awt::Rectangle SAL_CALL AccessibleEditableTextPara::getBounds() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -981,6 +1117,8 @@ namespace accessibility
awt::Point SAL_CALL AccessibleEditableTextPara::getLocation( ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
awt::Rectangle aRect = getBounds();
@@ -990,6 +1128,8 @@ namespace accessibility
awt::Point SAL_CALL AccessibleEditableTextPara::getLocationOnScreen( ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
// relate us to parent
@@ -1015,6 +1155,8 @@ namespace accessibility
awt::Size SAL_CALL AccessibleEditableTextPara::getSize( ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
awt::Rectangle aRect = getBounds();
@@ -1024,19 +1166,26 @@ namespace accessibility
void SAL_CALL AccessibleEditableTextPara::grabFocus( ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
// set cursor to this paragraph
setSelection(0,0);
}
sal_Int32 SAL_CALL AccessibleEditableTextPara::getForeground( ) throw (::com::sun::star::uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
// #104444# Added to XAccessibleComponent interface
- UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
+ svtools::ColorConfig aColorConfig;
+ UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
return static_cast<sal_Int32>(nColor);
}
sal_Int32 SAL_CALL AccessibleEditableTextPara::getBackground( ) throw (::com::sun::star::uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
// #104444# Added to XAccessibleComponent interface
Color aColor( Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() );
@@ -1049,6 +1198,8 @@ namespace accessibility
// XAccessibleText
sal_Int32 SAL_CALL AccessibleEditableTextPara::getCaretPosition() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
if( !HaveEditView() )
@@ -1068,11 +1219,15 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::setCaretPosition( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return setSelection(nIndex, nIndex);
}
sal_Unicode SAL_CALL AccessibleEditableTextPara::getCharacter( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1083,6 +1238,8 @@ namespace accessibility
uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getCharacterAttributes( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder();
@@ -1130,6 +1287,8 @@ namespace accessibility
awt::Rectangle SAL_CALL AccessibleEditableTextPara::getCharacterBounds( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1159,6 +1318,8 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleEditableTextPara::getCharacterCount() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1169,6 +1330,8 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleEditableTextPara::getIndexAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
USHORT nPara, nIndex;
@@ -1214,6 +1377,8 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getSelectedText() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1227,6 +1392,8 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionStart() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1240,6 +1407,8 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionEnd() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1253,6 +1422,8 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1273,6 +1444,8 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getText() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1283,6 +1456,8 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1293,6 +1468,8 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1337,6 +1514,8 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1393,6 +1572,8 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -1447,6 +1628,8 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
try
@@ -1479,6 +1662,8 @@ namespace accessibility
// XAccessibleEditableText
sal_Bool SAL_CALL AccessibleEditableTextPara::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
try
@@ -1507,6 +1692,8 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::pasteText( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
try
@@ -1535,6 +1722,8 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
try
@@ -1565,6 +1754,8 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::insertText( const ::rtl::OUString& sText, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
try
@@ -1597,6 +1788,8 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::rtl::OUString& sReplacement ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
try
@@ -1629,6 +1822,8 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const uno::Sequence< beans::PropertyValue >& aAttributeSet ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
try
@@ -1686,6 +1881,8 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleEditableTextPara::setText( const ::rtl::OUString& sText ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
return replaceText(0, getCharacterCount(), sText);
@@ -1694,11 +1891,15 @@ namespace accessibility
// XServiceInfo
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getImplementationName (void) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("AccessibleEditableTextPara"));
}
sal_Bool SAL_CALL AccessibleEditableTextPara::supportsService (const ::rtl::OUString& sServiceName) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
// Iterate over all supported service names and return true if on of them
// matches the given name.
uno::Sequence< ::rtl::OUString> aSupportedServices (
@@ -1711,6 +1912,8 @@ namespace accessibility
uno::Sequence< ::rtl::OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames (void) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
const ::rtl::OUString sServiceName( getServiceName() );
return uno::Sequence< ::rtl::OUString > (&sServiceName, 1);
}
@@ -1718,6 +1921,8 @@ namespace accessibility
// XServiceName
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getServiceName (void) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
+
// #105185# Using correct service now
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("drafts.com.sun.star.accessibility.AccessibleParagraphView"));
}
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.hxx b/svx/source/accessibility/AccessibleEditableTextPara.hxx
index 9b89445b34c9..2d2ccce4f44f 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.hxx
+++ b/svx/source/accessibility/AccessibleEditableTextPara.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleEditableTextPara.hxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: thb $ $Date: 2002-12-10 15:24:54 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -129,7 +129,6 @@
namespace accessibility
{
-
typedef ::cppu::WeakImplHelper6< ::drafts::com::sun::star::accessibility::XAccessible,
::drafts::com::sun::star::accessibility::XAccessibleContext,
::drafts::com::sun::star::accessibility::XAccessibleComponent,
@@ -376,6 +375,8 @@ namespace accessibility
*/
sal_Bool IsVisible() const;
+ int getNotifierClientId() const;
+
// retrieve text interface for given paragraph index
::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessibleText > GetParaInterface( sal_Int32 nIndex );
@@ -433,13 +434,11 @@ namespace accessibility
// the current state set (updated from SetState/UnSetState and guarded by solar mutex)
::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet;
- mutable osl::Mutex maMutex;
-
/// The shape we're the accessible for (unguarded)
::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > mxParent;
/// Our listeners (guarded by maMutex)
- ::cppu::OInterfaceContainerHelper maStateListeners;
+ int mnNotifierClientId;
};
} // end of namespace accessibility
diff --git a/svx/source/accessibility/AccessibleImageBullet.cxx b/svx/source/accessibility/AccessibleImageBullet.cxx
index 8224ee38257c..0999db537d9e 100644
--- a/svx/source/accessibility/AccessibleImageBullet.cxx
+++ b/svx/source/accessibility/AccessibleImageBullet.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleImageBullet.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: thb $ $Date: 2002-12-10 15:24:55 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -103,6 +103,10 @@
#include <drafts/com/sun/star/accessibility/AccessibleEventId.hpp>
#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
+
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
#include <unotools/accessiblestatesethelper.hxx>
#endif
@@ -127,6 +131,9 @@
#include "editeng.hxx"
#include "outliner.hxx"
#include "accessibility.hrc"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
using namespace ::com::sun::star;
@@ -134,6 +141,7 @@ using namespace ::drafts::com::sun::star::accessibility;
namespace accessibility
{
+ DBG_NAME( AccessibleImageBullet )
AccessibleImageBullet::AccessibleImageBullet ( const uno::Reference< XAccessible >& rParent ) :
mnParagraphIndex( 0 ),
@@ -141,40 +149,76 @@ namespace accessibility
mpEditSource( NULL ),
maEEOffset( 0, 0 ),
mxParent( rParent ),
- maStateListeners( maMutex )
- {
- // Create the state set.
- ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper ();
- mxStateSet = pStateSet;
+ // well, that's strictly (UNO) exception safe, though not
+ // really robust. We rely on the fact that this member is
+ // constructed last, and that the constructor body catches
+ // exceptions, thus no chance for exceptions once the Id is
+ // fetched. Nevertheless, normally should employ RAII here...
+ mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
+ {
+#ifdef DBG_UTIL
+ DBG_CTOR( AccessibleImageBullet, NULL );
+ OSL_TRACE( "Received ID: %d", mnNotifierClientId );
+#endif
- // these are always on
- pStateSet->AddState( AccessibleStateType::VISIBLE );
- pStateSet->AddState( AccessibleStateType::SHOWING );
- pStateSet->AddState( AccessibleStateType::ENABLED );
+ try
+ {
+ // Create the state set.
+ ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper ();
+ mxStateSet = pStateSet;
+
+ // these are always on
+ pStateSet->AddState( AccessibleStateType::VISIBLE );
+ pStateSet->AddState( AccessibleStateType::SHOWING );
+ pStateSet->AddState( AccessibleStateType::ENABLED );
+ }
+ catch( const uno::Exception& ) {}
}
AccessibleImageBullet::~AccessibleImageBullet()
{
+ DBG_DTOR( AccessibleImageBullet, NULL );
+
+ // sign off from event notifier
+ if( getNotifierClientId() != -1 )
+ {
+ try
+ {
+ ::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() );
+#ifdef DBG_UTIL
+ OSL_TRACE( "AccessibleImageBullet revoked ID: %d\n", mnNotifierClientId );
+#endif
+ }
+ catch( const uno::Exception& ) {}
+ }
}
uno::Any SAL_CALL AccessibleImageBullet::queryInterface (const uno::Type & rType) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
return AccessibleImageBulletInterfaceBase::queryInterface(rType);
}
uno::Reference< XAccessibleContext > SAL_CALL AccessibleImageBullet::getAccessibleContext( ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
// We implement the XAccessibleContext interface in the same object
return uno::Reference< XAccessibleContext > ( this );
}
sal_Int32 SAL_CALL AccessibleImageBullet::getAccessibleChildCount() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
return 0;
}
uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No childs available")),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy
@@ -182,21 +226,29 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleParent() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
return mxParent;
}
sal_Int32 SAL_CALL AccessibleImageBullet::getAccessibleIndexInParent() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
return mnIndexInParent;
}
sal_Int16 SAL_CALL AccessibleImageBullet::getAccessibleRole() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
return AccessibleRole::GRAPHIC;
}
::rtl::OUString SAL_CALL AccessibleImageBullet::getAccessibleDescription() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
// throws if defunc
@@ -213,6 +265,8 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
// throws if defunc
@@ -229,12 +283,16 @@ namespace accessibility
uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
// no relations, therefore empty
return uno::Reference< XAccessibleRelationSet >();
}
uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleImageBullet::getAccessibleStateSet() throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
// Create a copy of the state set and return it.
@@ -248,6 +306,8 @@ namespace accessibility
lang::Locale SAL_CALL AccessibleImageBullet::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
lang::Locale aLocale;
@@ -261,16 +321,24 @@ namespace accessibility
void SAL_CALL AccessibleImageBullet::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
{
- maStateListeners.addInterface( xListener );
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
+ if( getNotifierClientId() != -1 )
+ ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
}
void SAL_CALL AccessibleImageBullet::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
{
- maStateListeners.removeInterface( xListener );
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
+ if( getNotifierClientId() != -1 )
+ ::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
}
sal_Bool SAL_CALL AccessibleImageBullet::contains( const awt::Point& rPoint ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -285,12 +353,16 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleAt( const awt::Point& aPoint ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
// as we have no children, empty reference
return uno::Reference< XAccessible >();
}
awt::Rectangle SAL_CALL AccessibleImageBullet::getBounds( ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
@@ -328,6 +400,8 @@ namespace accessibility
awt::Point SAL_CALL AccessibleImageBullet::getLocation( ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
awt::Rectangle aRect = getBounds();
@@ -337,6 +411,8 @@ namespace accessibility
awt::Point SAL_CALL AccessibleImageBullet::getLocationOnScreen( ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
// relate us to parent
@@ -362,6 +438,8 @@ namespace accessibility
awt::Size SAL_CALL AccessibleImageBullet::getSize( ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
awt::Rectangle aRect = getBounds();
@@ -371,6 +449,8 @@ namespace accessibility
void SAL_CALL AccessibleImageBullet::grabFocus( ) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Not focusable")),
uno::Reference< uno::XInterface >
( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy
@@ -378,13 +458,18 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleImageBullet::getForeground( ) throw (::com::sun::star::uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
// #104444# Added to XAccessibleComponent interface
- UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
+ svtools::ColorConfig aColorConfig;
+ UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
return static_cast<sal_Int32>(nColor);
}
sal_Int32 SAL_CALL AccessibleImageBullet::getBackground( ) throw (::com::sun::star::uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
// #104444# Added to XAccessibleComponent interface
Color aColor( Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() );
@@ -396,11 +481,15 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleImageBullet::getImplementationName (void) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("AccessibleImageBullet"));
}
sal_Bool SAL_CALL AccessibleImageBullet::supportsService (const ::rtl::OUString& sServiceName) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
// Iterate over all supported service names and return true if on of them
// matches the given name.
uno::Sequence< ::rtl::OUString> aSupportedServices (
@@ -413,32 +502,71 @@ namespace accessibility
uno::Sequence< ::rtl::OUString> SAL_CALL AccessibleImageBullet::getSupportedServiceNames (void) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
const ::rtl::OUString sServiceName (RTL_CONSTASCII_USTRINGPARAM ("drafts.com.sun.star.accessibility.AccessibleContext"));
return uno::Sequence< ::rtl::OUString > (&sServiceName, 1);
}
::rtl::OUString SAL_CALL AccessibleImageBullet::getServiceName (void) throw (uno::RuntimeException)
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("drafts.com.sun.star.accessibility.AccessibleContext"));
}
void AccessibleImageBullet::SetIndexInParent( sal_Int32 nIndex )
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
mnIndexInParent = nIndex;
}
sal_Int32 AccessibleImageBullet::GetIndexInParent() const
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
return mnIndexInParent;
}
void AccessibleImageBullet::SetEEOffset( const Point& rOffset )
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
maEEOffset = rOffset;
}
+ void AccessibleImageBullet::Dispose()
+ {
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
+ // notify listeners
+ if( getNotifierClientId() != -1 )
+ {
+ try
+ {
+ uno::Reference < XAccessibleContext > xThis = getAccessibleContext();
+
+ // #106234# Delegate to EventNotifier
+ ::comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( getNotifierClientId(),
+ xThis );
+#ifdef DBG_UTIL
+ OSL_TRACE( "AccessibleImageBullet disposed ID: %d", mnNotifierClientId );
+#endif
+ }
+ catch( const uno::Exception& ) {}
+ }
+
+ // drop all references
+ mxParent = NULL;
+ mnNotifierClientId = -1;
+ mpEditSource = NULL;
+ }
+
void AccessibleImageBullet::SetEditSource( SvxEditSource* pEditSource )
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
SvxEditSource* pOldEditSource = mpEditSource;
mpEditSource = pEditSource;
@@ -451,74 +579,41 @@ namespace accessibility
SetState( AccessibleStateType::INVALID );
SetState( AccessibleStateType::DEFUNC );
- // notify listeners
- try
- {
- uno::Reference < XAccessibleContext > xThis = getAccessibleContext();
-
- lang::EventObject aEvent (xThis);
- maStateListeners.disposeAndClear( aEvent );
- }
- catch( const uno::Exception& ) {}
-
- // drop all references
- mxParent = NULL;
+ Dispose();
}
}
void AccessibleImageBullet::FireEvent(const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue ) const
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
uno::Reference < XAccessibleContext > xThis( const_cast< AccessibleImageBullet* > (this)->getAccessibleContext() );
AccessibleEventObject aEvent(xThis, nEventId, rNewValue, rOldValue);
- // no locking necessary, OInterfaceIteratorHelper copies listeners if someone removes/adds in between
- ::cppu::OInterfaceIteratorHelper aIter( const_cast< AccessibleImageBullet* >(this)->maStateListeners );
- while( aIter.hasMoreElements() )
- {
- uno::Reference < XAccessibleEventListener > xListener( aIter.next(), uno::UNO_QUERY );
-
- if( xListener.is() )
- {
- try
- {
- xListener->notifyEvent (aEvent);
- }
- catch( const lang::DisposedException& e )
- {
- // DisposedExceptions from the listener might indicate a
- // broken connection to a different environment.
-
- OSL_ENSURE(e.Context.is(), "AccessibleImageBullet::FireEvent: caught dispose exception with empty Context field");
- // If the exception stems from the listener then remove it
- // from the list of listeners. If the Context field of the
- // exception is empty this is interpreted to indicate the
- // listener as well.
- if (e.Context == xListener
- || !e.Context.is())
- aIter.remove();
- }
- catch( const uno::Exception& e )
- {
- DBG_WARNING1("AccessibleImageBullet::FireEvent: exception %s from listener",
- ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_DONTKNOW ).getStr() );
- }
- }
- }
+ // #106234# Delegate to EventNotifier
+ ::comphelper::AccessibleEventNotifier::addEvent( getNotifierClientId(),
+ aEvent );
}
void AccessibleImageBullet::GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
FireEvent( nEventId, rNewValue );
}
void AccessibleImageBullet::LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
FireEvent( nEventId, uno::Any(), rOldValue );
}
void AccessibleImageBullet::SetState( const sal_Int16 nStateId )
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
if( pStateSet != NULL &&
!pStateSet->contains(nStateId) )
@@ -530,6 +625,8 @@ namespace accessibility
void AccessibleImageBullet::UnSetState( const sal_Int16 nStateId )
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
if( pStateSet != NULL &&
pStateSet->contains(nStateId) )
@@ -539,8 +636,17 @@ namespace accessibility
}
}
+ int AccessibleImageBullet::getNotifierClientId() const
+ {
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
+ return mnNotifierClientId;
+ }
+
void AccessibleImageBullet::SetParagraphIndex( sal_Int32 nIndex )
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
uno::Any aOldDesc;
uno::Any aOldName;
@@ -569,11 +675,15 @@ namespace accessibility
sal_Int32 AccessibleImageBullet::GetParagraphIndex() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
return mnParagraphIndex;
}
SvxEditSource& AccessibleImageBullet::GetEditSource() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
if( mpEditSource )
return *mpEditSource;
else
@@ -585,6 +695,8 @@ namespace accessibility
SvxTextForwarder& AccessibleImageBullet::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
SvxEditSource& rEditSource = GetEditSource();
SvxTextForwarder* pTextForwarder = rEditSource.GetTextForwarder();
@@ -605,6 +717,8 @@ namespace accessibility
SvxViewForwarder& AccessibleImageBullet::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
SvxEditSource& rEditSource = GetEditSource();
SvxViewForwarder* pViewForwarder = rEditSource.GetViewForwarder();
@@ -627,6 +741,8 @@ namespace accessibility
const Point& AccessibleImageBullet::GetEEOffset() const
{
+ DBG_CHKTHIS( AccessibleImageBullet, NULL );
+
return maEEOffset;
}
diff --git a/svx/source/accessibility/AccessibleImageBullet.hxx b/svx/source/accessibility/AccessibleImageBullet.hxx
index f3e7ab614ff1..c92de737dda3 100644
--- a/svx/source/accessibility/AccessibleImageBullet.hxx
+++ b/svx/source/accessibility/AccessibleImageBullet.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleImageBullet.hxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: thb $ $Date: 2002-12-10 15:24:55 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -112,7 +112,6 @@
namespace accessibility
{
-
typedef ::cppu::WeakImplHelper5< ::drafts::com::sun::star::accessibility::XAccessible,
::drafts::com::sun::star::accessibility::XAccessibleContext,
::drafts::com::sun::star::accessibility::XAccessibleComponent,
@@ -209,6 +208,12 @@ namespace accessibility
*/
void SetEditSource( SvxEditSource* pEditSource );
+ /** Dispose this object
+
+ Notifies and deregisters the listeners, drops all references.
+ */
+ void Dispose();
+
/** Set the current paragraph number
@attention This method does not lock the SolarMutex,
@@ -246,6 +251,8 @@ namespace accessibility
SvxEditSource& GetEditSource() const SAL_THROW((::com::sun::star::uno::RuntimeException));
+ int getNotifierClientId() const;
+
/** Query the SvxTextForwarder for EditEngine access.
@attention This method does not lock the SolarMutex,
@@ -287,7 +294,7 @@ namespace accessibility
::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > mxParent;
/// Our listeners (guarded by maMutex)
- ::cppu::OInterfaceContainerHelper maStateListeners;
+ int mnNotifierClientId;
};
} // end of namespace accessibility
diff --git a/svx/source/accessibility/AccessibleParaManager.cxx b/svx/source/accessibility/AccessibleParaManager.cxx
index d5f77e81f292..59c699f73c45 100644
--- a/svx/source/accessibility/AccessibleParaManager.cxx
+++ b/svx/source/accessibility/AccessibleParaManager.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleParaManager.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: thb $ $Date: 2002-07-24 16:19:17 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -126,6 +126,9 @@ namespace accessibility
Release( nNumParas, maChildren.size() );
maChildren.resize( nNumParas );
+
+ if( mnFocusedChild >= nNumParas )
+ mnFocusedChild = -1;
}
sal_uInt32 AccessibleParaManager::GetNum() const
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 63c39f95fded..bd04a3309961 100755
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleShape.cxx,v $
*
- * $Revision: 1.38 $
+ * $Revision: 1.39 $
*
- * last change: $Author: thb $ $Date: 2002-11-29 17:56:48 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -131,6 +131,7 @@
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
#include <unotools/accessiblestatesethelper.hxx>
#endif
+#include "svdview.hxx"
using namespace ::rtl;
using namespace ::com::sun::star;
@@ -150,8 +151,10 @@ AccessibleShape::AccessibleShape (
maShapeTreeInfo (rShapeTreeInfo),
mnIndex (rShapeInfo.mnIndex),
mpText (NULL),
- mpParent (rShapeInfo.mpChildrenManager)
+ mpParent (rShapeInfo.mpChildrenManager),
+ m_nIndexInParent(-1)
{
+ m_pShape = GetSdrObjectFromXShape(mxShape);
}
@@ -186,11 +189,6 @@ void AccessibleShape::Init (void)
if (mpChildrenManager != NULL)
mpChildrenManager->Update();
- // Register at shape as dispose listener.
- Reference<lang::XComponent> xComponent (mxShape, uno::UNO_QUERY);
- if (xComponent.is())
- xComponent->addEventListener (this);
-
// Register at model as document::XEventListener.
if (maShapeTreeInfo.GetModelBroadcaster().is())
maShapeTreeInfo.GetModelBroadcaster()->addEventListener (
@@ -238,14 +236,11 @@ void AccessibleShape::UpdateStates (void)
{
try
{
- uno::Any aValue = xSet->getPropertyValue (
- OUString::createFromAscii ("FillStyle"));
drawing::FillStyle aFillStyle;
- aValue >>= aFillStyle;
- if (aFillStyle == drawing::FillStyle_SOLID)
- bShapeIsOpaque = true;
+ bShapeIsOpaque = ( xSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle"))) >>= aFillStyle)
+ && aFillStyle == drawing::FillStyle_SOLID;
}
- catch (::com::sun::star::beans::UnknownPropertyException)
+ catch (::com::sun::star::beans::UnknownPropertyException&)
{
// Ignore.
}
@@ -259,29 +254,38 @@ void AccessibleShape::UpdateStates (void)
// Set the selected state.
bool bShapeIsSelected = false;
- Reference<view::XSelectionSupplier> xSelectionSupplier (
- maShapeTreeInfo.GetController(), uno::UNO_QUERY);
- if (xSelectionSupplier.is())
+ // XXX fix_me this has to be done with an extra interface later on
+ if ( m_pShape && maShapeTreeInfo.GetSdrView() )
{
- Reference<drawing::XShape> xSelectedShape (
- xSelectionSupplier->getSelection(), uno::UNO_QUERY);
- if (xSelectedShape.is() && xSelectedShape == mxShape)
- bShapeIsSelected = true;
- else
- {
- Reference<container::XIndexAccess> xSelectedShapes (
- xSelectionSupplier->getSelection(), uno::UNO_QUERY);
- if( xSelectedShapes.is() )
- {
- for (sal_Int32 i=0,nCount=xSelectedShapes->getCount();
- i<nCount && !bShapeIsSelected; i++)
- {
- if (xSelectedShapes->getByIndex(i) == mxShape)
- bShapeIsSelected = true;
- }
- }
- }
+ bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == TRUE;
}
+
+
+// Reference<view::XSelectionSupplier> xSelectionSupplier ( maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+// if ( xSelectionSupplier.is() )
+// {
+// uno::Any aSelection(xSelectionSupplier->getSelection());
+// Reference<drawing::XShape> xSelectedShape;
+// aSelection >>= xSelectedShape;
+// if ( xSelectedShape.is() && xSelectedShape.get() == mxShape.get() )
+// bShapeIsSelected = true;
+// else
+// {
+// Reference<container::XIndexAccess> xSelectedShapes;
+// aSelection >>= xSelectedShapes;
+// if ( xSelectedShapes.is() )
+// {
+// for (sal_Int32 i=0,nCount=xSelectedShapes->getCount();
+// i<nCount && !bShapeIsSelected; ++i)
+// {
+// xSelectedShapes->getByIndex(i) >>= xSelectedShape;
+// bShapeIsSelected = xSelectedShape.get() == mxShape.get();
+// }
+// }
+// }
+// }
+
+
if (bShapeIsSelected)
pStateSet->AddState (AccessibleStateType::SELECTED);
else
@@ -361,8 +365,8 @@ sal_Bool AccessibleShape::GetState (sal_Int16 aState)
group or scene shapes and the paragraphs of text.
*/
sal_Int32 SAL_CALL
- AccessibleShape::getAccessibleChildCount (void)
- throw ()
+ AccessibleShape::getAccessibleChildCount ()
+ throw (::com::sun::star::uno::RuntimeException)
{
ThrowIfDisposed ();
sal_Int32 nChildCount = 0;
@@ -385,7 +389,7 @@ sal_Int32 SAL_CALL
*/
uno::Reference<XAccessible> SAL_CALL
AccessibleShape::getAccessibleChild (sal_Int32 nIndex)
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
{
ThrowIfDisposed ();
@@ -507,128 +511,134 @@ uno::Reference<XAccessible > SAL_CALL
awt::Rectangle SAL_CALL AccessibleShape::getBounds (void)
throw (::com::sun::star::uno::RuntimeException)
{
- ThrowIfDisposed ();
+ ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ ::osl::MutexGuard aGuard (maMutex);
- static const OUString sBoundRectName (
- RTL_CONSTASCII_USTRINGPARAM("BoundRect"));
- static const OUString sAnchorPositionName (
- RTL_CONSTASCII_USTRINGPARAM("AnchorPosition"));
+ ThrowIfDisposed ();
awt::Rectangle aBoundingBox;
-
- // Get the shape's bounding box in internal coordinates (in 100th of
- // mm). Use the property BoundRect. Only if that is not supported ask
- // the shape for its position and size directly.
- Reference<beans::XPropertySet> xSet (mxShape, uno::UNO_QUERY);
- Reference<beans::XPropertySetInfo> xSetInfo;
- bool bFoundBoundRect = false;
- if (xSet.is())
+ if ( mxShape.is() )
{
- xSetInfo = xSet->getPropertySetInfo ();
- if (xSetInfo.is())
+
+ static const OUString sBoundRectName (
+ RTL_CONSTASCII_USTRINGPARAM("BoundRect"));
+ static const OUString sAnchorPositionName (
+ RTL_CONSTASCII_USTRINGPARAM("AnchorPosition"));
+
+ // Get the shape's bounding box in internal coordinates (in 100th of
+ // mm). Use the property BoundRect. Only if that is not supported ask
+ // the shape for its position and size directly.
+ Reference<beans::XPropertySet> xSet (mxShape, uno::UNO_QUERY);
+ Reference<beans::XPropertySetInfo> xSetInfo;
+ bool bFoundBoundRect = false;
+ if (xSet.is())
{
- if (xSetInfo->hasPropertyByName (sBoundRectName))
+ xSetInfo = xSet->getPropertySetInfo ();
+ if (xSetInfo.is())
{
- try
- {
- uno::Any aValue = xSet->getPropertyValue (sBoundRectName);
- aValue >>= aBoundingBox;
- bFoundBoundRect = true;
- }
- catch (beans::UnknownPropertyException e)
+ if (xSetInfo->hasPropertyByName (sBoundRectName))
{
- // Handled below (bFoundBoundRect stays false).
+ try
+ {
+ uno::Any aValue = xSet->getPropertyValue (sBoundRectName);
+ aValue >>= aBoundingBox;
+ bFoundBoundRect = true;
+ }
+ catch (beans::UnknownPropertyException e)
+ {
+ // Handled below (bFoundBoundRect stays false).
+ }
}
+ else
+ OSL_TRACE (" no property BoundRect");
}
- else
- OSL_TRACE (" no property BoundRect");
}
- }
- // Fallback when there is no BoundRect Property.
- if ( ! bFoundBoundRect)
- {
- awt::Point aPosition (mxShape->getPosition());
- awt::Size aSize (mxShape->getSize());
- aBoundingBox = awt::Rectangle (
- aPosition.X, aPosition.Y,
- aSize.Width, aSize.Height);
-
- // While BoundRects have absolute positions, the position returned
- // by XPosition::getPosition is relative. Get the anchor position
- // (usually not (0,0) for Writer shapes).
- if (xSetInfo.is())
+ // Fallback when there is no BoundRect Property.
+ if ( ! bFoundBoundRect )
{
- if (xSetInfo->hasPropertyByName (sAnchorPositionName))
+ awt::Point aPosition (mxShape->getPosition());
+ awt::Size aSize (mxShape->getSize());
+ aBoundingBox = awt::Rectangle (
+ aPosition.X, aPosition.Y,
+ aSize.Width, aSize.Height);
+
+ // While BoundRects have absolute positions, the position returned
+ // by XPosition::getPosition is relative. Get the anchor position
+ // (usually not (0,0) for Writer shapes).
+ if (xSetInfo.is())
{
- uno::Any aPos = xSet->getPropertyValue (sAnchorPositionName);
- awt::Point aAnchorPosition;
- aPos >>= aAnchorPosition;
- aBoundingBox.X += aAnchorPosition.X;
- aBoundingBox.Y += aAnchorPosition.Y;
+ if (xSetInfo->hasPropertyByName (sAnchorPositionName))
+ {
+ uno::Any aPos = xSet->getPropertyValue (sAnchorPositionName);
+ awt::Point aAnchorPosition;
+ aPos >>= aAnchorPosition;
+ aBoundingBox.X += aAnchorPosition.X;
+ aBoundingBox.Y += aAnchorPosition.Y;
+ }
}
}
- }
-
- // Transform coordinates from internal to pixel.
- if (maShapeTreeInfo.GetViewForwarder() == NULL)
- throw uno::RuntimeException (::rtl::OUString (
- RTL_CONSTASCII_USTRINGPARAM(
- "AccessibleShape has no valid view forwarder")),
- static_cast<uno::XWeak*>(this));
- ::Size aPixelSize = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
- ::Size (aBoundingBox.Width, aBoundingBox.Height));
- ::Point aPixelPosition = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
- ::Point (aBoundingBox.X, aBoundingBox.Y));
- // Clip the shape's bounding box with the bounding box of its parent.
- Reference<XAccessibleComponent> xParentComponent (
- getAccessibleParent(), uno::UNO_QUERY);
- if (xParentComponent.is())
- {
- // Make the coordinates relative to the parent.
- awt::Point aParentLocation (xParentComponent->getLocationOnScreen());
- int x = aPixelPosition.getX() - aParentLocation.X;
- int y = aPixelPosition.getY() - aParentLocation.Y;
-
- /* // The following block is a workarround for bug #99889# (property
- // BoundRect returnes coordinates relative to document window
- // instead of absolute coordinates for shapes in Writer). Has to
- // be removed as soon as bug is fixed.
-
- // Use a non-null anchor position as flag that the shape is in a
- // Writer document.
- if (xSetInfo.is())
- if (xSetInfo->hasPropertyByName (sAnchorPositionName))
- {
- uno::Any aPos = xSet->getPropertyValue (sAnchorPositionName);
- awt::Point aAnchorPosition;
- aPos >>= aAnchorPosition;
- if (aAnchorPosition.X > 0)
+ // Transform coordinates from internal to pixel.
+ if (maShapeTreeInfo.GetViewForwarder() == NULL)
+ throw uno::RuntimeException (::rtl::OUString (
+ RTL_CONSTASCII_USTRINGPARAM(
+ "AccessibleShape has no valid view forwarder")),
+ static_cast<uno::XWeak*>(this));
+ ::Size aPixelSize = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
+ ::Size (aBoundingBox.Width, aBoundingBox.Height));
+ ::Point aPixelPosition = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
+ ::Point (aBoundingBox.X, aBoundingBox.Y));
+
+ // Clip the shape's bounding box with the bounding box of its parent.
+ Reference<XAccessibleComponent> xParentComponent (
+ getAccessibleParent(), uno::UNO_QUERY);
+ if (xParentComponent.is())
+ {
+ // Make the coordinates relative to the parent.
+ awt::Point aParentLocation (xParentComponent->getLocationOnScreen());
+ int x = aPixelPosition.getX() - aParentLocation.X;
+ int y = aPixelPosition.getY() - aParentLocation.Y;
+
+ /* // The following block is a workarround for bug #99889# (property
+ // BoundRect returnes coordinates relative to document window
+ // instead of absolute coordinates for shapes in Writer). Has to
+ // be removed as soon as bug is fixed.
+
+ // Use a non-null anchor position as flag that the shape is in a
+ // Writer document.
+ if (xSetInfo.is())
+ if (xSetInfo->hasPropertyByName (sAnchorPositionName))
{
- x = aPixelPosition.getX();
- y = aPixelPosition.getY();
+ uno::Any aPos = xSet->getPropertyValue (sAnchorPositionName);
+ awt::Point aAnchorPosition;
+ aPos >>= aAnchorPosition;
+ if (aAnchorPosition.X > 0)
+ {
+ x = aPixelPosition.getX();
+ y = aPixelPosition.getY();
+ }
}
- }
- // End of workarround.
- */
- // Clip with parent (with coordinates relative to itself).
- ::Rectangle aBBox (
- x, y, x + aPixelSize.getWidth(), y + aPixelSize.getHeight());
- awt::Size aParentSize (xParentComponent->getSize());
- ::Rectangle aParentBBox (0,0, aParentSize.Width, aParentSize.Height);
- aBBox = aBBox.GetIntersection (aParentBBox);
- aBoundingBox = awt::Rectangle (
- aBBox.getX(),
- aBBox.getY(),
- aBBox.getWidth(),
- aBBox.getHeight());
- }
- else
- {
- OSL_TRACE ("parent does not support component");
- aBoundingBox = awt::Rectangle (
- aPixelPosition.getX(), aPixelPosition.getY(),
- aPixelSize.getWidth(), aPixelSize.getHeight());
+ // End of workarround.
+ */
+ // Clip with parent (with coordinates relative to itself).
+ ::Rectangle aBBox (
+ x, y, x + aPixelSize.getWidth(), y + aPixelSize.getHeight());
+ awt::Size aParentSize (xParentComponent->getSize());
+ ::Rectangle aParentBBox (0,0, aParentSize.Width, aParentSize.Height);
+ aBBox = aBBox.GetIntersection (aParentBBox);
+ aBoundingBox = awt::Rectangle (
+ aBBox.getX(),
+ aBBox.getY(),
+ aBBox.getWidth(),
+ aBBox.getHeight());
+ }
+ else
+ {
+ OSL_TRACE ("parent does not support component");
+ aBoundingBox = awt::Rectangle (
+ aPixelPosition.getX(), aPixelPosition.getY(),
+ aPixelSize.getWidth(), aPixelSize.getHeight());
+ }
}
return aBoundingBox;
@@ -818,7 +828,6 @@ void SAL_CALL
AccessibleShape::getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException)
{
- ThrowIfDisposed ();
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleShape"));
}
@@ -891,36 +900,22 @@ uno::Sequence<uno::Type> SAL_CALL
//===== lang::XEventListener ================================================
+/** Disposing calls are accepted only from the model: Just reset the
+ reference to the model in the shape tree info. Otherwise this object
+ remains functional.
+*/
void SAL_CALL
AccessibleShape::disposing (const lang::EventObject& aEvent)
throw (uno::RuntimeException)
{
+ ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ ::osl::MutexGuard aGuard (maMutex);
+
try
{
- OSL_TRACE ("AccessibleShape::disposing");
-
- if (aEvent.Source == mxShape)
- {
- uno::Reference<beans::XPropertySet> xShapeProperties (
- mxShape, uno::UNO_QUERY);
- SetState (AccessibleStateType::DEFUNC);
- mxShape = NULL;
-
- // Release the child containers.
- if (mpChildrenManager != NULL)
- {
- delete mpChildrenManager;
- mpChildrenManager = NULL;
- }
- if (mpText != NULL)
- {
- mpText->Dispose();
- delete mpText;
- mpText = NULL;
- }
- }
- else if (aEvent.Source == maShapeTreeInfo.GetModelBroadcaster())
+ if (aEvent.Source == maShapeTreeInfo.GetModelBroadcaster())
{
+ ::osl::MutexGuard aGuard (maMutex);
// Remove reference to model broadcaster to allow it to pass
// away.
maShapeTreeInfo.SetModelBroadcaster(NULL);
@@ -948,7 +943,7 @@ void SAL_CALL
// First check if the event is for us.
uno::Reference<drawing::XShape> xShape (
rEventObject.Source, uno::UNO_QUERY);
- if (xShape == mxShape)
+ if ( xShape.get() == mxShape.get() )
{
if (rEventObject.EventName.equals (sShapeModified))
{
@@ -1268,7 +1263,8 @@ uno::Reference< drawing::XShape > AccessibleShape::GetXShape()
// protected
void AccessibleShape::disposing (void)
{
- OSL_TRACE ("AccessibleShape::disposing()");
+ ::vos::OGuard aSolarGuard (::Application::GetSolarMutex());
+ ::osl::MutexGuard aGuard (maMutex);
// Make sure to send an event that this object looses the focus in the
// case that it has the focus.
@@ -1309,7 +1305,18 @@ void AccessibleShape::disposing (void)
AccessibleContextBase::dispose ();
}
+sal_Int32 SAL_CALL
+ AccessibleShape::getAccessibleIndexInParent (void)
+ throw (::com::sun::star::uno::RuntimeException)
+{
+ ThrowIfDisposed ();
+ // Use a simple but slow solution for now. Optimize later.
+ sal_Int32 nIndex = m_nIndexInParent;
+ if ( -1 == nIndex )
+ nIndex = AccessibleContextBase::getAccessibleIndexInParent();
+ return nIndex;
+}
diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
index 7f835d426d17..f4ce9cfa495a 100644
--- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleShapeTreeInfo.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: af $ $Date: 2002-06-07 14:51:14 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -109,12 +109,15 @@ AccessibleShapeTreeInfo::AccessibleShapeTreeInfo (const AccessibleShapeTreeInfo&
AccessibleShapeTreeInfo& AccessibleShapeTreeInfo::operator= (const AccessibleShapeTreeInfo& rInfo)
{
- mxDocumentWindow = rInfo.mxDocumentWindow;
- mxModelBroadcaster = rInfo.mxModelBroadcaster;
- mpView = rInfo.mpView;
- mxController = rInfo.mxController,
- mpWindow = rInfo.mpWindow;
- mpViewForwarder = rInfo.mpViewForwarder;
+ if ( this != &rInfo )
+ {
+ mxDocumentWindow = rInfo.mxDocumentWindow;
+ mxModelBroadcaster = rInfo.mxModelBroadcaster;
+ mpView = rInfo.mpView;
+ mxController = rInfo.mxController,
+ mpWindow = rInfo.mpWindow;
+ mpViewForwarder = rInfo.mpViewForwarder;
+ }
return *this;
}
diff --git a/svx/source/accessibility/AccessibleStaticTextBase.cxx b/svx/source/accessibility/AccessibleStaticTextBase.cxx
index 771bb25db25c..ab369167840e 100644
--- a/svx/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/svx/source/accessibility/AccessibleStaticTextBase.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleStaticTextBase.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: thb $ $Date: 2002-11-15 13:12:52 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -154,6 +154,8 @@ namespace accessibility
//
//------------------------------------------------------------------------
+ DBG_NAME( AccessibleStaticTextBase_Impl );
+
/** AccessibleStaticTextBase_Impl
This class implements the AccessibleStaticTextBase
@@ -171,17 +173,38 @@ namespace accessibility
AccessibleStaticTextBase_Impl();
~AccessibleStaticTextBase_Impl();
- SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException)) { return maEditSource; }
+ SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException))
+ {
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+ return maEditSource;
+ }
void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException));
- void SetEventSource( const uno::Reference< XAccessible >& rInterface ) { mxThis = rInterface; }
- uno::Reference< XAccessible > GetEventSource() const { return mxThis; }
+ void SetEventSource( const uno::Reference< XAccessible >& rInterface )
+ {
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+ mxThis = rInterface;
+ }
+ uno::Reference< XAccessible > GetEventSource() const
+ {
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+ return mxThis;
+ }
void SetOffset( const Point& );
- Point GetOffset() const { ::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset ); return aPoint; }
+ Point GetOffset() const
+ {
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+ ::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset );
+ return aPoint;
+ }
void UpdateChildren();
- void Dispose() { mxThis = NULL; }
+ void Dispose();
#ifdef DBG_UTIL
void CheckInvariants() const;
@@ -189,8 +212,18 @@ namespace accessibility
AccessibleEditableTextPara& GetParagraph( sal_Int32 nPara ) const;
sal_Int32 GetParagraphCount() const;
- EPosition Index2Internal( sal_Int32 nFlatIndex ) const { return ImpCalcInternal( nFlatIndex, false); }
- EPosition Range2Internal( sal_Int32 nFlatIndex ) const { return ImpCalcInternal( nFlatIndex, true); }
+ EPosition Index2Internal( sal_Int32 nFlatIndex ) const
+ {
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+ return ImpCalcInternal( nFlatIndex, false );
+ }
+ EPosition Range2Internal( sal_Int32 nFlatIndex ) const
+ {
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+ return ImpCalcInternal( nFlatIndex, true );
+ }
sal_Bool SetSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex,
sal_Int32 nEndPara, sal_Int32 nEndIndex );
sal_Bool CopyText( sal_Int32 nStartPara, sal_Int32 nStartIndex,
@@ -206,7 +239,9 @@ namespace accessibility
uno::Reference< XAccessible > mxThis;
// implements our functionality, we're just an adapter (guarded by solar mutex)
- mutable AccessibleEditableTextPara maTextParagraph;
+ mutable AccessibleEditableTextPara* mpTextParagraph;
+
+ uno::Reference< XAccessible > mxParagraph;
// a wrapper for the text forwarders (guarded by solar mutex)
mutable SvxEditSourceAdapter maEditSource;
@@ -227,37 +262,44 @@ namespace accessibility
AccessibleStaticTextBase_Impl::AccessibleStaticTextBase_Impl() :
mxThis( NULL ),
- maTextParagraph( NULL ),
+ mpTextParagraph( new AccessibleEditableTextPara(NULL) ),
+ mxParagraph( mpTextParagraph ),
maEditSource(),
maMutex(),
maOffset(0,0)
{
+ DBG_CTOR( AccessibleStaticTextBase_Impl, NULL );
+
// TODO: this is still somewhat of a hack, all the more since
// now the maTextParagraph has an empty parent reference set
-
- // prevent automatic release of member variable
- maTextParagraph.acquire();
}
AccessibleStaticTextBase_Impl::~AccessibleStaticTextBase_Impl()
{
+ DBG_DTOR( AccessibleStaticTextBase_Impl, NULL );
}
void AccessibleStaticTextBase_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
maEditSource.SetEditSource( pEditSource );
- maTextParagraph.SetEditSource( &maEditSource );
+ if( mpTextParagraph )
+ mpTextParagraph->SetEditSource( &maEditSource );
}
void AccessibleStaticTextBase_Impl::SetOffset( const Point& rPoint )
{
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
// guard against non-atomic access to maOffset data structure
{
::osl::MutexGuard aGuard( maMutex );
maOffset = rPoint;
}
- maTextParagraph.SetEEOffset( rPoint );
+ if( mpTextParagraph )
+ mpTextParagraph->SetEEOffset( rPoint );
// in all cases, check visibility afterwards.
UpdateChildren();
@@ -265,9 +307,25 @@ namespace accessibility
void AccessibleStaticTextBase_Impl::UpdateChildren()
{
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
// currently no children
}
+ void AccessibleStaticTextBase_Impl::Dispose()
+ {
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+ // we're the owner of the paragraph, so destroy it, too
+ if( mpTextParagraph )
+ mpTextParagraph->Dispose();
+
+ // drop references
+ mxParagraph = NULL;
+ mxThis = NULL;
+ mpTextParagraph = NULL;
+ }
+
#ifdef DBG_UTIL
void AccessibleStaticTextBase_Impl::CheckInvariants() const
{
@@ -277,20 +335,33 @@ namespace accessibility
AccessibleEditableTextPara& AccessibleStaticTextBase_Impl::GetParagraph( sal_Int32 nPara ) const
{
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+ if( !mpTextParagraph )
+ throw lang::DisposedException (
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")), mxThis );
+
// TODO: Have a differnt method on AccessibleEditableTextPara
// that does not care about state changes
- maTextParagraph.SetParagraphIndex( nPara );
+ mpTextParagraph->SetParagraphIndex( nPara );
- return maTextParagraph;
+ return *mpTextParagraph;
}
sal_Int32 AccessibleStaticTextBase_Impl::GetParagraphCount() const
{
- return maTextParagraph.GetTextForwarder().GetParagraphCount();
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+ if( !mpTextParagraph )
+ return 0;
+ else
+ return mpTextParagraph->GetTextForwarder().GetParagraphCount();
}
EPosition AccessibleStaticTextBase_Impl::ImpCalcInternal( sal_Int32 nFlatIndex, bool bExclusive ) const
{
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
if( nFlatIndex < 0 )
throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleStaticTextBase_Impl::Index2Internal: character index out of bounds")),
mxThis);
@@ -332,9 +403,14 @@ namespace accessibility
sal_Bool AccessibleStaticTextBase_Impl::SetSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex,
sal_Int32 nEndPara, sal_Int32 nEndIndex )
{
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+ if( !mpTextParagraph )
+ return sal_False;
+
try
{
- SvxEditViewForwarder& rCacheVF = maTextParagraph.GetEditViewForwarder( sal_True );
+ SvxEditViewForwarder& rCacheVF = mpTextParagraph->GetEditViewForwarder( sal_True );
return rCacheVF.SetSelection( MakeSelection(nStartPara, nStartIndex, nEndPara, nEndIndex) );
}
catch( const uno::RuntimeException& )
@@ -346,10 +422,15 @@ namespace accessibility
sal_Bool AccessibleStaticTextBase_Impl::CopyText( sal_Int32 nStartPara, sal_Int32 nStartIndex,
sal_Int32 nEndPara, sal_Int32 nEndIndex )
{
+ DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
+
+ if( !mpTextParagraph )
+ return sal_False;
+
try
{
- SvxEditViewForwarder& rCacheVF = maTextParagraph.GetEditViewForwarder( sal_True );
- SvxTextForwarder& rCacheTF = maTextParagraph.GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs
+ SvxEditViewForwarder& rCacheVF = mpTextParagraph->GetEditViewForwarder( sal_True );
+ SvxTextForwarder& rCacheTF = mpTextParagraph->GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs
sal_Bool aRetVal;
// save current selection
@@ -704,7 +785,15 @@ namespace accessibility
if( AccessibleTextType::PARAGRAPH == aTextType )
{
- return mpImpl->GetParagraph( aPos.nPara ).getText();
+ // #106393# Special casing one behind last paragraph
+ if( aPos.nIndex == mpImpl->GetParagraph( aPos.nPara ).getCharacterCount() )
+ {
+ return ::rtl::OUString();
+ }
+ else
+ {
+ return mpImpl->GetParagraph( aPos.nPara ).getText();
+ }
}
else
{
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index e49bf55a7995..5c1d0913dbb1 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleTextHelper.cxx,v $
*
- * $Revision: 1.31 $
+ * $Revision: 1.32 $
*
- * last change: $Author: thb $ $Date: 2002-12-12 12:36:51 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -136,6 +136,10 @@
#include <drafts/com/sun/star/accessibility/AccessibleStateType.hpp>
#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
+
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
#include <unotools/accessiblestatesethelper.hxx>
#endif
@@ -192,6 +196,8 @@ namespace accessibility
//
//------------------------------------------------------------------------
+ DBG_NAME( AccessibleTextHelper_Impl )
+
class AccessibleTextHelper_Impl : public SfxListener
{
@@ -215,15 +221,29 @@ namespace accessibility
SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException));
void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException));
- void SetEventSource( const uno::Reference< XAccessible >& rInterface ) { mxFrontEnd = rInterface; }
- uno::Reference< XAccessible > GetEventSource() const { return mxFrontEnd; }
+ void SetEventSource( const uno::Reference< XAccessible >& rInterface )
+ {
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+ mxFrontEnd = rInterface;
+ }
+ uno::Reference< XAccessible > GetEventSource() const
+ {
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+ return mxFrontEnd;
+ }
void SetOffset( const Point& );
- Point GetOffset() const { ::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset ); return aPoint; }
+ Point GetOffset() const
+ {
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+ ::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset );
+ return aPoint;
+ }
void SetStartIndex( sal_Int32 nOffset );
sal_Int32 GetStartIndex() const
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// Strictly correct only with locked solar mutex, // but
// here we rely on the fact that sal_Int32 access is
// atomic
@@ -274,6 +294,8 @@ namespace accessibility
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ int getNotifierClientId() const { return mnNotifierClientId; }
+
// lock solar mutex before
SvxTextForwarder& GetTextForwarder() const SAL_THROW((uno::RuntimeException));
// lock solar mutex before
@@ -321,14 +343,13 @@ namespace accessibility
// whether we (this object) has the focus set (guarded by solar mutex)
sal_Bool mbThisHasFocus;
- // must be before maStateListeners, has to live longer
mutable ::osl::Mutex maMutex;
/// our current offset to the containing shape/cell (guarded by maMutex)
Point maOffset;
- // handles our event listeners (guarded by maMutex)
- ::cppu::OInterfaceContainerHelper maStateListeners;
+ /// client Id from AccessibleEventNotifier
+ int mnNotifierClientId;
};
@@ -349,16 +370,30 @@ namespace accessibility
mbGroupHasFocus( sal_False ),
mbThisHasFocus( sal_False ),
maOffset(0,0),
- maStateListeners( maMutex )
+ // well, that's strictly exception safe, though not really
+ // robust. We rely on the fact that this member is constructed
+ // last, and that the constructor body is empty, thus no
+ // chance for exceptions once the Id is fetched. Nevertheless,
+ // normally should employ RAII here...
+ mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient())
{
+ DBG_CTOR( AccessibleTextHelper_Impl, NULL );
+
+#ifdef DBG_UTIL
+ OSL_TRACE( "AccessibleTextHelper_Impl received ID: %d", mnNotifierClientId );
+#endif
}
AccessibleTextHelper_Impl::~AccessibleTextHelper_Impl()
{
+ DBG_DTOR( AccessibleTextHelper_Impl, NULL );
+
::vos::OGuard aGuard( Application::GetSolarMutex() );
try
{
+ // call Dispose here, too, since we've some resources not
+ // automatically freed otherwise
Dispose();
}
catch( const uno::Exception& ) {}
@@ -366,6 +401,8 @@ namespace accessibility
SvxTextForwarder& AccessibleTextHelper_Impl::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
if( !maEditSource.IsValid() )
throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown edit source")), mxFrontEnd);
@@ -382,6 +419,8 @@ namespace accessibility
SvxViewForwarder& AccessibleTextHelper_Impl::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
if( !maEditSource.IsValid() )
throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown edit source")), mxFrontEnd);
@@ -398,6 +437,8 @@ namespace accessibility
SvxEditViewForwarder& AccessibleTextHelper_Impl::GetEditViewForwarder( sal_Bool bCreate ) const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
if( !maEditSource.IsValid() )
throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown edit source")), mxFrontEnd);
@@ -424,6 +465,8 @@ namespace accessibility
SvxEditSourceAdapter& AccessibleTextHelper_Impl::GetEditSource() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
if( maEditSource.IsValid() )
return maEditSource;
else
@@ -432,6 +475,8 @@ namespace accessibility
sal_Bool AccessibleTextHelper_Impl::IsSelected() const
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
sal_Bool bRet = sal_False;
try
@@ -460,6 +505,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetStartIndex( sal_Int32 nOffset )
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
sal_Int32 nOldOffset( mnStartIndex );
mnStartIndex = nOffset;
@@ -476,6 +523,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetChildFocus( sal_Int32 nChild, sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
if( bHaveFocus )
{
if( mbThisHasFocus )
@@ -501,6 +550,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::ChangeChildFocus( sal_Int32 nNewChild ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
if( mbThisHasFocus )
SetShapeFocus( sal_False );
@@ -512,6 +563,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetShapeFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
sal_Bool bOldFocus( mbThisHasFocus );
mbThisHasFocus = bHaveFocus;
@@ -533,6 +586,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
sal_Bool bOldFocus( mbGroupHasFocus );
mbGroupHasFocus = bHaveFocus;
@@ -558,6 +613,8 @@ namespace accessibility
sal_Bool AccessibleTextHelper_Impl::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
// No locking of solar mutex here, since we rely on the fact
// that sal_Bool access is atomic
return mbThisHasFocus;
@@ -565,6 +622,8 @@ namespace accessibility
sal_Bool AccessibleTextHelper_Impl::IsActive() const SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
try
{
SvxEditSource& rEditSource = GetEditSource();
@@ -586,17 +645,22 @@ namespace accessibility
void AccessibleTextHelper_Impl::UpdateSelection()
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
try
{
ESelection aSelection;
if( GetEditViewForwarder().GetSelection( aSelection ) )
{
- if( !maLastSelection.IsEqual( aSelection ) )
+ if( !maLastSelection.IsEqual( aSelection ) &&
+ aSelection.nEndPara < maParaManager.GetNum() )
{
// #103998# Not that important, changed from assertion to trace
if( mbThisHasFocus )
DBG_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!");
+ USHORT nParas( static_cast< USHORT >( GetTextForwarder().GetParagraphCount() ) );
+
// notify all affected paragraphs (TODO: may be suboptimal,
// since some paragraphs might stay selected)
if( maLastSelection.nStartPara != EE_PARA_NOT_FOUND )
@@ -606,11 +670,14 @@ namespace accessibility
if( mbGroupHasFocus &&
maLastSelection.nEndPara != aSelection.nEndPara )
{
- maParaManager.FireEvent( maLastSelection.nEndPara,
- maLastSelection.nEndPara+1,
- AccessibleEventId::ACCESSIBLE_CARET_EVENT,
- uno::makeAny(static_cast<sal_Int32>(-1)),
- uno::makeAny(static_cast<sal_Int32>(maLastSelection.nEndPos)) );
+ if( maLastSelection.nEndPara < maParaManager.GetNum() )
+ {
+ maParaManager.FireEvent( ::std::min( maLastSelection.nEndPara, nParas ),
+ ::std::min( maLastSelection.nEndPara, nParas )+1,
+ AccessibleEventId::ACCESSIBLE_CARET_EVENT,
+ uno::makeAny(static_cast<sal_Int32>(-1)),
+ uno::makeAny(static_cast<sal_Int32>(maLastSelection.nEndPos)) );
+ }
ChangeChildFocus( aSelection.nEndPara );
@@ -639,6 +706,53 @@ namespace accessibility
DBG_TRACE5("AccessibleTextHelper_Impl::UpdateSelection(): caret changed, Object: %d, New pos: %d, Old pos: %d, New para: %d, Old para: %d",
this, aSelection.nEndPos, maLastSelection.nEndPos, aSelection.nEndPara, maLastSelection.nEndPara);
+ // #107037# notify selection change
+ if( maLastSelection.nStartPara == EE_PARA_NOT_FOUND )
+ {
+ // last selection is undefined
+ if( aSelection.nStartPos != aSelection.nEndPos ||
+ aSelection.nStartPara != aSelection.nEndPara )
+ {
+ // selection was undefined, now is on
+ maParaManager.FireEvent( aSelection.nStartPara,
+ aSelection.nEndPara+1,
+ AccessibleEventId::ACCESSIBLE_SELECTION_EVENT );
+ }
+ }
+ else
+ {
+ // last selection is valid
+ if( (maLastSelection.nStartPos != maLastSelection.nEndPos ||
+ maLastSelection.nStartPara != maLastSelection.nEndPara) &&
+ (aSelection.nStartPos == aSelection.nEndPos &&
+ aSelection.nStartPara == aSelection.nEndPara) )
+ {
+ // selection was on, now is empty
+ maParaManager.FireEvent( ::std::min( maLastSelection.nStartPara, nParas ),
+ ::std::min( maLastSelection.nEndPara, nParas )+1,
+ AccessibleEventId::ACCESSIBLE_SELECTION_EVENT );
+ }
+ else if( (maLastSelection.nStartPos == maLastSelection.nEndPos &&
+ maLastSelection.nStartPara == maLastSelection.nEndPara) &&
+ (aSelection.nStartPos != aSelection.nEndPos ||
+ aSelection.nStartPara != aSelection.nEndPara) )
+ {
+ // selection was empty, now is on
+ maParaManager.FireEvent( aSelection.nStartPara,
+ aSelection.nEndPara+1,
+ AccessibleEventId::ACCESSIBLE_SELECTION_EVENT );
+ }
+ else
+ {
+ // selection was on, now is different
+ maParaManager.FireEvent( ::std::min(aSelection.nStartPara,
+ ::std::min( maLastSelection.nStartPara, nParas )),
+ ::std::max( aSelection.nEndPara,
+ static_cast< USHORT >( ::std::min( maLastSelection.nEndPara, nParas )+1 ) ),
+ AccessibleEventId::ACCESSIBLE_SELECTION_EVENT );
+ }
+ }
+
maLastSelection = aSelection;
}
}
@@ -649,6 +763,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::ShutdownEditSource() SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
// This should only be called with solar mutex locked, i.e. from the main office thread
// This here is somewhat clumsy: As soon as our children have
@@ -674,6 +790,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
// This should only be called with solar mutex locked, i.e. from the main office thread
// shutdown old edit source
@@ -696,6 +814,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::SetOffset( const Point& rPoint )
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
// guard against non-atomic access to maOffset data structure
{
::osl::MutexGuard aGuard( maMutex );
@@ -711,6 +831,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::UpdateVisibleChildren( bool bBroadcastEvents )
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
try
{
SvxTextForwarder& rCacheTF = GetTextForwarder();
@@ -838,6 +960,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::UpdateBoundRect()
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
// send ACCESSIBLE_BOUNDRECT_EVENT to affected children
AccessibleTextHelper_UpdateChildBounds aFunctor( *this );
::std::transform( maParaManager.begin(), maParaManager.end(), maParaManager.begin(), aFunctor );
@@ -874,6 +998,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::ParagraphsMoved( sal_Int32 nFirst, sal_Int32 nMiddle, sal_Int32 nLast )
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
const sal_Int32 nParas = GetTextForwarder().GetParagraphCount();
/* rotate paragraphs
@@ -1020,6 +1146,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::ProcessQueue()
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
// inspect queue for paragraph insert/remove events. If there
// is exactly _one_ of those in the queue, and the number of
// paragraphs has changed by exactly one, use that event to
@@ -1270,6 +1398,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
// precondition: solar mutex locked
DBG_TESTSOLARMUTEX();
@@ -1390,8 +1520,29 @@ namespace accessibility
void AccessibleTextHelper_Impl::Dispose()
{
- // dispose children
- maParaManager.Dispose();
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
+ if( getNotifierClientId() != -1 )
+ {
+ try
+ {
+ // #106234# Unregister from EventNotifier
+ ::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() );
+#ifdef DBG_UTIL
+ OSL_TRACE( "AccessibleTextHelper_Impl disposed ID: %d", mnNotifierClientId );
+#endif
+ }
+ catch( const uno::Exception& ) {}
+
+ mnNotifierClientId = -1;
+ }
+
+ try
+ {
+ // dispose children
+ maParaManager.Dispose();
+ }
+ catch( const uno::Exception& ) {}
// quit listen on stale edit source
if( maEditSource.IsValid() )
@@ -1404,6 +1555,8 @@ namespace accessibility
void AccessibleTextHelper_Impl::FireEvent( const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue ) const
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
// -- object locked --
::osl::ClearableMutexGuard aGuard( maMutex );
@@ -1416,8 +1569,10 @@ namespace accessibility
else
aEvent = AccessibleEventObject(uno::Reference< uno::XInterface >(), nEventId, rNewValue, rOldValue);
- // no locking necessary, OInterfaceIteratorHelper copies listeners if someone removes/adds in between
- // Further locking, actually, might lead to deadlocks, since we're calling out of this object
+ // no locking necessary, FireEvent internally copies listeners
+ // if someone removes/adds in between Further locking,
+ // actually, might lead to deadlocks, since we're calling out
+ // of this object
aGuard.clear();
// -- until here --
@@ -1426,55 +1581,29 @@ namespace accessibility
void AccessibleTextHelper_Impl::FireEvent( const AccessibleEventObject& rEvent ) const
{
- // no locking necessary, OInterfaceIteratorHelper copies listeners if someone removes/adds in between
- // Further locking, actually, might lead to deadlocks, since we're calling out of this object
- ::cppu::OInterfaceIteratorHelper aIter( const_cast< AccessibleTextHelper_Impl* >(this)->maStateListeners );
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
// #102261# Call global queue for focus events
if( rEvent.EventId == AccessibleStateType::FOCUSED )
vcl::unohelper::NotifyAccessibleStateEventGlobally( rEvent );
- while( aIter.hasMoreElements() )
- {
- uno::Reference < XAccessibleEventListener > xListener( aIter.next(), uno::UNO_QUERY );
-
- if( xListener.is() )
- {
- try
- {
- xListener->notifyEvent (rEvent);
- }
- catch( const lang::DisposedException& e )
- {
- // DisposedExceptions from the listener might indicate a
- // broken connection to a different environment.
-
- OSL_ENSURE(e.Context.is(), "AccessibleTextHelper::FireEvent: caught dispose exception with empty Context field");
- // If the exception stems from the listener then remove it
- // from the list of listeners. If the Context field of the
- // exception is empty this is interpreted to indicate the
- // listener as well.
- if (e.Context == xListener
- || !e.Context.is())
- aIter.remove();
- }
- catch( const uno::Exception& e )
- {
- DBG_WARNING1("AccessibleTextHelper::FireEvent: exception %s from listener",
- ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_DONTKNOW ).getStr() );
- }
- }
- }
+ // #106234# Delegate to EventNotifier
+ ::comphelper::AccessibleEventNotifier::addEvent( getNotifierClientId(),
+ rEvent );
}
// XAccessibleContext
sal_Int32 SAL_CALL AccessibleTextHelper_Impl::getAccessibleChildCount() SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
return mnLastVisibleChild - mnFirstVisibleChild + 1;
}
uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleChild( sal_Int32 i ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
i -= GetStartIndex();
if( 0 > i || i >= getAccessibleChildCount() ||
@@ -1493,16 +1622,24 @@ namespace accessibility
void SAL_CALL AccessibleTextHelper_Impl::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
{
- maStateListeners.addInterface( xListener );
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
+ if( getNotifierClientId() != -1 )
+ ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
}
void SAL_CALL AccessibleTextHelper_Impl::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
{
- maStateListeners.removeInterface( xListener );
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
+ if( getNotifierClientId() != -1 )
+ ::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
}
uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleAt( const awt::Point& _aPoint ) SAL_THROW((uno::RuntimeException))
{
+ DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
+
// make given position relative
if( !mxFrontEnd.is() )
throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTextHelper_Impl::getAccessibleAt: frontend invalid")), mxFrontEnd );
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 34b423170b4c..d7499f563317 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ChildrenManagerImpl.cxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: af $ $Date: 2002-12-04 13:00:42 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -73,6 +73,12 @@
#ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_
#include <com/sun/star/view/XSelectionSupplier.hpp>
#endif
+#ifndef _COMPHELPER_UNO3_HXX_
+#include <comphelper/uno3.hxx>
+#endif
+#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_
+#include <com/sun/star/container/XChild.hpp>
+#endif
#include <rtl/ustring.hxx>
#include <tools/debug.hxx>
@@ -84,6 +90,17 @@ using ::com::sun::star::uno::Reference;
namespace accessibility {
+namespace
+{
+void adjustIndexInParentOfShapes(ChildDescriptorListType& _rList)
+{
+ ChildDescriptorListType::iterator aEnd = _rList.end();
+ sal_Int32 i=0;
+ for ( ChildDescriptorListType::iterator aIter = _rList.begin(); aIter != aEnd; ++aIter,++i)
+ aIter->setIndexAtAccessibleShape(i);
+}
+}
+
//===== AccessibleChildrenManager ===========================================
ChildrenManagerImpl::ChildrenManagerImpl (
@@ -97,9 +114,9 @@ ChildrenManagerImpl::ChildrenManagerImpl (
mxShapeList (rxShapeList),
mxParent (rxParent),
maShapeTreeInfo (rShapeTreeInfo),
- mrContext (rContext)
+ mrContext (rContext),
+ mnNewNameIndex(1)
{
- OSL_TRACE ("creating new children manager with %d children", rxShapeList->getCount());
}
@@ -154,7 +171,7 @@ uno::Reference<XAccessible>
"no accessible child with index ") + nIndex,
mxParent);
- return GetChild (maVisibleChildren[nIndex]);
+ return GetChild (maVisibleChildren[nIndex],nIndex);
}
@@ -164,7 +181,7 @@ uno::Reference<XAccessible>
yet in the cache.
*/
uno::Reference<XAccessible>
- ChildrenManagerImpl::GetChild (ChildDescriptor& rChildDescriptor)
+ ChildrenManagerImpl::GetChild (ChildDescriptor& rChildDescriptor,sal_Int32 _nIndex)
throw (::com::sun::star::uno::RuntimeException)
{
if ( ! rChildDescriptor.mxAccessibleShape.is())
@@ -181,15 +198,19 @@ uno::Reference<XAccessible>
AccessibleShapeInfo (
rChildDescriptor.mxShape,
mxParent,
- this),
+ this,
+ mnNewNameIndex++),
maShapeTreeInfo);
rChildDescriptor.mxAccessibleShape = uno::Reference<XAccessible> (
static_cast<uno::XWeak*>(pShape),
uno::UNO_QUERY);
// Now that there is a reference to the new accessible shape we
// can safely call its Init() method.
- if (pShape != NULL)
+ if ( pShape != NULL )
+ {
pShape->Init();
+ pShape->setIndexInParent(_nIndex);
+ }
}
}
@@ -203,10 +224,10 @@ uno::Reference<XAccessible>
ChildrenManagerImpl::GetChild (const uno::Reference<drawing::XShape>& xShape)
throw (uno::RuntimeException)
{
- ChildDescriptorListType::iterator I;
- for (I=maVisibleChildren.begin(); I!=maVisibleChildren.end(); I++)
+ ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
+ for (I = maVisibleChildren.begin(); I != aEnd; ++I)
{
- if (I->mxShape == xShape)
+ if ( I->mxShape.get() == xShape.get() )
return I->mxAccessibleShape;
}
return uno::Reference<XAccessible> ();
@@ -243,22 +264,25 @@ void ChildrenManagerImpl::Update (bool bCreateNewObjectsOnDemand)
// shapes from the current list into the new list.
MergeAccessibilityInformation (aNewChildList);
- // 4. If the visible area has changed then send events that signal a
+ // 4. Replace the current list of visible shapes with the new one. Do
+ // the same with the visible area.
+ {
+ ::osl::MutexGuard aGuard (maMutex);
+ adjustIndexInParentOfShapes(aNewChildList);
+ maVisibleChildren = aNewChildList;
+ maVisibleArea = aVisibleArea;
+ }
+
+ // 5. If the visible area has changed then send events that signal a
// change of their bounding boxes for all shapes that are members of
// both the current and the new list of visible shapes.
if (maVisibleArea != aVisibleArea)
SendVisibleAreaEvents (aNewChildList);
- // 5. If children have to be created immediately and not on demand then
+ // 6. If children have to be created immediately and not on demand then
// create the missing accessible objects now.
if ( ! bCreateNewObjectsOnDemand)
CreateAccessibilityObjects (aNewChildList);
-
- // 6. Replace the current list of visible shapes with the new one. Do
- // the same with the visible area.
- ::osl::MutexGuard aGuard (maMutex);
- maVisibleChildren = aNewChildList;
- maVisibleArea = aVisibleArea;
}
@@ -274,8 +298,8 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea();
// Add the visible shapes for wich the accessible objects already exist.
- AccessibleShapeList::iterator I;
- for (I=maAccessibleShapes.begin(); I!=maAccessibleShapes.end(); ++I)
+ AccessibleShapeList::iterator I,aEnd = maAccessibleShapes.end();
+ for (I=maAccessibleShapes.begin(); I != aEnd; ++I)
{
if (I->is())
{
@@ -298,18 +322,25 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
if (xShapeAccess.is())
{
sal_Int32 nShapeCount = xShapeAccess->getCount();
- for (sal_Int32 i=0; i<nShapeCount; i++)
+ raDescriptorList.reserve( nShapeCount );
+ awt::Point aPos;
+ awt::Size aSize;
+ Rectangle aBoundingBox;
+ uno::Reference<drawing::XShape> xShape;
+ for (sal_Int32 i=0; i<nShapeCount; ++i)
{
- uno::Reference<drawing::XShape> xShape;
xShapeAccess->getByIndex(i) >>= xShape;
- Rectangle aBoundingBox (
- xShape->getPosition().X,
- xShape->getPosition().Y,
- xShape->getPosition().X + xShape->getSize().Width,
- xShape->getPosition().Y + xShape->getSize().Height);
+ aPos = xShape->getPosition();
+ aSize = xShape->getSize();
+
+ aBoundingBox.nLeft = aPos.X;
+ aBoundingBox.nTop = aPos.Y;
+ aBoundingBox.nRight = aPos.X + aSize.Width;
+ aBoundingBox.nBottom = aPos.Y + aSize.Height;
+
// Insert shape if it is visible, i.e. its bounding box overlaps
// the visible area.
- if (aBoundingBox.IsOver (aVisibleArea))
+ if ( aBoundingBox.IsOver (aVisibleArea) )
raDescriptorList.push_back (ChildDescriptor (xShape));
}
}
@@ -324,30 +355,13 @@ void ChildrenManagerImpl::RemoveNonVisibleChildren (
// Iterate over list of formerly visible children and remove those that
// are not visible anymore, i.e. member of the new list of visible
// children.
- ChildDescriptorListType::iterator I;
- for (I=maVisibleChildren.begin(); I!=maVisibleChildren.end(); I++)
+ ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
+ for (I=maVisibleChildren.begin(); I != aEnd; ++I)
{
- if (find (raNewChildList.begin(), raNewChildList.end(), *I) == raNewChildList.end())
+ if (::std::find(raNewChildList.begin(), raNewChildList.end(), *I) == raNewChildList.end())
{
- if (I->mxAccessibleShape.is())
- {
- // Send event that the shape has been removed.
- uno::Any aOldValue;
- aOldValue <<= I->mxAccessibleShape;
- mrContext.CommitChange (
- AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
- uno::Any(),
- aOldValue);
-
- // Dispose and remove the object.
- if (I->mxShape.is())
- {
- Reference<lang::XComponent> xComponent (I->mxAccessibleShape, uno::UNO_QUERY);
- if (xComponent.is())
- xComponent->dispose ();
- I->mxAccessibleShape = NULL;
- }
- }
+ UnregisterAsDisposeListener (I->mxShape);
+ I->disposeAccessibleObject (mrContext);
}
}
}
@@ -359,19 +373,22 @@ void ChildrenManagerImpl::MergeAccessibilityInformation (
ChildDescriptorListType& raNewChildList)
{
ChildDescriptorListType::iterator aOldChildDescriptor;
- ChildDescriptorListType::iterator I;
- for (I=raNewChildList.begin(); I!=raNewChildList.end(); I++)
+ ChildDescriptorListType::iterator I, aEnd = raNewChildList.end();
+ for (I=raNewChildList.begin(); I != aEnd; ++I)
{
aOldChildDescriptor = find (maVisibleChildren.begin(), maVisibleChildren.end(), *I);
// Copy accessible shape if that exists in the old descriptor.
+ bool bRegistrationIsNecessary = true;
if (aOldChildDescriptor != maVisibleChildren.end())
if (aOldChildDescriptor->mxAccessibleShape.is())
{
I->mxAccessibleShape = aOldChildDescriptor->mxAccessibleShape;
- // I->mpAccessibleShape = aOldChildDescriptor->mpAccessibleShape;
I->mbCreateEventPending = false;
+ bRegistrationIsNecessary = false;
}
+ if (bRegistrationIsNecessary)
+ RegisterAsDisposeListener (I->mxShape);
}
}
@@ -381,8 +398,8 @@ void ChildrenManagerImpl::MergeAccessibilityInformation (
void ChildrenManagerImpl::SendVisibleAreaEvents (
ChildDescriptorListType& raNewChildList)
{
- ChildDescriptorListType::iterator I;
- for (I=raNewChildList.begin(); I!=raNewChildList.end(); I++)
+ ChildDescriptorListType::iterator I,aEnd = raNewChildList.end();
+ for (I=raNewChildList.begin(); I != aEnd; ++I)
{
// Tell shape of changed visible area. To do this, fake a
// change of the view forwarder. (Actually we usually get here
@@ -401,20 +418,19 @@ void ChildrenManagerImpl::SendVisibleAreaEvents (
void ChildrenManagerImpl::CreateAccessibilityObjects (
ChildDescriptorListType& raNewChildList)
{
- ChildDescriptorListType::iterator I;
- for (I=raNewChildList.begin(); I!=raNewChildList.end(); I++)
+ ChildDescriptorListType::iterator I, aEnd = raNewChildList.end();
+ sal_Int32 nPos = 0;
+ for ( I = raNewChildList.begin(); I != aEnd; ++I,++nPos)
{
// Create the associated accessible object when the flag says so and
// it does not yet exist.
- if ( ! I->mxAccessibleShape.is())
- GetChild (*I);
- if (I->mxAccessibleShape.is() && I->mbCreateEventPending)
+ if ( ! I->mxAccessibleShape.is() )
+ GetChild (*I,nPos);
+ if ( I->mxAccessibleShape.is() && I->mbCreateEventPending )
{
- uno::Any aNewShape;
- aNewShape <<= I->mxAccessibleShape;
mrContext.CommitChange (
AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
- aNewShape,
+ uno::makeAny(I->mxAccessibleShape),
uno::Any());
}
}
@@ -431,28 +447,40 @@ void ChildrenManagerImpl::AddShape (const Reference<drawing::XShape>& rxShape)
// Test visibility of the shape.
Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea();
+ awt::Point aPos = rxShape->getPosition();
+ awt::Size aSize = rxShape->getSize();
+
Rectangle aBoundingBox (
- rxShape->getPosition().X,
- rxShape->getPosition().Y,
- rxShape->getPosition().X + rxShape->getSize().Width,
- rxShape->getPosition().Y + rxShape->getSize().Height);
- if (aBoundingBox.IsOver (aVisibleArea))
+ aPos.X,
+ aPos.Y,
+ aPos.X + aSize.Width,
+ aPos.Y + aSize.Height);
+ // Add the shape only when it belongs to the list of shapes stored
+ // in mxShapeList (which is either a page or a group shape).
+ Reference<container::XChild> xChild (rxShape, uno::UNO_QUERY);
+ if (xChild.is())
{
- // Add shape to list of visible shapes.
- maVisibleChildren.push_back (ChildDescriptor (rxShape));
-
- // Create accessibility object.
- ChildDescriptorListType::iterator I (maVisibleChildren.end());
- GetChild (*--I);
-
- // Inform listeners about new child.
- uno::Any aNewShape;
- aNewShape <<= I->mxAccessibleShape;
- aGuard.clear();
- mrContext.CommitChange (
- AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
- aNewShape,
- uno::Any());
+ Reference<drawing::XShapes> xParent (xChild->getParent(), uno::UNO_QUERY);
+ if (xParent == mxShapeList)
+ if (aBoundingBox.IsOver (aVisibleArea))
+ {
+ // Add shape to list of visible shapes.
+ maVisibleChildren.push_back (ChildDescriptor (rxShape));
+
+ // Create accessibility object.
+ ChildDescriptor& rDescriptor = maVisibleChildren.back();
+ GetChild (rDescriptor, maVisibleChildren.size()-1);
+
+ // Inform listeners about new child.
+ uno::Any aNewShape;
+ aNewShape <<= rDescriptor.mxAccessibleShape;
+ aGuard.clear();
+ mrContext.CommitChange (
+ AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
+ aNewShape,
+ uno::Any());
+ RegisterAsDisposeListener (rDescriptor.mxShape);
+ }
}
}
}
@@ -473,23 +501,19 @@ void ChildrenManagerImpl::RemoveShape (const Reference<drawing::XShape>& rxShape
if (I != maVisibleChildren.end())
{
// Remove descriptor from that list.
- maVisibleChildren.erase (I);
Reference<XAccessible> xAccessibleShape (I->mxAccessibleShape);
I->mxAccessibleShape = NULL;
+ maVisibleChildren.erase (I);
- // Send event that the shape has been removed.
- uno::Any aOldValue;
- aOldValue <<= xAccessibleShape;
- aGuard.clear();
- mrContext.CommitChange (
- AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
- uno::Any(),
- aOldValue);
+ adjustIndexInParentOfShapes(maVisibleChildren);
- // Dispose and remove the object.
- Reference<lang::XComponent> xComponent (xAccessibleShape, uno::UNO_QUERY);
- // if (xComponent.is())
- // xComponent->dispose ();
+ UnregisterAsDisposeListener (I->mxShape);
+ // Dispose the accessible object.
+ I->disposeAccessibleObject (mrContext);
+
+ // Now we can safely remove the child descriptor and thus
+ // invalidate the iterator.
+ maVisibleChildren.erase (I);
}
}
}
@@ -519,33 +543,16 @@ void ChildrenManagerImpl::ClearAccessibleShapeList (void)
{
// Clear the list of visible accessible objects. Objects not created on
// demand for XShapes are treated below.
- ChildDescriptorListType::iterator I;
- for (I=maVisibleChildren.begin(); I!=maVisibleChildren.end(); I++)
- if (I->mxAccessibleShape.is() && I->mxShape.is())
- {
- uno::Any aShape;
- aShape <<= I->mxAccessibleShape;
- mrContext.CommitChange (
- AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
- uno::Any(),
- aShape);
-
- // Dispose the object.
- Reference<lang::XComponent> xComponent (
- I->mxAccessibleShape, uno::UNO_QUERY);
- if (xComponent.is())
- xComponent->dispose ();
-
- // Reset the reference to the accessible object in any case. If
- // it has not been disposed above it will be soon.
- I->mxAccessibleShape = NULL;
- }
+ ChildDescriptorListType::iterator I,aEnd = maVisibleChildren.end();
+ for (I=maVisibleChildren.begin(); I != aEnd; ++I)
+ if ( I->mxAccessibleShape.is() && I->mxShape.is() )
+ I->disposeAccessibleObject(mrContext);
maVisibleChildren.clear ();
// Dispose all objects in the accessible shape list.
- AccessibleShapeList::iterator J;
- for (J=maAccessibleShapes.begin(); J!=maAccessibleShapes.end(); J++)
+ AccessibleShapeList::iterator J,aEnd2 = maAccessibleShapes.end();
+ for (J=maAccessibleShapes.begin(); J != aEnd2; ++J)
if (J->is())
{
mrContext.CommitChange (
@@ -554,9 +561,7 @@ void ChildrenManagerImpl::ClearAccessibleShapeList (void)
uno::makeAny (*J));
// Dispose the object.
- Reference<lang::XComponent> xComponent (*J, uno::UNO_QUERY);
- if (xComponent.is())
- xComponent->dispose ();
+ ::comphelper::disposeComponent(*J);
}
maAccessibleShapes.clear ();
}
@@ -635,6 +640,23 @@ void SAL_CALL
{
maShapeTreeInfo.SetController (NULL);
}
+
+ // Handle disposing UNO shapes.
+ else
+ {
+ Reference<drawing::XShape> xShape (rEventObject.Source, uno::UNO_QUERY);
+
+ // Find the descriptor for the given shape.
+ ChildDescriptorListType::iterator I (
+ find (maVisibleChildren.begin(), maVisibleChildren.end(),
+ ChildDescriptor (xShape)));
+ if (I != maVisibleChildren.end())
+ {
+ // Clear the descriptor.
+ I->disposeAccessibleObject (mrContext);
+ I->mxShape = NULL;
+ }
+ }
}
@@ -679,8 +701,6 @@ void SAL_CALL
void SAL_CALL ChildrenManagerImpl::disposing (void)
{
- OSL_TRACE ("ChildrenManagerImpl::disposing()");
-
// Remove from broadcasters.
Reference<view::XSelectionSupplier> xSelectionSupplier (
maShapeTreeInfo.GetController(), uno::UNO_QUERY);
@@ -704,7 +724,8 @@ long int ChildrenManagerImpl::GetChildIndex (const ::com::sun::star::uno::Refere
throw (::com::sun::star::uno::RuntimeException)
{
::osl::MutexGuard aGuard (maMutex);
- for (unsigned long i=0; i<maVisibleChildren.size(); i++)
+ sal_Int32 nCount = maVisibleChildren.size();
+ for (sal_Int32 i=0; i < nCount; ++i)
{
// Is this equality comparison valid?
if (maVisibleChildren[i].mxAccessibleShape == xChild)
@@ -727,9 +748,10 @@ void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType,
else
{
::osl::MutexGuard aGuard (maMutex);
- for (unsigned long i=0; i<maVisibleChildren.size(); i++)
+ ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
+ for (I=maVisibleChildren.begin(); I != aEnd; ++I)
{
- AccessibleShape* pShape = maVisibleChildren[i].GetAccessibleShape();
+ AccessibleShape* pShape = I->GetAccessibleShape();
if (pShape != NULL)
pShape->ViewForwarderChanged (aChangeType, pViewForwarder);
}
@@ -764,8 +786,8 @@ sal_Bool ChildrenManagerImpl::ReplaceChild (
// it. Otherwise the child to replace is either not in the list or has
// not ye been created (and is therefore not in the list, too) and a
// replacement is not necessary.
- ChildDescriptorListType::iterator I;
- for (I=maVisibleChildren.begin(); I!=maVisibleChildren.end(); I++)
+ ChildDescriptorListType::iterator I,aEnd = maVisibleChildren.end();
+ for (I=maVisibleChildren.begin(); I != aEnd; ++I)
{
if (I->GetAccessibleShape() == pCurrentChild)
{
@@ -829,8 +851,8 @@ void ChildrenManagerImpl::UpdateSelection (void)
AccessibleShape* pCurrentlyFocusedShape = NULL;
AccessibleShape* pNewFocusedShape = NULL;
- ChildDescriptorListType::iterator I;
- for (I=maVisibleChildren.begin(); I!=maVisibleChildren.end(); I++)
+ ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
+ for (I=maVisibleChildren.begin(); I != aEnd; ++I)
{
AccessibleShape* pAccessibleShape = I->GetAccessibleShape();
if (I->mxAccessibleShape.is() && I->mxShape.is() && pAccessibleShape!=NULL)
@@ -889,6 +911,29 @@ void ChildrenManagerImpl::UpdateSelection (void)
pNewFocusedShape->SetState (AccessibleStateType::FOCUSED);
}
}
+// -----------------------------------------------------------------------------
+
+
+void ChildrenManagerImpl::RegisterAsDisposeListener (
+ const Reference<drawing::XShape>& xShape)
+{
+ Reference<lang::XComponent> xComponent (xShape, uno::UNO_QUERY);
+ if (xComponent.is())
+ xComponent->addEventListener (
+ static_cast<document::XEventListener*>(this));
+}
+
+
+
+
+void ChildrenManagerImpl::UnregisterAsDisposeListener (
+ const Reference<drawing::XShape>& xShape)
+{
+ Reference<lang::XComponent> xComponent (xShape, uno::UNO_QUERY);
+ if (xComponent.is())
+ xComponent->removeEventListener (
+ static_cast<document::XEventListener*>(this));
+}
@@ -917,42 +962,48 @@ ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShap
-AccessibleShape* ChildDescriptor::GetAccessibleShape (void) const
+ChildDescriptor::~ChildDescriptor (void)
{
- return static_cast<AccessibleShape*> (mxAccessibleShape.get());
}
-/** Compare two child descriptors. Take into account that a child
- descriptor may be based on a UNO shape or, already, on an accessible
- shape.
- */
-bool ChildDescriptor::operator == (const ChildDescriptor& aDescriptor)
+AccessibleShape* ChildDescriptor::GetAccessibleShape (void) const
{
- if (mxShape.get() == aDescriptor.mxShape.get())
- if (mxShape.is())
- return true;
- else if (mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get())
- return true;
-
- return false;
+ return static_cast<AccessibleShape*> (mxAccessibleShape.get());
+}
+// -----------------------------------------------------------------------------
+void ChildDescriptor::setIndexAtAccessibleShape(sal_Int32 _nIndex)
+{
+ AccessibleShape* pShape = GetAccessibleShape();
+ if ( pShape )
+ pShape->setIndexInParent(_nIndex);
}
+// -----------------------------------------------------------------------------
-/** The ordering defined by this operator is only used in order to be able
- to put child descriptors in some STL containers. The ordering itself is
- not so important, its 'features' are not used.
-*/
-bool ChildDescriptor::operator < (const ChildDescriptor& aDescriptor)
+void ChildDescriptor::disposeAccessibleObject (AccessibleContextBase& rParent)
{
- if (mxShape.get() < aDescriptor.mxShape.get())
- return true;
- else
- return false;
+ if (mxAccessibleShape.is())
+ {
+ // Send event that the shape has been removed.
+ uno::Any aOldValue;
+ aOldValue <<= mxAccessibleShape;
+ rParent.CommitChange (
+ AccessibleEventId::ACCESSIBLE_CHILD_EVENT,
+ uno::Any(),
+ aOldValue);
+
+ // Dispose and remove the object.
+ Reference<lang::XComponent> xComponent (mxAccessibleShape, uno::UNO_QUERY);
+ if (xComponent.is())
+ xComponent->dispose ();
+
+ mxAccessibleShape = NULL;
+ }
}
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index ac3896179260..648cfc8f6de9 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ChildrenManagerImpl.hxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: af $ $Date: 2002-12-04 13:01:07 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -105,6 +105,7 @@ namespace accessibility {
class AccessibleShape;
class ChildDescriptor; // See below for declaration.
+typedef ::std::vector<ChildDescriptor> ChildDescriptorListType;
// Re-using MutexOwner class defined in AccessibleContextBase.hxx
@@ -131,6 +132,10 @@ class ChildDescriptor; // See below for declaration.
shapes is taken from the view forwarder. Thus, to signal a change of
the visible area call <member>ViewForwarderChanged</member>.</p>
+ <p>The children manager adds itself as disposing() listener at every UNO
+ shape it creates an accessible object for so that when the UNO shape
+ passes away it can dispose() the associated accessible object.</p>
+
@see ChildrenManager
*/
class ChildrenManagerImpl
@@ -204,6 +209,8 @@ public:
@param aChildDescriptor
This object contains references to the original shape and its
associated accessible object.
+ @param _nIndex
+ The index which will be used in getAccessibleIndexInParent of the accessible shape.
@return
Returns a reference to the requested accessible child. This
reference is empty if it has not been possible to create the
@@ -211,7 +218,7 @@ public:
*/
::com::sun::star::uno::Reference<
::drafts::com::sun::star::accessibility::XAccessible>
- GetChild (ChildDescriptor& aChildDescriptor)
+ GetChild (ChildDescriptor& aChildDescriptor,sal_Int32 _nIndex)
throw (::com::sun::star::uno::RuntimeException);
/** Return the requested accessible child given a shape. This method
@@ -352,7 +359,6 @@ protected:
between updates (i.e. complete rebuilds of the list) and allows a
fast (constant time) access to its elements for given indices.</p>
*/
- typedef ::std::vector<ChildDescriptor> ChildDescriptorListType;
ChildDescriptorListType maVisibleChildren;
/** The original list of UNO shapes. The visible shapes are inserted
@@ -407,6 +413,12 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
private:
+ /** Names of new accessible objects are disambiguated with this index.
+ It gets increased every time a new object is created and (at the
+ moment) never reset.
+ */
+ sal_Int32 mnNewNameIndex;
+
// Don't use the copy constructor or the assignment operator. They are
// not implemented (and are not intended to be).
ChildrenManagerImpl (const ChildrenManagerImpl&);
@@ -470,6 +482,22 @@ private:
*/
void RemoveShape (const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape>& xShape);
+
+ /** Add the children manager as dispose listener at the given shape so
+ that the associated accessible object can be disposed when the shape
+ is disposed.
+ @param xShape
+ Register at this shape as dispose listener.
+ */
+ void RegisterAsDisposeListener (const ::com::sun::star::uno::Reference<
+ ::com::sun::star::drawing::XShape>& xShape);
+
+ /** Remove the children manager as dispose listener at the given shape
+ @param xShape
+ Unregister at this shape as dispose listener.
+ */
+ void UnregisterAsDisposeListener (const ::com::sun::star::uno::Reference<
+ ::com::sun::star::drawing::XShape>& xShape);
};
@@ -509,6 +537,12 @@ public:
*/
AccessibleShape* GetAccessibleShape (void) const;
+ /** set the index _nIndex at the accessible shape
+ @param _nIndex
+ The new index in parent.
+ */
+ void setIndexAtAccessibleShape(sal_Int32 _nIndex);
+
/** This flag is set during the visibility calculation and indicates
that at one time in this process an event is sent that informs the
listners of the creation of a new accessible object. This flags is
@@ -529,9 +563,33 @@ public:
explicit ChildDescriptor (const ::com::sun::star::uno::Reference<
::drafts::com::sun::star::accessibility::XAccessible>& rxAccessibleShape);
+ ~ChildDescriptor (void);
- bool operator == (const ChildDescriptor& aDescriptor);
- bool operator < (const ChildDescriptor& aDescriptor);
+ /** Dispose the accessible object of this descriptor. If that object
+ does not exist then do nothing.
+ @param rParent
+ The parent of the accessible object to dispose. A child event
+ is sent in its name.
+ */
+ void disposeAccessibleObject (AccessibleContextBase& rParent);
+
+ /** Compare two child descriptors. Take into account that a child
+ descriptor may be based on a UNO shape or, already, on an accessible
+ shape.
+ */
+ inline bool operator == (const ChildDescriptor& aDescriptor)
+ {
+ return (this == &aDescriptor || (mxShape.get() == aDescriptor.mxShape.get() ) && ( mxShape.is() || mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get()));
+ }
+
+ /** The ordering defined by this operator is only used in order to be able
+ to put child descriptors in some STL containers. The ordering itself is
+ not so important, its 'features' are not used.
+ */
+ inline bool operator < (const ChildDescriptor& aDescriptor)
+ {
+ return (mxShape.get() < aDescriptor.mxShape.get());
+ }
};
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index ea903d318c02..33a67510f816 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: GraphCtlAccessibleContext.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: af $ $Date: 2002-10-23 09:45:49 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -104,6 +104,15 @@
#ifndef _SFXSMPLHINT_HXX
#include <svtools/smplhint.hxx>
#endif
+#ifndef _TOOLKIT_HELPER_CONVERT_HXX_
+#include <toolkit/helper/convert.hxx>
+#endif
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
//===== local includes ========================================================
@@ -160,7 +169,8 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
SvxGraphCtrlAccessibleContext_Base( m_aMutex ),
mxParent( rxParent ),
mpControl( &rRepr ),
- mbDisposed( sal_False )
+ mbDisposed( sal_False ),
+ mnClientId( 0 )
{
mpModel = mpControl->GetSdrModel();
mpPage = (SdrPage*)mpModel->GetPage( 0 );
@@ -382,18 +392,8 @@ void SvxGraphCtrlAccessibleContext::CommitChange (
/** sends an AccessibleEventObject to all added XAccessibleEventListeners */
void SvxGraphCtrlAccessibleContext::FireEvent (const AccessibleEventObject& aEvent)
{
- AccessibleEventListenerListType::iterator I;
-
- for (I=mxAccessibleEventListeners.begin(); I!=mxAccessibleEventListeners.end(); I++)
- {
- if ((*I).is())
- {
- OSL_TRACE ("Fireing event.");
- (*I)->notifyEvent (aEvent);
- }
- else
- OSL_TRACE ("listener invalid.");
- }
+ if (mnClientId)
+ comphelper::AccessibleEventNotifier::addEvent( mnClientId, aEvent );
}
//-----------------------------------------------------------------------------
@@ -526,13 +526,12 @@ lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( Il
void SAL_CALL SvxGraphCtrlAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
-
- if( xListener.is() )
+ if (xListener.is())
{
- mxAccessibleEventListeners.insert (
- mxAccessibleEventListeners.begin(),
- xListener);
+ OGuard aGuard( Application::GetSolarMutex() );
+ if (!mnClientId)
+ mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
+ comphelper::AccessibleEventNotifier::addEventListener( mnClientId, xListener );
}
}
@@ -541,10 +540,21 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addEventListener( const Reference<
void SAL_CALL SvxGraphCtrlAccessibleContext::removeEventListener( const Reference< XAccessibleEventListener >& xListener )
throw( RuntimeException )
{
- OGuard aGuard( Application::GetSolarMutex() );
+ if (xListener.is())
+ {
+ OGuard aGuard( Application::GetSolarMutex() );
- if( xListener.is() )
- mxAccessibleEventListeners.erase (xListener);
+ sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener );
+ if ( !nListenerCount )
+ {
+ // no listeners anymore
+ // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+ // and at least to us not firing any events anymore, in case somebody calls
+ // NotifyAccessibleEvent, again
+ comphelper::AccessibleEventNotifier::revokeClient( mnClientId );
+ mnClientId = 0;
+ }
+ }
}
//-----------------------------------------------------------------------------
@@ -604,7 +614,8 @@ Any SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleKeyBinding() throw( Run
sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void)
throw (::com::sun::star::uno::RuntimeException)
{
- UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
+ svtools::ColorConfig aColorConfig;
+ UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
return static_cast<sal_Int32>(nColor);
}
@@ -651,8 +662,8 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService
{
Sequence< OUString > aSNs( 2 );
- aSNs[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.accessibility.AccessibleContext" ) );
- aSNs[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.accessibility.AccessibleComponent" ) );
+ aSNs[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.accessibility.Accessible" ) );
+ aSNs[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.accessibility.AccessibleContext" ) );
return aSNs;
}
@@ -824,64 +835,39 @@ void SvxGraphCtrlAccessibleContext::setDescription( const OUString& rDescr )
void SAL_CALL SvxGraphCtrlAccessibleContext::disposing()
{
- {
- OGuard aGuard( Application::GetSolarMutex() );
-
- if( mbDisposed )
- return;
-
- mbDisposed = sal_True;
-
- mpControl = NULL; // object dies with representation
- mpView = NULL;
- mpPage = NULL;
+ OGuard aGuard( Application::GetSolarMutex() );
- {
- ShapesMapType::iterator I;
+ if( mbDisposed )
+ return;
- for (I=mxShapes.begin(); I!=mxShapes.end(); I++)
- {
- XAccessible* pAcc = (*I).second;
- Reference< XComponent > xComp( pAcc, UNO_QUERY );
- if( xComp.is() )
- xComp->dispose();
+ mbDisposed = sal_True;
- (*I).second->release();
- }
+ mpControl = NULL; // object dies with representation
+ mpView = NULL;
+ mpPage = NULL;
- mxShapes.clear();
- }
+ {
+ ShapesMapType::iterator I;
+ for (I=mxShapes.begin(); I!=mxShapes.end(); I++)
{
+ XAccessible* pAcc = (*I).second;
+ Reference< XComponent > xComp( pAcc, UNO_QUERY );
+ if( xComp.is() )
+ xComp->dispose();
- lang::EventObject aEvent;
- aEvent.Source = static_cast< cppu::OWeakObject* >( this );
-
- EventListenerListType::iterator I;
-
- for (I=mxEventListeners.begin(); I!=mxEventListeners.end(); I++)
- {
- if ((*I).is())
- {
- OSL_TRACE ("Fireing event.");
- try
- {
- (*I)->disposing( aEvent );
- }
- catch ( RuntimeException & )
- {
- // be robust, if e.g. a remote bridge has disposed already.
- // there is no way, to delegate the error to the caller :o(.
- }
- }
- else
- OSL_TRACE ("listener invalid.");
- }
+ (*I).second->release();
}
+ mxShapes.clear();
}
- CommitChange( AccessibleEventId::ACCESSIBLE_STATE_EVENT, Any(), Any() );
+ // Send a disposing to all listeners.
+ if ( mnClientId )
+ {
+ comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this );
+ mnClientId = 0;
+ }
}
//-----------------------------------------------------------------------------
@@ -894,21 +880,38 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( R
throw DisposedException();
return Rectangle(
- mpControl->GetParent()->OutputToAbsoluteScreenPixel(
+ mpControl->GetAccessibleParentWindow()->OutputToAbsoluteScreenPixel(
mpControl->GetPosPixel() ),
mpControl->GetSizePixel() );
}
//-----------------------------------------------------------------------------
+/** Calculate the relative coordinates of the bounding box as difference
+ between the absolute coordinates of the bounding boxes of this control
+ and its parent in the accessibility tree.
+*/
Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException )
{
OGuard aGuard( Application::GetSolarMutex() );
- if( NULL == mpControl )
+ Rectangle aBounds ( 0, 0, 0, 0 );
+
+ Window* pWindow = mpControl;
+ if (pWindow != NULL)
+ {
+ aBounds = pWindow->GetWindowExtentsRelative (NULL);
+ Window* pParent = pWindow->GetAccessibleParentWindow();
+ if (pParent != NULL)
+ {
+ Rectangle aParentRect = pParent->GetWindowExtentsRelative (NULL);
+ aBounds -= aParentRect.TopLeft();
+ }
+ }
+ else
throw DisposedException();
- return Rectangle( mpControl->GetPosPixel(), mpControl->GetSizePixel() );
+ return aBounds;
}
//-----------------------------------------------------------------------------
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 1bca3f8da045..0a62f5c5ab81 100755
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ShapeTypeHandler.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: af $ $Date: 2002-06-27 12:06:13 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -132,8 +132,8 @@ ShapeTypeId ShapeTypeHandler::GetTypeId (const OUString& aServiceName) const
tServiceNameToSlotId::iterator I (maServiceNameToSlotId.find (aServiceName));
if (I != maServiceNameToSlotId.end())
{
- long nSlotId = maServiceNameToSlotId[aServiceName];
- return maShapeTypeDescriptorList[nSlotId].mnShapeTypeId;
+ // long nSlotId = maServiceNameToSlotId[aServiceName];
+ return maShapeTypeDescriptorList[I->second].mnShapeTypeId;
}
else
return -1;
@@ -274,7 +274,7 @@ long ShapeTypeHandler::GetSlotId (const OUString& aServiceName) const
{
tServiceNameToSlotId::iterator I (maServiceNameToSlotId.find (aServiceName));
if (I != maServiceNameToSlotId.end())
- return maServiceNameToSlotId[aServiceName];
+ return I->second;
else
return 0;
}
diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src
index 939699c1d903..071196ca90a4 100644
--- a/svx/source/accessibility/accessibility.src
+++ b/svx/source/accessibility/accessibility.src
@@ -2,9 +2,9 @@
*
* $RCSfile: accessibility.src,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: kz $ $Date: 2002-12-05 10:23:11 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -96,18 +96,18 @@ String RID_SVXSTR_A11Y_TEXT_COLOR
Text[ russian ] = "text color";
Text[ greek ] = "text color";
Text[ dutch ] = "text color";
- Text[ french ] = "Couleur du texte";
- Text[ spanish ] = "Color de texto";
+ Text[ french ] = "Couleur de police";
+ Text[ spanish ] = "Color de fuente";
Text[ finnish ] = "text color";
- Text[ italian ] = "Colore testo";
+ Text[ italian ] = "Colore carattere";
Text[ danish ] = "text color";
- Text[ swedish ] = "Textfrg";
+ Text[ swedish ] = "Teckenfrg";
Text[ polish ] = "text color";
Text[ portuguese_brazilian ] = "Cor da Fonte";
- Text[ japanese ] = "テキストの色";
- Text[ korean ] = "텍스트 색상";
+ Text[ japanese ] = "フォントの色";
+ Text[ korean ] = "글꼴 색상";
Text[ chinese_simplified ] = "文字颜色";
- Text[ chinese_traditional ] = "文字顏色";
+ Text[ chinese_traditional ] = "字型顏色";
Text[ turkish ] = "text color";
Text[ arabic ] = "text color";
Text[ catalan ] = "Color del text";
@@ -131,7 +131,7 @@ String RID_SVXSTR_A11Y_BACKGROUND_COLOR
Text[ polish ] = "background color";
Text[ portuguese_brazilian ] = "background color";
Text[ japanese ] = "背景色";
- Text[ korean ] = "배경색";
+ Text[ korean ] = "배경 색상";
Text[ chinese_simplified ] = "背景颜色";
Text[ chinese_traditional ] = "背景顔色";
Text[ turkish ] = "background color";
@@ -341,7 +341,7 @@ String RID_SVXSTR_A11Y_AND
Text[ polish ] = "and";
Text[ portuguese_brazilian ] = "and";
Text[ japanese ] = "および";
- Text[ korean ] = "기타 대상";
+ Text[ korean ] = "와(과)";
Text[ chinese_simplified ] = "和";
Text[ chinese_traditional ] = "和";
Text[ turkish ] = "and";
@@ -370,7 +370,7 @@ String RID_SVXSTR_RECTCTL_ACC_CORN_NAME
Text[ polish ] = "Corner control";
Text[ portuguese_brazilian ] = "Corner control";
Text[ japanese ] = "コーナーコントロール";
- Text[ korean ] = "코너 조정";
+ Text[ korean ] = "모서리 컨트롤";
Text[ chinese_simplified ] = "角控制";
Text[ chinese_traditional ] = "角控制項";
Text[ turkish ] = "Corner control";
@@ -422,7 +422,7 @@ String RID_SVXSTR_RECTCTL_ACC_ANGL_NAME
Text[ polish ] = "Angle control";
Text[ portuguese_brazilian ] = "Angle control";
Text[ japanese ] = "アングルコントロール";
- Text[ korean ] = "각도 조정";
+ Text[ korean ] = "각도 컨트롤";
Text[ chinese_simplified ] = "角度控制";
Text[ chinese_traditional ] = "角度控制項";
Text[ turkish ] = "Angle control";
@@ -501,7 +501,7 @@ String RID_SVXSTR_RECTCTL_ACC_CHLD_MT
Text[ polish ] = "Top middle";
Text[ portuguese_brazilian ] = "Top middle";
Text[ japanese ] = "中央上";
- Text[ korean ] = "중간 위";
+ Text[ korean ] = "위 가운데";
Text[ chinese_simplified ] = "中上";
Text[ chinese_traditional ] = "中上";
Text[ turkish ] = "Top middle";
@@ -579,7 +579,7 @@ String RID_SVXSTR_RECTCTL_ACC_CHLD_MM
Text[ polish ] = "Center";
Text[ portuguese_brazilian ] = "Center";
Text[ japanese ] = "中央";
- Text[ korean ] = "중간";
+ Text[ korean ] = "가운데";
Text[ chinese_simplified ] = "中";
Text[ chinese_traditional ] = "中";
Text[ turkish ] = "Center";
@@ -657,7 +657,7 @@ String RID_SVXSTR_RECTCTL_ACC_CHLD_MB
Text[ polish ] = "Bottom middle";
Text[ portuguese_brazilian ] = "Bottom middle";
Text[ japanese ] = "中央下";
- Text[ korean ] = "중간 아래";
+ Text[ korean ] = "아래 가운데";
Text[ chinese_simplified ] = "中下";
Text[ chinese_traditional ] = "中下";
Text[ turkish ] = "Bottom middle";
@@ -919,7 +919,7 @@ String RID_SVXSTR_GRAPHCTRL_ACC_NAME
Text[ polish ] = "Graph control";
Text[ portuguese_brazilian ] = "Graph control";
Text[ japanese ] = "輪郭コントロール";
- Text[ korean ] = "윤곽 조정";
+ Text[ korean ] = "윤곽 컨트롤";
Text[ chinese_simplified ] = "轮廓控制";
Text[ chinese_traditional ] = "輪廓控製項";
Text[ turkish ] = "Graph control";
@@ -1026,7 +1026,7 @@ String RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION
Text[ polish ] = "Image bullet in paragraph: $(ARG)";
Text[ portuguese_brazilian ] = "Image bullet in paragraph: $(ARG)";
Text[ japanese ] = "段落の箇条書きシンボル: $(ARG)";
- Text[ korean ] = "단락 내 글머리기호 이미지: $(ARG)";
+ Text[ korean ] = "단락 내 글머리 기호 이미지: $(ARG)";
Text[ chinese_simplified ] = "段落之中的图形式项目符号:$(ARG)";
Text[ chinese_traditional ] = "段落之中的圖形項目符號:$(ARG)";
Text[ turkish ] = "Image bullet in paragraph: $(ARG)";
@@ -1053,7 +1053,7 @@ String RID_SVXSTR_A11Y_IMAGEBULLET_NAME
Text[ polish ] = "Image bullet";
Text[ portuguese_brazilian ] = "Image bullet";
Text[ japanese ] = "箇条書きシンボル";
- Text[ korean ] = "글머리기호 이미지";
+ Text[ korean ] = "글머리 기호 이미지";
Text[ chinese_simplified ] = "图形式的项目符号";
Text[ chinese_traditional ] = "圖形式的項目符號";
Text[ turkish ] = "Image bullet";
@@ -1080,7 +1080,7 @@ String RID_SVXSTR_CHARACTER_SELECTION
Text[ polish ] = "Special character selection";
Text[ portuguese_brazilian ] = "Special character selection";
Text[ japanese ] = "記号と特殊文字の選択";
- Text[ korean ] = "특수 문자 선택";
+ Text[ korean ] = "특수문자 선택";
Text[ chinese_simplified ] = "选择特殊字符";
Text[ chinese_traditional ] = "選擇特殊字元";
Text[ turkish ] = "Special character selection";
@@ -1107,7 +1107,7 @@ String RID_SVXSTR_CHAR_SEL_DESC
Text[ polish ] = "Select special characters in this area.";
Text[ portuguese_brazilian ] = "Select special characters in this area.";
Text[ japanese ] = "この範囲で記号と特殊文字を選択します。";
- Text[ korean ] = "이 영역에서 특수 문자를 선택하십시오.";
+ Text[ korean ] = "이 영역에서 특수문자를 선택하십시오.";
Text[ chinese_simplified ] = "在这个区域内选择特殊字符。";
Text[ chinese_traditional ] = "在這個區域選擇特殊字元。";
Text[ turkish ] = "Select special characters in this area.";
@@ -1144,3 +1144,8 @@ String RID_SVXSTR_CHARACTER_CODE
Text[ thai ] = "Character code ";
};
+
+
+
+
+
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 1b07d1a36a0a..e1a45f81ea00 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: charmapacc.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: sab $ $Date: 2002-11-15 09:50:54 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -758,7 +758,7 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole()
c_Shifted >>= 4;
}
if( c < 256 )
- sprintf( buf+6, " (%d)", c );
+ snprintf( buf+6, 10, " (%d)", c );
sDescription.AppendAscii(buf);
return sDescription;
diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk
index 87c4c16cee8c..42ecde44c232 100755
--- a/svx/source/accessibility/makefile.mk
+++ b/svx/source/accessibility/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.16 $
+# $Revision: 1.17 $
#
-# last change: $Author: thb $ $Date: 2002-12-12 12:36:51 $
+# last change: $Author: hr $ $Date: 2003-03-27 15:00:34 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -99,6 +99,7 @@ CXXFILES = \
ShapeTypeHandler.cxx \
SvxShapeTypes.cxx \
AccessibleControlShape.cxx \
+ accessiblewrapper.cxx
SLOFILES = \
$(SLO)$/charmapacc.obj \
@@ -123,7 +124,8 @@ SLOFILES = \
$(SLO)$/AccessibleImageBullet.obj \
$(SLO)$/ShapeTypeHandler.obj \
$(SLO)$/SvxShapeTypes.obj \
- $(SLO)$/AccessibleControlShape.obj
+ $(SLO)$/AccessibleControlShape.obj \
+ $(SLO)$/accessiblewrapper.obj
SRS2NAME = accessibility
SRC2FILES = accessibility.src
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index a57284db8092..cc115dec06ef 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: svxrectctaccessiblecontext.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: os $ $Date: 2002-10-29 15:18:43 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -118,6 +118,9 @@
#ifndef _SVX_DIALMGR_HXX
#include <dialmgr.hxx>
#endif
+#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER
+#include <comphelper/accessibleeventnotifier.hxx>
+#endif
using namespace ::cppu;
@@ -224,9 +227,9 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
SvxRectCtlAccessibleContext_Base( m_aMutex ),
mxParent( rxParent ),
mpRepr( &rRepr ),
- mpEventListeners( NULL ),
mnSelectedChild( NOCHILDSELECTED ),
- mbAngleMode( rRepr.GetNumOfChilds() == 8 )
+ mbAngleMode( rRepr.GetNumOfChilds() == 8 ),
+ mnClientId( 0 )
{
DBG_CTOR( SvxRectCtlAccessibleContext, NULL );
@@ -491,23 +494,33 @@ lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale( void ) throw( Ille
void SAL_CALL SvxRectCtlAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
throw( RuntimeException )
{
- if( xListener.is() )
+ if (xListener.is())
{
::osl::MutexGuard aGuard( m_aMutex );
-
- if( !mpEventListeners )
- mpEventListeners = new cppu::OInterfaceContainerHelper( m_aMutex );
-
- mpEventListeners->addInterface( xListener );
+ if (!mnClientId)
+ mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
+ comphelper::AccessibleEventNotifier::addEventListener( mnClientId, xListener );
}
}
void SAL_CALL SvxRectCtlAccessibleContext::removeEventListener( const Reference< XAccessibleEventListener >& xListener )
throw( RuntimeException )
{
- ::osl::MutexGuard aGuard( m_aMutex );
- if( xListener.is() && mpEventListeners )
- mpEventListeners->removeInterface( xListener );
+ if (xListener.is())
+ {
+ ::osl::MutexGuard aGuard( m_aMutex );
+
+ sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener );
+ if ( !nListenerCount )
+ {
+ // no listeners anymore
+ // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+ // and at least to us not firing any events anymore, in case somebody calls
+ // NotifyAccessibleEvent, again
+ comphelper::AccessibleEventNotifier::revokeClient( mnClientId );
+ mnClientId = 0;
+ }
+ }
}
void SAL_CALL SvxRectCtlAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& xListener )
@@ -767,39 +780,8 @@ void SvxRectCtlAccessibleContext::setDescription( const OUString& rDescr )
void SvxRectCtlAccessibleContext::CommitChange( const AccessibleEventObject& rEvent )
{
- ::osl::ClearableMutexGuard aGuard( m_aMutex );
- if( mpEventListeners )
- {
- // Call all listeners.
- Sequence< Reference< XInterface > > aListeners = mpEventListeners->getElements();
-
- aGuard.clear();
-
- sal_uInt32 nLength( aListeners.getLength() );
- if( nLength )
- {
- const Reference< XInterface >* pInterfaces = aListeners.getConstArray();
- sal_uInt32 i = nLength;
-
- while( i )
- { // double while because of performance lack of try-catch in loop
- try
- {
- while( i )
- {
- ( static_cast< XAccessibleEventListener* >( pInterfaces->get() ) )->notifyEvent( rEvent );
- --i;
- ++pInterfaces;
- }
- }
- catch( RuntimeException& )
- {
- --i;
- ++pInterfaces;
- }
- }
- }
- }
+ if (mnClientId)
+ comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent );
}
void SAL_CALL SvxRectCtlAccessibleContext::disposing()
@@ -826,23 +808,14 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing()
mpChilds = NULL;
}
- const Reference< XInterface > xSource( *this );
- Any aDefunc;
- aDefunc <<= AccessibleStateType::DEFUNC;
- CommitChange( AccessibleEventObject( xSource, AccessibleEventId::ACCESSIBLE_STATE_EVENT, Any(), aDefunc ) );
-
{
::osl::MutexGuard aGuard( m_aMutex );
- if( mpEventListeners )
+ // Send a disposing to all listeners.
+ if ( mnClientId )
{
- lang::EventObject aEvent;
- aEvent.Source = static_cast< cppu::OWeakObject* >( this );
-
- mpEventListeners->disposeAndClear( aEvent );
- delete mpEventListeners;
-
- mpEventListeners = NULL;
+ comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this );
+ mnClientId = 0;
}
mxParent = Reference< XAccessible >();
@@ -909,11 +882,11 @@ SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext(
mxParent(rxParent),
mrParentWindow( rParentWindow ),
mpBoundingBox( new Rectangle( rBoundingBox ) ),
- mpEventListeners( NULL ),
msName( rName ),
msDescription( rDescription ),
mbIsChecked( sal_False ),
- mnIndexInParent( nIndexInParent )
+ mnIndexInParent( nIndexInParent ),
+ mnClientId( 0 )
{
DBG_CTOR( SvxRectCtlChildAccessibleContext, NULL );
}
@@ -923,20 +896,11 @@ SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext()
{
DBG_DTOR( SvxRectCtlChildAccessibleContext, NULL );
- osl_incrementInterlockedCount( &m_refCount );
- // prevent to enter this a second time
-
- if( mpEventListeners )
+ if( IsAlive() )
{
- lang::EventObject aEvent;
- aEvent.Source = static_cast< cppu::OWeakObject* >( this );
-
- mpEventListeners->disposeAndClear( aEvent );
- delete mpEventListeners;
- mpEventListeners = NULL;
+ osl_incrementInterlockedCount( &m_refCount );
+ dispose(); // set mpRepr = NULL & release all childs
}
-
- delete mpBoundingBox;
}
//===== XAccessible =========================================================
@@ -1130,12 +1094,12 @@ lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale( void ) throw(
void SAL_CALL SvxRectCtlChildAccessibleContext::addEventListener( const Reference< XAccessibleEventListener >& xListener )
throw( RuntimeException )
{
- ::osl::MutexGuard aGuard( maMutex );
- if( xListener.is() )
+ if (xListener.is())
{
- if( !mpEventListeners )
- mpEventListeners = new cppu::OInterfaceContainerHelper( maMutex );
- mpEventListeners->addInterface( xListener );
+ ::osl::MutexGuard aGuard( maMutex );
+ if (!mnClientId)
+ mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
+ comphelper::AccessibleEventNotifier::addEventListener( mnClientId, xListener );
}
}
@@ -1145,9 +1109,21 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::addEventListener( const Referenc
void SAL_CALL SvxRectCtlChildAccessibleContext::removeEventListener( const Reference< XAccessibleEventListener >& xListener )
throw( RuntimeException )
{
- ::osl::MutexGuard aGuard( maMutex );
- if( xListener.is() && mpEventListeners )
- mpEventListeners->removeInterface( xListener );
+ if (xListener.is())
+ {
+ ::osl::MutexGuard aGuard( maMutex );
+
+ sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener );
+ if ( !nListenerCount )
+ {
+ // no listeners anymore
+ // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+ // and at least to us not firing any events anymore, in case somebody calls
+ // NotifyAccessibleEvent, again
+ comphelper::AccessibleEventNotifier::revokeClient( mnClientId );
+ mnClientId = 0;
+ }
+ }
}
//===== XAccessibleValue ================================================
@@ -1230,27 +1206,26 @@ Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementatio
void SvxRectCtlChildAccessibleContext::CommitChange( const AccessibleEventObject& rEvent )
{
- ::osl::ClearableMutexGuard aGuard( maMutex );
- if( mpEventListeners )
- {
- // Call all listeners.
- Sequence< Reference< XInterface > > aListeners = mpEventListeners->getElements();
+ if (mnClientId)
+ comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent );
+}
- aGuard.clear();
+void SAL_CALL SvxRectCtlChildAccessibleContext::disposing()
+{
+ if( !rBHelper.bDisposed )
+ {
+ ::osl::MutexGuard aGuard( maMutex );
- sal_uInt32 nLength = aListeners.getLength();
- if( nLength )
+ // Send a disposing to all listeners.
+ if ( mnClientId )
{
- const Reference< XInterface >* pInterfaces = aListeners.getConstArray();
- try
- {
- for( sal_uInt32 i = nLength ; i ; --i, ++pInterfaces )
- ( static_cast< XAccessibleEventListener* >( pInterfaces->get() ) )->notifyEvent( rEvent );
- }
- catch( RuntimeException& )
- {
- }
+ comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this );
+ mnClientId = 0;
}
+
+ mxParent = Reference< XAccessible >();
+
+ delete mpBoundingBox;
}
}
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 94936f38cb35..ca8b5e24b220 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: _bmpmask.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: cl $ $Date: 2002-07-09 09:24:59 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -510,6 +510,8 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx,
aCbx4.SetClickHdl( LINK( pData, MaskData, CbxHdl ) );
aCbxTrans.SetClickHdl( LINK( pData, MaskData, CbxTransHdl ) );
+ SetAccessibleNames ();
+
aLbColor1.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
aLbColor2.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
aLbColor3.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
@@ -1259,3 +1261,28 @@ void SvxBmpMask::ApplyStyle()
aTbxPipette.SetItemImage( TBI_PIPETTE, bHighContrast ? maImgPipetteH : maImgPipette );
}
+
+/** Set an accessible name for the source color check boxes. Without this
+ the lengthy description is read.
+*/
+void SvxBmpMask::SetAccessibleNames (void)
+{
+ String sSourceColor (BMP_RESID( RID_SVXDLG_BMPMASK_STR_SOURCECOLOR));
+ String sSourceColorN;
+
+ sSourceColorN = sSourceColor;
+ sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 1"));
+ aCbx1.SetAccessibleName (sSourceColorN);
+
+ sSourceColorN = sSourceColor;
+ sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 2"));
+ aCbx2.SetAccessibleName (sSourceColorN);
+
+ sSourceColorN = sSourceColor;
+ sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 3"));
+ aCbx3.SetAccessibleName (sSourceColorN);
+
+ sSourceColorN = sSourceColor;
+ sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 4"));
+ aCbx4.SetAccessibleName (sSourceColorN);
+}
diff --git a/svx/source/dialog/align.cxx b/svx/source/dialog/align.cxx
index 271c4715f0ef..948d2cf32ae0 100644
--- a/svx/source/dialog/align.cxx
+++ b/svx/source/dialog/align.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: align.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: nn $ $Date: 2002-09-26 14:13:43 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -282,10 +282,10 @@ void SvxAlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
{
const SfxPoolItem* pItem;
- USHORT nPos = ALIGNDLG_HORALIGN_STD;
pItem = GetUniqueItem( rCoreAttrs, SID_ATTR_ALIGN_HOR_JUSTIFY );
if ( pItem )
{
+ USHORT nPos = ALIGNDLG_HORALIGN_STD;
switch ( (SvxCellHorJustify)
( (const SvxHorJustifyItem*)pItem )->GetValue() )
{
@@ -294,8 +294,10 @@ void SvxAlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
case SVX_HOR_JUSTIFY_RIGHT: nPos = ALIGNDLG_HORALIGN_RIGHT; break;
case SVX_HOR_JUSTIFY_BLOCK: nPos = ALIGNDLG_HORALIGN_BLOCK; break;
}
+ aLbHorAlign.SelectEntryPos( nPos );
}
- aLbHorAlign.SelectEntryPos( nPos );
+ else
+ aLbHorAlign.SetNoSelection();
pItem = GetUniqueItem( rCoreAttrs, SID_ATTR_ALIGN_INDENT );
if ( pItem )
@@ -308,10 +310,10 @@ void SvxAlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
else
aEdIndent.SetText( String() );
- nPos = ALIGNDLG_VERALIGN_STD;
pItem = GetUniqueItem( rCoreAttrs, SID_ATTR_ALIGN_VER_JUSTIFY );
if ( pItem )
{
+ USHORT nPos = ALIGNDLG_VERALIGN_STD;
switch ( (SvxCellVerJustify)
( (const SvxVerJustifyItem*)pItem )->GetValue() )
{
@@ -319,19 +321,20 @@ void SvxAlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
case SVX_VER_JUSTIFY_CENTER: nPos = ALIGNDLG_VERALIGN_MID; break;
case SVX_VER_JUSTIFY_BOTTOM: nPos = ALIGNDLG_VERALIGN_BOTTOM; break;
}
+ aLbVerAlign.SelectEntryPos( nPos );
}
- aLbVerAlign.SelectEntryPos( nPos );
+ else
+ aLbVerAlign.SetNoSelection();
pItem = GetUniqueItem( rCoreAttrs, SID_ATTR_ALIGN_ORIENTATION );
- aWinOrient.SetDegrees(0);
- aWinOrient.SetStackedTxt(FALSE);
+ aWinOrient.SetNoDegrees();
if ( pItem )
{
switch ( (SvxCellOrientation)
( (const SvxOrientationItem*)pItem )->GetValue() )
{
case SVX_ORIENTATION_STANDARD:
- pItem = GetItem( rCoreAttrs, SID_ATTR_ALIGN_DEGREES );
+ pItem = GetUniqueItem( rCoreAttrs, SID_ATTR_ALIGN_DEGREES );
if(pItem)
{
aWinOrient.SetDegrees(
@@ -447,6 +450,7 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
USHORT nWhich;
TriState eState;
const SfxPoolItem* pOld = 0;
+ bool bSelected = false;
// Horizontale Ausrichtung
nWhich = GetWhich( SID_ATTR_ALIGN_HOR_JUSTIFY );
@@ -460,12 +464,14 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
case ALIGNDLG_HORALIGN_RIGHT: nTmp = SVX_HOR_JUSTIFY_RIGHT; break;
case ALIGNDLG_HORALIGN_BLOCK: nTmp = SVX_HOR_JUSTIFY_BLOCK; break;
}
- DBG_ASSERT( (USHRT_MAX != nTmp) || !aLbHorAlign.IsEnabled(), "no button checked" );
+ bSelected = aLbHorAlign.GetSelectEntryCount() > 0;
+ pOld = GetUniqueItem( rOldSet, SID_ATTR_ALIGN_HOR_JUSTIFY );
+
+ DBG_ASSERT( !bSelected || (USHRT_MAX != nTmp) || !aLbHorAlign.IsEnabled(), "no button checked" );
// if aLbHorAlign is disabled SetFlags was called with the WBA_NO_HORIZONTAL flag set
// 67977 - 30.07.99 - FS
- pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_HOR_JUSTIFY );
- if ( !pOld || ( (const SvxHorJustifyItem*)pOld )->GetValue() != nTmp )
+ if ( bSelected && (!pOld || (((const SvxHorJustifyItem*)pOld)->GetValue() != nTmp)) )
{
rCoreAttrs.Put( SvxHorJustifyItem( (SvxCellHorJustify)nTmp, nWhich ) );
bAttrsChanged |= TRUE;
@@ -496,12 +502,14 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
case ALIGNDLG_VERALIGN_MID: nTmp = SVX_VER_JUSTIFY_CENTER; break;
case ALIGNDLG_VERALIGN_BOTTOM: nTmp = SVX_VER_JUSTIFY_BOTTOM; break;
}
- DBG_ASSERT( (USHRT_MAX != nTmp) || !aLbVerAlign.IsEnabled(), "no button checked" );
+ bSelected = aLbHorAlign.GetSelectEntryCount() > 0;
+ pOld = GetUniqueItem( rOldSet, SID_ATTR_ALIGN_VER_JUSTIFY );
+
+ DBG_ASSERT( !bSelected || (USHRT_MAX != nTmp) || !aLbVerAlign.IsEnabled(), "no button checked" );
// if aLbVerAlign is disabled SetFlags was called with the WBA_NO_VERTICAL flag set
// 67977 - 30.07.99 - FS
- pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_VER_JUSTIFY );
- if ( !pOld || ( (const SvxVerJustifyItem*)pOld )->GetValue() != nTmp )
+ if ( bSelected && (!pOld || (((const SvxVerJustifyItem*)pOld )->GetValue() != nTmp)) )
{
rCoreAttrs.Put( SvxVerJustifyItem( (SvxCellVerJustify)nTmp, nWhich ) );
bAttrsChanged |= TRUE;
@@ -509,43 +517,46 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
rCoreAttrs.ClearItem( nWhich );
- // Schreibrichtung
- nWhich = GetWhich( SID_ATTR_ALIGN_ORIENTATION );
+ if ( aWinOrient.HasDegrees() )
+ {
+ // Schreibrichtung
+ nWhich = GetWhich( SID_ATTR_ALIGN_ORIENTATION );
- nTmp = SVX_ORIENTATION_STANDARD;
+ nTmp = SVX_ORIENTATION_STANDARD;
- if ( aWinOrient.IsStackedTxt() )
- nTmp = SVX_ORIENTATION_STACKED;
- else if ( aWinOrient.GetDegrees()==90 )
- nTmp = SVX_ORIENTATION_BOTTOMTOP;
- else if ( aWinOrient.GetDegrees()==270 )
- nTmp = SVX_ORIENTATION_TOPBOTTOM;
+ if ( aWinOrient.IsStackedTxt() )
+ nTmp = SVX_ORIENTATION_STACKED;
+ else if ( aWinOrient.GetDegrees()==90 )
+ nTmp = SVX_ORIENTATION_BOTTOMTOP;
+ else if ( aWinOrient.GetDegrees()==270 )
+ nTmp = SVX_ORIENTATION_TOPBOTTOM;
- pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_ORIENTATION );
+ pOld = GetUniqueItem( rOldSet, SID_ATTR_ALIGN_ORIENTATION );
- if ( !pOld || ( (const SvxOrientationItem*)pOld )->GetValue() != nTmp )
- {
- rCoreAttrs.Put(
- SvxOrientationItem( (SvxCellOrientation)nTmp, nWhich ) );
- bAttrsChanged |= TRUE;
- }
- else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
- rCoreAttrs.ClearItem( nWhich );
+ if ( !pOld || ( (const SvxOrientationItem*)pOld )->GetValue() != nTmp )
+ {
+ rCoreAttrs.Put(
+ SvxOrientationItem( (SvxCellOrientation)nTmp, nWhich ) );
+ bAttrsChanged |= TRUE;
+ }
+ else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
+ rCoreAttrs.ClearItem( nWhich );
- // Schreibwinkel
- nWhich = GetWhich( SID_ATTR_ALIGN_DEGREES );
+ // Schreibwinkel
+ nWhich = GetWhich( SID_ATTR_ALIGN_DEGREES );
- long nDegrees=aWinOrient.GetDegrees()*100L;
+ long nDegrees=aWinOrient.GetDegrees()*100L;
- pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_DEGREES );
+ pOld = GetUniqueItem( rOldSet, SID_ATTR_ALIGN_DEGREES );
- if ( !pOld || ( (const SfxInt32Item*)pOld )->GetValue() != nDegrees )
- {
- rCoreAttrs.Put(SfxInt32Item( nWhich,nDegrees) );
- bAttrsChanged |= TRUE;
+ if ( !pOld || ( (const SfxInt32Item*)pOld )->GetValue() != nDegrees )
+ {
+ rCoreAttrs.Put(SfxInt32Item( nWhich,nDegrees) );
+ bAttrsChanged |= TRUE;
+ }
+ else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
+ rCoreAttrs.ClearItem( nWhich );
}
- else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
- rCoreAttrs.ClearItem( nWhich );
// Bezugskante
@@ -572,8 +583,8 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
eState = aBtnAsianVert.GetState();
pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_ASIANVERTICAL );
- if ( !pOld || ( (const SfxBoolItem*)pOld )->GetValue()
- != ( eState == STATE_CHECK ) )
+ if ( !pOld || (((const SfxBoolItem*)pOld )->GetValue() != (eState == STATE_CHECK)) ||
+ (aBtnAsianVert.IsTriStateEnabled() && (eState != STATE_DONTKNOW)) ) // changed from "don't care"
{
rCoreAttrs.Put( SfxBoolItem( nWhich, (eState == STATE_CHECK) ) );
bAttrsChanged = TRUE;
@@ -582,34 +593,40 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
rCoreAttrs.ClearItem( nWhich );
// Abst"ande zum Zellinhalt
- nWhich = GetWhich( SID_ATTR_ALIGN_MARGIN );
- SvxMarginItem aMargin(
- (INT16)aEdLeftSpace.Denormalize(
- aEdLeftSpace.GetValue( FUNIT_TWIP ) ),
- (INT16)aEdTopSpace.Denormalize(
- aEdTopSpace.GetValue( FUNIT_TWIP ) ),
- (INT16)aEdRightSpace.Denormalize(
- aEdRightSpace.GetValue( FUNIT_TWIP ) ),
- (INT16)aEdBottomSpace.Denormalize(
- aEdBottomSpace.GetValue( FUNIT_TWIP ) ),
- nWhich );
- pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_MARGIN );
-
- if ( !pOld || !( *(const SvxMarginItem*)pOld == aMargin ) )
- {
- rCoreAttrs.Put( aMargin );
- bAttrsChanged |= TRUE;
+
+ // #106224# all edits empty: do nothing
+ if( aEdLeftSpace.GetText().Len() || aEdRightSpace.GetText().Len() ||
+ aEdTopSpace.GetText().Len() || aEdBottomSpace.GetText().Len() )
+ {
+ nWhich = GetWhich( SID_ATTR_ALIGN_MARGIN );
+ SvxMarginItem aMargin(
+ (INT16)aEdLeftSpace.Denormalize(
+ aEdLeftSpace.GetValue( FUNIT_TWIP ) ),
+ (INT16)aEdTopSpace.Denormalize(
+ aEdTopSpace.GetValue( FUNIT_TWIP ) ),
+ (INT16)aEdRightSpace.Denormalize(
+ aEdRightSpace.GetValue( FUNIT_TWIP ) ),
+ (INT16)aEdBottomSpace.Denormalize(
+ aEdBottomSpace.GetValue( FUNIT_TWIP ) ),
+ nWhich );
+ pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_MARGIN );
+
+ if ( !pOld || !( *(const SvxMarginItem*)pOld == aMargin ) )
+ {
+ rCoreAttrs.Put( aMargin );
+ bAttrsChanged |= TRUE;
+ }
+ else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
+ rCoreAttrs.ClearItem( nWhich );
}
- else if ( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
- rCoreAttrs.ClearItem( nWhich );
// Zeilenumbruch
nWhich = GetWhich( SID_ATTR_ALIGN_LINEBREAK );
eState = aBtnWrap.GetState();
pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_LINEBREAK );
- if ( !pOld || ( (const SfxBoolItem*)pOld )->GetValue()
- != ( eState == STATE_CHECK ) )
+ if( !pOld || (((const SfxBoolItem*)pOld )->GetValue() != (eState == STATE_CHECK)) ||
+ (aBtnWrap.IsTriStateEnabled() && (eState != STATE_DONTKNOW)) ) // changed from "don't care"
{
rCoreAttrs.Put( SfxBoolItem( nWhich, (eState == STATE_CHECK) ) );
bAttrsChanged = TRUE;
@@ -622,8 +639,8 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
eState = aBtnHyphen.GetState();
pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_HYPHENATION );
- if ( !pOld || ( (const SfxBoolItem*)pOld )->GetValue()
- != ( eState == STATE_CHECK ) )
+ if ( !pOld || (((const SfxBoolItem*)pOld )->GetValue() != (eState == STATE_CHECK)) ||
+ (aBtnHyphen.IsTriStateEnabled() && (eState != STATE_DONTKNOW)) ) // changed from "don't care"
{
rCoreAttrs.Put( SfxBoolItem( nWhich, (eState == STATE_CHECK) ) );
bAttrsChanged = TRUE;
@@ -635,7 +652,7 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
nWhich = GetWhich( SID_ATTR_FRAMEDIRECTION );
pOld = GetUniqueItem( rOldSet, SID_ATTR_FRAMEDIRECTION );
SvxFrameDirection eDir = aLbFrameDir.GetSelectEntryValue();
- BOOL bSelected = aLbFrameDir.GetSelectEntryCount() > 0;
+ bSelected = aLbFrameDir.GetSelectEntryCount() > 0;
if( bSelected && (!pOld || (((const SvxFrameDirectionItem*)pOld)->GetValue() != eDir)) )
{
diff --git a/svx/source/dialog/align.src b/svx/source/dialog/align.src
index 59b919ced3ee..f2ffaa4845ce 100644
--- a/svx/source/dialog/align.src
+++ b/svx/source/dialog/align.src
@@ -2,9 +2,9 @@
*
* $RCSfile: align.src,v $
*
- * $Revision: 1.40 $
+ * $Revision: 1.41 $
*
- * last change: $Author: kz $ $Date: 2002-09-18 19:22:05 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -127,7 +127,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text[ portuguese ] = "H~orizontal";
Text[ russian ] = " ";
Text[ greek ] = "";
- Text[ dutch ] = "~Horizontaal";
+ Text[ dutch ] = "Hori~zontaal";
Text[ french ] = "H~orizontal";
Text[ spanish ] = "~Horizontal";
Text[ finnish ] = "Vaaka~taso";
@@ -137,7 +137,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text[ polish ] = "Poziomo";
Text[ portuguese_brazilian ] = "H~orizontal";
Text[ japanese ] = "横(~Z)";
- Text[ korean ] = "수평으로(~Z)";
+ Text[ korean ] = "가로(~Z)";
Text[ chinese_simplified ] = "水平(~Z)";
Text[ chinese_traditional ] = "水平(~Z)";
Text[ turkish ] = "Yatay";
@@ -194,10 +194,10 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
StringList [ russian ] =
{
- < "" ; ALIGNDLG_HORALIGN_STD ; > ;
- < "" ; ALIGNDLG_HORALIGN_LEFT ; > ;
+ < " " ; ALIGNDLG_HORALIGN_STD ; > ;
+ < " " ; ALIGNDLG_HORALIGN_LEFT ; > ;
< " " ; ALIGNDLG_HORALIGN_CENTER ; > ;
- < "" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
+ < " " ; ALIGNDLG_HORALIGN_RIGHT ; > ;
< " " ; ALIGNDLG_HORALIGN_BLOCK ; > ;
};
StringList [ greek ] =
@@ -211,9 +211,9 @@ TabPage RID_SVXPAGE_ALIGNMENT
StringList [ dutch ] =
{
< "Standaard" ; ALIGNDLG_HORALIGN_STD ; > ;
- < "Links " ; ALIGNDLG_HORALIGN_LEFT ; > ;
+ < "Links" ; ALIGNDLG_HORALIGN_LEFT ; > ;
< "Gecentreerd" ; ALIGNDLG_HORALIGN_CENTER ; > ;
- < "Rechts " ; ALIGNDLG_HORALIGN_RIGHT ; > ;
+ < "Rechts" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
< "Blok" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
};
StringList [ french ] =
@@ -234,7 +234,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
StringList [ finnish ] =
{
- < "Oletusarvo" ; ALIGNDLG_HORALIGN_STD ; > ;
+ < "Oletus" ; ALIGNDLG_HORALIGN_STD ; > ;
< "Vasen" ; ALIGNDLG_HORALIGN_LEFT ; > ;
< "Keskell" ; ALIGNDLG_HORALIGN_CENTER ; > ;
< "Oikea" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
@@ -290,11 +290,11 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
StringList [ korean ] =
{
- < "표준" ; ALIGNDLG_HORALIGN_STD ; > ;
+ < "기본값" ; ALIGNDLG_HORALIGN_STD ; > ;
< "왼쪽" ; ALIGNDLG_HORALIGN_LEFT ; > ;
< "가운데" ; ALIGNDLG_HORALIGN_CENTER ; > ;
< "오른쪽" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
- < "블록" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
+ < "양쪽 맞춤" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
};
StringList [ chinese_simplified ] =
{
@@ -310,7 +310,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
< "向左" ; ALIGNDLG_HORALIGN_LEFT ; > ;
< "置中" ; ALIGNDLG_HORALIGN_CENTER ; > ;
< "向右" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
- < "两端对齐" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
+ < "左右對齊" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
};
StringList [ turkish ] =
{
@@ -396,9 +396,9 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ ENGLISH ] = "~Vertical" ;
Text[ english_us ] = "~Vertical";
Text[ portuguese ] = "~Vertical";
- Text[ russian ] = " ";
+ Text[ russian ] = " ~";
Text[ greek ] = "~Vertical";
- Text[ dutch ] = "~Verticaal";
+ Text[ dutch ] = "Ver~ticaal";
Text[ french ] = "Vertical";
Text[ spanish ] = "~Vertical";
Text[ finnish ] = "~Pystytaso";
@@ -460,10 +460,10 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
StringList [ russian ] =
{
- < "" ; ALIGNDLG_VERALIGN_STD ; > ;
- < "" ; ALIGNDLG_VERALIGN_TOP ; > ;
+ < " " ; ALIGNDLG_VERALIGN_STD ; > ;
+ < " " ; ALIGNDLG_VERALIGN_TOP ; > ;
< " " ; ALIGNDLG_VERALIGN_MID ; > ;
- < "" ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
+ < " " ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
};
StringList [ greek ] =
{
@@ -483,7 +483,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
{
< "Standard" ; ALIGNDLG_VERALIGN_STD ; > ;
< "En haut" ; ALIGNDLG_VERALIGN_TOP ; > ;
- < "Milieu" ; ALIGNDLG_VERALIGN_MID ; > ;
+ < "Centre" ; ALIGNDLG_VERALIGN_MID ; > ;
< "En bas" ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
};
StringList [ spanish ] =
@@ -495,9 +495,9 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
StringList [ finnish ] =
{
- < "Oletusarvo" ; ALIGNDLG_VERALIGN_STD ; > ;
+ < "Oletus" ; ALIGNDLG_VERALIGN_STD ; > ;
< "Ylreuna" ; ALIGNDLG_VERALIGN_TOP ; > ;
- < "Keskikohta" ; ALIGNDLG_VERALIGN_MID ; > ;
+ < "Keskelle" ; ALIGNDLG_VERALIGN_MID ; > ;
< "Alareuna" ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
};
StringList [ italian ] =
@@ -544,7 +544,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
StringList [ korean ] =
{
- < "기본" ; ALIGNDLG_VERALIGN_STD ; > ;
+ < "기본값" ; ALIGNDLG_VERALIGN_STD ; > ;
< "위" ; ALIGNDLG_VERALIGN_TOP ; > ;
< "가운데" ; ALIGNDLG_VERALIGN_MID ; > ;
< "아래" ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
@@ -604,13 +604,13 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ portuguese ] = "Orientao" ;
Text [ finnish ] = "Tekstin suunta" ;
Text [ danish ] = "Skriveretning" ;
- Text [ french ] = "Orientation" ;
+ Text [ french ] = "Orientation du texte" ;
Text [ swedish ] = "Skrivriktning" ;
Text [ dutch ] = "Schrijfrichting" ;
Text [ spanish ] = "Direccin de escritura" ;
Text [ english_us ] = "Text direction" ;
Text[ chinese_simplified ] = "书写方向";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Kierunek pisania";
Text[ japanese ] = "文字の方向";
Text[ chinese_traditional ] = "書寫方向";
@@ -651,14 +651,14 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text[ language_user1 ] = " ";
Text[ english_us ] = "De~grees";
Text[ portuguese ] = "~Graus";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ greek ] = "~";
- Text[ dutch ] = "Gra~den";
+ Text[ dutch ] = "Ho~ek";
Text[ french ] = "Angle";
Text[ spanish ] = "~ngulo";
- Text[ finnish ] = "~Asteet";
+ Text[ finnish ] = "A~steet";
Text[ italian ] = "~Gradi";
- Text[ danish ] = "~Vinkel";
+ Text[ danish ] = "V~inkel";
Text[ swedish ] = "~Vinkel";
Text[ polish ] = "Kt";
Text[ portuguese_brazilian ] = "Gra~d";
@@ -694,7 +694,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ italian ] = "Bordo di ri~ferimento" ;
Text [ spanish ] = "~Aristas de referencia" ;
Text [ french ] = "Bord de rfrence" ;
- Text [ dutch ] = "~Invalshoek" ;
+ Text [ dutch ] = "I~nvalshoek" ;
Text [ portuguese ] = "A~resta de referncia" ;
Text[ chinese_simplified ] = "引用边(~F)";
Text[ russian ] = " ";
@@ -702,14 +702,14 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text[ japanese ] = "基準になる縁(~F)";
Text[ chinese_traditional ] = "參照邊(~F)";
Text[ arabic ] = " ";
- Text[ dutch ] = "~Invalshoek";
+ Text[ dutch ] = "I~nvalshoek";
Text[ chinese_simplified ] = "引用边(~F)";
Text[ greek ] = " ";
Text[ korean ] = "기준 모서리(~F)";
Text[ turkish ] = "Referans ~kenar";
Text[ language_user1 ] = " ";
Text[ catalan ] = "~Vores de referncia";
- Text[ finnish ] = "~Viitteen reuna";
+ Text[ finnish ] = "Viittee~n reuna";
Text[ thai ] = "ขอบการ~อ้างอิง";
};
Control CTR_BORDER_LOCK
@@ -741,7 +741,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text[ polish ] = "Use ~Asian vertical layout mode";
Text[ portuguese_brazilian ] = "Use ~Asian vertical layout mode";
Text[ japanese ] = "日本語縦書きレイアウトモードの使用";
- Text[ korean ] = "아시아 형식의 세로 쓰기 레이아웃 모드 사용 ";
+ Text[ korean ] = "세로 쓰기 모드 사용 ";
Text[ chinese_simplified ] = "使用中日韩竖写模式";
Text[ chinese_traditional ] = "使用中日韓直書模式(~A)";
Text[ turkish ] = "Use ~Asian vertical layout mode";
@@ -767,7 +767,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ spanish ] = "Distancia a la cuadrcula" ;
Text [ english_us ] = "Spacing to grid lines" ;
Text[ chinese_simplified ] = "至网格线的距离";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Odstp od linii siatki";
Text[ japanese ] = "グリッド線までの間隔";
Text[ chinese_traditional ] = "至網格線的距離";
@@ -775,7 +775,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text[ dutch ] = "Afstand tot rasterlijnen";
Text[ chinese_simplified ] = "至网格线的距离";
Text[ greek ] = " ";
- Text[ korean ] = "괘선과의 간격";
+ Text[ korean ] = "눈금선과의 간격";
Text[ turkish ] = "Klavuz izgilere uzaklk";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Espai a la quadrcula";
@@ -792,7 +792,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ portuguese_brazilian ] = "E~squerda" ;
Text [ portuguese ] = "E~squerda" ;
Text [ finnish ] = "~Vasen" ;
- Text [ danish ] = "Venstre" ;
+ Text [ danish ] = "~Venstre" ;
Text [ french ] = " gauche" ;
Text [ swedish ] = "V~nster" ;
Text [ dutch ] = "~Links" ;
@@ -837,15 +837,15 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ italian ] = "A ~destra" ;
Text [ portuguese_brazilian ] = "Dir~eita" ;
Text [ portuguese ] = "Dir~eita" ;
- Text [ finnish ] = "Oikea" ;
- Text [ danish ] = "Hjre" ;
+ Text [ finnish ] = "Oik~ea" ;
+ Text [ danish ] = "H~jre" ;
Text [ french ] = " droite" ;
Text [ swedish ] = "H~ger" ;
Text [ dutch ] = "~Rechts" ;
Text [ spanish ] = "Derecha" ;
Text [ english_us ] = "Right" ;
Text[ chinese_simplified ] = "向右";
- Text[ russian ] = "";
+ Text[ russian ] = "~";
Text[ polish ] = "Z prawej";
Text[ japanese ] = "右";
Text[ chinese_traditional ] = "向右";
@@ -883,8 +883,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ italian ] = "In alto" ;
Text [ portuguese_brazilian ] = "To~po" ;
Text [ portuguese ] = "Em ~cima" ;
- Text [ finnish ] = "~Ylosa" ;
- Text [ danish ] = "verst" ;
+ Text [ finnish ] = "~Ylreuna" ;
+ Text [ danish ] = "v~erst" ;
Text [ french ] = "En haut" ;
Text [ swedish ] = "U~ppe" ;
Text [ dutch ] = "~Boven" ;
@@ -929,7 +929,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ italian ] = "In basso" ;
Text [ portuguese_brazilian ] = "Bas~e" ;
Text [ portuguese ] = "Em ~baixo" ;
- Text [ finnish ] = "~Alaosa" ;
+ Text [ finnish ] = "Alare~una" ;
Text [ danish ] = "Nederst" ;
Text [ french ] = "En bas" ;
Text [ swedish ] = "N~ere" ;
@@ -937,7 +937,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ spanish ] = "Abaj~o" ;
Text [ english_us ] = "Botto~m" ;
Text[ chinese_simplified ] = "向下(~M)";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ polish ] = "W dole";
Text[ japanese ] = "下(~M)";
Text[ chinese_traditional ] = "向下(~M)";
@@ -971,25 +971,25 @@ TabPage RID_SVXPAGE_ALIGNMENT
Size = MAP_APPFONT ( 248 , 8 ) ;
Text = "Eigenschaften" ;
Text [ English ] = "Text Flow" ;
- Text [ english_us ] = "Text flow" ;
- Text [ swedish ] = "Textflde" ;
+ Text [ english_us ] = "Properties" ;
+ Text [ swedish ] = "Egenskaper" ;
Text [ danish ] = "Tekstretning" ;
- Text [ italian ] = "Testo" ;
- Text [ spanish ] = "Flujo de texto" ;
- Text [ french ] = "Enchanements" ;
+ Text [ italian ] = "Propriet?" ;
+ Text [ spanish ] = "Propiedades" ;
+ Text [ french ] = "Proprits" ;
Text [ dutch ] = "Tekstverloop" ;
Text [ portuguese_brazilian ] = "Textflu" ;
Text [ portuguese ] = "Fluxo de texto" ;
- Text[ chinese_simplified ] = "换行和分页";
- Text[ russian ] = " ";
+ Text[ chinese_simplified ] = "属性";
+ Text[ russian ] = " ";
Text[ polish ] = "Tekst";
- Text[ japanese ] = "体裁";
- Text[ chinese_traditional ] = "換行和分頁";
+ Text[ japanese ] = "属性";
+ Text[ chinese_traditional ] = "屬性";
Text[ arabic ] = " ";
Text[ dutch ] = "Tekstverloop";
- Text[ chinese_simplified ] = "换行和分页";
+ Text[ chinese_simplified ] = "属性";
Text[ greek ] = " ";
- Text[ korean ] = "텍스트 흐름";
+ Text[ korean ] = "등록 정보";
Text[ turkish ] = "Metin ak";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Flux del text";
@@ -1012,19 +1012,19 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ danish ] = "Linjeskift" ;
Text [ french ] = "Renvoi la ligne automatique" ;
Text [ swedish ] = "Automatisk rad~brytning" ;
- Text [ dutch ] = "~Regelafbreking" ;
+ Text [ dutch ] = "Re~gelafbreking" ;
Text [ spanish ] = "Salto de ~lnea automtico" ;
Text [ english_us ] = "Automatic ~line break" ;
Text[ chinese_simplified ] = "自动换行";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Podzia wierszy";
Text[ japanese ] = "自動的に折り返す";
Text[ chinese_traditional ] = "自動換行";
Text[ arabic ] = " ";
- Text[ dutch ] = "~Regelafbreking";
+ Text[ dutch ] = "Re~gelafbreking";
Text[ chinese_simplified ] = "自动换行";
Text[ greek ] = " ";
- Text[ korean ] = "자동 단락";
+ Text[ korean ] = "자동 줄 바꿈";
Text[ turkish ] = "Satr son~u";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Salt de ~lnia";
@@ -1038,7 +1038,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ ENGLISH ] = "Hyphenation active" ;
Text[ english_us ] = "Hyphenation active";
Text[ portuguese ] = "Diviso silbica activa";
- Text[ russian ] = " ()";
+ Text[ russian ] = " ";
Text[ greek ] = "Hyphenation active";
Text[ dutch ] = "~Woordafbreking actief";
Text[ french ] = "Coupure des mots active";
@@ -1069,18 +1069,18 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text[ russian ] = "Te~xt flow";
Text[ greek ] = "Te~xt flow";
Text[ dutch ] = "Te~xt flow";
- Text[ french ] = "Te~xt flow";
- Text[ spanish ] = "Te~xt flow";
+ Text[ french ] = "Enchanements";
+ Text[ spanish ] = "~Flujo de texto";
Text[ finnish ] = "Te~xt flow";
- Text[ italian ] = "Te~xt flow";
+ Text[ italian ] = "Flusso di testo";
Text[ danish ] = "Te~xt flow";
- Text[ swedish ] = "Te~xt flow";
+ Text[ swedish ] = "Te~xtflde";
Text[ polish ] = "Te~xt flow";
Text[ portuguese_brazilian ] = "Te~xt flow";
- Text[ japanese ] = "Te~xt flow";
- Text[ korean ] = "Te~xt flow";
- Text[ chinese_simplified ] = "Te~xt flow";
- Text[ chinese_traditional ] = "Te~xt flow";
+ Text[ japanese ] = "体裁(~X)";
+ Text[ korean ] = "텍스트 흐름";
+ Text[ chinese_simplified ] = "换行和分页";
+ Text[ chinese_traditional ] = "換行和分頁(~X)";
Text[ turkish ] = "Te~xt flow";
Text[ arabic ] = "Te~xt flow";
Text[ catalan ] = "Te~xt flow";
@@ -1131,7 +1131,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ dutch ] = "Inhoud uitbreiden vanaf onderkant cel." ;
Text [ portuguese ] = "Expanso do texto a partir do canto inferior da clula." ;
Text[ chinese_simplified ] = "文字从单元格下边缘延伸。";
- Text[ russian ] = " .";
+ Text[ russian ] = " ";
Text[ polish ] = "Rozcignicie tekstu od dolnej krawdzi komrki.";
Text[ japanese ] = "セルの下縁を基準に傾ける";
Text[ language_user1 ] = " ";
@@ -1160,7 +1160,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ dutch ] = "Inhoud uitbreiden vanaf bovenkant cel." ;
Text [ portuguese ] = "Expanso do texto a partir do canto superior da clula." ;
Text[ chinese_simplified ] = "文字从单元格上边缘扩展。";
- Text[ russian ] = " .";
+ Text[ russian ] = " ";
Text[ polish ] = "Rozcignicie tekstu od grnej krawdzi komrki.";
Text[ japanese ] = "セルの上縁を基準に傾ける";
Text[ language_user1 ] = " ";
@@ -1169,7 +1169,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text[ dutch ] = "Inhoud uitbreiden vanaf bovenkant cel.";
Text[ chinese_simplified ] = "文字从单元格上边缘扩展。";
Text[ greek ] = " .";
- Text[ korean ] = "셀 윗테두리에서 부터 텍스트 확장";
+ Text[ korean ] = "셀 위 테두리에서부터 텍스트 확장";
Text[ turkish ] = "Hcre st kenarndan metin genilemesi.";
Text[ catalan ] = "Expansi del text a partir de la vora superior de la cel.la.";
Text[ finnish ] = "Tekstin laajennus solun ylreunasta";
@@ -1189,7 +1189,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
Text [ dutch ] = "Inhoud uitbreiden alleen binnen cel." ;
Text [ portuguese ] = "Expanso do texto apenas dentro da clula." ;
Text[ chinese_simplified ] = "文字只在单元格内扩展。";
- Text[ russian ] = " .";
+ Text[ russian ] = " ";
Text[ polish ] = "Rozcignicie tekstu tylko wewntrz komrki.";
Text[ japanese ] = "セル内でのみ傾ける";
Text[ language_user1 ] = " ";
@@ -1222,3 +1222,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
// ********************************************************************** EOF
+
+
+
+
+
diff --git a/svx/source/dialog/backgrnd.src b/svx/source/dialog/backgrnd.src
index f47ffdd10667..8e122af0d227 100644
--- a/svx/source/dialog/backgrnd.src
+++ b/svx/source/dialog/backgrnd.src
@@ -2,9 +2,9 @@
*
* $RCSfile: backgrnd.src,v $
*
- * $Revision: 1.27 $
+ * $Revision: 1.28 $
*
- * last change: $Author: os $ $Date: 2002-08-16 12:59:20 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,7 +77,7 @@
text [ portuguese_brazilian ] = "unverkn?fte Grafik" ; \
text [ portuguese ] = "Imagem no ligada" ; \
text[ chinese_simplified ] = "未链接的图形"; \
- text[ russian ] = " "; \
+ text[ russian ] = " "; \
text[ polish ] = "Nie poczona grafika"; \
text[ japanese ] = "リンクされていない図"; \
text[ chinese_traditional ] = "未連結的圖形"; \
@@ -87,7 +87,7 @@
text[ turkish ] = "Balantsz grafik"; \
text[ language_user1 ] = " "; \
text[ finnish ] = "Linkittmtn kuva"; \
- text[ catalan ] = "Imagen no vinculada"; \
+ text[ catalan ] = "Imatge no enllaada"; \
text[ thai ] = "กราฟิคที่ไม่เชื่อมโยง";
// pragma ----------------------------------------------------------------
@@ -135,11 +135,11 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ chinese_traditional ] = "當作(~S)";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "양식(~S)";
+ Text[ korean ] = "형식(~S)";
Text[ turkish ] = "~Artalan";
Text[ language_user1 ] = " ";
- Text[ finnish ] = "~Nimell?";
- Text[ catalan ] = "~Como";
+ Text[ finnish ] = "T~ytt";
+ Text[ catalan ] = "C~om a";
Text[ thai ] = "เป็~น";
};
ListBox LB_SELECTOR
@@ -212,7 +212,7 @@ TabPage RID_SVXPAGE_BACKGROUND
StringList [ russian ] =
{
< "" ; Default ; > ;
- < "" ; Default ; > ;
+ < " " ; Default ; > ;
};
StringList [ polish ] =
{
@@ -262,7 +262,7 @@ TabPage RID_SVXPAGE_BACKGROUND
StringList [ catalan ] =
{
< "Color" ; Default ; > ;
- < "Imagen" ; Default ; > ;
+ < "Imatge" ; Default ; > ;
};
StringList [ thai ] =
{
@@ -295,11 +295,11 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ chinese_traditional ] = "用於(~O)";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "대상(~O)";
+ Text[ korean ] = "용도(~O)";
Text[ turkish ] = "He~def";
Text[ language_user1 ] = " ";
Text[ finnish ] = "~Kohde";
- Text[ catalan ] = "Pa~ra";
+ Text[ catalan ] = "P~er a";
Text[ thai ] = "สำ~หรับ";
};
ListBox LB_TBL_BOX
@@ -421,7 +421,7 @@ TabPage RID_SVXPAGE_BACKGROUND
{
< "셀" ; > ;
< "행" ; > ;
- < "시트" ; > ;
+ < "표" ; > ;
};
StringList [ turkish ] =
{
@@ -443,9 +443,9 @@ TabPage RID_SVXPAGE_BACKGROUND
};
StringList [ catalan ] =
{
- < "Celda" ; > ;
+ < "Cel.la" ; > ;
< "Fila" ; > ;
- < "Tabla" ; > ;
+ < "Taula" ; > ;
};
StringList [ thai ] =
{
@@ -524,7 +524,7 @@ TabPage RID_SVXPAGE_BACKGROUND
StringList [ russian ] =
{
< "" ; > ;
- < "" ; > ;
+ < "" ; > ;
};
StringList [ polish ] =
{
@@ -573,8 +573,8 @@ TabPage RID_SVXPAGE_BACKGROUND
};
StringList [ catalan ] =
{
- < "Prrafo" ; > ;
- < "Carcter" ; > ;
+ < "Pargraf" ; > ;
+ < "Carcter" ; > ;
};
StringList [ thai ] =
{
@@ -623,10 +623,10 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ chinese_traditional ] = "背景顏色";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "배경색상";
+ Text[ korean ] = "배경 색상";
Text[ turkish ] = "Artalan rengi";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Background color";
+ Text[ catalan ] = "Color del fons";
Text[ thai ] = "สีพื้นหลัง";
};
Window WIN_PREVIEW1
@@ -643,6 +643,26 @@ TabPage RID_SVXPAGE_BACKGROUND
Size = MAP_APPFONT ( 50 , 8) ;
Text = "~Transparenz" ;
Text [ english_us ] = "~Transparency" ;
+ Text[ portuguese ] = "~Transparency";
+ Text[ russian ] = "~Transparency";
+ Text[ greek ] = "~Transparency";
+ Text[ dutch ] = "~Transparency";
+ Text[ french ] = "Transparence";
+ Text[ spanish ] = "Tran~sparencia";
+ Text[ finnish ] = "~Transparency";
+ Text[ italian ] = "Trasparenza";
+ Text[ danish ] = "~Transparency";
+ Text[ swedish ] = "~Transparens";
+ Text[ polish ] = "~Transparency";
+ Text[ portuguese_brazilian ] = "~Transparency";
+ Text[ japanese ] = "透過性";
+ Text[ korean ] = "투명화";
+ Text[ chinese_simplified ] = "透明(~T)";
+ Text[ chinese_traditional ] = "透明(~T)";
+ Text[ turkish ] = "~Transparency";
+ Text[ arabic ] = "~Transparency";
+ Text[ catalan ] = "~Transparency";
+ Text[ thai ] = "~Transparency";
};
MetricField MF_COL_TRANS
{
@@ -689,7 +709,7 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ turkish ] = "Dosya";
Text[ language_user1 ] = " ";
Text[ finnish ] = "Tiedosto";
- Text[ catalan ] = "File";
+ Text[ catalan ] = "Fitxer";
Text[ thai ] = "แฟ้ม";
};
PushButton BTN_BROWSE
@@ -704,12 +724,12 @@ TabPage RID_SVXPAGE_BACKGROUND
Text [ swedish ] = "~Vlj ut..." ;
Text [ danish ] = "Gennemse..." ;
Text [ italian ] = "~Sfoglia..." ;
- Text [ spanish ] = "Seleccio~nar..." ;
+ Text [ spanish ] = "~Buscar..." ;
Text [ french ] = "~Parcourir..." ;
- Text [ dutch ] = "~Doorzoeken..." ;
+ Text [ dutch ] = "Bla~deren..." ;
Text [ portuguese ] = "~Pesquisar..." ;
Text[ chinese_simplified ] = "浏览(~B)...";
- Text[ russian ] = "...";
+ Text[ russian ] = "...";
Text[ polish ] = "Przegld~aj...";
Text[ japanese ] = "選択(~B)...";
Text[ chinese_traditional ] = "瀏覽(~B)...";
@@ -718,8 +738,8 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ korean ] = "선택(~B)...";
Text[ turkish ] = "Se...";
Text[ language_user1 ] = " ";
- Text[ finnish ] = "~Selaa";
- Text[ catalan ] = "Seleccio~nar...";
+ Text[ finnish ] = "Sel~aa...";
+ Text[ catalan ] = "~Navega...";
Text[ thai ] = "เ~รียกดู...";
};
CheckBox BTN_LINK
@@ -739,7 +759,7 @@ TabPage RID_SVXPAGE_BACKGROUND
Text [ portuguese_brazilian ] = "~Verkn?fen" ;
Text [ portuguese ] = "~Ligao" ;
Text[ chinese_simplified ] = "链接(~L)";
- Text[ russian ] = "";
+ Text[ russian ] = " ";
Text[ polish ] = "Po~cz";
Text[ japanese ] = "リンク(~L)";
Text[ chinese_traditional ] = "捷徑(~L)";
@@ -748,8 +768,8 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ korean ] = "연결(~L)";
Text[ turkish ] = "Bala";
Text[ language_user1 ] = " ";
- Text[ finnish ] = "~Linkki";
- Text[ catalan ] = "~Vincular";
+ Text[ finnish ] = "~Linkit";
+ Text[ catalan ] = "~Enllaa";
Text[ thai ] = "เ~ชื่อมโยง";
};
FixedText FT_FILE
@@ -785,7 +805,7 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ korean ] = "유형";
Text[ turkish ] = "Tr";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Type";
+ Text[ catalan ] = "Tipus";
Text[ finnish ] = "Tyyppi";
Text[ thai ] = "ชนิด";
};
@@ -815,8 +835,8 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ korean ] = "위치(~P)";
Text[ turkish ] = "O~rtala";
Text[ language_user1 ] = " ";
- Text[ finnish ] = "~Sijainti";
- Text[ catalan ] = "~Posicin";
+ Text[ finnish ] = "S~ijainti";
+ Text[ catalan ] = "~Posici";
Text[ thai ] = "~ตำแหน่ง";
};
RadioButton BTN_AREA
@@ -843,11 +863,11 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ chinese_traditional ] = "平面(~E)";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "영역(~E)";
+ Text[ korean ] = "면(~E)";
Text[ turkish ] = "Ser";
Text[ language_user1 ] = " ";
Text[ finnish ] = "~Alue";
- Text[ catalan ] = "~rea";
+ Text[ catalan ] = "~rea";
Text[ thai ] = "พื้น~ที่";
};
RadioButton BTN_TILE
@@ -876,8 +896,8 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ korean ] = "바둑판식(~T)";
Text[ turkish ] = "~De";
Text[ language_user1 ] = " ";
- Text[ finnish ] = "~Vierekk?in";
- Text[ catalan ] = "~Mosaico";
+ Text[ finnish ] = "Vi~erekkin";
+ Text[ catalan ] = "~Mosaic";
Text[ thai ] = "~ซ้อนทับ";
};
Control WND_POSITION
@@ -896,6 +916,26 @@ TabPage RID_SVXPAGE_BACKGROUND
Size = MAP_APPFONT ( 153 , 8) ;
Text = "Transparenz" ;
Text [ english_us ] = "Transparency" ;
+ Text[ portuguese ] = "Transparency";
+ Text[ russian ] = "Transparency";
+ Text[ greek ] = "Transparency";
+ Text[ dutch ] = "Transparency";
+ Text[ french ] = "Transparence";
+ Text[ spanish ] = "Transparencia";
+ Text[ finnish ] = "Transparency";
+ Text[ italian ] = "Trasparenza";
+ Text[ danish ] = "Transparency";
+ Text[ swedish ] = "Transparens";
+ Text[ polish ] = "Transparency";
+ Text[ portuguese_brazilian ] = "Transparency";
+ Text[ japanese ] = "透過性";
+ Text[ korean ] = "투명화";
+ Text[ chinese_simplified ] = "透明";
+ Text[ chinese_traditional ] = "透明";
+ Text[ turkish ] = "Transparency";
+ Text[ arabic ] = "Transparency";
+ Text[ catalan ] = "Transparency";
+ Text[ thai ] = "Transparency";
};
MetricField MF_GRAPH_TRANS
{
@@ -936,7 +976,7 @@ TabPage RID_SVXPAGE_BACKGROUND
Text [ portuguese ] = "~Previsualizar" ;
Text [ portuguese_brazilian ] = "V~orschau" ;
Text[ chinese_simplified ] = "预览(~V)";
- Text[ russian ] = "";
+ Text[ russian ] = " ";
Text[ polish ] = "P~odgld";
Text[ japanese ] = "プレビュー(~V)";
Text[ chinese_traditional ] = "預覽(~V)";
@@ -947,14 +987,14 @@ TabPage RID_SVXPAGE_BACKGROUND
Text [ portuguese_brazilian ] = "V~orschau" ;
Text [ portuguese ] = "~Previsualizar" ;
Text[ chinese_simplified ] = "预览(~V)";
- Text[ russian ] = "";
+ Text[ russian ] = " ";
Text[ polish ] = "P~odgld";
Text[ japanese ] = "プレビュー(~V)";
Text[ chinese_traditional ] = "預覽(~V)";
Text[ arabic ] = "";
Text[ language_user1 ] = " ";
Text[ finnish ] = "Esi~katselu";
- Text[ catalan ] = "Previsuali~zacin";
+ Text[ catalan ] = "Previsualit~zaci";
Text[ thai ] = "แสดงตั~วอย่าง";
};
String STR_BROWSE
@@ -971,17 +1011,17 @@ TabPage RID_SVXPAGE_BACKGROUND
Text [ portuguese_brazilian ] = "Grafik suchen" ;
Text [ portuguese ] = "Localizar imagem" ;
Text[ chinese_simplified ] = "搜寻图形";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Szukaj grafiki";
Text[ japanese ] = "図を検索";
Text[ chinese_traditional ] = "搜尋圖形";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "그래픽 찾기";
+ Text[ korean ] = "그림 찾기";
Text[ turkish ] = "Grafik bul";
Text[ language_user1 ] = " ";
- Text[ finnish ] = "Etsi kuvat";
- Text[ catalan ] = "Buscar imagen";
+ Text[ finnish ] = "Etsi grafiikka";
+ Text[ catalan ] = "Cerca imatge";
Text[ thai ] = "หากราฟิค";
};
String STR_UNLINKED
@@ -998,9 +1038,24 @@ TabPage RID_SVXPAGE_BACKGROUND
Text[ korean ] = "배경";
Text[ turkish ] = "Artalan";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Fondo";
+ Text[ catalan ] = "Fons";
Text[ thai ] = "พื้นหลัง";
};
// ********************************************************************** EOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/bbdlg.src b/svx/source/dialog/bbdlg.src
index d6a5633a8208..05cf2d964647 100644
--- a/svx/source/dialog/bbdlg.src
+++ b/svx/source/dialog/bbdlg.src
@@ -2,9 +2,9 @@
*
* $RCSfile: bbdlg.src,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: kz $ $Date: 2001-11-16 22:34:32 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:44 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -74,7 +74,7 @@ TabDialog RID_SVXDLG_BBDLG
Text [ italian ] = "Bordo / Sfondo" ;
Text [ portuguese_brazilian ] = "Margem / Fundo" ;
Text [ portuguese ] = "Contorno/Plano de fundo" ;
- Text [ finnish ] = "Reuna/tausta" ;
+ Text [ finnish ] = "Reuna / tausta" ;
Text [ danish ] = "Ramme / Baggrund" ;
Text [ french ] = "Bordure / Arrire-plan" ;
Text [ swedish ] = "Inramning/ Bakgrund" ;
@@ -104,7 +104,7 @@ TabDialog RID_SVXDLG_BBDLG
Text [ french ] = "Bordure" ;
Text [ swedish ] = "Inramning" ;
Text [ dutch ] = "Omranding" ;
- Text [ spanish ] = "Borde" ;
+ Text [ spanish ] = "Bordes" ;
Text [ english_us ] = "Borders" ;
Text[ chinese_simplified ] = "边框";
Text[ russian ] = "";
@@ -116,7 +116,8 @@ TabDialog RID_SVXDLG_BBDLG
Text[ korean ] = "테두리";
Text[ turkish ] = "Kenarlk";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Borde";
+ Text[ catalan ] = "Vores";
+ Text[ thai ] = "เส้นขอบ";
};
PageItem
{
@@ -144,7 +145,8 @@ TabDialog RID_SVXDLG_BBDLG
Text[ korean ] = "배경";
Text[ turkish ] = "Artalan";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Fondo";
+ Text[ catalan ] = "Fons";
+ Text[ thai ] = "พื้นหลัง";
};
};
};
@@ -158,7 +160,8 @@ TabDialog RID_SVXDLG_BBDLG
Text[ korean ] = "테두리 / 배경";
Text[ turkish ] = "Kenarlk / Artalan";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Bordes / Fondo";
+ Text[ catalan ] = "Vora / Fons";
+ Text[ thai ] = "เส้นขอบ / พื้นหลัง";
};
// ********************************************************************** EOF
@@ -168,3 +171,6 @@ TabDialog RID_SVXDLG_BBDLG
+
+
+
diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc
index b7a32a3d2d63..7a99679e3083 100644
--- a/svx/source/dialog/bmpmask.hrc
+++ b/svx/source/dialog/bmpmask.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: bmpmask.hrc,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: cl $ $Date: 2002-07-09 09:25:00 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -60,6 +60,7 @@
************************************************************************/
#define RID_SVXDLG_BMPMASK (RID_SVX_BMPMASK_START)
#define RID_SVXDLG_BMPMASK_STR_TRANSP (RID_SVX_BMPMASK_START + 1)
+#define RID_SVXDLG_BMPMASK_STR_SOURCECOLOR (RID_SVX_BMPMASK_START + 2)
#define GRP_Q 1
#define CTR_PIPETTE 1
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
index 08e8a70e0a1b..2d95007088f2 100644
--- a/svx/source/dialog/bmpmask.src
+++ b/svx/source/dialog/bmpmask.src
@@ -2,9 +2,9 @@
*
* $RCSfile: bmpmask.src,v $
*
- * $Revision: 1.35 $
+ * $Revision: 1.36 $
*
- * last change: $Author: kz $ $Date: 2002-11-27 16:33:06 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -136,7 +136,7 @@ DockingWindow RID_SVXDLG_BMPMASK
Text[ chinese_traditional ] = "源顏色";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "소스 색상";
+ Text[ korean ] = "원본 색상";
Text[ turkish ] = "Kaynak renk";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Color font";
@@ -194,7 +194,7 @@ DockingWindow RID_SVXDLG_BMPMASK
Text[ chinese_traditional ] = "替代成...";
Text[ arabic ] = " ...";
Text[ greek ] = " ...";
- Text[ korean ] = "바꿀 색상...";
+ Text[ korean ] = "바꾸기...";
Text[ turkish ] = "Yeni renk...";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Reemplaa amb...";
@@ -545,6 +545,23 @@ String RID_SVXDLG_BMPMASK_STR_TRANSP
Text[ thai ] = "โปร่งแสง";
};
+String RID_SVXDLG_BMPMASK_STR_SOURCECOLOR
+{
+ // This string is used by the eyedropper dialog to denote a color in an image
+ // that will be replaced by another color.
+ Text = "Quellfarbe";
+ Text [ ENGLISH ] = "Source Color";
+ Text[ english_us ] = "Source Color";
+ Text[ french ] = "Source Color";
+ Text[ spanish ] = "Source Color";
+ Text[ italian ] = "Source Color";
+ Text[ swedish ] = "Source Color";
+ Text[ japanese ] = "Source Color";
+ Text[ korean ] = "Source Color";
+ Text[ chinese_simplified ] = "Source Color";
+ Text[ chinese_traditional ] = "Source Color";
+};
+
// ********************************************************************** EOF
@@ -559,3 +576,8 @@ String RID_SVXDLG_BMPMASK_STR_TRANSP
+
+
+
+
+
diff --git a/svx/source/dialog/border.cxx b/svx/source/dialog/border.cxx
index 398b6a7bbe24..406019828b1c 100644
--- a/svx/source/dialog/border.cxx
+++ b/svx/source/dialog/border.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: border.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: pb $ $Date: 2002-11-26 10:11:32 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -602,53 +602,24 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
SvxLineStruct aDefStyle;
List aList;
- if ( aFrameSel.GetLine(SVX_FRMSELLINE_TOP).GetState() == SVX_FRMLINESTATE_SHOW )
- {
- aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_TOP)) );
- aFrameSel.SelectLine( SVX_FRMSELLINE_TOP );
- }
- else
- aFrameSel.SelectLine( SVX_FRMSELLINE_TOP, FALSE );
-
- if ( aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM).GetState() == SVX_FRMLINESTATE_SHOW )
- {
- aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM)) );
- aFrameSel.SelectLine( SVX_FRMSELLINE_BOTTOM );
- }
- else
- aFrameSel.SelectLine( SVX_FRMSELLINE_BOTTOM, FALSE );
+ SvxFrameSelectorLine eTypes[] = { SVX_FRMSELLINE_TOP,
+ SVX_FRMSELLINE_BOTTOM,
+ SVX_FRMSELLINE_LEFT,
+ SVX_FRMSELLINE_RIGHT,
+ SVX_FRMSELLINE_HOR,
+ SVX_FRMSELLINE_VER
+ };
- if ( aFrameSel.GetLine(SVX_FRMSELLINE_LEFT).GetState() == SVX_FRMLINESTATE_SHOW )
+ for (sal_Int32 i=0; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
{
- aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_LEFT)) );
- aFrameSel.SelectLine( SVX_FRMSELLINE_LEFT );
- }
- else
- aFrameSel.SelectLine( SVX_FRMSELLINE_LEFT, FALSE );
-
- if ( aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT).GetState() == SVX_FRMLINESTATE_SHOW )
- {
- aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT)) );
- aFrameSel.SelectLine( SVX_FRMSELLINE_RIGHT );
- }
- else
- aFrameSel.SelectLine( SVX_FRMSELLINE_RIGHT, FALSE );
-
- if ( aFrameSel.GetLine(SVX_FRMSELLINE_HOR).GetState() == SVX_FRMLINESTATE_SHOW )
- {
- aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_HOR)) );
- aFrameSel.SelectLine( SVX_FRMSELLINE_HOR );
- }
- else
- aFrameSel.SelectLine( SVX_FRMSELLINE_HOR, FALSE );
-
- if ( aFrameSel.GetLine(SVX_FRMSELLINE_VER).GetState() == SVX_FRMLINESTATE_SHOW )
- {
- aList.Insert( &(aFrameSel.GetLine(SVX_FRMSELLINE_VER)) );
- aFrameSel.SelectLine( SVX_FRMSELLINE_VER );
+ if ( aFrameSel.GetLine(eTypes[i]).GetState() == SVX_FRMLINESTATE_SHOW )
+ {
+ aList.Insert( &(aFrameSel.GetLine(eTypes[i])) );
+ aFrameSel.SelectLine( eTypes[i] );
+ }
+ else
+ aFrameSel.SelectLine( eTypes[i], FALSE );
}
- else
- aFrameSel.SelectLine( SVX_FRMSELLINE_VER, FALSE );
if ( aList.Count() > 0 )
{
@@ -860,7 +831,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
if(!bIsTableBorder && 0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS) &&
SFX_ITEM_AVAILABLE > rSet.GetItemState(GetWhich( SID_ATTR_PARA_LINESPACE )))
{
- for( USHORT i = nLBCount - 1; i > LINESTYLE_HTML_MAX; i--)
+ for( USHORT i = nLBCount - 1; i > LINESTYLE_HTML_MAX; --i)
aLbLineStyle.RemoveEntry(i);
}
@@ -938,32 +909,34 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
//------------------
// Umrandung aussen:
//------------------
- pCoreLine = &aCoreLine;
- SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_LEFT), pCoreLine );
- aBoxItem.SetLine( pCoreLine, BOX_LINE_LEFT );
-
- pCoreLine = &aCoreLine;
- SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT), pCoreLine );
- aBoxItem.SetLine( pCoreLine, BOX_LINE_RIGHT );
-
- pCoreLine = &aCoreLine;
- SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_TOP), pCoreLine );
- aBoxItem.SetLine( pCoreLine, BOX_LINE_TOP );
-
- pCoreLine = &aCoreLine;
- SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM), pCoreLine );
- aBoxItem.SetLine( pCoreLine, BOX_LINE_BOTTOM );
+ typedef ::std::pair<SvxFrameSelectorLine,USHORT> TBorderPair;
+ TBorderPair eTypes1[] = {
+ TBorderPair(SVX_FRMSELLINE_TOP,BOX_LINE_TOP),
+ TBorderPair(SVX_FRMSELLINE_BOTTOM,BOX_LINE_BOTTOM),
+ TBorderPair(SVX_FRMSELLINE_LEFT,BOX_LINE_LEFT),
+ TBorderPair(SVX_FRMSELLINE_RIGHT,BOX_LINE_RIGHT),
+ };
+
+ for (sal_Int32 i=0; i < sizeof(eTypes1)/sizeof(TBorderPair); ++i)
+ {
+ pCoreLine = &aCoreLine;
+ SetCoreLine_Impl( &aFrameSel.GetLine(eTypes1[i].first), pCoreLine );
+ aBoxItem.SetLine( pCoreLine, eTypes1[i].second );
+ }
//--------------------------------
// Umrandung hor/ver und TableFlag
//--------------------------------
- pCoreLine = &aCoreLine;
- SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_HOR), pCoreLine );
- aBoxInfoItem.SetLine( pCoreLine, BOXINFO_LINE_HORI );
-
- pCoreLine = &aCoreLine;
- SetCoreLine_Impl( &aFrameSel.GetLine(SVX_FRMSELLINE_VER), pCoreLine );
- aBoxInfoItem.SetLine( pCoreLine, BOXINFO_LINE_VERT );
+ TBorderPair eTypes2[] = {
+ TBorderPair(SVX_FRMSELLINE_HOR,BOXINFO_LINE_HORI),
+ TBorderPair(SVX_FRMSELLINE_VER,BOXINFO_LINE_VERT)
+ };
+ for (sal_Int32 j=0; j < sizeof(eTypes2)/sizeof(TBorderPair); ++j)
+ {
+ pCoreLine = &aCoreLine;
+ SetCoreLine_Impl( &aFrameSel.GetLine(eTypes2[j].first), pCoreLine );
+ aBoxInfoItem.SetLine( pCoreLine, eTypes2[j].second );
+ }
aBoxInfoItem.SetTable( bIsTableBorder );
@@ -1181,15 +1154,19 @@ IMPL_LINK( SvxBorderTabPage, SelPreHdl_Impl, void *, EMPTYARG )
{
aFrameSel.HideLines();
- aFrameSel.GetLine(SVX_FRMSELLINE_LEFT) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_TOP) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM).SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.SelectLine( SVX_FRMSELLINE_NONE );
- aFrameSel.SelectLine( SVX_FRMSELLINE_LEFT );
- aFrameSel.SelectLine( SVX_FRMSELLINE_RIGHT );
- aFrameSel.SelectLine( SVX_FRMSELLINE_TOP );
- aFrameSel.SelectLine( SVX_FRMSELLINE_BOTTOM );
+ static const SvxFrameSelectorLine eTypes[] = { SVX_FRMSELLINE_NONE,
+ SVX_FRMSELLINE_TOP,
+ SVX_FRMSELLINE_BOTTOM,
+ SVX_FRMSELLINE_LEFT,
+ SVX_FRMSELLINE_RIGHT
+ };
+
+ sal_Int32 i;
+ for (i=1; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+ aFrameSel.GetLine(eTypes[i]) .SetState( SVX_FRMLINESTATE_SHOW );
+
+ for (i=0; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+ aFrameSel.SelectLine( eTypes[i] );
}
break;
@@ -1198,17 +1175,19 @@ IMPL_LINK( SvxBorderTabPage, SelPreHdl_Impl, void *, EMPTYARG )
if ( bIsTableBorder ) // aussen/horizontal
{
aFrameSel.HideLines();
- aFrameSel.GetLine(SVX_FRMSELLINE_LEFT) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_TOP) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM).SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_HOR) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.SelectLine( SVX_FRMSELLINE_NONE );
- aFrameSel.SelectLine( SVX_FRMSELLINE_LEFT );
- aFrameSel.SelectLine( SVX_FRMSELLINE_RIGHT );
- aFrameSel.SelectLine( SVX_FRMSELLINE_TOP );
- aFrameSel.SelectLine( SVX_FRMSELLINE_BOTTOM );
- aFrameSel.SelectLine( SVX_FRMSELLINE_HOR );
+ static const SvxFrameSelectorLine eTypes[] = { SVX_FRMSELLINE_NONE,
+ SVX_FRMSELLINE_TOP,
+ SVX_FRMSELLINE_BOTTOM,
+ SVX_FRMSELLINE_LEFT,
+ SVX_FRMSELLINE_RIGHT,
+ SVX_FRMSELLINE_HOR
+ };
+
+ sal_Int32 i;
+ for (i=1; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+ aFrameSel.GetLine(eTypes[i]) .SetState( SVX_FRMLINESTATE_SHOW );
+ for (i=0; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+ aFrameSel.SelectLine( eTypes[i] );
}
else // links/rechts
{
@@ -1227,19 +1206,20 @@ IMPL_LINK( SvxBorderTabPage, SelPreHdl_Impl, void *, EMPTYARG )
if ( bIsTableBorder ) // aussen/hor./ver.
{
aFrameSel.HideLines();
- aFrameSel.GetLine(SVX_FRMSELLINE_LEFT) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_RIGHT) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_TOP) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_BOTTOM).SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_HOR) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.GetLine(SVX_FRMSELLINE_VER) .SetState( SVX_FRMLINESTATE_SHOW );
- aFrameSel.SelectLine( SVX_FRMSELLINE_NONE );
- aFrameSel.SelectLine( SVX_FRMSELLINE_LEFT );
- aFrameSel.SelectLine( SVX_FRMSELLINE_RIGHT );
- aFrameSel.SelectLine( SVX_FRMSELLINE_TOP );
- aFrameSel.SelectLine( SVX_FRMSELLINE_BOTTOM );
- aFrameSel.SelectLine( SVX_FRMSELLINE_HOR );
- aFrameSel.SelectLine( SVX_FRMSELLINE_VER );
+ static const SvxFrameSelectorLine eTypes[] = { SVX_FRMSELLINE_NONE,
+ SVX_FRMSELLINE_TOP,
+ SVX_FRMSELLINE_BOTTOM,
+ SVX_FRMSELLINE_LEFT,
+ SVX_FRMSELLINE_RIGHT,
+ SVX_FRMSELLINE_HOR,
+ SVX_FRMSELLINE_VER
+ };
+
+ sal_Int32 i;
+ for (i=1; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+ aFrameSel.GetLine(eTypes[i]) .SetState( SVX_FRMLINESTATE_SHOW );
+ for (i=0; i < sizeof(eTypes)/sizeof(SvxFrameSelectorLine); ++i)
+ aFrameSel.SelectLine( eTypes[i] );
}
else // oben/unten
{
diff --git a/svx/source/dialog/border.src b/svx/source/dialog/border.src
index 450ce9650290..6eac25f6e595 100644
--- a/svx/source/dialog/border.src
+++ b/svx/source/dialog/border.src
@@ -2,9 +2,9 @@
*
* $RCSfile: border.src,v $
*
- * $Revision: 1.42 $
+ * $Revision: 1.43 $
*
- * last change: $Author: kz $ $Date: 2002-12-09 10:01:01 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -83,7 +83,7 @@ TabPage RID_SVXPAGE_BORDER
Text [ french ] = "Bordure" ;
Text [ swedish ] = "Inramning" ;
Text [ dutch ] = "Omranding" ;
- Text [ spanish ] = "Borde" ;
+ Text [ spanish ] = "Bordes" ;
Text [ english_us ] = "Borders" ;
Text[ chinese_simplified ] = "边框";
Text[ russian ] = "";
@@ -119,7 +119,7 @@ TabPage RID_SVXPAGE_BORDER
Text[ chinese_traditional ] = "線條排序";
Text[ arabic ] = "";
Text[ greek ] = " ";
- Text[ korean ] = "외곽선 미리보기";
+ Text[ korean ] = "선 배치";
Text[ turkish ] = "ereve";
Text[ language_user1 ] = "EM6A; EM6April01: Found in Text doc under Format - Page - Borders tab.";
Text[ catalan ] = "Marc";
@@ -144,7 +144,7 @@ TabPage RID_SVXPAGE_BORDER
Text[ polish ] = "~Default";
Text[ portuguese_brazilian ] = "~Default";
Text[ japanese ] = "標準";
- Text[ korean ] = "표준";
+ Text[ korean ] = "기본값";
Text[ chinese_simplified ] = "标准(~D)";
Text[ chinese_traditional ] = "標準(~D)";
Text[ turkish ] = "~Default";
@@ -250,7 +250,7 @@ TabPage RID_SVXPAGE_BORDER
Text[ polish ] = "St~yle";
Text[ portuguese_brazilian ] = "St~yle";
Text[ japanese ] = "スタイル";
- Text[ korean ] = "유형";
+ Text[ korean ] = "스타일 ";
Text[ chinese_simplified ] = "风格(~Y)";
Text[ chinese_traditional ] = "風格";
Text[ turkish ] = "St~yle";
@@ -528,7 +528,7 @@ TabPage RID_SVXPAGE_BORDER
Text[ polish ] = "Odstp od zawartoci";
Text[ portuguese_brazilian ] = "Settings";
Text[ japanese ] = "内容までの間隔";
- Text[ korean ] = "내용에 대한 간격";
+ Text[ korean ] = "내용과의 간격";
Text[ chinese_simplified ] = "至内容的距离";
Text[ chinese_traditional ] = "至內文的距離";
Text[ arabic ] = " ";
@@ -644,7 +644,7 @@ TabPage RID_SVXPAGE_BORDER
Text[ chinese_traditional ] = "顏色(~O)";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "색(~O)";
+ Text[ korean ] = "색상(~O)";
Text[ turkish ] = "Re~nk";
Text[ language_user1 ] = " ";
Text[ catalan ] = "C~olor";
@@ -682,7 +682,7 @@ TabPage RID_SVXPAGE_BORDER
Text[ chinese_traditional ] = "陰影";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "음영";
+ Text[ korean ] = "그림자 스타일";
Text[ turkish ] = "Glge";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Estil de l'ombra";
@@ -748,22 +748,22 @@ String RID_SVXSTR_TABLE_PRESET_NONE
Text [ english_us ] = "Set No Borders" ;
Text[ portuguese ] = "Set No Borders";
Text[ russian ] = "Set No Borders";
- Text[ spanish ] = "Set No Borders";
- Text[ italian ] = "Set No Borders";
- Text[ swedish ] = "Set No Borders";
+ Text[ spanish ] = "Sin bordes";
+ Text[ italian ] = "Non impostare bordi";
+ Text[ swedish ] = "Ingen inramning";
Text[ polish ] = "Set No Borders";
Text[ portuguese_brazilian ] = "Set No Borders";
- Text[ japanese ] = "Set No Borders";
- Text[ korean ] = "Set No Borders";
+ Text[ japanese ] = "枠線なしを設定";
+ Text[ korean ] = "테두리 표시하지 않음";
Text[ turkish ] = "Set No Borders";
Text[ thai ] = "Set No Borders";
Text[ greek ] = "Set No Borders";
Text[ dutch ] = "Set No Borders";
- Text[ french ] = "Set No Borders";
+ Text[ french ] = "Sans bordure";
Text[ finnish ] = "Set No Borders";
Text[ danish ] = "Set No Borders";
- Text[ chinese_simplified ] = "Set No Borders";
- Text[ chinese_traditional ] = "Set No Borders";
+ Text[ chinese_simplified ] = "不采用边框";
+ Text[ chinese_traditional ] = "設定沒有邊框";
Text[ arabic ] = "Set No Borders";
Text[ catalan ] = "Set No Borders";
};
@@ -773,22 +773,22 @@ String RID_SVXSTR_TABLE_PRESET_ONLYOUTER
Text [ english_us ] = "Set Outer Border Only" ;
Text[ portuguese ] = "Set Outer Border Only";
Text[ russian ] = "Set Outer Border Only";
- Text[ spanish ] = "Set Outer Border Only";
- Text[ italian ] = "Set Outer Border Only";
- Text[ swedish ] = "Set Outer Border Only";
+ Text[ spanish ] = "Slo borde exterior";
+ Text[ italian ] = "Imposta solo bordi esterni";
+ Text[ swedish ] = "Bara yttre inramning";
Text[ polish ] = "Set Outer Border Only";
Text[ portuguese_brazilian ] = "Set Outer Border Only";
- Text[ japanese ] = "Set Outer Border Only";
- Text[ korean ] = "Set Outer Border Only";
+ Text[ japanese ] = "外枠のみを設定";
+ Text[ korean ] = "바깥쪽 테두리만 표시";
Text[ turkish ] = "Set Outer Border Only";
Text[ thai ] = "Set Outer Border Only";
Text[ greek ] = "Set Outer Border Only";
Text[ dutch ] = "Set Outer Border Only";
- Text[ french ] = "Set Outer Border Only";
+ Text[ french ] = "Bordure extrieure";
Text[ finnish ] = "Set Outer Border Only";
Text[ danish ] = "Set Outer Border Only";
- Text[ chinese_simplified ] = "Set Outer Border Only";
- Text[ chinese_traditional ] = "Set Outer Border Only";
+ Text[ chinese_simplified ] = "仅采用外边框";
+ Text[ chinese_traditional ] = "僅設定外側邊框";
Text[ arabic ] = "Set Outer Border Only";
Text[ catalan ] = "Set Outer Border Only";
};
@@ -798,22 +798,22 @@ String RID_SVXSTR_TABLE_PRESET_OUTERHORI
Text [ english_us ] = "Set Outer Border and Horizontal Lines" ;
Text[ portuguese ] = "Set Outer Border and Horizontal Lines";
Text[ russian ] = "Set Outer Border and Horizontal Lines";
- Text[ spanish ] = "Set Outer Border and Horizontal Lines";
- Text[ italian ] = "Set Outer Border and Horizontal Lines";
- Text[ swedish ] = "Set Outer Border and Horizontal Lines";
+ Text[ spanish ] = "Borde exterior y lneas horizontales";
+ Text[ italian ] = "Imposta bordo esterno e righe orizzontali";
+ Text[ swedish ] = "Yttre inramning och horisontella linjer";
Text[ polish ] = "Set Outer Border and Horizontal Lines";
Text[ portuguese_brazilian ] = "Set Outer Border and Horizontal Lines";
- Text[ japanese ] = "Set Outer Border and Horizontal Lines";
- Text[ korean ] = "Set Outer Border and Horizontal Lines";
+ Text[ japanese ] = "外枠と横線を設定";
+ Text[ korean ] = "바깥쪽 테두리와 가로줄만 표시";
Text[ turkish ] = "Set Outer Border and Horizontal Lines";
Text[ thai ] = "Set Outer Border and Horizontal Lines";
Text[ greek ] = "Set Outer Border and Horizontal Lines";
Text[ dutch ] = "Set Outer Border and Horizontal Lines";
- Text[ french ] = "Set Outer Border and Horizontal Lines";
+ Text[ french ] = "Bordure extrieure et lignes horizontales";
Text[ finnish ] = "Set Outer Border and Horizontal Lines";
Text[ danish ] = "Set Outer Border and Horizontal Lines";
- Text[ chinese_simplified ] = "Set Outer Border and Horizontal Lines";
- Text[ chinese_traditional ] = "Set Outer Border and Horizontal Lines";
+ Text[ chinese_simplified ] = "采用边框和水平线";
+ Text[ chinese_traditional ] = "設定外側邊框和水平線";
Text[ arabic ] = "Set Outer Border and Horizontal Lines";
Text[ catalan ] = "Set Outer Border and Horizontal Lines";
};
@@ -823,22 +823,22 @@ String RID_SVXSTR_TABLE_PRESET_OUTERALL
Text [ english_us ] = "Set Outer Border and All Inner Lines" ;
Text[ portuguese ] = "Set Outer Border and All Inner Lines";
Text[ russian ] = "Set Outer Border and All Inner Lines";
- Text[ spanish ] = "Set Outer Border and All Inner Lines";
- Text[ italian ] = "Set Outer Border and All Inner Lines";
- Text[ swedish ] = "Set Outer Border and All Inner Lines";
+ Text[ spanish ] = "Borde exterior y todas las lneas interiores ";
+ Text[ italian ] = "Imposta bordo esterno e tutte le righe interne";
+ Text[ swedish ] = "Yttre inramning och alla inre linjer";
Text[ polish ] = "Set Outer Border and All Inner Lines";
Text[ portuguese_brazilian ] = "Set Outer Border and All Inner Lines";
- Text[ japanese ] = "Set Outer Border and All Inner Lines";
- Text[ korean ] = "Set Outer Border and All Inner Lines";
+ Text[ japanese ] = "外枠と表内のすべての線を設定";
+ Text[ korean ] = "바깥쪽 테두리 및 모든 안쪽 줄 표시";
Text[ turkish ] = "Set Outer Border and All Inner Lines";
Text[ thai ] = "Set Outer Border and All Inner Lines";
Text[ greek ] = "Set Outer Border and All Inner Lines";
Text[ dutch ] = "Set Outer Border and All Inner Lines";
- Text[ french ] = "Set Outer Border and All Inner Lines";
+ Text[ french ] = "Bordure extrieure et totalit des lignes intrieures";
Text[ finnish ] = "Set Outer Border and All Inner Lines";
Text[ danish ] = "Set Outer Border and All Inner Lines";
- Text[ chinese_simplified ] = "Set Outer Border and All Inner Lines";
- Text[ chinese_traditional ] = "Set Outer Border and All Inner Lines";
+ Text[ chinese_simplified ] = "采用外边框和全部内框线";
+ Text[ chinese_traditional ] = "設定外側邊框和所有內側線";
Text[ arabic ] = "Set Outer Border and All Inner Lines";
Text[ catalan ] = "Set Outer Border and All Inner Lines";
};
@@ -848,22 +848,22 @@ String RID_SVXSTR_TABLE_PRESET_OUTERINNER
Text [ english_us ] = "Set Outer Border Without Changing Inner Lines" ;
Text[ portuguese ] = "Set Outer Border Without Changing Inner Lines";
Text[ russian ] = "Set Outer Border Without Changing Inner Lines";
- Text[ spanish ] = "Set Outer Border Without Changing Inner Lines";
- Text[ italian ] = "Set Outer Border Without Changing Inner Lines";
- Text[ swedish ] = "Set Outer Border Without Changing Inner Lines";
+ Text[ spanish ] = "Borde exterior sin modificacin de las lneas interiores";
+ Text[ italian ] = "Imposta il bordo esterno senza modificare le righe interne";
+ Text[ swedish ] = "Rita yttre inramning utan att ndra inre linjer";
Text[ polish ] = "Set Outer Border Without Changing Inner Lines";
Text[ portuguese_brazilian ] = "Set Outer Border Without Changing Inner Lines";
- Text[ japanese ] = "Set Outer Border Without Changing Inner Lines";
- Text[ korean ] = "Set Outer Border Without Changing Inner Lines";
+ Text[ japanese ] = "表内の線を変更せず、外枠線を設定";
+ Text[ korean ] = "안쪽 줄은 변경하지 않고 바깥쪽 테두리를 표시";
Text[ turkish ] = "Set Outer Border Without Changing Inner Lines";
Text[ thai ] = "Set Outer Border Without Changing Inner Lines";
Text[ greek ] = "Set Outer Border Without Changing Inner Lines";
Text[ dutch ] = "Set Outer Border Without Changing Inner Lines";
- Text[ french ] = "Set Outer Border Without Changing Inner Lines";
+ Text[ french ] = "Bordure extrieure sans modification des lignes intrieures";
Text[ finnish ] = "Set Outer Border Without Changing Inner Lines";
Text[ danish ] = "Set Outer Border Without Changing Inner Lines";
- Text[ chinese_simplified ] = "Set Outer Border Without Changing Inner Lines";
- Text[ chinese_traditional ] = "Set Outer Border Without Changing Inner Lines";
+ Text[ chinese_simplified ] = "采用外边框,不改动内框线";
+ Text[ chinese_traditional ] = "設定外側邊框但不變更內側線";
Text[ arabic ] = "Set Outer Border Without Changing Inner Lines";
Text[ catalan ] = "Set Outer Border Without Changing Inner Lines";
};
@@ -873,22 +873,22 @@ String RID_SVXSTR_PARA_PRESET_NONE
Text [ english_us ] = "Set No Border" ;
Text[ portuguese ] = "Set No Border";
Text[ russian ] = "Set No Border";
- Text[ spanish ] = "Set No Border";
- Text[ italian ] = "Set No Border";
- Text[ swedish ] = "Set No Border";
+ Text[ spanish ] = "Sin borde";
+ Text[ italian ] = "Non impostare bordo";
+ Text[ swedish ] = "Ingen inramning";
Text[ polish ] = "Set No Border";
Text[ portuguese_brazilian ] = "Set No Border";
- Text[ japanese ] = "Set No Border";
- Text[ korean ] = "Set No Border";
+ Text[ japanese ] = "枠線なしを設定";
+ Text[ korean ] = "테두리 표시하지 않음";
Text[ turkish ] = "Set No Border";
Text[ thai ] = "Set No Border";
Text[ greek ] = "Set No Border";
Text[ dutch ] = "Set No Border";
- Text[ french ] = "Set No Border";
+ Text[ french ] = "Sans bordure";
Text[ finnish ] = "Set No Border";
Text[ danish ] = "Set No Border";
- Text[ chinese_simplified ] = "Set No Border";
- Text[ chinese_traditional ] = "Set No Border";
+ Text[ chinese_simplified ] = "不采用边框";
+ Text[ chinese_traditional ] = "設定沒有邊框";
Text[ arabic ] = "Set No Border";
Text[ catalan ] = "Set No Border";
};
@@ -898,22 +898,22 @@ String RID_SVXSTR_PARA_PRESET_ALL
Text [ english_us ] = "Set All Four Borders" ;
Text[ portuguese ] = "Set All Four Borders";
Text[ russian ] = "Set All Four Borders";
- Text[ spanish ] = "Set All Four Borders";
- Text[ italian ] = "Set All Four Borders";
- Text[ swedish ] = "Set All Four Borders";
+ Text[ spanish ] = "Los cuatro bordes";
+ Text[ italian ] = "Imposta tutti e quattro i bordi";
+ Text[ swedish ] = "Komplett inramning";
Text[ polish ] = "Set All Four Borders";
Text[ portuguese_brazilian ] = "Set All Four Borders";
- Text[ japanese ] = "Set All Four Borders";
- Text[ korean ] = "Set All Four Borders";
+ Text[ japanese ] = "四辺の枠線を設定";
+ Text[ korean ] = "테두리의 네면을 모두 표시";
Text[ turkish ] = "Set All Four Borders";
Text[ thai ] = "Set All Four Borders";
Text[ greek ] = "Set All Four Borders";
Text[ dutch ] = "Set All Four Borders";
- Text[ french ] = "Set All Four Borders";
+ Text[ french ] = "Bordure complte";
Text[ finnish ] = "Set All Four Borders";
Text[ danish ] = "Set All Four Borders";
- Text[ chinese_simplified ] = "Set All Four Borders";
- Text[ chinese_traditional ] = "Set All Four Borders";
+ Text[ chinese_simplified ] = "采用全部的边框";
+ Text[ chinese_traditional ] = "設定所有四邊邊框";
Text[ arabic ] = "Set All Four Borders";
Text[ catalan ] = "Set All Four Borders";
};
@@ -923,22 +923,22 @@ String RID_SVXSTR_PARA_PRESET_LEFTRIGHT
Text [ english_us ] = "Set Left and Right Borders Only" ;
Text[ portuguese ] = "Set Left and Right Borders Only";
Text[ russian ] = "Set Left and Right Borders Only";
- Text[ spanish ] = "Set Left and Right Borders Only";
- Text[ italian ] = "Set Left and Right Borders Only";
- Text[ swedish ] = "Set Left and Right Borders Only";
+ Text[ spanish ] = "Slo borde derecho e izquierdo";
+ Text[ italian ] = "Imposta solo il bordo sinistro e destro";
+ Text[ swedish ] = "Rita bara hger och vnster kant";
Text[ polish ] = "Set Left and Right Borders Only";
Text[ portuguese_brazilian ] = "Set Left and Right Borders Only";
- Text[ japanese ] = "Set Left and Right Borders Only";
- Text[ korean ] = "Set Left and Right Borders Only";
+ Text[ japanese ] = "左右の外枠線を設定";
+ Text[ korean ] = "왼쪽과 오른쪽의 테두리만 표시";
Text[ turkish ] = "Set Left and Right Borders Only";
Text[ thai ] = "Set Left and Right Borders Only";
Text[ greek ] = "Set Left and Right Borders Only";
Text[ dutch ] = "Set Left and Right Borders Only";
- Text[ french ] = "Set Left and Right Borders Only";
+ Text[ french ] = "Bordure gauche et droite";
Text[ finnish ] = "Set Left and Right Borders Only";
Text[ danish ] = "Set Left and Right Borders Only";
- Text[ chinese_simplified ] = "Set Left and Right Borders Only";
- Text[ chinese_traditional ] = "Set Left and Right Borders Only";
+ Text[ chinese_simplified ] = "仅采用左右边框";
+ Text[ chinese_traditional ] = "僅設定左側和右側邊框";
Text[ arabic ] = "Set Left and Right Borders Only";
Text[ catalan ] = "Set Left and Right Borders Only";
};
@@ -948,22 +948,22 @@ String RID_SVXSTR_PARA_PRESET_TOPBOTTOM
Text [ english_us ] = "Set Top and Bottom Borders Only" ;
Text[ portuguese ] = "Set Top and Bottom Borders Only";
Text[ russian ] = "Set Top and Bottom Borders Only";
- Text[ spanish ] = "Set Top and Bottom Borders Only";
- Text[ italian ] = "Set Top and Bottom Borders Only";
- Text[ swedish ] = "Set Top and Bottom Borders Only";
+ Text[ spanish ] = "Slo borde inferior y superior ";
+ Text[ italian ] = "Imposta il bordo superiore ed inferiore";
+ Text[ swedish ] = "Rita bara vre och nedre kant";
Text[ polish ] = "Set Top and Bottom Borders Only";
Text[ portuguese_brazilian ] = "Set Top and Bottom Borders Only";
- Text[ japanese ] = "Set Top and Bottom Borders Only";
- Text[ korean ] = "Set Top and Bottom Borders Only";
+ Text[ japanese ] = "上下の外枠線を設定";
+ Text[ korean ] = "맨위와 맨아래의 테두리만 표시";
Text[ turkish ] = "Set Top and Bottom Borders Only";
Text[ thai ] = "Set Top and Bottom Borders Only";
Text[ greek ] = "Set Top and Bottom Borders Only";
Text[ dutch ] = "Set Top and Bottom Borders Only";
- Text[ french ] = "Set Top and Bottom Borders Only";
+ Text[ french ] = "Bordure suprieure et infrieure";
Text[ finnish ] = "Set Top and Bottom Borders Only";
Text[ danish ] = "Set Top and Bottom Borders Only";
- Text[ chinese_simplified ] = "Set Top and Bottom Borders Only";
- Text[ chinese_traditional ] = "Set Top and Bottom Borders Only";
+ Text[ chinese_simplified ] = "仅采用上下边框";
+ Text[ chinese_traditional ] = "僅設定上方和下方邊框";
Text[ arabic ] = "Set Top and Bottom Borders Only";
Text[ catalan ] = "Set Top and Bottom Borders Only";
};
@@ -973,22 +973,22 @@ String RID_SVXSTR_PARA_PRESET_ONLYLEFT
Text [ english_us ] = "Set Left Border Only" ;
Text[ portuguese ] = "Set Left Border Only";
Text[ russian ] = "Set Left Border Only";
- Text[ spanish ] = "Set Left Border Only";
- Text[ italian ] = "Set Left Border Only";
- Text[ swedish ] = "Set Left Border Only";
+ Text[ spanish ] = "Slo borde izquierdo";
+ Text[ italian ] = "Imposta solo il margine sinistro";
+ Text[ swedish ] = "Bara vnster kant";
Text[ polish ] = "Set Left Border Only";
Text[ portuguese_brazilian ] = "Set Left Border Only";
- Text[ japanese ] = "Set Left Border Only";
- Text[ korean ] = "Set Left Border Only";
+ Text[ japanese ] = "左外枠を設定";
+ Text[ korean ] = "왼쪽 테두리만 표시";
Text[ turkish ] = "Set Left Border Only";
Text[ thai ] = "Set Left Border Only";
Text[ greek ] = "Set Left Border Only";
Text[ dutch ] = "Set Left Border Only";
- Text[ french ] = "Set Left Border Only";
+ Text[ french ] = "Bordure gauche";
Text[ finnish ] = "Set Left Border Only";
Text[ danish ] = "Set Left Border Only";
- Text[ chinese_simplified ] = "Set Left Border Only";
- Text[ chinese_traditional ] = "Set Left Border Only";
+ Text[ chinese_simplified ] = "仅采用左边框";
+ Text[ chinese_traditional ] = "僅設定左側邊框";
Text[ arabic ] = "Set Left Border Only";
Text[ catalan ] = "Set Left Border Only";
};
@@ -998,22 +998,22 @@ String RID_SVXSTR_SHADOW_STYLE_NONE
Text [ english_us ] = "No Shadow" ;
Text[ portuguese ] = "No Shadow";
Text[ russian ] = "No Shadow";
- Text[ spanish ] = "No Shadow";
- Text[ italian ] = "No Shadow";
- Text[ swedish ] = "No Shadow";
+ Text[ spanish ] = "Sin sombra";
+ Text[ italian ] = "Nessuna ombreggiatura";
+ Text[ swedish ] = "Ingen skugga";
Text[ polish ] = "No Shadow";
Text[ portuguese_brazilian ] = "No Shadow";
- Text[ japanese ] = "No Shadow";
- Text[ korean ] = "No Shadow";
+ Text[ japanese ] = "影なし";
+ Text[ korean ] = "그림자 없음";
Text[ turkish ] = "No Shadow";
Text[ thai ] = "No Shadow";
Text[ greek ] = "No Shadow";
Text[ dutch ] = "No Shadow";
- Text[ french ] = "No Shadow";
+ Text[ french ] = "Sans ombre";
Text[ finnish ] = "No Shadow";
Text[ danish ] = "No Shadow";
- Text[ chinese_simplified ] = "No Shadow";
- Text[ chinese_traditional ] = "No Shadow";
+ Text[ chinese_simplified ] = "不带阴影";
+ Text[ chinese_traditional ] = "不帶陰影";
Text[ arabic ] = "No Shadow";
Text[ catalan ] = "No Shadow";
};
@@ -1023,22 +1023,22 @@ String RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT
Text [ english_us ] = "Cast Shadow to Bottom Right" ;
Text[ portuguese ] = "Cast Shadow to Bottom Right";
Text[ russian ] = "Cast Shadow to Bottom Right";
- Text[ spanish ] = "Cast Shadow to Bottom Right";
- Text[ italian ] = "Cast Shadow to Bottom Right";
- Text[ swedish ] = "Cast Shadow to Bottom Right";
+ Text[ spanish ] = "Proyectar sombra hacia abajo y a la derecha";
+ Text[ italian ] = "Ombreggiatura in basso verso destra";
+ Text[ swedish ] = "Kasta skugga nedt t hger";
Text[ polish ] = "Cast Shadow to Bottom Right";
Text[ portuguese_brazilian ] = "Cast Shadow to Bottom Right";
- Text[ japanese ] = "Cast Shadow to Bottom Right";
- Text[ korean ] = "Cast Shadow to Bottom Right";
+ Text[ japanese ] = "右下に影を付ける";
+ Text[ korean ] = "오른쪽 아래 방향으로 그림자 효과내기";
Text[ turkish ] = "Cast Shadow to Bottom Right";
Text[ thai ] = "Cast Shadow to Bottom Right";
Text[ greek ] = "Cast Shadow to Bottom Right";
Text[ dutch ] = "Cast Shadow to Bottom Right";
- Text[ french ] = "Cast Shadow to Bottom Right";
+ Text[ french ] = "Projection de l'ombre en bas droite";
Text[ finnish ] = "Cast Shadow to Bottom Right";
Text[ danish ] = "Cast Shadow to Bottom Right";
- Text[ chinese_simplified ] = "Cast Shadow to Bottom Right";
- Text[ chinese_traditional ] = "Cast Shadow to Bottom Right";
+ Text[ chinese_simplified ] = "阴影投向右下";
+ Text[ chinese_traditional ] = "右下方加上陰影";
Text[ arabic ] = "Cast Shadow to Bottom Right";
Text[ catalan ] = "Cast Shadow to Bottom Right";
};
@@ -1048,22 +1048,22 @@ String RID_SVXSTR_SHADOW_STYLE_TOPRIGHT
Text [ english_us ] = "Cast Shadow to Top Right" ;
Text[ portuguese ] = "Cast Shadow to Top Right";
Text[ russian ] = "Cast Shadow to Top Right";
- Text[ spanish ] = "Cast Shadow to Top Right";
- Text[ italian ] = "Cast Shadow to Top Right";
- Text[ swedish ] = "Cast Shadow to Top Right";
+ Text[ spanish ] = "Proyectar sombra hacia arriba y a la derecha";
+ Text[ italian ] = "Ombreggiatura in alto verso destra";
+ Text[ swedish ] = "Kasta skugga uppt t hger";
Text[ polish ] = "Cast Shadow to Top Right";
Text[ portuguese_brazilian ] = "Cast Shadow to Top Right";
- Text[ japanese ] = "Cast Shadow to Top Right";
- Text[ korean ] = "Cast Shadow to Top Right";
+ Text[ japanese ] = "右上に影を付ける";
+ Text[ korean ] = "오른쪽 위 방향으로 그림자 효과내기";
Text[ turkish ] = "Cast Shadow to Top Right";
Text[ thai ] = "Cast Shadow to Top Right";
Text[ greek ] = "Cast Shadow to Top Right";
Text[ dutch ] = "Cast Shadow to Top Right";
- Text[ french ] = "Cast Shadow to Top Right";
+ Text[ french ] = "Projection de l'ombre en haut droite";
Text[ finnish ] = "Cast Shadow to Top Right";
Text[ danish ] = "Cast Shadow to Top Right";
- Text[ chinese_simplified ] = "Cast Shadow to Top Right";
- Text[ chinese_traditional ] = "Cast Shadow to Top Right";
+ Text[ chinese_simplified ] = "阴影投向右上";
+ Text[ chinese_traditional ] = "右上方加上陰影";
Text[ arabic ] = "Cast Shadow to Top Right";
Text[ catalan ] = "Cast Shadow to Top Right";
};
@@ -1073,22 +1073,22 @@ String RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT
Text [ english_us ] = "Cast Shadow to Bottom Left" ;
Text[ portuguese ] = "Cast Shadow to Bottom Left";
Text[ russian ] = "Cast Shadow to Bottom Left";
- Text[ spanish ] = "Cast Shadow to Bottom Left";
- Text[ italian ] = "Cast Shadow to Bottom Left";
- Text[ swedish ] = "Cast Shadow to Bottom Left";
+ Text[ spanish ] = "Proyectar sombra hacia abajo y a la izquierda";
+ Text[ italian ] = "Ombreggiatura in basso verso sinistra";
+ Text[ swedish ] = "Kasta skugga nedt t vnster";
Text[ polish ] = "Cast Shadow to Bottom Left";
Text[ portuguese_brazilian ] = "Cast Shadow to Bottom Left";
- Text[ japanese ] = "Cast Shadow to Bottom Left";
- Text[ korean ] = "Cast Shadow to Bottom Left";
+ Text[ japanese ] = "左下に影を付ける";
+ Text[ korean ] = "왼쪽 아래 방향으로 그림자 효과내기";
Text[ turkish ] = "Cast Shadow to Bottom Left";
Text[ thai ] = "Cast Shadow to Bottom Left";
Text[ greek ] = "Cast Shadow to Bottom Left";
Text[ dutch ] = "Cast Shadow to Bottom Left";
- Text[ french ] = "Cast Shadow to Bottom Left";
+ Text[ french ] = "Projection de l'ombre en bas gauche";
Text[ finnish ] = "Cast Shadow to Bottom Left";
Text[ danish ] = "Cast Shadow to Bottom Left";
- Text[ chinese_simplified ] = "Cast Shadow to Bottom Left";
- Text[ chinese_traditional ] = "Cast Shadow to Bottom Left";
+ Text[ chinese_simplified ] = "阴影投向左上";
+ Text[ chinese_traditional ] = "左下方加上陰影";
Text[ arabic ] = "Cast Shadow to Bottom Left";
Text[ catalan ] = "Cast Shadow to Bottom Left";
};
@@ -1098,24 +1098,29 @@ String RID_SVXSTR_SHADOW_STYLE_TOPLEFT
Text [ english_us ] = "Cast Shadow to Top Left" ;
Text[ portuguese ] = "Cast Shadow to Top Left";
Text[ russian ] = "Cast Shadow to Top Left";
- Text[ spanish ] = "Cast Shadow to Top Left";
- Text[ italian ] = "Cast Shadow to Top Left";
- Text[ swedish ] = "Cast Shadow to Top Left";
+ Text[ spanish ] = "Proyectar sombra hacia arriba y a la izquierda";
+ Text[ italian ] = "Ombreggiatura in alto verso sinistra";
+ Text[ swedish ] = "Kasta skugga uppt t vnster";
Text[ polish ] = "Cast Shadow to Top Left";
Text[ portuguese_brazilian ] = "Cast Shadow to Top Left";
- Text[ japanese ] = "Cast Shadow to Top Left";
- Text[ korean ] = "Cast Shadow to Top Left";
+ Text[ japanese ] = "右上に影を付ける";
+ Text[ korean ] = "왼쪽 위 방향으로 그림자 효과내기";
Text[ turkish ] = "Cast Shadow to Top Left";
Text[ thai ] = "Cast Shadow to Top Left";
Text[ greek ] = "Cast Shadow to Top Left";
Text[ dutch ] = "Cast Shadow to Top Left";
- Text[ french ] = "Cast Shadow to Top Left";
+ Text[ french ] = "Projection de l'ombre en haut gauche";
Text[ finnish ] = "Cast Shadow to Top Left";
Text[ danish ] = "Cast Shadow to Top Left";
- Text[ chinese_simplified ] = "Cast Shadow to Top Left";
- Text[ chinese_traditional ] = "Cast Shadow to Top Left";
+ Text[ chinese_simplified ] = "阴影投向左上";
+ Text[ chinese_traditional ] = "左上方加上陰影";
Text[ arabic ] = "Cast Shadow to Top Left";
Text[ catalan ] = "Cast Shadow to Top Left";
};
// **********************************************************************
+
+
+
+
+
diff --git a/svx/source/dialog/chardlg.cxx b/svx/source/dialog/chardlg.cxx
index 03299265b7cf..58805cb0ec3c 100644
--- a/svx/source/dialog/chardlg.cxx
+++ b/svx/source/dialog/chardlg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: chardlg.cxx,v $
*
- * $Revision: 1.75 $
+ * $Revision: 1.76 $
*
- * last change: $Author: iha $ $Date: 2002-11-28 19:19:40 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -3431,7 +3431,15 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet )
}
else
{
- m_a0degRB.Check( TRUE );
+ if( eState == SFX_ITEM_DONTCARE )
+ {
+ m_a0degRB.Check( FALSE );
+ m_a90degRB.Check( FALSE );
+ m_a270degRB.Check( FALSE );
+ }
+ else
+ m_a0degRB.Check( TRUE );
+
m_aFitToLineCB.Check( FALSE );
}
m_aFitToLineCB.SetClickHdl( aOldLink );
diff --git a/svx/source/dialog/chardlg.src b/svx/source/dialog/chardlg.src
index f41ad783530b..958cdfbda237 100644
--- a/svx/source/dialog/chardlg.src
+++ b/svx/source/dialog/chardlg.src
@@ -2,9 +2,9 @@
*
* $RCSfile: chardlg.src,v $
*
- * $Revision: 1.62 $
+ * $Revision: 1.63 $
*
- * last change: $Author: os $ $Date: 2002-10-09 12:54:15 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -108,9 +108,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text = "Schriftart fr westlichen Text";
Text [ english_us ] = "Western text font";
Text[ portuguese ] = "Tipo de letra para texto ocidental";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Lettertype voor westelijke tekst";
+ Text[ dutch ] = "Lettertype voor westerse tekst";
Text[ french ] = "Police pour texte occidental";
Text[ spanish ] = "Fuente para texto occidental";
Text[ italian ] = "Tipo di carattere occidentale";
@@ -119,7 +119,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ polish ] = "Czcionka tekstu zachodniego";
Text[ portuguese_brazilian ] = "Schriftart f? westlichen Text";
Text[ japanese ] = "英数字用フォント";
- Text[ korean ] = "알파벳";
+ Text[ korean ] = "서양권 언어 글꼴";
Text[ chinese_simplified ] = "适用于西文的字体";
Text[ chinese_traditional ] = "西文字型";
Text[ turkish ] = "Schriftart fr westlichen Text";
@@ -136,7 +136,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text [ ENGLISH ] = "~Font";
Text [ english_us ] = "Font";
Text[ portuguese ] = "~Tipo de letra";
- Text[ russian ] = " ";
+ Text[ russian ] = "";
Text[ greek ] = "~";
Text[ dutch ] = "~Lettertype";
Text[ french ] = "Police";
@@ -153,7 +153,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ turkish ] = "Font";
Text[ arabic ] = " ";
Text[ catalan ] = "Tipus de lletra";
- Text[ finnish ] = "Fontti";
+ Text[ finnish ] = "Fo~ntti";
Text[ thai ] = "ตัวอักษร";
};
FixedText FT_WEST_NAME_NOCJK
@@ -164,7 +164,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text [ ENGLISH ] = "~Font";
Text [ english_us ] = "~Font";
Text[ portuguese ] = "~Tipo de letra";
- Text[ russian ] = " ";
+ Text[ russian ] = "";
Text[ greek ] = "~";
Text[ dutch ] = "~Lettertype";
Text[ french ] = "Police";
@@ -210,7 +210,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ portuguese ] = "Estilo";
Text[ russian ] = "";
Text[ greek ] = "";
- Text[ dutch ] = "~Type";
+ Text[ dutch ] = "T~ype";
Text[ french ] = "Style";
Text[ spanish ] = "Estilo";
Text[ italian ] = "Stile";
@@ -219,13 +219,13 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ polish ] = "Styl";
Text[ portuguese_brazilian ] = "Type";
Text[ japanese ] = "スタイル(~T)";
- Text[ korean ] = "유형(~T)";
+ Text[ korean ] = "스타일(~T)";
Text[ chinese_simplified ] = "字体形状(~T)";
Text[ chinese_traditional ] = "字型形狀(~T)";
Text[ turkish ] = "Type";
Text[ arabic ] = " ";
Text[ catalan ] = "~Tipografia";
- Text[ finnish ] = "~Kirjasinlaji";
+ Text[ finnish ] = "K~irjasinlaji";
Text[ thai ] = "~รูปร่างของตัวพิมพ์";
};
FixedText FT_WEST_STYLE_NOCJK
@@ -253,7 +253,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ turkish ] = "Type";
Text[ arabic ] = " ";
Text[ catalan ] = "Estil";
- Text[ finnish ] = "~Fonttityyppi";
+ Text[ finnish ] = "Kir~jasinlaji";
Text[ thai ] = "~รูปร่างของตัวพิมพ์";
};
ComboBox LB_WEST_STYLE
@@ -279,10 +279,10 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
StringList [ language_user1 ] =
{
- "Normal" ;
- "Kursiv" ;
+ "Norm; Normal" ;
+ "Kurs; Kurs; Kursiv" ;
"Fett" ;
- "Fett Kursiv" ;
+ "Fett; Fett; Fett Kursiv" ;
};
StringList [ portuguese ] =
{
@@ -370,9 +370,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
StringList [ korean ] =
{
- "보통" ;
+ "표준" ;
"이탤릭체" ;
- "굵은" ;
+ "굵게" ;
"이탤릭체 (굵게)" ;
};
StringList [ chinese_simplified ] =
@@ -413,9 +413,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
StringList [ finnish ] =
{
"Normaali" ;
- "Kursivointi" ;
- "Lihavointi" ;
- "Lihavointi ja kursivointi" ;
+ "Kursivoitu" ;
+ "Lihavoitu" ;
+ "Lihavoitu ja kursivoitu" ;
};
StringList [ thai ] =
{
@@ -448,10 +448,10 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
StringList [ language_user1 ] =
{
- "Normal" ;
- "Kursiv" ;
+ "Norm; Normal" ;
+ "Kurs; Kursiv" ;
"Fett" ;
- "Fett Kursiv" ;
+ "Fett; Fett Kursiv" ;
};
StringList [ portuguese ] =
{
@@ -539,7 +539,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
StringList [ korean ] =
{
- "보통" ;
+ "표준" ;
"이탤릭체" ;
"굵게" ;
"이탤릭체(굵게)" ;
@@ -582,9 +582,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
StringList [ finnish ] =
{
"Normaali" ;
- "Kursivointi" ;
- "Lihavointi" ;
- "Lihavointi ja kursivointi" ;
+ "Kursivoitu" ;
+ "Lihavoitu" ;
+ "Lihavoitu ja kursivoitu" ;
};
StringList [ thai ] =
{
@@ -604,7 +604,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ portuguese ] = "~Tamanho";
Text[ russian ] = "";
Text[ greek ] = "";
- Text[ dutch ] = "L~ettergrootte";
+ Text[ dutch ] = "Lette~rgrootte";
Text[ french ] = "Taille";
Text[ spanish ] = "Tamao";
Text[ italian ] = "~Dimensione";
@@ -630,9 +630,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text [ ENGLISH ] = "~Size";
Text [ english_us ] = "Size";
Text[ portuguese ] = "~Tamanho";
- Text[ russian ] = "";
+ Text[ russian ] = "~";
Text[ greek ] = "";
- Text[ dutch ] = "L~ettergrootte";
+ Text[ dutch ] = "Lette~rgrootte";
Text[ french ] = "Taille";
Text[ spanish ] = "Tamao";
Text[ italian ] = "~Dimensione";
@@ -718,7 +718,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ turkish ] = "Language";
Text[ arabic ] = "";
Text[ catalan ] = "Idioma";
- Text[ finnish ] = "~Kieli";
+ Text[ finnish ] = "Ki~eli";
Text[ thai ] = "~ภาษา";
};
ListBox LB_WEST_LANG
@@ -746,7 +746,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text = "Schriftart fr asiatischen Text";
Text [ english_us ] = "Asian text font";
Text[ portuguese ] = "Tipo de letra para texto asitico";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "Lettertype voor Aziatische tekst";
Text[ french ] = "Police pour texte asiatique";
@@ -757,7 +757,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ polish ] = "Czcionka tekstu azjatyckiego";
Text[ portuguese_brazilian ] = "Schriftart f? asiatischen Text";
Text[ japanese ] = "日本語用フォント";
- Text[ korean ] = "아시아 문자";
+ Text[ korean ] = "한글 글꼴";
Text[ chinese_simplified ] = "中日韩字体";
Text[ chinese_traditional ] = "中日韓字型";
Text[ turkish ] = "Schriftart fr asiatischen Text";
@@ -774,13 +774,13 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text [ ENGLISH ] = "F~ont";
Text [ english_us ] = "Font";
Text[ portuguese ] = "Ti~po de letra";
- Text[ russian ] = " ";
+ Text[ russian ] = "";
Text[ greek ] = "~";
Text[ dutch ] = "L~ettertype";
Text[ french ] = "Police";
Text[ spanish ] = "Fuente";
Text[ italian ] = "Tipo di carattere";
- Text[ danish ] = "Sk~rifttype";
+ Text[ danish ] = "Skriftt~ype";
Text[ swedish ] = "Tec~kensnitt";
Text[ polish ] = "Czcionka";
Text[ portuguese_brazilian ] = "Font";
@@ -821,13 +821,13 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ polish ] = "Styl";
Text[ portuguese_brazilian ] = "Type";
Text[ japanese ] = "スタイル(~Y)";
- Text[ korean ] = "유형(~Y)";
+ Text[ korean ] = "글꼴 유형(~Y)";
Text[ chinese_simplified ] = "字体形状(~Y)";
Text[ chinese_traditional ] = "字型形狀(~Y)";
Text[ turkish ] = "Type";
Text[ arabic ] = " ";
Text[ catalan ] = "T~ipografia";
- Text[ finnish ] = "~Kirjasinlaji";
+ Text[ finnish ] = "K~irjasinlaji";
Text[ thai ] = "รู~ปร่างของตัวพิมพ์";
};
ComboBox LB_EAST_STYLE
@@ -853,10 +853,10 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
StringList [ language_user1 ] =
{
- "Normal" ;
- "Kursiv" ;
+ "Norm; Normal" ;
+ "Kurs; Kursiv" ;
"Fett" ;
- "Fett Kursiv" ;
+ "Fett; Fett Kursiv" ;
};
StringList [ portuguese ] =
{
@@ -944,9 +944,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
StringList [ korean ] =
{
- "보통" ;
+ "표준" ;
"이탤릭체" ;
- "굵은" ;
+ "굵게" ;
"이탤릭체 (굵게)" ;
};
StringList [ chinese_simplified ] =
@@ -987,9 +987,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
StringList [ finnish ] =
{
"Normaali" ;
- "Kursivointi" ;
- "Lihavointi" ;
- "Lihavointi ja kursivointi" ;
+ "Kursivoitu" ;
+ "Lihavoitu" ;
+ "Lihavoitu ja kursivoitu" ;
};
StringList [ thai ] =
{
@@ -1009,11 +1009,11 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ portuguese ] = "~Tamanho";
Text[ russian ] = "";
Text[ greek ] = "";
- Text[ dutch ] = "~Lettergrootte";
+ Text[ dutch ] = "Letter~grootte";
Text[ french ] = "Taille";
Text[ spanish ] = "Tamao";
Text[ italian ] = "~Dimensione";
- Text[ danish ] = "Skri~ftgrad";
+ Text[ danish ] = "Skrift~grad";
Text[ swedish ] = "Teckens~torlek";
Text[ polish ] = "Rozmiar";
Text[ portuguese_brazilian ] = "Size";
@@ -1049,7 +1049,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ french ] = "Langue";
Text[ spanish ] = "Idioma";
Text[ italian ] = "Lingua";
- Text[ danish ] = "S~prog";
+ Text[ danish ] = "Spr~og";
Text[ swedish ] = "Sp~rk";
Text[ polish ] = "Jzyk";
Text[ portuguese_brazilian ] = "Language";
@@ -1081,7 +1081,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ russian ] = "Complex script font";
Text[ greek ] = "Complex script font";
Text[ dutch ] = "Complex script font";
- Text[ french ] = "Police pour CTL";
+ Text[ french ] = "Police pour scripts complexes";
Text[ spanish ] = "Fuente CTL";
Text[ finnish ] = "Complex script font";
Text[ italian ] = "Carattere per script complessi";
@@ -1090,7 +1090,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ polish ] = "Complex script font";
Text[ portuguese_brazilian ] = "Complex script font";
Text[ japanese ] = "複合文字言語用フォント";
- Text[ korean ] = "CTL용 글꼴";
+ Text[ korean ] = "복합 문자 언어용(CTL) 글꼴";
Text[ chinese_simplified ] = "适用于复杂的文字版式的字型";
Text[ chinese_traditional ] = "適用于複雜的文字版式的字型";
Text[ turkish ] = "Complex script font";
@@ -1153,7 +1153,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ polish ] = "Styl";
Text[ portuguese_brazilian ] = "Type";
Text[ japanese ] = "スタイル(~Y)";
- Text[ korean ] = "유형(~Y)";
+ Text[ korean ] = "스타일(~Y)";
Text[ chinese_simplified ] = "字体形状(~Y)";
Text[ chinese_traditional ] = "字型形狀(~Y)";
Text[ turkish ] = "Type";
@@ -1185,10 +1185,10 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
StringList [ language_user1 ] =
{
- "Normal" ;
- "Kursiv" ;
+ "Norm; Normal" ;
+ "Kurs; Kursiv" ;
"Fett" ;
- "Fett Kursiv" ;
+ "Fett; Fett Kursiv" ;
};
StringList [ portuguese ] =
{
@@ -1230,7 +1230,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
"Normal" ;
"Cursiva" ;
"Negrita" ;
- "Cursiva negrita" ;
+ "Negrita cursiva " ;
};
StringList [ italian ] =
{
@@ -1262,10 +1262,10 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
StringList [ portuguese_brazilian ] =
{
- "Normal" ;
- "Kursiv" ;
- "Fett" ;
- "Fett Kursiv" ;
+ "Padro" ;
+ "Itlico" ;
+ "Negrito" ;
+ "Itlico negrito" ;
};
StringList [ japanese ] =
{
@@ -1276,7 +1276,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
StringList [ korean ] =
{
- "표준" ;
+ "보통" ;
"이탤릭체" ;
"굵게" ;
"이탤릭체 (굵게)" ;
@@ -1408,7 +1408,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
{
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 129 ) ;
- Size = MAP_APPFONT ( 248 , 39 ) ;
+ Size = MAP_APPFONT ( 248 , 37 ) ;
Text = "Beispiel";
Text [ english_us ] = "Example";
Text[ portuguese ] = "Exemplo";
@@ -1434,8 +1434,9 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
FixedText FT_CHAR_FONTTYPE
{
- Pos = MAP_APPFONT ( 6 , 171 ) ;
- Size = MAP_APPFONT ( 248 , 10 ) ;
+ Pos = MAP_APPFONT ( 6 , 168 ) ;
+ Size = MAP_APPFONT ( 248 , 16 ) ;
+ WordBreak = TRUE ;
};
FixedLine FL_COLOR2
{
@@ -1486,7 +1487,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
Text[ polish ] = "Kolor";
Text[ portuguese_brazilian ] = "Font ~Color";
Text[ japanese ] = "フォントの色(~C)";
- Text[ korean ] = "글꼴(~C)";
+ Text[ korean ] = "글꼴 색상(~C)";
Text[ chinese_simplified ] = "字体颜色(~C)";
Text[ chinese_traditional ] = "字型顏色(~C)";
Text[ turkish ] = "Font ~Color";
@@ -1505,7 +1506,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
String STR_CHARNAME_NOSTYLE
{
- Text[language_user1] = "PB: %s wird ersetzt durch fett oder kursiv";
+ Text[language_user1] = "PB: ; PB: %s wird ersetzt durch fett oder kursiv";
Text = "Nicht %s";
Text[ english_us ] = "No %s";
Text[ portuguese ] = "Sem %s";
@@ -1572,7 +1573,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text [ ENGLISH ] = "~Underlining" ;
Text [ english_us ] = "Underlining" ;
Text[ portuguese ] = "~Sublinhado";
- Text[ russian ] = "";
+ Text[ russian ] = "~";
Text[ greek ] = "~";
Text[ dutch ] = "~Onderstrepen";
Text[ french ] = "~Soulignage";
@@ -1585,11 +1586,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ japanese ] = "下線";
Text[ korean ] = "밑줄";
Text[ chinese_simplified ] = "下划线";
- Text[ chinese_traditional ] = "下划線";
+ Text[ chinese_traditional ] = "下劃線";
Text[ turkish ] = "Underlining";
Text[ arabic ] = " ";
Text[ catalan ] = "Subratllat";
- Text[ finnish ] = "Alleviivaus";
+ Text[ finnish ] = "Allev~iivaus";
Text[ thai ] = "ขีดเส้นใต้";
};
ListBox LB_UNDERLINE
@@ -1641,23 +1642,23 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ language_user1 ] =
{
- < "(Ohne)" ; CHRDLG_UNDERLINE_NONE ; > ;
- < "Einfach" ; CHRDLG_UNDERLINE_SINGLE ; > ;
- < "Doppelt" ; CHRDLG_UNDERLINE_DOUBLE ; > ;
+ < "(Ohn; (Ohne)" ; CHRDLG_UNDERLINE_NONE ; > ;
+ < "Einf; Einfach" ; CHRDLG_UNDERLINE_SINGLE ; > ;
+ < "Dopp; Doppelt" ; CHRDLG_UNDERLINE_DOUBLE ; > ;
< "Fett"; CHRDLG_UNDERLINE_BOLD; > ;
- < "Punktiert" ; CHRDLG_UNDERLINE_DOTTED ; > ;
- < "Punktiert fett" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
- < "Strich"; CHRDLG_UNDERLINE_DASH; > ;
- < "Strich fett"; CHRDLG_UNDERLINE_BOLDDASH; > ;
- < "Strich lang"; CHRDLG_UNDERLINE_LONGDASH; > ;
- < "Strich fett lang"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
- < "Punkt Strich"; CHRDLG_UNDERLINE_DASHDOT; > ;
- < "Punkt Strich fett"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
- < "Punkt Punkt Strich"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
- < "Punkt Punkt Strich fett"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
- < "Welle"; CHRDLG_UNDERLINE_WAVE; > ;
- < "Welle fett"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
- < "Welle doppelt"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
+ < "Punk; Punktiert" ; CHRDLG_UNDERLINE_DOTTED ; > ;
+ < "Punk; Punktiert fett" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
+ < "Stri; Strich"; CHRDLG_UNDERLINE_DASH; > ;
+ < "Stri; Strich fett"; CHRDLG_UNDERLINE_BOLDDASH; > ;
+ < "Stri; Strich lang"; CHRDLG_UNDERLINE_LONGDASH; > ;
+ < "Stri; Strich fett lang"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
+ < "Punk; Punkt Strich"; CHRDLG_UNDERLINE_DASHDOT; > ;
+ < "Punk; Punkt Strich fett"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
+ < "Punk; Punkt Punkt Strich"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
+ < "Punk; Punkt Punkt Strich fett"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
+ < "Well; Welle"; CHRDLG_UNDERLINE_WAVE; > ;
+ < "Well; Welle fett"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
+ < "Well; Welle doppelt"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
};
StringList [ portuguese ] =
{
@@ -1681,20 +1682,20 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ russian ] =
{
- < "()" ; CHRDLG_UNDERLINE_NONE ; > ;
+ < "()" ; CHRDLG_UNDERLINE_NONE ; > ;
< "" ; CHRDLG_UNDERLINE_SINGLE ; > ;
< "" ; CHRDLG_UNDERLINE_DOUBLE ; > ;
< ""; CHRDLG_UNDERLINE_BOLD; > ;
< "" ; CHRDLG_UNDERLINE_DOTTED ; > ;
< " ()" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
- < ""; CHRDLG_UNDERLINE_DASH; > ;
+ < ""; CHRDLG_UNDERLINE_DASH; > ;
< " ()"; CHRDLG_UNDERLINE_BOLDDASH; > ;
- < " ()"; CHRDLG_UNDERLINE_LONGDASH; > ;
- < " (, )"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
- < " "; CHRDLG_UNDERLINE_DASHDOT; > ;
- < " ()"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
- < " "; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
- < " ()"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
+ < " "; CHRDLG_UNDERLINE_LONGDASH; > ;
+ < " ()"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
+ < ""; CHRDLG_UNDERLINE_DASHDOT; > ;
+ < " ()"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
+ < " 2 "; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
+ < " 2 ()"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
< ""; CHRDLG_UNDERLINE_WAVE; > ;
< " ()"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
< " "; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
@@ -1902,22 +1903,22 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
StringList [ korean ] =
{
< "(없음)" ; CHRDLG_UNDERLINE_NONE ; > ;
- < "보통" ; CHRDLG_UNDERLINE_SINGLE ; > ;
+ < "단일선" ; CHRDLG_UNDERLINE_SINGLE ; > ;
< "이중" ; CHRDLG_UNDERLINE_DOUBLE ; > ;
< "굵게"; CHRDLG_UNDERLINE_BOLD; > ;
< "점" ; CHRDLG_UNDERLINE_DOTTED ; > ;
< "점(굵게)" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
- < "선"; CHRDLG_UNDERLINE_DASH; > ;
- < "선(굵게)"; CHRDLG_UNDERLINE_BOLDDASH; > ;
- < "긴 선"; CHRDLG_UNDERLINE_LONGDASH; > ;
- < "긴 선(굵게)"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
+ < "파선"; CHRDLG_UNDERLINE_DASH; > ;
+ < "파선(굵게)"; CHRDLG_UNDERLINE_BOLDDASH; > ;
+ < "긴 파선"; CHRDLG_UNDERLINE_LONGDASH; > ;
+ < "긴 파선(굵게)"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
< "일점 쇄선"; CHRDLG_UNDERLINE_DASHDOT; > ;
< "일점 쇄선(굵게)"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
< "이점 쇄선"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
< "이점 쇄선(굵게)"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
- < "반복 기호"; CHRDLG_UNDERLINE_WAVE; > ;
- < "반복 기호(굵게)"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
- < "반복 기호(이중)"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
+ < "파선"; CHRDLG_UNDERLINE_WAVE; > ;
+ < "파선(굵게)"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
+ < "이중 파선"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
};
StringList [ chinese_simplified ] =
{
@@ -1947,10 +1948,10 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
< "粗體"; CHRDLG_UNDERLINE_BOLD; > ;
< "點線" ; CHRDLG_UNDERLINE_DOTTED ; > ;
< "點線粗體" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
- < "划線"; CHRDLG_UNDERLINE_DASH; > ;
- < "划線粗體"; CHRDLG_UNDERLINE_BOLDDASH; > ;
- < "長划線"; CHRDLG_UNDERLINE_LONGDASH; > ;
- < "划線粗長體"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
+ < "劃線"; CHRDLG_UNDERLINE_DASH; > ;
+ < "劃線粗體"; CHRDLG_UNDERLINE_BOLDDASH; > ;
+ < "長劃線"; CHRDLG_UNDERLINE_LONGDASH; > ;
+ < "劃線粗長體"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
< "點劃線"; CHRDLG_UNDERLINE_DASHDOT; > ;
< "點劃線粗體"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
< "雙點劃線"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
@@ -2022,22 +2023,22 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
StringList [ finnish ] =
{
< "(Ilman)" ; CHRDLG_UNDERLINE_NONE ; > ;
- < "Yksittinen" ; CHRDLG_UNDERLINE_SINGLE ; > ;
+ < "Rivivli 1" ; CHRDLG_UNDERLINE_SINGLE ; > ;
< "Kaksinkertainen" ; CHRDLG_UNDERLINE_DOUBLE ; > ;
- < "Lihavointi"; CHRDLG_UNDERLINE_BOLD; > ;
+ < "Lihavoitu"; CHRDLG_UNDERLINE_BOLD; > ;
< "Pisteet" ; CHRDLG_UNDERLINE_DOTTED ; > ;
- < "Pisteet (lihavointi)" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
- < "Vliviiva"; CHRDLG_UNDERLINE_DASH; > ;
- < "Vliviiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDDASH; > ;
- < "Pitk ajatusviiva"; CHRDLG_UNDERLINE_LONGDASH; > ;
- < "Pitk ajatusviiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
- < "Piste-viiva"; CHRDLG_UNDERLINE_DASHDOT; > ;
- < "Piste-viiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
- < "Piste-piste-viiva"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
- < "Piste-piste-viiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
- < "Aaltoviiva"; CHRDLG_UNDERLINE_WAVE; > ;
- < "Aaltoviiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
- < "Kaksinkertainen aaltoviiva"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
+ < "Pisteet (lihavoitu)" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
+ < "Katkoviiva"; CHRDLG_UNDERLINE_DASH; > ;
+ < "Katkoviiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDDASH; > ;
+ < "Pitk katkoviiva"; CHRDLG_UNDERLINE_LONGDASH; > ;
+ < "pitk katkoviiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
+ < "Pistekatkoviiva"; CHRDLG_UNDERLINE_DASHDOT; > ;
+ < "Pistekatkoviiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
+ < "Piste piste viiva"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
+ < "Piste piste viiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
+ < "Aalto"; CHRDLG_UNDERLINE_WAVE; > ;
+ < "Aalto (lihavoitu)"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
+ < "Kaksinkertainen aalto"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
};
StringList [ thai ] =
{
@@ -2074,12 +2075,12 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ french ] = "Couleur";
Text[ spanish ] = "Color";
Text[ italian ] = "Colore";
- Text[ danish ] = "~Farve";
+ Text[ danish ] = "Far~ve";
Text[ swedish ] = "~Frg";
Text[ polish ] = "Kolor";
Text[ portuguese_brazilian ] = "Color";
Text[ japanese ] = "色";
- Text[ korean ] = "색";
+ Text[ korean ] = "색상";
Text[ chinese_simplified ] = "颜色";
Text[ chinese_traditional ] = "顏色";
Text[ turkish ] = "Color";
@@ -2151,12 +2152,12 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ language_user1 ] =
{
- < "(Ohne)" ; CHRDLG_STRIKEOUT_NONE ; > ;
- < "Einfach" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
- < "Doppelt" ; CHRDLG_STRIKEOUT_DOUBLE ; > ;
+ < "(Ohn; (Ohne)" ; CHRDLG_STRIKEOUT_NONE ; > ;
+ < "Einf; Einfach" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
+ < "Dopp; Doppelt" ; CHRDLG_STRIKEOUT_DOUBLE ; > ;
< "Fett" ; CHRDLG_STRIKEOUT_BOLD ; > ;
- < "Mit /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
- < "Mit X" ; CHRDLG_STRIKEOUT_X ; > ;
+ < "Mit ; Mit /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
+ < "Mit ; Mit X" ; CHRDLG_STRIKEOUT_X ; > ;
};
StringList [ portuguese ] =
{
@@ -2169,12 +2170,12 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ russian ] =
{
- < "()" ; CHRDLG_STRIKEOUT_NONE ; > ;
+ < "()" ; CHRDLG_STRIKEOUT_NONE ; > ;
< "" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
< "" ; CHRDLG_STRIKEOUT_DOUBLE ; > ;
< "" ; CHRDLG_STRIKEOUT_BOLD ; > ;
- < " /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
- < " X" ; CHRDLG_STRIKEOUT_X ; > ;
+ < ": /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
+ < ": X" ; CHRDLG_STRIKEOUT_X ; > ;
};
StringList [ greek ] =
{
@@ -2269,11 +2270,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
StringList [ korean ] =
{
< "(없음)" ; CHRDLG_STRIKEOUT_NONE ; > ;
- < "보통" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
+ < "단일선" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
< "이중" ; CHRDLG_STRIKEOUT_DOUBLE ; > ;
- < "굵은" ; CHRDLG_STRIKEOUT_BOLD ; > ;
- < "함께 /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
- < "함께 X" ; CHRDLG_STRIKEOUT_X ; > ;
+ < "굵게" ; CHRDLG_STRIKEOUT_BOLD ; > ;
+ < "/ 로" ; CHRDLG_STRIKEOUT_SLASH ; > ;
+ < "X 로" ; CHRDLG_STRIKEOUT_X ; > ;
};
StringList [ chinese_simplified ] =
{
@@ -2323,11 +2324,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
StringList [ finnish ] =
{
< "(Ilman)" ; CHRDLG_STRIKEOUT_NONE ; > ;
- < "Yksittinen" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
+ < "Rivivli 1" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
< "Kaksinkertainen" ; CHRDLG_STRIKEOUT_DOUBLE ; > ;
- < "Lihavointi" ; CHRDLG_STRIKEOUT_BOLD ; > ;
- < "Kenoviivoilla" ; CHRDLG_STRIKEOUT_SLASH ; > ;
- < "X-kirjaimilla" ; CHRDLG_STRIKEOUT_X ; > ;
+ < "Lihavoitu" ; CHRDLG_STRIKEOUT_BOLD ; > ;
+ < "Sek /" ; CHRDLG_STRIKEOUT_SLASH ; > ;
+ < "X:n kanssa" ; CHRDLG_STRIKEOUT_X ; > ;
};
StringList [ thai ] =
{
@@ -2359,13 +2360,13 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ polish ] = "Tylko sowa";
Text[ portuguese_brazilian ] = "Individual words";
Text[ japanese ] = "単語ごとにする(~W)";
- Text[ korean ] = "단어씩(~W)";
+ Text[ korean ] = "한 단어 마다(~W)";
Text[ chinese_simplified ] = "逐字(~W)";
Text[ chinese_traditional ] = "逐字(~W)";
Text[ turkish ] = "Individual words";
Text[ arabic ] = " ";
Text[ catalan ] = "~Paraules individuals";
- Text[ finnish ] = "~Yksittiset sanat";
+ Text[ finnish ] = "Yksittiset ~sanat";
Text[ thai ] = "~คำเฉพาะ";
};
FixedText FT_EMPHASIS
@@ -2382,18 +2383,18 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ french ] = "Caractres d'a~ccentuation";
Text[ spanish ] = "Caracteres de acentuacin";
Text[ italian ] = "Carattere di accentua~zione";
- Text[ danish ] = "~Fremhvningstegn";
+ Text[ danish ] = "Fre~mhvningstegn";
Text[ swedish ] = "~Betoningstecken";
Text[ polish ] = "Znak intonacji";
Text[ portuguese_brazilian ] = "Emphasis character";
Text[ japanese ] = "強調に用いる記号(~H)";
- Text[ korean ] = "강세 글꼴(~H)";
+ Text[ korean ] = "강조 표시(~H)";
Text[ chinese_simplified ] = "重音符(~H)";
Text[ chinese_traditional ] = "重音符號(~H)";
Text[ turkish ] = "Emphasis character";
Text[ arabic ] = " ";
Text[ catalan ] = "Carcter ~emftic";
- Text[ finnish ] = "~Korostusmerkki";
+ Text[ finnish ] = "Korostus~merkki";
Text[ thai ] = "เครื่องหมายเ~น้น";
};
ListBox LB_EMPHASIS
@@ -2421,11 +2422,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ language_user1 ] =
{
- < "(ohne)" ; default ; > ;
- < "Punkt" ; default ; > ;
- < "Kreis" ; default ; > ;
- < "Scheibe" ; default ; > ;
- < "Akzent" ; default ; > ;
+ < "(ohn; (ohne)" ; default ; > ;
+ < "Punk; Punkt" ; default ; > ;
+ < "Krei; Kreis" ; default ; > ;
+ < "Sche; Scheibe" ; default ; > ;
+ < "Akze; Akzent" ; default ; > ;
};
StringList [ english_us ] =
{
@@ -2445,9 +2446,9 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ russian ] =
{
- < "()" ; default ; > ;
+ < "()" ; default ; > ;
< "" ; default ; > ;
- < "" ; default ; > ;
+ < "" ; default ; > ;
< "" ; default ; > ;
< "" ; default ; > ;
};
@@ -2465,7 +2466,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
< "Punt" ; default ; > ;
< "Cirkel" ; default ; > ;
< "Schijf" ; default ; > ;
- < "Accent " ; default ; > ;
+ < "Accent" ; default ; > ;
};
StringList [ french ] =
{
@@ -2581,8 +2582,8 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ finnish ] =
{
- < "(Ei mitn)" ; default ; > ;
- < "Pilkku" ; default ; > ;
+ < "(ilman)" ; default ; > ;
+ < "Piste" ; default ; > ;
< "Ympyr" ; default ; > ;
< "Levy" ; default ; > ;
< "Aksentti" ; default ; > ;
@@ -2604,7 +2605,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text [ ENGLISH ] = "~Position" ;
Text [ english_us ] = "Position" ;
Text[ portuguese ] = "~Posio";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ greek ] = "";
Text[ dutch ] = "~Positie";
Text[ french ] = "Position";
@@ -2643,8 +2644,8 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ language_user1 ] =
{
- < "ber Text" ; CHRDLG_POSITION_OVER ; > ;
- < "Unter Text" ; CHRDLG_POSITION_UNDER ; > ;
+ < "be; ber Text" ; CHRDLG_POSITION_OVER ; > ;
+ < "Unte; Unter Text" ; CHRDLG_POSITION_UNDER ; > ;
};
StringList [ portuguese ] =
{
@@ -2791,7 +2792,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text [ ENGLISH ] = "~Effects" ;
Text [ english_us ] = "Effects" ;
Text[ portuguese ] = "~Efeitos";
- Text[ russian ] = " ";
+ Text[ russian ] = "";
Text[ greek ] = "";
Text[ dutch ] = "~Effecten";
Text[ french ] = "~Attributs";
@@ -2842,11 +2843,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ language_user1 ] =
{
- < "Keine" ; Default ; > ;
- < "Versalien" ; Default ; > ;
- < "Gemeine" ; Default ; > ;
- < "Titelschrift" ; Default ; > ;
- < "Kapit?lchen" ; Default ; > ;
+ < "Kein; Keine" ; Default ; > ;
+ < "Vers; Versalien" ; Default ; > ;
+ < "Geme; Gemeine" ; Default ; > ;
+ < "Tite; Titelschrift" ; Default ; > ;
+ < "Kapi; Kapit?lchen" ; Default ; > ;
};
StringList [ portuguese ] =
{
@@ -2858,10 +2859,10 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ russian ] =
{
- < "()" ; Default ; > ;
+ < "()" ; Default ; > ;
< "" ; Default ; > ;
< "" ; Default ; > ;
- < " " ; Default ; > ;
+ < "" ; Default ; > ;
< "" ; Default ; > ;
};
StringList [ greek ] =
@@ -2877,7 +2878,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
< "(Zonder)" ; Default ; > ;
< "Hoofdletters" ; Default ; > ;
< "Kleine letters" ; Default ; > ;
- < "Titel" ; Default ; > ;
+ < "Lettertype titel" ; Default ; > ;
< "Klein-kapitaal" ; Default ; > ;
};
StringList [ french ] =
@@ -2946,7 +2947,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ korean ] =
{
- < "없음" ; Default ; > ;
+ < "(없음)" ; Default ; > ;
< "대문자" ; Default ; > ;
< "소문자" ; Default ; > ;
< "제목" ; Default ; > ;
@@ -2994,11 +2995,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ finnish ] =
{
- < "Ei mitn" ; Default ; > ;
+ < "(ilman)" ; Default ; > ;
< "Isot kirjaimet" ; Default ; > ;
< "Pienet kirjaimet" ; Default ; > ;
< "Otsikko" ; Default ; > ;
- < "Pienet alkukirjaimet" ; Default ; > ;
+ < "Kapiteelikirjaimet" ; Default ; > ;
};
StringList [ thai ] =
{
@@ -3017,7 +3018,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text [ ENGLISH ] = "~Relief" ;
Text[ english_us ] = "~Relief";
Text[ portuguese ] = "~Relevo";
- Text[ russian ] = "";
+ Text[ russian ] = "~";
Text[ greek ] = "A";
Text[ dutch ] = "~Relif";
Text[ french ] = "Relief";
@@ -3056,9 +3057,9 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ language_user1 ] =
{
- < "Keine" ; Default ; > ;
- < "Erhaben" ; Default ; > ;
- < "Vertieft" ; Default ; > ;
+ < "Kein; Keine" ; Default ; > ;
+ < "Erha; Erhaben" ; Default ; > ;
+ < "Vert; Vertieft" ; Default ; > ;
};
StringList [ english_us ] =
{
@@ -3074,7 +3075,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ russian ] =
{
- < "()" ; Default ; > ;
+ < "()" ; Default ; > ;
< "" ; Default ; > ;
< "" ; Default ; > ;
};
@@ -3100,7 +3101,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
{
< "(Ninguno)" ; Default ; > ;
< "Saliente" ; Default ; > ;
- < "Ahondado" ; Default ; > ;
+ < "Grabado" ; Default ; > ;
};
StringList [ italian ] =
{
@@ -3140,9 +3141,9 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ korean ] =
{
- < "없음" ; Default ; > ;
- < "돌출" ; Default ; > ;
- < "홈" ; Default ; > ;
+ < "(없음)" ; Default ; > ;
+ < "돌출 효과" ; Default ; > ;
+ < "오목 효과" ; Default ; > ;
};
StringList [ chinese_simplified ] =
{
@@ -3176,8 +3177,8 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
StringList [ finnish ] =
{
- < "Ei mitn" ; Default ; > ;
- < "Kohokuvioitu" ; Default ; > ;
+ < "(ilman)" ; Default ; > ;
+ < "Korkokuva" ; Default ; > ;
< "Kaiverrettu" ; Default ; > ;
};
StringList [ thai ] =
@@ -3206,7 +3207,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ polish ] = "Kontur";
Text[ portuguese_brazilian ] = "Outline";
Text[ japanese ] = "中抜き";
- Text[ korean ] = "윤곽";
+ Text[ korean ] = "외곽선";
Text[ chinese_simplified ] = "轮廓";
Text[ chinese_traditional ] = "輪廓";
Text[ turkish ] = "Outline";
@@ -3234,16 +3235,16 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ polish ] = "Cie";
Text[ portuguese_brazilian ] = "Shadow";
Text[ japanese ] = "影";
- Text[ korean ] = "음영";
+ Text[ korean ] = "그림자";
Text[ chinese_simplified ] = "阴影";
Text[ chinese_traditional ] = "陰影";
Text[ turkish ] = "Shadow";
Text[ arabic ] = "";
Text[ catalan ] = "Ombra";
- Text[ finnish ] = "Varjo ";
+ Text[ finnish ] = "Varjo";
Text[ thai ] = "แรเงา";
};
- CheckBox CB_BLINKING
+ TriStateBox CB_BLINKING
{
Pos = MAP_APPFONT ( 166 , 92 ) ;
Size = MAP_APPFONT ( 82 , 10 ) ;
@@ -3256,14 +3257,14 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ greek ] = " ~";
Text[ dutch ] = "~Knipperend";
Text[ french ] = "Clignotant";
- Text[ spanish ] = "Intermitente";
+ Text[ spanish ] = "~Intermitente";
Text[ italian ] = "La~mpeggiante";
Text[ danish ] = "B~linkende";
Text[ swedish ] = "B~linkande";
Text[ polish ] = "Miganie";
Text[ portuguese_brazilian ] = "Blinking";
Text[ japanese ] = "点滅(~B)";
- Text[ korean ] = "점멸(~B)";
+ Text[ korean ] = "깜박임 효과(~B)";
Text[ chinese_simplified ] = "闪动的(~B)";
Text[ chinese_traditional ] = "閃動(~B)";
Text[ turkish ] = "Blinking";
@@ -3276,7 +3277,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
{
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 129 ) ;
- Size = MAP_APPFONT ( 248 , 39 ) ;
+ Size = MAP_APPFONT ( 248 , 37 ) ;
Text = "Beispiel";
Text [ english_us ] = "Example";
Text[ portuguese ] = "Exemplo";
@@ -3302,8 +3303,9 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
FixedText FT_EFFECTS_FONTTYPE
{
- Pos = MAP_APPFONT ( 6 , 171 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
+ Pos = MAP_APPFONT ( 6 , 168 ) ;
+ Size = MAP_APPFONT ( 248 , 16 ) ;
+ WordBreak = TRUE ;
};
String STR_EFFECTS_CAPITALS
{
@@ -3360,9 +3362,9 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text = "Titelschrift";
Text [ english_us ] = "Title" ;
Text[ portuguese ] = "Caracteres do ttulo";
- Text[ russian ] = " ";
+ Text[ russian ] = "";
Text[ greek ] = "";
- Text[ dutch ] = "Titel";
+ Text[ dutch ] = "Lettertype titel";
Text[ french ] = "Caractres du titre";
Text[ spanish ] = "Ttulo";
Text[ italian ] = "Titolo";
@@ -3402,7 +3404,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ turkish ] = "Small Capitals";
Text[ arabic ] = " ";
Text[ catalan ] = "Majscules petites";
- Text[ finnish ] = "Pienet alkukirjaimet";
+ Text[ finnish ] = "Kapiteelikirjaimet";
Text[ thai ] = "ตัวพิมพ์เล็ก";
};
String STR_EFFECTS_OUTLINE
@@ -3421,7 +3423,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ polish ] = "Kontur";
Text[ portuguese_brazilian ] = "Outline";
Text[ japanese ] = "中抜き";
- Text[ korean ] = "윤곽";
+ Text[ korean ] = "외곽선";
Text[ chinese_simplified ] = "轮廓";
Text[ chinese_traditional ] = "輪廓";
Text[ turkish ] = "Outline";
@@ -3446,13 +3448,13 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ polish ] = "Cie";
Text[ portuguese_brazilian ] = "Shadow";
Text[ japanese ] = "影";
- Text[ korean ] = "음영";
+ Text[ korean ] = "그림자";
Text[ chinese_simplified ] = "阴影";
Text[ chinese_traditional ] = "陰影";
Text[ turkish ] = "Shadow";
Text[ arabic ] = "";
Text[ catalan ] = "Ombra";
- Text[ finnish ] = "Varjo ";
+ Text[ finnish ] = "Va~rjo";
Text[ thai ] = "แรเงา";
};
String STR_EFFECTS_BLINKING
@@ -3471,7 +3473,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
Text[ polish ] = "Miganie";
Text[ portuguese_brazilian ] = "Blinking";
Text[ japanese ] = "点滅";
- Text[ korean ] = "점멸";
+ Text[ korean ] = "깜박임 효과";
Text[ chinese_simplified ] = "闪动的";
Text[ chinese_traditional ] = "閃動";
Text[ turkish ] = "Blinking";
@@ -3522,7 +3524,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text = "Position";
Text [ english_us ] = "Position" ;
Text[ portuguese ] = "Posio";
- Text[ russian ] = "";
+ Text[ russian ] = " ";
Text[ greek ] = "";
Text[ dutch ] = "Positie";
Text[ french ] = "Position";
@@ -3551,9 +3553,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text [ english_us ] = "Superscript" ;
TabStop = TRUE;
Text[ portuguese ] = "S~uperior linha";
- Text[ russian ] = " ";
+ Text[ russian ] = "";
Text[ greek ] = "";
- Text[ dutch ] = "S~upercript";
+ Text[ dutch ] = "S~uperscript";
Text[ french ] = "Exposant";
Text[ spanish ] = "Superndice";
Text[ italian ] = "~Apice";
@@ -3568,7 +3570,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ turkish ] = "Super";
Text[ arabic ] = "";
Text[ catalan ] = "Superndex";
- Text[ finnish ] = "Ylpuolella";
+ Text[ finnish ] = "Ylindeksi";
Text[ thai ] = "ตัวยก";
};
RadioButton RB_NORMALPOS
@@ -3580,9 +3582,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text [ english_us ] = "Normal" ;
TabStop = TRUE;
Text[ portuguese ] = "~Normal";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ greek ] = "~";
- Text[ dutch ] = "~Normal";
+ Text[ dutch ] = "Sta~ndaard";
Text[ french ] = "~Normal";
Text[ spanish ] = "Normal";
Text[ italian ] = "Normale";
@@ -3609,9 +3611,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text [ english_us ] = "Subscript" ;
TabStop = TRUE;
Text[ portuguese ] = "A~baixo";
- Text[ russian ] = " ";
+ Text[ russian ] = "";
Text[ greek ] = "~";
- Text[ dutch ] = "S~ub";
+ Text[ dutch ] = "Su~b";
Text[ french ] = "~Indice";
Text[ spanish ] = "Subndice";
Text[ italian ] = "P~edice";
@@ -3626,7 +3628,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ turkish ] = "Sub";
Text[ arabic ] = "";
Text[ catalan ] = "Subndex";
- Text[ finnish ] = "Alapuolella";
+ Text[ finnish ] = "Alaindeksi";
Text[ thai ] = "ตัวห้อย";
};
FixedText FT_HIGHLOW
@@ -3637,9 +3639,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text [ ENGLISH ] = "~Raise/lower by" ;
Text [ english_us ] = "~Raise/lower by" ;
Text[ portuguese ] = "~Superior/Inferior em";
- Text[ russian ] = "/ ";
+ Text[ russian ] = " ";
Text[ greek ] = "/ ";
- Text[ dutch ] = "S~upercript/subscript met";
+ Text[ dutch ] = "~Superscript/subscript met";
Text[ french ] = "Exposant/indice ";
Text[ spanish ] = "Super/subndice";
Text[ italian ] = "Apice/Pedice di";
@@ -3648,13 +3650,13 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ polish ] = "Ind.gr./Ind.dln. przy";
Text[ portuguese_brazilian ] = "Raise/lower by";
Text[ japanese ] = "上/下の割合(~R)";
- Text[ korean ] = "높게/낮게, 정도(~R)";
+ Text[ korean ] = "올림/내림 설정(~R)";
Text[ chinese_simplified ] = "上升/下降值(~R)";
Text[ chinese_traditional ] = "上昇/下降值(~R)";
Text[ turkish ] = "Raise/lower by";
Text[ arabic ] = "/ ";
Text[ catalan ] = "Augment/disminuci de";
- Text[ finnish ] = "Nosta/laske";
+ Text[ finnish ] = "~Nosta / laske";
Text[ thai ] = "~ขึ้น/ลงโดย";
};
MetricField ED_HIGHLOW
@@ -3684,7 +3686,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ portuguese ] = "A~utomtico";
Text[ russian ] = "";
Text[ greek ] = "~";
- Text[ dutch ] = "A~utomatisch";
+ Text[ dutch ] = "Au~tomatisch";
Text[ french ] = "Automatique";
Text[ spanish ] = "Automtico";
Text[ italian ] = "A~utomatico";
@@ -3710,7 +3712,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text [ ENGLISH ] = "R~elative font size" ;
Text [ english_us ] = "Relative font size" ;
Text[ portuguese ] = "Ta~manho relativo";
- Text[ russian ] = " .";
+ Text[ russian ] = " ";
Text[ greek ] = " ~ ";
Text[ dutch ] = "~Relatieve schriftgrootte";
Text[ french ] = "~Taille relative";
@@ -3721,7 +3723,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ polish ] = "Wzgl. rozm. czcionki";
Text[ portuguese_brazilian ] = "Relative font size";
Text[ japanese ] = "相対フォントサイズ";
- Text[ korean ] = "글꼴 크기, 상대적";
+ Text[ korean ] = "글꼴 크기에 비례하여";
Text[ chinese_simplified ] = "相对的字体大小";
Text[ chinese_traditional ] = "相對的字型大小";
Text[ turkish ] = "Relative font size";
@@ -3764,7 +3766,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ polish ] = "Rotacja / Skalowanie";
Text[ portuguese_brazilian ] = "Rotation / scaling";
Text[ japanese ] = "回転と倍率";
- Text[ korean ] = "회전 / 배율";
+ Text[ korean ] = "회전 및 배율";
Text[ chinese_simplified ] = "旋转/显示比例";
Text[ chinese_traditional ] = "旋轉/顯示比例";
Text[ turkish ] = "Rotation / scaling";
@@ -3791,13 +3793,13 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ polish ] = "Skalowanie";
Text[ portuguese_brazilian ] = "Scaling";
Text[ japanese ] = "倍率";
- Text[ korean ] = "배율";
+ Text[ korean ] = "장평";
Text[ chinese_simplified ] = "显示比例";
Text[ chinese_traditional ] = "顯示比例";
Text[ turkish ] = "Scaling";
Text[ arabic ] = "Scaling";
Text[ catalan ] = "Redimensionament";
- Text[ finnish ] = "Skaalataan";
+ Text[ finnish ] = "Skaalaus";
Text[ thai ] = "สเกล";
};
RadioButton RB_0_DEG
@@ -3826,7 +3828,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ turkish ] = "0 degree";
Text[ arabic ] = "0 ";
Text[ catalan ] = "0 graus";
- Text[ finnish ] = "0 astetta";
+ Text[ finnish ] = "~0 astetta";
Text[ thai ] = "~0 องศา";
};
RadioButton RB_90_DEG
@@ -3855,7 +3857,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ turkish ] = "90 degree";
Text[ arabic ] = "90 ";
Text[ catalan ] = "90 graus";
- Text[ finnish ] = "90 astetta";
+ Text[ finnish ] = "~90 astetta";
Text[ thai ] = "~90 องศา";
};
RadioButton RB_270_DEG
@@ -3884,7 +3886,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ turkish ] = "270 degree";
Text[ arabic ] = "270 ";
Text[ catalan ] = "270 graus";
- Text[ finnish ] = "270 astetta";
+ Text[ finnish ] = "~270 astetta";
Text[ thai ] = "~270 องศา";
};
CheckBox CB_FIT_TO_LINE
@@ -3900,20 +3902,20 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ greek ] = " ";
Text[ dutch ] = "A~anpassen aan regel";
Text[ french ] = "Adapter la ligne";
- Text[ spanish ] = "Ajustar a fila";
+ Text[ spanish ] = "~Ajustar a la lnea";
Text[ italian ] = "Adatta alla riga";
Text[ danish ] = "Tilpas til ~linje";
Text[ swedish ] = "Anpassa till ~rad";
Text[ polish ] = "Dopasuj do wiersza";
Text[ portuguese_brazilian ] = "Fit to line";
Text[ japanese ] = "行に合わせる";
- Text[ korean ] = "줄에 맞추기";
+ Text[ korean ] = "줄에 맞춤";
Text[ chinese_simplified ] = "和行对齐";
Text[ chinese_traditional ] = "和行對齊";
Text[ turkish ] = "Fit to line";
Text[ arabic ] = " ";
Text[ catalan ] = "Ajusta a fila";
- Text[ finnish ] = "Sovita riviin";
+ Text[ finnish ] = "Sovita riville";
Text[ thai ] = "จัดพอดีบรรทัด";
};
FixedText FT_SCALE_WIDTH
@@ -3926,7 +3928,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ portuguese ] = "E~scalar largura";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "~Breedte scaleren";
+ Text[ dutch ] = "~Breedte op schaal brengen";
Text[ french ] = "Graduer la largeur";
Text[ spanish ] = "Tamao del ancho";
Text[ italian ] = "Scala larghezza";
@@ -3935,13 +3937,13 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ polish ] = "Skaluj szeroko";
Text[ portuguese_brazilian ] = "Scale width";
Text[ japanese ] = "幅の倍率(~W)";
- Text[ korean ] = "폭 배율(~W)";
+ Text[ korean ] = "너비 배율 조정(~W)";
Text[ chinese_simplified ] = "宽度显示比例(~W)";
Text[ chinese_traditional ] = "寬度顯示比例(~W)";
Text[ turkish ] = "Scale width";
Text[ arabic ] = " ";
Text[ catalan ] = "Amplada de l'escala";
- Text[ finnish ] = "Skaalaa leveys";
+ Text[ finnish ] = "Skaalaa ~leveys";
Text[ thai ] = "สเกลความ~กว้าง";
};
MetricField MF_SCALE_WIDTH
@@ -3969,7 +3971,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ portuguese ] = "Espaamento";
Text[ russian ] = "";
Text[ greek ] = "";
- Text[ dutch ] = "Spatiring";
+ Text[ dutch ] = "Kerning";
Text[ french ] = "Espacement";
Text[ spanish ] = "Espacios";
Text[ italian ] = "Spaziatura";
@@ -3978,13 +3980,13 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ polish ] = "Odstpy";
Text[ portuguese_brazilian ] = "Spacing";
Text[ japanese ] = "文字間隔";
- Text[ korean ] = "간격";
+ Text[ korean ] = "자간";
Text[ chinese_simplified ] = "间隔";
Text[ chinese_traditional ] = "間隔";
Text[ turkish ] = "Spacing";
Text[ arabic ] = " ";
Text[ catalan ] = "Espaiat";
- Text[ finnish ] = "Objektivlit";
+ Text[ finnish ] = "Vlit";
Text[ thai ] = "ระยะห่าง";
};
ListBox LB_KERNING2
@@ -4007,9 +4009,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
StringList [ language_user1 ] =
{
- < "Standard" ; Default ; > ;
- < "Gesperrt" ; Default ; > ;
- < "Schmal" ; Default ; > ;
+ < "Stan; Standard" ; Default ; > ;
+ < "Gesp; Gesperrt" ; Default ; > ;
+ < "Schm; Schmal" ; Default ; > ;
};
StringList [ portuguese ] =
{
@@ -4019,7 +4021,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
StringList [ russian ] =
{
- < "" ; Default ; > ;
+ < "" ; Default ; > ;
< "" ; Default ; > ;
< "" ; Default ; > ;
};
@@ -4085,8 +4087,8 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
StringList [ korean ] =
{
- < "기본" ; Default ; > ;
- < "장평" ; Default ; > ;
+ < "기본값" ; Default ; > ;
+ < "넓게" ; Default ; > ;
< "좁게" ; Default ; > ;
};
StringList [ chinese_simplified ] =
@@ -4121,7 +4123,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
StringList [ finnish ] =
{
- < "Oletusarvo" ; Default ; > ;
+ < "Oletus" ; Default ; > ;
< "Laajennettu" ; Default ; > ;
< "Tiivistetty" ; Default ; > ;
};
@@ -4158,7 +4160,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ turkish ] = "by";
Text[ arabic ] = "";
Text[ catalan ] = "per";
- Text[ finnish ] = "/";
+ Text[ finnish ] = "~etisyys";
Text[ thai ] = "โด~ย";
};
MetricField ED_KERNING2
@@ -4183,9 +4185,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text [ english_us ] = "~Pair kerning" ;
TabStop = TRUE;
Text[ portuguese ] = "~Kerning de pares";
- Text[ russian ] = "~ ";
+ Text[ russian ] = "~ ";
Text[ greek ] = " ";
- Text[ dutch ] = "~Paarwijze Kerning";
+ Text[ dutch ] = "~Paarsgewijze kerning";
Text[ french ] = "~Crnage pair";
Text[ spanish ] = "~Ajuste par entre caracteres";
Text[ italian ] = "Crenatura caratteri a coppia";
@@ -4194,13 +4196,13 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text[ polish ] = "Kerning w parze";
Text[ portuguese_brazilian ] = "~Pair kerning";
Text[ japanese ] = "文字組みのカーニング(~P)";
- Text[ korean ] = "커닝, 쌍(~P)";
+ Text[ korean ] = "글꼴 커닝(~P)";
Text[ chinese_simplified ] = "字母间隔相等(~P)";
Text[ chinese_traditional ] = "字母間隔相等(~P)";
Text[ turkish ] = "~Pair kerning";
Text[ arabic ] = " ";
Text[ catalan ] = "Interlletratge ~parell";
- Text[ finnish ] = "~Parilimitys";
+ Text[ finnish ] = "~Parivlistys";
Text[ thai ] = "ปรับระยะห่าง~คู่";
};
Window WIN_POS_PREVIEW
@@ -4209,7 +4211,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
Text [ english_us ] = "Example" ;
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 129 ) ;
- Size = MAP_APPFONT ( 248 , 39 ) ;
+ Size = MAP_APPFONT ( 248 , 37 ) ;
Text[ portuguese ] = "Exemplo";
Text[ russian ] = "";
Text[ greek ] = "";
@@ -4233,8 +4235,9 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
FixedText FT_POS_FONTTYPE
{
- Pos = MAP_APPFONT ( 6 , 171 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
+ Pos = MAP_APPFONT ( 6 , 168 ) ;
+ Size = MAP_APPFONT ( 248 , 16 ) ;
+ WordBreak = TRUE ;
};
};
@@ -4261,7 +4264,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
Text[ polish ] = "Dwa wiersze";
Text[ portuguese_brazilian ] = "Two lines";
Text[ japanese ] = "2行使い";
- Text[ korean ] = "두 행";
+ Text[ korean ] = "2줄";
Text[ chinese_simplified ] = "双行";
Text[ chinese_traditional ] = "雙行";
Text[ turkish ] = "Two lines";
@@ -4279,7 +4282,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
Text [ english_us ] = "~Write in double lines" ;
TabStop = TRUE;
Text[ portuguese ] = "~Linhas duplas";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = "~ ";
Text[ dutch ] = "T~wee regels per rij";
Text[ french ] = "~Deux lignes en une pour l'criture";
@@ -4290,13 +4293,13 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
Text[ polish ] = "Pisz w dwch wierszach";
Text[ portuguese_brazilian ] = "Two lines each line";
Text[ japanese ] = "1行を2行使いにする(~W)";
- Text[ korean ] = "매 행당 두 행 쓰기(~W)";
+ Text[ korean ] = "두 줄을 한 줄 높이로 쓰기(~W)";
Text[ chinese_simplified ] = "用一行的空间输入两行字(~W)";
Text[ chinese_traditional ] = "用一行的空間輸入兩行字(~W)";
Text[ turkish ] = "Two lines each line";
Text[ arabic ] = " ";
Text[ catalan ] = "Dos lnies per rengla";
- Text[ finnish ] = "~Kyt kaksoisviivoja";
+ Text[ finnish ] = "Kyt ~kaksoisviivoja";
Text[ thai ] = "เ~ขียนในบรรทัดคู่";
};
FixedLine FL_ENCLOSE
@@ -4306,7 +4309,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
Text = "Einschlieende Zeichen";
Text [ english_us ] = "Enclosing character" ;
Text[ portuguese ] = "Caracteres de incluso";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "Omhullend teken";
Text[ french ] = "Caractres d'encadrement";
@@ -4317,7 +4320,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
Text[ polish ] = "Znaki wiodce i kocowe";
Text[ portuguese_brazilian ] = "Enclose character";
Text[ japanese ] = "かっこ記号";
- Text[ korean ] = "원 문자";
+ Text[ korean ] = "원문자";
Text[ chinese_simplified ] = "带括号的字符";
Text[ chinese_traditional ] = "帶括號的字元";
Text[ turkish ] = "Enclose character";
@@ -4333,7 +4336,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
Text = "A~nfangszeichen";
Text [ english_us ] = "I~nitial character" ;
Text[ portuguese ] = "Carcter i~nicial";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "~Eerste teken";
Text[ french ] = "Caractre de ~dbut";
@@ -4379,12 +4382,12 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
};
StringList [ language_user1 ] =
{
- < "(Keines)" ; CHRDLG_ENCLOSE_NONE ; > ;
+ < "(Kei; (Keines)" ; CHRDLG_ENCLOSE_NONE ; > ;
< "(" ; CHRDLG_ENCLOSE_ROUND ; > ;
< "[" ; CHRDLG_ENCLOSE_SQUARE ; > ;
< "<" ; CHRDLG_ENCLOSE_POINTED ; > ;
< "{" ; CHRDLG_ENCLOSE_CURVED ; > ;
- < "Weitere Zeichen..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+ < "Weit; Weitere Zeichen..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
};
StringList [ portuguese ] =
{
@@ -4397,12 +4400,12 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
};
StringList [ russian ] =
{
- < "()" ; CHRDLG_ENCLOSE_NONE ; > ;
+ < "()" ; CHRDLG_ENCLOSE_NONE ; > ;
< "(" ; CHRDLG_ENCLOSE_ROUND ; > ;
< "[" ; CHRDLG_ENCLOSE_SQUARE ; > ;
< "<" ; CHRDLG_ENCLOSE_POINTED ; > ;
< "{" ; CHRDLG_ENCLOSE_CURVED ; > ;
- < " ..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+ < " ..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
};
StringList [ greek ] =
{
@@ -4555,7 +4558,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
< "[" ; CHRDLG_ENCLOSE_SQUARE ; > ;
< "<" ; CHRDLG_ENCLOSE_POINTED ; > ;
< "{" ; CHRDLG_ENCLOSE_CURVED ; > ;
- < "Muut merkit" ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+ < "Muut merkit..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
};
StringList [ thai ] =
{
@@ -4569,7 +4572,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
Text = "~Endzeichen";
Text [ english_us ] = "Final charact~er" ;
Text[ portuguese ] = "Carcter ~final";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = "~ ";
Text[ dutch ] = "~Laatste teken";
Text[ french ] = "Caractre de ~fin";
@@ -4615,12 +4618,12 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
};
StringList [ language_user1 ] =
{
- < "(Keines)" ; CHRDLG_ENCLOSE_NONE ; > ;
+ < "(Kei; (Keines)" ; CHRDLG_ENCLOSE_NONE ; > ;
< ")" ; CHRDLG_ENCLOSE_ROUND ; > ;
< "]" ; CHRDLG_ENCLOSE_SQUARE ; > ;
< ">" ; CHRDLG_ENCLOSE_POINTED ; > ;
< "}" ; CHRDLG_ENCLOSE_CURVED ; > ;
- < "Weitere Zeichen..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+ < "Weit; Weitere Zeichen..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
};
StringList [ portuguese ] =
{
@@ -4633,12 +4636,12 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
};
StringList [ russian ] =
{
- < "()" ; CHRDLG_ENCLOSE_NONE ; > ;
+ < "()" ; CHRDLG_ENCLOSE_NONE ; > ;
< ")" ; CHRDLG_ENCLOSE_ROUND ; > ;
< "]" ; CHRDLG_ENCLOSE_SQUARE ; > ;
< ">" ; CHRDLG_ENCLOSE_POINTED ; > ;
< "}" ; CHRDLG_ENCLOSE_CURVED ; > ;
- < " ..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+ < " ..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
};
StringList [ greek ] =
{
@@ -4791,7 +4794,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
< "]" ; CHRDLG_ENCLOSE_SQUARE ; > ;
< ">" ; CHRDLG_ENCLOSE_POINTED ; > ;
< "}" ; CHRDLG_ENCLOSE_CURVED ; > ;
- < "Muut merkit" ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
+ < "Muut merkit..." ; CHRDLG_ENCLOSE_SPECIAL_CHAR ; > ;
};
StringList [ thai ] =
{
@@ -4802,7 +4805,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
{
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 129 ) ;
- Size = MAP_APPFONT ( 248 , 39 ) ;
+ Size = MAP_APPFONT ( 248 , 37 ) ;
Text = "Beispiel";
Text [ english_us ] = "Example" ;
Text[ portuguese ] = "Exemplo";
@@ -4828,11 +4831,17 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
};
FixedText FT_TWOLINES_FONTTYPE
{
- Pos = MAP_APPFONT ( 6 , 171 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
+ Pos = MAP_APPFONT ( 6 , 168 ) ;
+ Size = MAP_APPFONT ( 248 , 16 ) ;
+ WordBreak = TRUE ;
Hide = TRUE;
};
};
// ********************************************************************** EOF
+
+
+
+
+
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index db2bdf2286c9..094d43f0b3de 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: charmap.cxx,v $
*
- * $Revision: 1.27 $
+ * $Revision: 1.28 $
*
- * last change: $Author: oj $ $Date: 2002-07-30 10:35:49 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,6 +91,10 @@
#endif
#pragma hdrstop
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
#include <rtl/textenc.h>
#include <ucsubset.hxx>
@@ -133,8 +137,8 @@ protected:
virtual void Paint( const Rectangle& );
private:
- long nY;
- BOOL bCenter;
+ long mnY;
+ BOOL mbCenter;
};
@@ -471,14 +475,14 @@ void SvxShowCharSet::DeSelect()
}
// -----------------------------------------------------------------------
-void SvxShowCharSet::DrawChars_Impl( int n1, int n2)
+void SvxShowCharSet::DrawChars_Impl( int n1, int n2 )
{
if( n1 > LastInView() || n2 < FirstInView() )
return;
Size aOutputSize = GetOutputSizePixel();
- if( aVscrollSB.IsVisible())
- aOutputSize.setWidth( aOutputSize.Width() - SBWIDTH);
+ if( aVscrollSB.IsVisible() )
+ aOutputSize.setWidth( aOutputSize.Width() - SBWIDTH );
int i;
for ( i = 1; i < COLUMN_COUNT; ++i )
@@ -487,25 +491,58 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2)
DrawLine( Point( 0, nY * i ), Point( aOutputSize.Width(), nY * i ) );
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- Color aWindowTextColor( rStyleSettings.GetWindowTextColor() );
+ svtools::ColorConfig aColorConfig;
+ Color aWindowTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
Color aHighlightColor( rStyleSettings.GetHighlightColor() );
Color aHighlightTextColor( rStyleSettings.GetHighlightTextColor() );
Color aFaceColor( rStyleSettings.GetFaceColor() );
Color aLightColor( rStyleSettings.GetLightColor() );
Color aShadowColor( rStyleSettings.GetShadowColor() );
- for ( i = n1; i <= n2; ++i)
+ for( i = n1; i <= n2; ++i )
{
Point pix = MapIndexToPixel( i );
int x = pix.X();
int y = pix.Y();
- String aCharStr( MapIndexToUnicode( maFontCharMap, i ) );
- int tx = x + ( nX - GetTextWidth(aCharStr) ) / 2;
+ sal_Unicode cChar = MapIndexToUnicode( maFontCharMap, i );
+ String aCharStr( cChar );
+ int nTextWidth = GetTextWidth(aCharStr);
+ int tx = x + ( nX - nTextWidth ) / 2;
int ty = y + ( nY - GetTextHeight() ) / 2;
Point aPointTxTy( tx, ty );
- Color aTextCol = GetTextColor();
+ // adjust position before it gets out of bounds
+ Rectangle aBoundRect;
+ if( GetTextBoundRect( aBoundRect, aCharStr ) )
+ {
+ // zero advance width glyphs gets centered to middle
+ if( !nTextWidth )
+ {
+ aPointTxTy.X() = x - aBoundRect.Left();
+ aPointTxTy.X() += (nX - aBoundRect.GetWidth()) / 2;
+ }
+
+ aBoundRect += aPointTxTy;
+
+ // shift back vertically if needed
+ int nYLDelta = aBoundRect.Top() - y;
+ int nYHDelta = (y + nY) - aBoundRect.Bottom();
+ if( nYLDelta < 0 )
+ aPointTxTy.Y() -= nYLDelta;
+ else if( nYHDelta <= 0 )
+ aPointTxTy.Y() += nYHDelta - 1;
+
+ // shift back horizontally if needed
+ int nXLDelta = aBoundRect.Left() - x;
+ int nXHDelta = (x + nX) - aBoundRect.Right();
+ if( nXLDelta < 0 )
+ aPointTxTy.X() -= nXLDelta;
+ else if( nXHDelta <= 0 )
+ aPointTxTy.X() += nXHDelta - 1;
+ }
+
+ Color aTextCol = GetTextColor();
if ( i != nSelectedIndex )
{
SetTextColor( aWindowTextColor );
@@ -555,7 +592,8 @@ void SvxShowCharSet::InitSettings( BOOL bForeground, BOOL bBackground )
if ( bForeground )
{
- Color aTextColor = rStyleSettings.GetWindowTextColor();
+ svtools::ColorConfig aColorConfig;
+ Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
if ( IsControlForeground() )
aTextColor = GetControlForeground();
@@ -813,9 +851,9 @@ sal_Int32 SvxShowCharSet::getMaxCharCount() const
}
// class SvxShowText =====================================================
-SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, BOOL _bCenter )
+SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, BOOL bCenter )
: Control( pParent, rResId ),
- bCenter( _bCenter)
+ mbCenter( bCenter)
{}
// -----------------------------------------------------------------------
@@ -823,12 +861,50 @@ SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, BOOL _bCenter )
void SvxShowText::Paint( const Rectangle& )
{
Color aTextCol = GetTextColor();
- SetTextColor( Application::GetSettings().GetStyleSettings().GetWindowTextColor() );
- String aText = GetText();
- Point aPoint( bCenter? ( GetOutputSizePixel().Width() - GetTextWidth( aText ) ) / 2 : 2, nY );
- DrawText( aPoint, aText );
+ svtools::ColorConfig aColorConfig;
+ Color aWindowTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
+ SetTextColor( aWindowTextColor );
+
+ const String aText = GetText();
+ const Size aSize = GetOutputSizePixel();
+ Point aPoint( 2, mnY );
+ // adjust position before it gets out of bounds
+ Rectangle aBoundRect;
+ if( !GetTextBoundRect( aBoundRect, aText ) )
+ aPoint.X() = (aSize.Width() - GetTextWidth( aText )) / 2;
+ else
+ {
+ aBoundRect += aPoint;
+
+ // shift back vertically if needed
+ int nYLDelta = aBoundRect.Top();
+ int nYHDelta = aSize.Height() - aBoundRect.Bottom();
+ if( nYLDelta < 0 )
+ aPoint.Y() -= nYLDelta;
+ else if( nYHDelta <= 0 )
+ aPoint.Y() += nYHDelta - 1;
+
+ if( mbCenter )
+ {
+ // move left point so that glyph is in middle of cell
+ aPoint.X() = -aBoundRect.Left();
+ aPoint.X() += (aSize.Width() - aBoundRect.GetWidth()) / 2;
+ }
+ else
+ {
+ // shift back horizontally if needed
+ int nXLDelta = aBoundRect.Left();
+ int nXHDelta = aSize.Width() - aBoundRect.Right();
+ if( nXLDelta < 0 )
+ aPoint.X() -= nXLDelta;
+ else if( nXHDelta <= 0 )
+ aPoint.X() += nXHDelta - 1;
+ }
+ }
+
+ DrawText( aPoint, aText );
SetTextColor( aTextCol );
}
@@ -840,10 +916,10 @@ void SvxShowText::SetFont( const Font& rFont )
Font aFont = rFont;
aFont.SetWeight( WEIGHT_NORMAL );
aFont.SetAlign( ALIGN_TOP );
- aFont.SetSize( PixelToLogic( Size( 0, nWinHeight-6 ) ) );
+ aFont.SetSize( PixelToLogic( Size( 0, (nWinHeight*3)/4 ) ) );
aFont.SetTransparent( TRUE );
Control::SetFont( aFont );
- nY = ( nWinHeight - GetTextHeight() ) / 2;
+ mnY = ( nWinHeight - GetTextHeight() ) / 2;
Invalidate();
}
@@ -1170,7 +1246,7 @@ IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG )
if ( bSelect )
{
// no sprintf or hex-formatter around :-(
- char buf[16] = "0x0000";
+ char buf[16] = "U+0000";
sal_Unicode c_Shifted = c;
for( int i = 0; i < 4; ++i )
{
@@ -1179,7 +1255,7 @@ IMPL_LINK( SvxCharMapData, CharHighlightHdl, Control *, EMPTYARG )
c_Shifted >>= 4;
}
if( c < 256 )
- sprintf( buf+6, " (%d)", c );
+ snprintf( buf+6, 10, " (%d)", c );
aTemp = String::CreateFromAscii( buf );
}
aCharCodeText.SetText( aTemp );
diff --git a/svx/source/dialog/charmap.src b/svx/source/dialog/charmap.src
index 1794317c5c16..99ead3642551 100644
--- a/svx/source/dialog/charmap.src
+++ b/svx/source/dialog/charmap.src
@@ -2,8 +2,8 @@
*
* $RCSfile: charmap.src,v $
*
- * $Revision: 1.43 $
- * last change: $Author: kz $ $Date: 2002-02-04 10:56:25 $
+ * $Revision: 1.44 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,7 +81,7 @@ ModalDialog RID_SVXDLG_CHARMAP
Text[ spanish ] = "Smbolos";
Text[ english_us ] = "Special Characters";
Text[ chinese_simplified ] = "特殊字符";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Znaki specjalne";
Text[ japanese ] = "記号と特殊文字";
Text[ chinese_traditional ] = "特殊字元";
@@ -127,7 +127,8 @@ ModalDialog RID_SVXDLG_CHARMAP
Text[ korean ] = "글꼴(~F)";
Text[ turkish ] = "~Yaztipi";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Fuente";
+ Text[ catalan ] = "~Lletra";
+ Text[ thai ] = "~ตัวอักษร";
};
ListBox LB_FONT
{
@@ -145,24 +146,25 @@ ModalDialog RID_SVXDLG_CHARMAP
Text [ ENGLISH ] = "~Subset" ;
Text[ english_us ] = "~Subset";
Text[ portuguese ] = "~Subconjunto";
- Text[ russian ] = "~ ";
+ Text[ russian ] = " ";
Text[ greek ] = "";
Text[ dutch ] = "~Bereik";
- Text[ french ] = "~Sous-ensemble";
+ Text[ french ] = "Sous-ensemble";
Text[ spanish ] = "~rea";
Text[ italian ] = "Set ~caratt.";
- Text[ danish ] = "~Subset";
+ Text[ danish ] = "~Omrde";
Text[ swedish ] = "~Omrde";
Text[ polish ] = "~Obszar";
Text[ portuguese_brazilian ] = "~Subset";
Text[ japanese ] = "種類(~S)";
- Text[ korean ] = "범위(~S)";
+ Text[ korean ] = "종류(~S)";
Text[ chinese_simplified ] = "子集(~S)";
Text[ chinese_traditional ] = "子集(~S)";
Text[ turkish ] = "~Subset";
Text[ arabic ] = " ";
- Text[ catalan ] = "~rea";
- Text[ finnish ] = "~Alijoukko";
+ Text[ catalan ] = "~Subconjunt";
+ Text[ finnish ] = "~Osajoukko";
+ Text[ thai ] = "~สับเซต";
};
ListBox LB_SUBSET
{
@@ -188,7 +190,7 @@ ModalDialog RID_SVXDLG_CHARMAP
Text[ spanish ] = "Carcter:";
Text[ english_us ] = "Characters:";
Text[ chinese_simplified ] = "字符:";
- Text[ russian ] = ":";
+ Text[ russian ] = ":";
Text[ polish ] = "Znaki:";
Text[ japanese ] = "文字:";
Text[ chinese_traditional ] = "字元:";
@@ -197,8 +199,9 @@ ModalDialog RID_SVXDLG_CHARMAP
Text[ korean ] = "문자:";
Text[ turkish ] = "Karakter:";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Carcter:";
+ Text[ catalan ] = "Carcter:";
Text[ finnish ] = "Merkit:";
+ Text[ thai ] = "ตัวอักขระ:";
};
/*
Edit CT_SHOWTEXT
@@ -257,10 +260,10 @@ ModalDialog RID_SVXDLG_CHARMAP
Text[ portuguese_brazilian ] = "~Apagar";
Text[ portuguese ] = "E~liminar";
Text[ danish ] = "Slet";
- Text[ french ] = "~Supprimer";
+ Text[ french ] = "Supprimer";
Text[ swedish ] = "~Radera";
Text[ dutch ] = "~Wissen";
- Text[ spanish ] = "~Eliminar";
+ Text[ spanish ] = "~Borrar";
Text[ english_us ] = "~Delete";
Text[ chinese_simplified ] = "删除(~D)";
Text[ russian ] = "";
@@ -272,15 +275,17 @@ ModalDialog RID_SVXDLG_CHARMAP
Text[ korean ] = "삭제(~D)";
Text[ turkish ] = "~Sil";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Eliminar";
+ Text[ catalan ] = "Su~primeix";
Text[ finnish ] = "~Poista";
+ Text[ thai ] = "~ลบ";
};
Text[ greek ] = " ";
- Text[ korean ] = "특수기호";
+ Text[ korean ] = "기호 및 특수문자";
Text[ turkish ] = "zel karakter";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Smbolos";
- Text[ finnish ] = "Erikoismerkit";
+ Text[ catalan ] = "Smbols";
+ Text[ finnish ] = "Erikoismerkki";
+ Text[ thai ] = "ตัวอักขระพิเศษ";
};
/*
@@ -302,18 +307,19 @@ String RID_SUBSETSTR_BASIC_LATIN
Text[ french ] = "Latin de base";
Text[ spanish ] = "Latn bsico";
Text[ italian ] = "Latino di base";
- Text[ danish ] = "Basic Latin";
+ Text[ danish ] = "Basis Latin";
Text[ swedish ] = "Latin (standard)";
Text[ polish ] = "aciski podstawowy";
Text[ portuguese_brazilian ] = "Basic Latin";
Text[ japanese ] = "基本ラテン文字";
- Text[ korean ] = "라틴어 (기본)";
+ Text[ korean ] = "기본 라틴어";
Text[ chinese_simplified ] = "基本拉丁文";
Text[ chinese_traditional ] = "基本拉丁文";
Text[ turkish ] = "Basic Latin";
Text[ arabic ] = " ";
- Text[ catalan ] = "Latn bsico";
- Text[ finnish ] = "Latina (perus)";
+ Text[ catalan ] = "Llat bsic";
+ Text[ finnish ] = "Latina (perusteet)";
+ Text[ thai ] = "ภาษาลาตินพื้นฐาน";
};
String RID_SUBSETSTR_LATIN_1
{
@@ -321,7 +327,7 @@ String RID_SUBSETSTR_LATIN_1
Text [ ENGLISH ] = "Latin-1" ;
Text[ english_us ] = "Latin-1";
Text[ portuguese ] = "Latim-1";
- Text[ russian ] = " Latin-1";
+ Text[ russian ] = "-1";
Text[ greek ] = "-1";
Text[ dutch ] = "Latijn-1";
Text[ french ] = "Latin-1";
@@ -332,13 +338,14 @@ String RID_SUBSETSTR_LATIN_1
Text[ polish ] = "aciski-1";
Text[ portuguese_brazilian ] = "Latin-1";
Text[ japanese ] = "ラテン文字 1";
- Text[ korean ] = "라틴-1";
+ Text[ korean ] = "라틴어-1";
Text[ chinese_simplified ] = "拉丁文-1";
Text[ chinese_traditional ] = "拉丁文-1";
Text[ turkish ] = "Latin-1";
Text[ arabic ] = "-1";
- Text[ catalan ] = "Latn-1";
+ Text[ catalan ] = "Llat-1";
Text[ finnish ] = "Latina-1";
+ Text[ thai ] = "ภาษาลาติน-1";
};
String RID_SUBSETSTR_LATIN_EXTENDED_A
{
@@ -352,18 +359,19 @@ String RID_SUBSETSTR_LATIN_EXTENDED_A
Text[ french ] = "Latin tendu-A";
Text[ spanish ] = "Latn ampliado A";
Text[ italian ] = "Latino esteso A";
- Text[ danish ] = "Latin Extended-A";
+ Text[ danish ] = "Latin Udvidet-A";
Text[ swedish ] = "Utkat latin A";
Text[ polish ] = "aciski rozszerzony-A";
Text[ portuguese_brazilian ] = "Latin Extended-A";
Text[ japanese ] = "ラテン拡張文字 A";
- Text[ korean ] = "라틴어, 확장-A";
+ Text[ korean ] = "라틴어 확장-A";
Text[ chinese_simplified ] = "拉丁文扩充 A";
Text[ chinese_traditional ] = "拉丁文擴充-A";
Text[ turkish ] = "Latin Extended-A";
Text[ arabic ] = " A-";
- Text[ catalan ] = "Latn ampliado A";
+ Text[ catalan ] = "Llat ampliat A";
Text[ finnish ] = "Latina (laajennus A)";
+ Text[ thai ] = "ขยายภาษาลาตินA";
};
String RID_SUBSETSTR_LATIN_EXTENDED_B
{
@@ -377,18 +385,19 @@ String RID_SUBSETSTR_LATIN_EXTENDED_B
Text[ french ] = "Latin tendu-B";
Text[ spanish ] = "Latn ampliado B";
Text[ italian ] = "Latino esteso B";
- Text[ danish ] = "Latin Extended-B";
+ Text[ danish ] = "Latin Udvidet-B";
Text[ swedish ] = "Utkat latin B";
Text[ polish ] = "aciski rozszerzony-B";
Text[ portuguese_brazilian ] = "Latin Extended-B";
Text[ japanese ] = "ラテン拡張文字 B";
- Text[ korean ] = "라틴어, 확장-B";
+ Text[ korean ] = "라틴어 확장 B";
Text[ chinese_simplified ] = "拉丁文扩充 B";
Text[ chinese_traditional ] = "拉丁文擴充-B";
Text[ turkish ] = "Latin Extended-B";
Text[ arabic ] = " B-";
- Text[ catalan ] = "Latn ampliado B";
+ Text[ catalan ] = "Llat ampliat B";
Text[ finnish ] = "Latina (laajennus B)";
+ Text[ thai ] = "ขยายภาษาลาตินB";
};
String RID_SUBSETSTR_IPA_EXTENSIONS
{
@@ -402,7 +411,7 @@ String RID_SUBSETSTR_IPA_EXTENSIONS
Text[ french ] = "Extensions IPA";
Text[ spanish ] = "Ampliaciones fonticas";
Text[ italian ] = "Estensioni fonetiche";
- Text[ danish ] = "IPA Extensions";
+ Text[ danish ] = "Lydskrift Udvidelser";
Text[ swedish ] = "IPA-utkningar";
Text[ polish ] = "Rozszerzenia IPA";
Text[ portuguese_brazilian ] = "IPA Extensions";
@@ -412,8 +421,9 @@ String RID_SUBSETSTR_IPA_EXTENSIONS
Text[ chinese_traditional ] = "國際音標";
Text[ turkish ] = "IPA Extensions";
Text[ arabic ] = "IPA ";
- Text[ catalan ] = "Ampliaciones fonticas";
+ Text[ catalan ] = "Extensions de l'IPA";
Text[ finnish ] = "IPA-laajennukset";
+ Text[ thai ] = "ส่วนขยาย IPA ";
};
String RID_SUBSETSTR_SPACING_MODIFIERS
{
@@ -421,13 +431,13 @@ String RID_SUBSETSTR_SPACING_MODIFIERS
Text [ ENGLISH ] = "Spacing Modifier Letters" ;
Text[ english_us ] = "Spacing Modifier Letters";
Text[ portuguese ] = "Caracteres de modificao do espaamento";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "Modificerende letters";
Text[ french ] = "Lettres du modificateur d'espacement";
Text[ spanish ] = "Caracteres modificadores de espacios";
Text[ italian ] = "Caratteri modificatori di spazio";
- Text[ danish ] = "Spacing Modifier Letters";
+ Text[ danish ] = "Spacing Modifier-tegn";
Text[ swedish ] = "Avstndsndrande tecken";
Text[ polish ] = "Litery modyfikujce odstpy";
Text[ portuguese_brazilian ] = "Spacing Modifier Letters";
@@ -437,8 +447,9 @@ String RID_SUBSETSTR_SPACING_MODIFIERS
Text[ chinese_traditional ] = "間隔修飾字元";
Text[ turkish ] = "Spacing Modifier Letters";
Text[ arabic ] = " ";
- Text[ catalan ] = "Caracteres modificadores de espacios";
+ Text[ catalan ] = "Lletres modificadores d'espaiat";
Text[ finnish ] = "Vlimerkityksen muokkauskirjaimet";
+ Text[ thai ] = "ระยะห่างตัวดัดแปลงแก้ไขอักษร";
};
String RID_SUBSETSTR_COMB_DIACRITICAL
{
@@ -452,7 +463,7 @@ String RID_SUBSETSTR_COMB_DIACRITICAL
Text[ french ] = "Marques diacritiques jonctives";
Text[ spanish ] = "Combinacin de caracteres diacrticos";
Text[ italian ] = "Caratteri diacritici di combinazione";
- Text[ danish ] = "Combining Diacritical Marks";
+ Text[ danish ] = "Kombinerende diakritiske tegn";
Text[ swedish ] = "Kombinerade diakritiska tecken";
Text[ polish ] = "czce znaki diakrytyczne";
Text[ portuguese_brazilian ] = "Combining Diacritical Marks";
@@ -462,8 +473,9 @@ String RID_SUBSETSTR_COMB_DIACRITICAL
Text[ chinese_traditional ] = "組合式符號";
Text[ turkish ] = "Combining Diacritical Marks";
Text[ arabic ] = " ";
- Text[ catalan ] = "Combinacin de caracteres diacrticos";
+ Text[ catalan ] = "Combinaci de carcters diacrtics";
Text[ finnish ] = "Yhdistvt diakriittiset merkit";
+ Text[ thai ] = "เชื่อมเครื่องหมายการออกเสียง";
};
String RID_SUBSETSTR_BASIC_GREEK
{
@@ -477,18 +489,19 @@ String RID_SUBSETSTR_BASIC_GREEK
Text[ french ] = "Grec de base";
Text[ spanish ] = "Griego bsico";
Text[ italian ] = "Greco di base";
- Text[ danish ] = "Basic Greek";
+ Text[ danish ] = "Basis Grsk";
Text[ swedish ] = "Grekisk (standard)";
Text[ polish ] = "Grecki podstawowy";
Text[ portuguese_brazilian ] = "Basic Greek";
Text[ japanese ] = "基本ギリシャ文字";
- Text[ korean ] = "그리스어 (기본)";
+ Text[ korean ] = "기본 그리스어";
Text[ chinese_simplified ] = "基本希腊语";
Text[ chinese_traditional ] = "基本希腊語";
Text[ turkish ] = "Basic Greek";
Text[ arabic ] = " ";
- Text[ catalan ] = "Griego bsico";
+ Text[ catalan ] = "Grec bsic";
Text[ finnish ] = "kreikka (perusteet)";
+ Text[ thai ] = "ภาษากรีกพื้นฐาน";
};
String RID_SUBSETSTR_GREEK_SYMS_COPTIC
{
@@ -502,7 +515,7 @@ String RID_SUBSETSTR_GREEK_SYMS_COPTIC
Text[ french ] = "Symboles grecs et coptes";
Text[ spanish ] = "Smbolos griegos y copto";
Text[ italian ] = "Simboli greci e copti";
- Text[ danish ] = "Greek Symbols And Coptic";
+ Text[ danish ] = "Grske symboler og koptisk";
Text[ swedish ] = "Grekiska symboler och koptiska";
Text[ polish ] = "Symbole greckie i koptyjskie";
Text[ portuguese_brazilian ] = "Greek Symbols And Coptic";
@@ -512,8 +525,9 @@ String RID_SUBSETSTR_GREEK_SYMS_COPTIC
Text[ chinese_traditional ] = "希腊符號和埃及古語";
Text[ turkish ] = "Greek Symbols And Coptic";
Text[ arabic ] = " ";
- Text[ catalan ] = "Smbolos griegos y copto";
+ Text[ catalan ] = "Smbols grecs i coptes";
Text[ finnish ] = "kreikkalaiset ja koptiset merkit";
+ Text[ thai ] = "สัญลักษณ์ภาษากรีกและเกี่ยวกับชาวอียิปต์โบราณ";
};
String RID_SUBSETSTR_CYRILLIC
{
@@ -527,7 +541,7 @@ String RID_SUBSETSTR_CYRILLIC
Text[ french ] = "Cyrillique";
Text[ spanish ] = "Cirlico";
Text[ italian ] = "Cirillico";
- Text[ danish ] = "Cyrillic";
+ Text[ danish ] = "Kyrillisk";
Text[ swedish ] = "Kyrillisk";
Text[ polish ] = "Cyrylica";
Text[ portuguese_brazilian ] = "Cyrillic";
@@ -537,8 +551,9 @@ String RID_SUBSETSTR_CYRILLIC
Text[ chinese_traditional ] = "西里爾語";
Text[ turkish ] = "Cyrillic";
Text[ arabic ] = "";
- Text[ catalan ] = "Cirlico";
+ Text[ catalan ] = "Cirl.lic";
Text[ finnish ] = "kyrillinen";
+ Text[ thai ] = "ตัวอักขระของซิริล";
};
String RID_SUBSETSTR_ARMENIAN
{
@@ -548,11 +563,11 @@ String RID_SUBSETSTR_ARMENIAN
Text[ portuguese ] = "Armnio";
Text[ russian ] = "";
Text[ greek ] = "";
- Text[ dutch ] = "Armenieens";
+ Text[ dutch ] = "Armeens";
Text[ french ] = "Armnien";
Text[ spanish ] = "Armenio";
Text[ italian ] = "Armeno";
- Text[ danish ] = "Armenian";
+ Text[ danish ] = "Armensk";
Text[ swedish ] = "Armenisk";
Text[ polish ] = "Armeski";
Text[ portuguese_brazilian ] = "Armenian";
@@ -562,8 +577,9 @@ String RID_SUBSETSTR_ARMENIAN
Text[ chinese_traditional ] = "亞美尼亞語";
Text[ turkish ] = "Armenian";
Text[ arabic ] = "";
- Text[ catalan ] = "Armenio";
+ Text[ catalan ] = "Armeni";
Text[ finnish ] = "armenia";
+ Text[ thai ] = "ภาษาอามีเนีย";
};
String RID_SUBSETSTR_HEBREW_EXTENDED
{
@@ -577,18 +593,19 @@ String RID_SUBSETSTR_HEBREW_EXTENDED
Text[ french ] = "Hbreu de base";
Text[ spanish ] = "Hebreo bsico";
Text[ italian ] = "Ebraico di base";
- Text[ danish ] = "Basic Hebrew";
+ Text[ danish ] = "Basis Hebraisk";
Text[ swedish ] = "Hebreisk (standard)";
Text[ polish ] = "Hebrajski podstawowy";
Text[ portuguese_brazilian ] = "Basic Hebrew";
Text[ japanese ] = "基本ヘブライ文字";
- Text[ korean ] = "히브리어(기본)";
+ Text[ korean ] = "기본 히브리어";
Text[ chinese_simplified ] = "基本希伯来语";
Text[ chinese_traditional ] = "基本希伯來語";
Text[ turkish ] = "Basic Hebrew";
Text[ arabic ] = " ";
- Text[ catalan ] = "Hebreo bsico";
+ Text[ catalan ] = "Hebreu bsic";
Text[ finnish ] = "heprea (perusteet)";
+ Text[ thai ] = "ภาษาฮิบรูพื้นฐาน";
};
String RID_SUBSETSTR_BASIC_HEBREW
{
@@ -602,7 +619,7 @@ String RID_SUBSETSTR_BASIC_HEBREW
Text[ french ] = "Hbreu tendu";
Text[ spanish ] = "Hebreo ampliado";
Text[ italian ] = "Ebraico esteso";
- Text[ danish ] = "Hebrew Extended";
+ Text[ danish ] = "Udvidet Hebraisk";
Text[ swedish ] = "Hebreisk (utkad)";
Text[ polish ] = "Hebrajski rozszerzony";
Text[ portuguese_brazilian ] = "Hebrew Extended";
@@ -612,8 +629,9 @@ String RID_SUBSETSTR_BASIC_HEBREW
Text[ chinese_traditional ] = "希伯來語擴充";
Text[ turkish ] = "Hebrew Extended";
Text[ arabic ] = " ";
- Text[ catalan ] = "Hebreo ampliado";
+ Text[ catalan ] = "Hebreu ampliat";
Text[ finnish ] = "heprea (laajennettu)";
+ Text[ thai ] = "ขยายภาษาฮิบรู";
};
String RID_SUBSETSTR_BASIC_ARABIC
{
@@ -627,18 +645,19 @@ String RID_SUBSETSTR_BASIC_ARABIC
Text[ french ] = "Arabe de base";
Text[ spanish ] = "rabe bsico";
Text[ italian ] = "Arabo di base";
- Text[ danish ] = "Basic Arabic";
+ Text[ danish ] = "Basis Arabisk";
Text[ swedish ] = "Arabisk (standard)";
Text[ polish ] = "Arabski podstawowy";
Text[ portuguese_brazilian ] = "Basic Arabic";
Text[ japanese ] = "基本アラビア文字";
- Text[ korean ] = "아랍어(기본)";
+ Text[ korean ] = "기본 아랍어";
Text[ chinese_simplified ] = "基本阿拉伯语";
Text[ chinese_traditional ] = "基本阿拉伯語";
Text[ turkish ] = "Basic Arabic";
Text[ arabic ] = " ";
- Text[ catalan ] = "Arabe bsico";
+ Text[ catalan ] = "rab bsic";
Text[ finnish ] = "arabia (perusteet)";
+ Text[ thai ] = "ภาษาอาราบิกพื้นฐาน";
};
String RID_SUBSETSTR_ARABIC_EXTENDED
{
@@ -652,7 +671,7 @@ String RID_SUBSETSTR_ARABIC_EXTENDED
Text[ french ] = "Arabe tendu";
Text[ spanish ] = "Arabe ampliado";
Text[ italian ] = "Arabo esteso";
- Text[ danish ] = "Arabic Extended";
+ Text[ danish ] = "Udvidet Arabisk";
Text[ swedish ] = "Arabisk (utkad)";
Text[ polish ] = "Arabski roszerzony";
Text[ portuguese_brazilian ] = "Arabic Extended";
@@ -663,8 +682,9 @@ String RID_SUBSETSTR_ARABIC_EXTENDED
Text[ chinese_traditional ] = "阿拉伯語擴充";
Text[ turkish ] = "Arabic Extended";
Text[ arabic ] = " ";
- Text[ catalan ] = "Arabe ampliado";
+ Text[ catalan ] = "rab ampliat";
Text[ finnish ] = "arabia (laajennettu)";
+ Text[ thai ] = "ขยายภาษาอาราบิก";
};
String RID_SUBSETSTR_DEVANAGARI
{
@@ -690,6 +710,7 @@ String RID_SUBSETSTR_DEVANAGARI
Text[ arabic ] = "";
Text[ catalan ] = "Devanagari";
Text[ finnish ] = "devanagari";
+ Text[ thai ] = "ภาษาเดวานาการี";
};
String RID_SUBSETSTR_BENGALI
{
@@ -703,7 +724,7 @@ String RID_SUBSETSTR_BENGALI
Text[ french ] = "Bengali";
Text[ spanish ] = "Bengal";
Text[ italian ] = "Bengalese";
- Text[ danish ] = "Bengali";
+ Text[ danish ] = "Bengalsk";
Text[ swedish ] = "Bengali";
Text[ polish ] = "Bengalski";
Text[ portuguese_brazilian ] = "Bengali";
@@ -715,6 +736,7 @@ String RID_SUBSETSTR_BENGALI
Text[ arabic ] = "";
Text[ catalan ] = "Bengal";
Text[ finnish ] = "bengali";
+ Text[ thai ] = "ภาษาเบงกาลี";
};
String RID_SUBSETSTR_GURMUKHI
{
@@ -740,6 +762,7 @@ String RID_SUBSETSTR_GURMUKHI
Text[ arabic ] = "";
Text[ catalan ] = "Gurmukhi";
Text[ finnish ] = "gurmukhi";
+ Text[ thai ] = "ภาษาเกอมูคิ";
};
String RID_SUBSETSTR_GUJARATI
{
@@ -765,6 +788,7 @@ String RID_SUBSETSTR_GUJARATI
Text[ arabic ] = "";
Text[ catalan ] = "Gujarati";
Text[ finnish ] = "gujarati";
+ Text[ thai ] = "ภาษากูจาราติ";
};
String RID_SUBSETSTR_ORIYA
{
@@ -790,6 +814,7 @@ String RID_SUBSETSTR_ORIYA
Text[ arabic ] = "";
Text[ catalan ] = "Oriya";
Text[ finnish ] = "orija";
+ Text[ thai ] = "ภาษาโอริยา";
};
String RID_SUBSETSTR_TAMIL
{
@@ -803,7 +828,7 @@ String RID_SUBSETSTR_TAMIL
Text[ french ] = "Tamoul";
Text[ spanish ] = "Tamil";
Text[ italian ] = "Tamil";
- Text[ danish ] = "Tamil";
+ Text[ danish ] = "Tamilsk";
Text[ swedish ] = "Tamil";
Text[ polish ] = "Tamilski";
Text[ portuguese_brazilian ] = "Tamil";
@@ -815,6 +840,7 @@ String RID_SUBSETSTR_TAMIL
Text[ arabic ] = "";
Text[ catalan ] = "Tamil";
Text[ finnish ] = "tamili";
+ Text[ thai ] = "ภาษาทมิฬ";
};
String RID_SUBSETSTR_TELUGU
{
@@ -841,6 +867,7 @@ String RID_SUBSETSTR_TELUGU
Text[ arabic ] = "";
Text[ catalan ] = "Telugu";
Text[ finnish ] = "telugu";
+ Text[ thai ] = "ภาษาเทลูกู";
};
String RID_SUBSETSTR_KANNADA
{
@@ -859,13 +886,14 @@ String RID_SUBSETSTR_KANNADA
Text[ polish ] = "Kannada";
Text[ portuguese_brazilian ] = "Kannada";
Text[ japanese ] = "カンナダ";
- Text[ korean ] = "캐나다어";
+ Text[ korean ] = "카나다어";
Text[ chinese_simplified ] = "(印度)卡纳达语";
Text[ chinese_traditional ] = "印度的卡納達語";
Text[ turkish ] = "Kannada";
Text[ arabic ] = "";
Text[ catalan ] = "Kannada";
- Text[ finnish ] = "kannada";
+ Text[ finnish ] = "kashmir";
+ Text[ thai ] = "ภาษากันนาดา";
};
String RID_SUBSETSTR_MALAYALAM
{
@@ -879,7 +907,7 @@ String RID_SUBSETSTR_MALAYALAM
Text[ french ] = "Malayalam";
Text[ spanish ] = "Malasio";
Text[ italian ] = "Malayalam";
- Text[ danish ] = "Malayalam";
+ Text[ danish ] = "Malaysisk";
Text[ swedish ] = "Malajiska";
Text[ polish ] = "Malajski";
Text[ portuguese_brazilian ] = "Malayalam";
@@ -889,8 +917,9 @@ String RID_SUBSETSTR_MALAYALAM
Text[ chinese_traditional ] = "印度西南部的Dravidian語的方言";
Text[ turkish ] = "Malayalam";
Text[ arabic ] = "";
- Text[ catalan ] = "Malayalam";
+ Text[ catalan ] = "Malaialam";
Text[ finnish ] = "malayalam";
+ Text[ thai ] = "ภาษามาลายาลัม";
};
String RID_SUBSETSTR_THAI
{
@@ -904,18 +933,19 @@ String RID_SUBSETSTR_THAI
Text[ french ] = "Tha";
Text[ spanish ] = "Tailands";
Text[ italian ] = "Thai";
- Text[ danish ] = "Thai";
+ Text[ danish ] = "Thailandsk";
Text[ swedish ] = "Thailndsk";
Text[ polish ] = "Tajski";
Text[ portuguese_brazilian ] = "Thai";
Text[ japanese ] = "タイ";
- Text[ korean ] = "타이랜드어";
+ Text[ korean ] = "태국어";
Text[ chinese_simplified ] = "泰语";
Text[ chinese_traditional ] = "泰語";
Text[ turkish ] = "Thai";
Text[ arabic ] = "";
- Text[ catalan ] = "Tailands";
+ Text[ catalan ] = "Tai";
Text[ finnish ] = "thai";
+ Text[ thai ] = "ภาษาไทย";
};
String RID_SUBSETSTR_LAO
{
@@ -929,7 +959,7 @@ String RID_SUBSETSTR_LAO
Text[ french ] = "Laotien";
Text[ spanish ] = "Laosiano";
Text[ italian ] = "Lao";
- Text[ danish ] = "Lao";
+ Text[ danish ] = "Laotisk";
Text[ swedish ] = "Laotisk";
Text[ polish ] = "Laotaski";
Text[ portuguese_brazilian ] = "Lao";
@@ -939,8 +969,9 @@ String RID_SUBSETSTR_LAO
Text[ chinese_traditional ] = "老撾語";
Text[ turkish ] = "Lao";
Text[ arabic ] = "";
- Text[ catalan ] = "Laosiano";
+ Text[ catalan ] = "Laos";
Text[ finnish ] = "lao";
+ Text[ thai ] = "ภาษาลาว";
};
String RID_SUBSETSTR_BASIC_GEORGIAN
{
@@ -954,18 +985,19 @@ String RID_SUBSETSTR_BASIC_GEORGIAN
Text[ french ] = "Gorgien de base";
Text[ spanish ] = "Georgiano bsico";
Text[ italian ] = "Georgiano di base";
- Text[ danish ] = "Basic Georgian";
+ Text[ danish ] = "Basis Georgisk";
Text[ swedish ] = "Georgisk (standard)";
Text[ polish ] = "Gruziski podstawowy";
Text[ portuguese_brazilian ] = "Basic Georgian";
Text[ japanese ] = "基本 グルジア文字";
- Text[ korean ] = "그루지아어 (기본)";
+ Text[ korean ] = "기본 그루지아어";
Text[ chinese_simplified ] = "基本格鲁吉亚语";
Text[ chinese_traditional ] = "基本格魯吉亞語";
Text[ turkish ] = "Basic Georgian";
Text[ arabic ] = " ";
- Text[ catalan ] = "Georgiano bsico";
+ Text[ catalan ] = "Georgi bsic";
Text[ finnish ] = "georgia (perusteet)";
+ Text[ thai ] = "ภาษาจอร์เจียพื้นฐาน";
};
String RID_SUBSETSTR_GEORGIAN_EXTENDED
{
@@ -977,9 +1009,9 @@ String RID_SUBSETSTR_GEORGIAN_EXTENDED
Text[ greek ] = " ";
Text[ dutch ] = "Georgisch - uitgebreid";
Text[ french ] = "Gorgien tendu";
- Text[ spanish ] = "Georgiano extendido";
+ Text[ spanish ] = "Georgiano ampliado";
Text[ italian ] = "Georgiano esteso";
- Text[ danish ] = "Georgian Extended";
+ Text[ danish ] = "Udvidet Georgisk";
Text[ swedish ] = "Georgisk (standard)";
Text[ polish ] = "Gruziski rozszerzony";
Text[ portuguese_brazilian ] = "Georgian Extended";
@@ -989,8 +1021,9 @@ String RID_SUBSETSTR_GEORGIAN_EXTENDED
Text[ chinese_traditional ] = "格魯吉亞語擴充";
Text[ turkish ] = "Georgian Extended";
Text[ arabic ] = " ";
- Text[ catalan ] = "Georgiano extendido";
+ Text[ catalan ] = "Georgi ampliat";
Text[ finnish ] = "georgia (laajennettu)";
+ Text[ thai ] = "ภาษาจอร์เจียเพิ่มเติม";
};
String RID_SUBSETSTR_HANGUL_JAMO
{
@@ -1016,6 +1049,7 @@ String RID_SUBSETSTR_HANGUL_JAMO
Text[ arabic ] = " ";
Text[ catalan ] = "Hangul Jamo";
Text[ finnish ] = "hangul jamo";
+ Text[ thai ] = "ภาษาฮังกุลจาโม";
};
String RID_SUBSETSTR_LATIN_EXTENDED_ADDS
{
@@ -1027,9 +1061,9 @@ String RID_SUBSETSTR_LATIN_EXTENDED_ADDS
Text[ greek ] = " ";
Text[ dutch ] = "Latin uitgebreid extra";
Text[ french ] = "Latin tendu additionnel";
- Text[ spanish ] = "Latn extendido adicional";
+ Text[ spanish ] = "Latn ampliado adicional";
Text[ italian ] = "Latino esteso addizionale";
- Text[ danish ] = "Latin Extended Additional";
+ Text[ danish ] = "Latin Udvidede tilfjelser";
Text[ swedish ] = "Utkat latin tillgg";
Text[ polish ] = "aciski rozszerzony dodatkowy";
Text[ portuguese_brazilian ] = "Latin Extended Additional";
@@ -1039,8 +1073,9 @@ String RID_SUBSETSTR_LATIN_EXTENDED_ADDS
Text[ chinese_traditional ] = "拉丁文擴充附加";
Text[ turkish ] = "Latin Extended Additional";
Text[ arabic ] = " ";
- Text[ catalan ] = "Latn extendido adicional";
+ Text[ catalan ] = "Llat ampliat addicional";
Text[ finnish ] = "latina (lislaajennus)";
+ Text[ thai ] = "ส่วนเพิ่มภาษาลาติน";
};
String RID_SUBSETSTR_GREEK_EXTENDED
{
@@ -1054,7 +1089,7 @@ String RID_SUBSETSTR_GREEK_EXTENDED
Text[ french ] = "Grec tendu";
Text[ spanish ] = "Griego ampliado";
Text[ italian ] = "Greco esteso";
- Text[ danish ] = "Greek Extended";
+ Text[ danish ] = "Udvidet Grsk";
Text[ swedish ] = "Grekisk (utkad)";
Text[ polish ] = "Grecki rozszerzony";
Text[ portuguese_brazilian ] = "Greek Extended";
@@ -1064,8 +1099,9 @@ String RID_SUBSETSTR_GREEK_EXTENDED
Text[ chinese_traditional ] = "希腊語擴充";
Text[ turkish ] = "Greek Extended";
Text[ arabic ] = " ";
- Text[ catalan ] = "Griego ampliado";
+ Text[ catalan ] = "Grec ampliat";
Text[ finnish ] = "kreikka (laajennettu)";
+ Text[ thai ] = "ภาษากรีกเพิ่มเติม";
};
String RID_SUBSETSTR_GENERAL_PUNCTUATION
{
@@ -1079,32 +1115,33 @@ String RID_SUBSETSTR_GENERAL_PUNCTUATION
Text[ french ] = "Ponctuation gnrale";
Text[ spanish ] = "Puntuacin general";
Text[ italian ] = "Punteggiatura generale";
- Text[ danish ] = "General Punctuation";
+ Text[ danish ] = "Generel tegnstning";
Text[ swedish ] = "Allmn interpunktion";
Text[ polish ] = "Oglna interpunkcja";
Text[ portuguese_brazilian ] = "General Punctuation";
Text[ japanese ] = "普通の句読点";
- Text[ korean ] = "일반 구두법";
+ Text[ korean ] = "일반 문장부호";
Text[ chinese_simplified ] = "普通的标点符号";
Text[ chinese_traditional ] = "普通的標點符號";
Text[ turkish ] = "General Punctuation";
Text[ arabic ] = " ";
- Text[ catalan ] = "Puntuacin general";
+ Text[ catalan ] = "Puntuaci general";
Text[ finnish ] = "Yleinen vlimerkitys";
+ Text[ thai ] = "เครื่องหมายวรรคตอนทั่วไป";
};
String RID_SUBSETSTR_SUB_SUPER_SCRIPTS
{
Text = "Hoch- und Tiefstellungen" ;
Text [ ENGLISH ] = "Superscripts And Subscripts" ;
- Text[ english_us ] = "Superscripts And Subscripts";
+ Text[ english_us ] = "Superscripts and Subscripts";
Text[ portuguese ] = "Superior linha e inferior linha";
Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "Superscripts en subscripts";
Text[ french ] = "Exposants et indices";
- Text[ spanish ] = "Super y subndices";
+ Text[ spanish ] = "Subndices y superndices";
Text[ italian ] = "Apice e pedice";
- Text[ danish ] = "Superscripts And Subscripts";
+ Text[ danish ] = "Hvet og snket skrift";
Text[ swedish ] = "Upphjda och nedsnkta tecken";
Text[ polish ] = "Indeksy dolne i grne";
Text[ portuguese_brazilian ] = "Superscripts And Subscripts";
@@ -1114,8 +1151,9 @@ String RID_SUBSETSTR_SUB_SUPER_SCRIPTS
Text[ chinese_traditional ] = "上標和下標";
Text[ turkish ] = "Superscripts And Subscripts";
Text[ arabic ] = " ";
- Text[ catalan ] = "Super y subndices";
+ Text[ catalan ] = "Super i subndexs";
Text[ finnish ] = "Yl- ja alaindeksit";
+ Text[ thai ] = "ตัวยกและตัวห้อย";
};
String RID_SUBSETSTR_CURRENCY_SYMBOLS
{
@@ -1129,18 +1167,19 @@ String RID_SUBSETSTR_CURRENCY_SYMBOLS
Text[ french ] = "Symboles montaires";
Text[ spanish ] = "Smbolos de monedas";
Text[ italian ] = "Simboli di valute";
- Text[ danish ] = "Currency Symbols";
+ Text[ danish ] = "Valutasymboler";
Text[ swedish ] = "Valutasymboler";
Text[ polish ] = "Symbole waluty";
Text[ portuguese_brazilian ] = "Currency Symbols";
Text[ japanese ] = "通貨記号";
- Text[ korean ] = "화폐 기호";
+ Text[ korean ] = "통화 기호";
Text[ chinese_simplified ] = "货币符号";
Text[ chinese_traditional ] = "貨幣符號";
Text[ turkish ] = "Currency Symbols";
Text[ arabic ] = " ";
- Text[ catalan ] = "Smbolos de monedas";
+ Text[ catalan ] = "Smbols de monedes";
Text[ finnish ] = "Valuuttasymbolit";
+ Text[ thai ] = "สัญลักษณ์สกุลเงิน";
};
String RID_SUBSETSTR_COMB_DIACRITIC_SYMS
{
@@ -1148,13 +1187,13 @@ String RID_SUBSETSTR_COMB_DIACRITIC_SYMS
Text [ ENGLISH ] = "Combining Diacritical Marks For Symbols" ;
Text[ english_us ] = "Combining Diacritical Symbols";
Text[ portuguese ] = "A combinar smbolos diacrticos";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "Gecombineerde diakritische tekens";
Text[ french ] = "Signes diacritiques jonctifs";
Text[ spanish ] = "Combinacin de smbolos diacrticos";
Text[ italian ] = "Simboli diacritici di combinazione";
- Text[ danish ] = "Combining Diacritical Marks For Symbols";
+ Text[ danish ] = "Kombinerende diakritiske symboler";
Text[ swedish ] = "Kombinerade diakritiska symboler";
Text[ polish ] = "Diakrytyczne czce (symbole)";
Text[ portuguese_brazilian ] = "Combining Diacritical Marks For Symbols";
@@ -1164,8 +1203,9 @@ String RID_SUBSETSTR_COMB_DIACRITIC_SYMS
Text[ chinese_traditional ] = "組合式符號";
Text[ turkish ] = "Combining Diacritical Marks For Symbols";
Text[ arabic ] = " ";
- Text[ catalan ] = "Combinacin de smbolos diacrticos";
+ Text[ catalan ] = "Combinaci de smbols diacrtics";
Text[ finnish ] = "Yhdistvt diakriittiset merkit";
+ Text[ thai ] = "เชื่อมสัญลักษณ์การออกเสียง";
};
String RID_SUBSETSTR_LETTERLIKE_SYMBOLS
{
@@ -1175,11 +1215,11 @@ String RID_SUBSETSTR_LETTERLIKE_SYMBOLS
Text[ portuguese ] = "Smbolos tipo letras";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Letterachtige symbolen";
+ Text[ dutch ] = "Lettersymbolen";
Text[ french ] = "Symboles Letterlike";
Text[ spanish ] = "Smbolos tipo carta";
Text[ italian ] = "Simboli delle lettere";
- Text[ danish ] = "Letterlike Symbols";
+ Text[ danish ] = "Bogstavsymboler";
Text[ swedish ] = "Bokstavsliknande symboler";
Text[ polish ] = "Symbole literopodobne";
Text[ portuguese_brazilian ] = "Letterlike Symbols";
@@ -1189,8 +1229,9 @@ String RID_SUBSETSTR_LETTERLIKE_SYMBOLS
Text[ chinese_traditional ] = "似字母符號";
Text[ turkish ] = "Letterlike Symbols";
Text[ arabic ] = " ";
- Text[ catalan ] = "Smbolos tipo carta";
+ Text[ catalan ] = "Smbols tipus carta";
Text[ finnish ] = "Kirjainsymbolit";
+ Text[ thai ] = "สัญลักษณ์คล้ายตัวอักษร";
};
String RID_SUBSETSTR_NUMBER_FORMS
{
@@ -1204,7 +1245,7 @@ String RID_SUBSETSTR_NUMBER_FORMS
Text[ french ] = "Symboles de nombres";
Text[ spanish ] = "Smbolos numricos";
Text[ italian ] = "Simboli numerici";
- Text[ danish ] = "Number Forms";
+ Text[ danish ] = "Talsymboler";
Text[ swedish ] = "Siffersymboler";
Text[ polish ] = "Formy liczb";
Text[ portuguese_brazilian ] = "Number Forms";
@@ -1214,8 +1255,9 @@ String RID_SUBSETSTR_NUMBER_FORMS
Text[ chinese_traditional ] = "數字符號";
Text[ turkish ] = "Number Forms";
Text[ arabic ] = " ";
- Text[ catalan ] = "Smbolos numricos";
- Text[ finnish ] = "Numeromuodot";
+ Text[ catalan ] = "Smbols numrics";
+ Text[ finnish ] = "Lukumuodot";
+ Text[ thai ] = "แบบตัวเลข";
};
String RID_SUBSETSTR_ARROWS
{
@@ -1229,7 +1271,7 @@ String RID_SUBSETSTR_ARROWS
Text[ french ] = "Flches";
Text[ spanish ] = "Flechas";
Text[ italian ] = "Frecce";
- Text[ danish ] = "Arrows";
+ Text[ danish ] = "Pilesymboler";
Text[ swedish ] = "Pilsymboler";
Text[ polish ] = "Strzaki";
Text[ portuguese_brazilian ] = "Arrows";
@@ -1239,8 +1281,9 @@ String RID_SUBSETSTR_ARROWS
Text[ chinese_traditional ] = "箭頭符號";
Text[ turkish ] = "Arrows";
Text[ arabic ] = "";
- Text[ catalan ] = "Flechas";
+ Text[ catalan ] = "Fletxes";
Text[ finnish ] = "Nuolet";
+ Text[ thai ] = "ลูกศร";
};
String RID_SUBSETSTR_MATH_OPERATORS
{
@@ -1250,11 +1293,11 @@ String RID_SUBSETSTR_MATH_OPERATORS
Text[ portuguese ] = "Operadores matemticos";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Wiskundige symbolen";
+ Text[ dutch ] = "Wiskundige operatoren";
Text[ french ] = "Oprateurs mathmatiques";
Text[ spanish ] = "Operadores matemticos";
Text[ italian ] = "Operatori matematici";
- Text[ danish ] = "Mathematical Operators";
+ Text[ danish ] = "Matematiske operatorer";
Text[ swedish ] = "Matematiska operatorer";
Text[ polish ] = "Operatory matematyczne";
Text[ portuguese_brazilian ] = "Mathematical Operators";
@@ -1264,8 +1307,9 @@ String RID_SUBSETSTR_MATH_OPERATORS
Text[ chinese_traditional ] = "數學運算符號";
Text[ turkish ] = "Mathematical Operators";
Text[ arabic ] = " ";
- Text[ catalan ] = "Operadores matemticos";
+ Text[ catalan ] = "Operadors matemtics";
Text[ finnish ] = "Matemaattiset operaattorit";
+ Text[ thai ] = "ตัวปฏิบัติการทางคณิตศาสตร์";
};
String RID_SUBSETSTR_MISC_TECHNICAL
{
@@ -1276,11 +1320,11 @@ String RID_SUBSETSTR_MISC_TECHNICAL
Text[ portuguese ] = "Caracteres tcnicos vrios";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Diverse technisch";
+ Text[ dutch ] = "Diverse technische tekens";
Text[ french ] = "Divers technique";
Text[ spanish ] = "Diversos caracteres tcnicos";
Text[ italian ] = "Tecnici misti";
- Text[ danish ] = "Miscellaneous Technical";
+ Text[ danish ] = "Forskellige tekniske tegn";
Text[ swedish ] = "Blandade tekniska tecken";
Text[ polish ] = "Rne techniczne";
Text[ portuguese_brazilian ] = "Miscellaneous Technical";
@@ -1290,8 +1334,9 @@ String RID_SUBSETSTR_MISC_TECHNICAL
Text[ chinese_traditional ] = "各式技術符號";
Text[ turkish ] = "Miscellaneous Technical";
Text[ arabic ] = " ";
- Text[ catalan ] = "Diversos caracteres tcnicos";
+ Text[ catalan ] = "Diversos carcters tcnics";
Text[ finnish ] = "Sekalaiset tekniset merkit";
+ Text[ thai ] = "เทคนิคเบ็ดเตล็ด";
};
String RID_SUBSETSTR_CONTROL_PICTURES
{
@@ -1305,18 +1350,19 @@ String RID_SUBSETSTR_CONTROL_PICTURES
Text[ french ] = "Pictogrammes de commande";
Text[ spanish ] = "Smbolos del teclado";
Text[ italian ] = "Simboli tastiera";
- Text[ danish ] = "Control Pictures";
+ Text[ danish ] = "Tastatursymboler";
Text[ swedish ] = "Tangentbordssymboler";
Text[ polish ] = "Symbole klawiaturowe";
Text[ portuguese_brazilian ] = "Control Pictures";
Text[ japanese ] = "キーボード記号";
- Text[ korean ] = "키보드 기호";
+ Text[ korean ] = "그림 컨트롤";
Text[ chinese_simplified ] = "键盘符号";
Text[ chinese_traditional ] = "控制符號";
Text[ turkish ] = "Control Pictures";
Text[ arabic ] = " ";
- Text[ catalan ] = "Smbolos del teclado";
+ Text[ catalan ] = "Imatges de control";
Text[ finnish ] = "Ohjauskuvat";
+ Text[ thai ] = "ควบคุมรูปภาพ";
};
String RID_SUBSETSTR_OPTICAL_CHAR_REC
{
@@ -1324,13 +1370,13 @@ String RID_SUBSETSTR_OPTICAL_CHAR_REC
Text [ ENGLISH ] = "Optical Character Recognition" ;
Text[ english_us ] = "Optical Character Recognition";
Text[ portuguese ] = "Reconhecimento ptico de caracteres";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "Optische tekenherkenning";
Text[ french ] = "Reconnaissance optique de caractres";
Text[ spanish ] = "Caracteres legibles por mquina";
Text[ italian ] = "Riconoscimento ottico dei caratteri";
- Text[ danish ] = "Optical Character Recognition";
+ Text[ danish ] = "Maskinlsbare tegn";
Text[ swedish ] = "Optisk teckenlsning";
Text[ polish ] = "Optyczne rozpoznawanie znakw";
Text[ portuguese_brazilian ] = "Optical Character Recognition";
@@ -1340,8 +1386,9 @@ String RID_SUBSETSTR_OPTICAL_CHAR_REC
Text[ chinese_traditional ] = "可供光學系統識別的字元";
Text[ turkish ] = "Optical Character Recognition";
Text[ arabic ] = " ";
- Text[ catalan ] = "Caracteres legibles por mquina";
- Text[ finnish ] = "Optinen merkkitunnistus";
+ Text[ catalan ] = "Carcters llegibles per mquina";
+ Text[ finnish ] = "Optinen merkkientunnistaminen";
+ Text[ thai ] = "จดจำตัวอักขระทางตา";
};
String RID_SUBSETSTR_ENCLOSED_ALPHANUM
{
@@ -1349,24 +1396,25 @@ String RID_SUBSETSTR_ENCLOSED_ALPHANUM
Text [ ENGLISH ] = "Enclosed Alphanumerics" ;
Text[ english_us ] = "Enclosed Alphanumerics";
Text[ portuguese ] = "Caracteres alfanumricos inclusos";
- Text[ russian ] = " - ";
+ Text[ russian ] = " - ";
Text[ greek ] = " ";
Text[ dutch ] = "Ingesloten tekens";
Text[ french ] = "Alphanumriques encercls";
Text[ spanish ] = "Caracteres incluidos";
Text[ italian ] = "Alfanumerici inclusi";
- Text[ danish ] = "Enclosed Alphanumerics";
+ Text[ danish ] = "Tegn med bolle omkring";
Text[ swedish ] = "Omslutna alfanumeriska tecken";
Text[ polish ] = "Znaki otoczone";
Text[ portuguese_brazilian ] = "Enclosed Alphanumerics";
Text[ japanese ] = "囲み文字";
- Text[ korean ] = "원문자 (알파벳)";
+ Text[ korean ] = "원문자";
Text[ chinese_simplified ] = "带括号的字母数字";
Text[ chinese_traditional ] = "帶括號的字符";
Text[ turkish ] = "Enclosed Alphanumerics";
Text[ arabic ] = " ";
- Text[ catalan ] = "Caracteres incluidos";
+ Text[ catalan ] = "Carcters inclosos";
Text[ finnish ] = "Sislletyt aakkosnumeeriset merkit";
+ Text[ thai ] = "ตัวเลขหนังสือที่ล้อมรอบ";
};
String RID_SUBSETSTR_BOX_DRAWING
{
@@ -1374,24 +1422,25 @@ String RID_SUBSETSTR_BOX_DRAWING
Text [ ENGLISH ] = "Box Drawing" ;
Text[ english_us ] = "Box Drawing";
Text[ portuguese ] = "Desenho de caixa";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " ";
Text[ dutch ] = "Vakken";
Text[ french ] = "Bote de dessin";
Text[ spanish ] = "Smbolos de marco";
Text[ italian ] = "Disegno caselle";
- Text[ danish ] = "Box Drawing";
+ Text[ danish ] = "Indramningssymboler";
Text[ swedish ] = "Ramelement";
Text[ polish ] = "Elementy ramek";
Text[ portuguese_brazilian ] = "Box Drawing";
Text[ japanese ] = "罫線素片";
- Text[ korean ] = "상자 그림";
+ Text[ korean ] = "상자 그리기";
Text[ chinese_simplified ] = "制表符";
Text[ chinese_traditional ] = "區塊元件";
Text[ turkish ] = "Box Drawing";
Text[ arabic ] = " ";
- Text[ catalan ] = "Smbolos de marco";
+ Text[ catalan ] = "Dibuix del quadre";
Text[ finnish ] = "Ruutupiirros";
+ Text[ thai ] = "กล่องวาดรูป";
};
String RID_SUBSETSTR_BLOCK_ELEMENTS
{
@@ -1405,7 +1454,7 @@ String RID_SUBSETSTR_BLOCK_ELEMENTS
Text[ french ] = "Pavs";
Text[ spanish ] = "Smbolos de bloque";
Text[ italian ] = "Blocchi";
- Text[ danish ] = "Block Elements";
+ Text[ danish ] = "Bloksymboler";
Text[ swedish ] = "Blocksymboler";
Text[ polish ] = "Elementy blokowe";
Text[ portuguese_brazilian ] = "Block Elements";
@@ -1415,8 +1464,9 @@ String RID_SUBSETSTR_BLOCK_ELEMENTS
Text[ chinese_traditional ] = "區塊元件";
Text[ turkish ] = "Block Elements";
Text[ arabic ] = " ";
- Text[ catalan ] = "Smbolos de bloque";
+ Text[ catalan ] = "Elements de bloc";
Text[ finnish ] = "Lohko-osat";
+ Text[ thai ] = "องค์ประกอบบล็อค";
};
String RID_SUBSETSTR_GEOMETRIC_SHAPES
{
@@ -1426,11 +1476,11 @@ String RID_SUBSETSTR_GEOMETRIC_SHAPES
Text[ portuguese ] = "Formas geomtricas";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Geometrische vormen";
+ Text[ dutch ] = "Meetkundige symbolen";
Text[ french ] = "Formes gomtriques";
Text[ spanish ] = "Smbolos geomtricos";
Text[ italian ] = "Simboli geometrici";
- Text[ danish ] = "Geometric Shapes";
+ Text[ danish ] = "Geometriske symboler";
Text[ swedish ] = "Geometriska symboler";
Text[ polish ] = "Ksztaty geometryczne";
Text[ portuguese_brazilian ] = "Geometric Shapes";
@@ -1440,8 +1490,9 @@ String RID_SUBSETSTR_GEOMETRIC_SHAPES
Text[ chinese_traditional ] = "几何形";
Text[ turkish ] = "Geometric Shapes";
Text[ arabic ] = " ";
- Text[ catalan ] = "Smbolos geomtricos";
+ Text[ catalan ] = "Smbols geomtrics";
Text[ finnish ] = "Geometriset muodot";
+ Text[ thai ] = "รูปร่างทรงเรขาคณิต";
};
String RID_SUBSETSTR_MISC_DINGBATS
{
@@ -1455,7 +1506,7 @@ String RID_SUBSETSTR_MISC_DINGBATS
Text[ french ] = "Symboles divers";
Text[ spanish ] = "Diversos smbolos";
Text[ italian ] = "Simboli";
- Text[ danish ] = "Miscellaneous Symbols";
+ Text[ danish ] = "Forskellige symboler";
Text[ swedish ] = "Diverse symboler";
Text[ polish ] = "Rne";
Text[ portuguese_brazilian ] = "Miscellaneous Symbols";
@@ -1466,8 +1517,9 @@ String RID_SUBSETSTR_MISC_DINGBATS
Text[ chinese_traditional ] = "混合什錦符號";
Text[ turkish ] = "Miscellaneous Symbols";
Text[ arabic ] = " ";
- Text[ catalan ] = "Diversos smbolos";
+ Text[ catalan ] = "Diversos smbols";
Text[ finnish ] = "Sekalaiset symbolit";
+ Text[ thai ] = "สัญลักษณ์เบ็ดเตล็ด";
};
String RID_SUBSETSTR_DINGBATS
{
@@ -1475,7 +1527,7 @@ String RID_SUBSETSTR_DINGBATS
Text [ ENGLISH ] = "Dingbats" ;
Text[ english_us ] = "Dingbats";
Text[ portuguese ] = "Dingbats";
- Text[ russian ] = " Dingbat";
+ Text[ russian ] = " ";
Text[ greek ] = "Dingbats";
Text[ dutch ] = "Dingbats";
Text[ french ] = "Dingbats";
@@ -1494,6 +1546,7 @@ String RID_SUBSETSTR_DINGBATS
Text[ arabic ] = "Dingbats";
Text[ catalan ] = "Dingbats";
Text[ finnish ] = "Dingbat-leikkeet";
+ Text[ thai ] = "ภาษาดิงแบท";
};
String RID_SUBSETSTR_CJK_SYMS_PUNCTUATION
{
@@ -1507,18 +1560,19 @@ String RID_SUBSETSTR_CJK_SYMS_PUNCTUATION
Text[ french ] = "Ponctuation et symboles CJC";
Text[ spanish ] = "Smbolos y puntuacin CJK";
Text[ italian ] = "Simboli e punteggiatura CJK";
- Text[ danish ] = "CJK Symbols And Punctuation";
+ Text[ danish ] = "CJK-symboler og tegnstning";
Text[ swedish ] = "CJK - symboler och skiljetecken";
Text[ polish ] = "Symbole i znaki przestankowe CJK";
Text[ portuguese_brazilian ] = "CJK Symbols And Punctuation";
Text[ japanese ] = "CJK用の記号と句読点";
- Text[ korean ] = "CJK 기호와 구두점";
+ Text[ korean ] = "CJK 기호와 문장 부호";
Text[ chinese_simplified ] = "中日韩符号和标点";
Text[ chinese_traditional ] = "中日韓符號和標點";
Text[ turkish ] = "CJK Symbols And Punctuation";
Text[ arabic ] = " ";
- Text[ catalan ] = "Smbolos y puntuacin CJK";
+ Text[ catalan ] = "Smbols i puntuaci CJK";
Text[ finnish ] = "CJK-merkit ja -vlimerkitys";
+ Text[ thai ] = "สัญลักษณ์และเครื่องหมายวรรคตอน CJK ";
};
String RID_SUBSETSTR_HIRAGANA
{
@@ -1544,6 +1598,7 @@ String RID_SUBSETSTR_HIRAGANA
Text[ arabic ] = "";
Text[ catalan ] = "Hiragana";
Text[ finnish ] = "hiragana";
+ Text[ thai ] = "ฮิรากานะ";
};
String RID_SUBSETSTR_KATAKANA
{
@@ -1562,13 +1617,14 @@ String RID_SUBSETSTR_KATAKANA
Text[ polish ] = "Katakana";
Text[ portuguese_brazilian ] = "Katakana";
Text[ japanese ] = "カタカナ";
- Text[ korean ] = "가다가나";
+ Text[ korean ] = "가타카나";
Text[ chinese_simplified ] = "片假名";
Text[ chinese_traditional ] = "片假名";
Text[ turkish ] = "Katakana";
Text[ arabic ] = "";
Text[ catalan ] = "Katakana";
Text[ finnish ] = "katakana";
+ Text[ thai ] = "คาตากานะ";
};
String RID_SUBSETSTR_BOPOMOFO
{
@@ -1594,6 +1650,7 @@ String RID_SUBSETSTR_BOPOMOFO
Text[ arabic ] = "";
Text[ catalan ] = "Bopomofo";
Text[ finnish ] = "bopomofo";
+ Text[ thai ] = "ภาษาโบโพโมโฟ";
};
String RID_SUBSETSTR_HANGUL_COMPAT_JAMO
{
@@ -1607,7 +1664,7 @@ String RID_SUBSETSTR_HANGUL_COMPAT_JAMO
Text[ french ] = "Hangul compatible Jamo";
Text[ spanish ] = "Jamo compatible con Hangul";
Text[ italian ] = "Hangul compatibile con Jamo";
- Text[ danish ] = "Hangul Compatibility Jamo";
+ Text[ danish ] = "Hangul kompatibel Jamo";
Text[ swedish ] = "Hangul-kompatibilitet Jamo";
Text[ polish ] = "Jambo zgodne z Hangul";
Text[ portuguese_brazilian ] = "Hangul Compatibility Jamo";
@@ -1617,8 +1674,9 @@ String RID_SUBSETSTR_HANGUL_COMPAT_JAMO
Text[ chinese_traditional ] = "韓文兼容 Jamo";
Text[ turkish ] = "Hangul Compatibility Jamo";
Text[ arabic ] = " ";
- Text[ catalan ] = "Jamo compatible con Hangul";
+ Text[ catalan ] = "Jamo amb compatibilitat Hangul";
Text[ finnish ] = "hangul-yhteensopiva jamo";
+ Text[ thai ] = "ความเข้ากันได้ของภาษาฮังกุลจาโม";
};
String RID_SUBSETSTR_CJK_MISC
{
@@ -1632,7 +1690,7 @@ String RID_SUBSETSTR_CJK_MISC
Text[ french ] = "CJC divers";
Text[ spanish ] = "Diversos caracteres CJK";
Text[ italian ] = "Caratteri CJK";
- Text[ danish ] = "CJK Miscellaneous";
+ Text[ danish ] = "Forskellige CJK-tegn";
Text[ swedish ] = "Diverse CJK-tecken";
Text[ polish ] = "Rne znaki CJK";
Text[ portuguese_brazilian ] = "CJK Miscellaneous";
@@ -1642,8 +1700,9 @@ String RID_SUBSETSTR_CJK_MISC
Text[ chinese_traditional ] = "中日韓混合字元";
Text[ turkish ] = "CJK Miscellaneous";
Text[ arabic ] = " ";
- Text[ catalan ] = "Diversos caracteres CJK";
+ Text[ catalan ] = "CJK: diversos";
Text[ finnish ] = "Sekalaiset CJK-merkit";
+ Text[ thai ] = "เบ็ดเตล็ด CJK ";
};
String RID_SUBSETSTR_ENCLOSED_CJK_LETTERS
{
@@ -1651,24 +1710,25 @@ String RID_SUBSETSTR_ENCLOSED_CJK_LETTERS
Text [ ENGLISH ] = "Enclosed CJK Letters And Months" ;
Text[ english_us ] = "Enclosed CJK Letters And Months";
Text[ portuguese ] = "Caracteres e meses CJK inclusos";
- Text[ russian ] = " CJK- ";
+ Text[ russian ] = " CJK ";
Text[ greek ] = " CJK ";
Text[ dutch ] = "Ingesloten CJK-letters & maanden";
Text[ french ] = "Mois & lettres CJC encercls";
Text[ spanish ] = "Caracteres y meses incluidos en CJK";
Text[ italian ] = "Caratteri e mesi CJK inclusi";
- Text[ danish ] = "Enclosed CJK Letters And Months";
+ Text[ danish ] = "CJK-tegn og -mneder med bolle omkring";
Text[ swedish ] = "Omslutna CJK-bokstav och -mnad";
Text[ polish ] = "Otoczone CJK litery i miesice";
Text[ portuguese_brazilian ] = "Enclosed CJK Letters And Months";
Text[ japanese ] = "囲みCJK用文字・月";
- Text[ korean ] = "CJK 문자와 월, 원문자";
+ Text[ korean ] = "CJK용 원문자 및 월";
Text[ chinese_simplified ] = "带括号的中日韩字符和月份";
Text[ chinese_traditional ] = "帶括號的中日韓字元和月份";
Text[ turkish ] = "Enclosed CJK Letters And Months";
Text[ arabic ] = " ";
- Text[ catalan ] = "Caracteres y meses incluidos en CJK";
+ Text[ catalan ] = "Carcters i mesos inclosos en CJK";
Text[ finnish ] = "Sisllytetyt CJK-kirjaimet ja kuukaudet";
+ Text[ thai ] = "ตัวอักษรและเดือนที่ล้อมรอบ CJK ";
};
String RID_SUBSETSTR_CJK_COMPATIBILITY
{
@@ -1683,7 +1743,7 @@ String RID_SUBSETSTR_CJK_COMPATIBILITY
Text[ french ] = "Compatibilit CJC";
Text[ spanish ] = "Compatibilidad CJK";
Text[ italian ] = "Compatibilit CJK";
- Text[ danish ] = "CJK Compatibility";
+ Text[ danish ] = "CJK-kompatibilitet";
Text[ swedish ] = "CJK kompatibilitet";
Text[ polish ] = "Kompatybilno z CJK";
Text[ portuguese_brazilian ] = "CJK Compatibility";
@@ -1693,8 +1753,9 @@ String RID_SUBSETSTR_CJK_COMPATIBILITY
Text[ chinese_traditional ] = "中日韓相容";
Text[ turkish ] = "CJK Compatibility";
Text[ arabic ] = " ";
- Text[ catalan ] = "Compatibilidad CJK";
+ Text[ catalan ] = "Compatibilitat amb CJK";
Text[ finnish ] = "CJK-yhteensopivuus";
+ Text[ thai ] = "ความเข้ากันได้ของ CJK ";
};
String RID_SUBSETSTR_HANGUL
{
@@ -1720,6 +1781,7 @@ String RID_SUBSETSTR_HANGUL
Text[ arabic ] = "Hangul";
Text[ catalan ] = "Hangul";
Text[ finnish ] = "hangul";
+ Text[ thai ] = "ภาษาฮังกุล";
};
String RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH
{
@@ -1733,7 +1795,7 @@ String RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH
Text[ french ] = "Idogrammes unifis CJC";
Text[ spanish ] = "Ideogramas CJK unificados";
Text[ italian ] = "Ideogramma CJK unificato";
- Text[ danish ] = "CJK Unified Ideographs";
+ Text[ danish ] = "Standardiserede CJK-ideogrammer";
Text[ swedish ] = "Enhetliga CJK-ideogram";
Text[ polish ] = "Ujednolicone ideogramy CJK";
Text[ portuguese_brazilian ] = "CJK Unified Ideographs";
@@ -1743,8 +1805,9 @@ String RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH
Text[ chinese_traditional ] = "中日韓統一漢字";
Text[ turkish ] = "CJK Unified Ideographs";
Text[ arabic ] = " ";
- Text[ catalan ] = "Ideogramas CJK unificados";
+ Text[ catalan ] = "Ideogrames unificats CJK";
Text[ finnish ] = "Yhdistetyt CJK-symbolit";
+ Text[ thai ] = "เครื่องหมายแสดงความหมายที่มีเอกภาพของ CJK ";
};
String RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH
{
@@ -1758,7 +1821,7 @@ String RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH
Text[ french ] = "Idogrammes unifis CJC extension-A";
Text[ spanish ] = "Ideogramas CJK unificados extensin A";
Text[ italian ] = "Ideogramma CJK unificato estensione A";
- Text[ danish ] = "CJK Unified Ideographs Extension-A";
+ Text[ danish ] = "Standardiserede CJK-ideogrammer Udvidelse-A";
Text[ swedish ] = "Enhetliga CJK-ideogram utkning-A";
Text[ polish ] = "Ujednolicony ideogram CJK rozszerzenie-A";
Text[ portuguese_brazilian ] = "CJK Unified Ideographs Extension-A";
@@ -1768,8 +1831,9 @@ String RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH
Text[ chinese_traditional ] = "中日韓統一漢字擴充-A";
Text[ turkish ] = "CJK Unified Ideographs Extension-A";
Text[ arabic ] = " A-";
- Text[ catalan ] = "Ideogramas CJK unificados extensin A";
+ Text[ catalan ] = "Ideogrames CJK unificats extensi A";
Text[ finnish ] = "Yhdistetyt CJK-symbolit (laajennus A)";
+ Text[ thai ] = "ส่วนขยายเครื่องหมายที่แสดงความหมายที่มีเอกภาพของ CJK -A";
};
String RID_SUBSETSTR_PRIVATE_USE_AREA
{
@@ -1779,11 +1843,11 @@ String RID_SUBSETSTR_PRIVATE_USE_AREA
Text[ portuguese ] = "rea de utilizao privada";
Text[ russian ] = " ";
Text[ greek ] = " ";
- Text[ dutch ] = "Privgebruik";
+ Text[ dutch ] = "Priv-gebruik";
Text[ french ] = "Zone usage priv";
Text[ spanish ] = "Smbolos especficos de fuentes";
Text[ italian ] = "Area uso privato";
- Text[ danish ] = "Private Use Area";
+ Text[ danish ] = "Tegnstspecifikke symboler";
Text[ swedish ] = "Symboler specifika f. teckenuppsttningar";
Text[ polish ] = "Symbole specyficzne dla zbioru znakw";
Text[ portuguese_brazilian ] = "Private Use Area";
@@ -1793,8 +1857,9 @@ String RID_SUBSETSTR_PRIVATE_USE_AREA
Text[ chinese_traditional ] = "專用區域";
Text[ turkish ] = "Private Use Area";
Text[ arabic ] = " ";
- Text[ catalan ] = "Smbolos especficos de fuentes";
+ Text[ catalan ] = "rea d's privat";
Text[ finnish ] = "Henkilkohtainen alue";
+ Text[ thai ] = "พื้นที่ใช้ส่วนตัว";
};
String RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS
{
@@ -1808,7 +1873,7 @@ String RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS
Text[ french ] = "Idogrammes compatibles CJC";
Text[ spanish ] = "Ideogramas de compatibilidad CJK";
Text[ italian ] = "Ideogrammi compatibili CJK";
- Text[ danish ] = "CJK Compatibility Ideographs";
+ Text[ danish ] = "CJK-kompatible ideogrammer";
Text[ swedish ] = "CJK - kompatibilitetsideogram";
Text[ polish ] = "Ideogramy zgodne z CJK";
Text[ portuguese_brazilian ] = "CJK Compatibility Ideographs";
@@ -1818,8 +1883,9 @@ String RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS
Text[ chinese_traditional ] = "中日韓相容字元";
Text[ turkish ] = "CJK Compatibility Ideographs";
Text[ arabic ] = " ";
- Text[ catalan ] = "Ideogramas de compatibilidad CJK";
+ Text[ catalan ] = "Ideogrames de compatibilitat amb CJK";
Text[ finnish ] = "CJK-yhteensopivuussymbolit";
+ Text[ thai ] = "ความเข้ากันได้ของเครื่องหมายที่แสดงความหมาย CJK ";
};
String RID_SUBSETSTR_ALPHA_PRESENTATION
{
@@ -1833,18 +1899,19 @@ String RID_SUBSETSTR_ALPHA_PRESENTATION
Text[ french ] = "Formes de prsentation alphabtiques";
Text[ spanish ] = "Formas de presentacin alfabticas";
Text[ italian ] = "Forme di presentazione alfabetiche";
- Text[ danish ] = "Alphabetic Presentation Forms";
+ Text[ danish ] = "Alfabetiske prsentationsformer";
Text[ swedish ] = "Alfabetiska presentationsformat";
Text[ polish ] = "Fromy prezentacji alfabetycznej";
Text[ portuguese_brazilian ] = "Alphabetic Presentation Forms";
Text[ japanese ] = "アルファベット表示形";
- Text[ korean ] = "알파벳 프리젠테이션 형식";
+ Text[ korean ] = "알파벳 프레젠테이션 형식";
Text[ chinese_simplified ] = "字母的演示形式";
Text[ chinese_traditional ] = "字母演示圖樣";
Text[ turkish ] = "Alphabetic Presentation Forms";
Text[ arabic ] = " ";
- Text[ catalan ] = "Formas de presentacin alfabticas";
+ Text[ catalan ] = "Formes de presentaci alfabtiques";
Text[ finnish ] = "Aakkostetut esityslomakkeet";
+ Text[ thai ] = "แบบฟอร์มการนำเสนอเรียงตามตัวอักษร";
};
String RID_SUBSETSTR_ARABIC_PRESENT_A
{
@@ -1859,18 +1926,19 @@ String RID_SUBSETSTR_ARABIC_PRESENT_A
Text[ spanish ] = "Formas A de presentacin rabe";
Text[ italian ] = "Forme di presentazione arabe A";
- Text[ danish ] = "Arabic Presentation Forms-A";
+ Text[ danish ] = "Arabiske prsentationsformer-A";
Text[ swedish ] = "Arabiskt presentationsformat-A";
Text[ polish ] = "Arabskie formy prezentacyjne-A";
Text[ portuguese_brazilian ] = "Arabic Presentation Forms-A";
Text[ japanese ] = "アラビア表示形 A";
- Text[ korean ] = "아랍어 프리젠테이션 유형-A";
+ Text[ korean ] = "아랍어 프레젠테이션 형식-A";
Text[ chinese_simplified ] = "阿拉伯演示形式 A";
Text[ chinese_traditional ] = "阿拉伯演示圖樣-A";
Text[ turkish ] = "Arabic Presentation Forms-A";
Text[ arabic ] = " -A";
- Text[ catalan ] = "Formas A de presentacin rabe";
+ Text[ catalan ] = "Formes A de presentaci rab";
Text[ finnish ] = "Arabiankieliset esityslomakkeet - A";
+ Text[ thai ] = "แบบฟอร์มการนำเสนอภาษาอารบิก-A";
};
String RID_SUBSETSTR_COMBINING_HALF_MARKS
{
@@ -1884,7 +1952,7 @@ String RID_SUBSETSTR_COMBINING_HALF_MARKS
Text[ french ] = "Demi-signes jonctifs";
Text[ spanish ] = "Combinacin de medias marcas";
Text[ italian ] = "Mezze marche di combinazione";
- Text[ danish ] = "Combining Half Marks";
+ Text[ danish ] = "Kombinerende halvmrker";
Text[ swedish ] = "Kombinerar halva markeringar";
Text[ polish ] = "czce pznaczniki";
Text[ portuguese_brazilian ] = "Combining Half Marks";
@@ -1894,8 +1962,9 @@ String RID_SUBSETSTR_COMBINING_HALF_MARKS
Text[ chinese_traditional ] = "對應的符號";
Text[ turkish ] = "Combining Half Marks";
Text[ arabic ] = " ";
- Text[ catalan ] = "Combinacin de medias marcas";
+ Text[ catalan ] = "Combinaci de miges marques";
Text[ finnish ] = "Puolimerkkien yhdistminen";
+ Text[ thai ] = "การเชื่อมเครื่องหมายครึ่ง";
};
String RID_SUBSETSTR_CJK_COMPAT_FORMS
{
@@ -1909,7 +1978,7 @@ String RID_SUBSETSTR_CJK_COMPAT_FORMS
Text[ french ] = "Formes compatibles CJC";
Text[ spanish ] = "Formas de compatibilidad CJK";
Text[ italian ] = "Forme compatibili CJK";
- Text[ danish ] = "CJK Compatibility Forms";
+ Text[ danish ] = "CJK-kompatibilitetsformer";
Text[ swedish ] = "CJK - kompatibilitetsformat";
Text[ polish ] = "Formy zgodnoci CJK";
Text[ portuguese_brazilian ] = "CJK Compatibility Forms";
@@ -1919,8 +1988,9 @@ String RID_SUBSETSTR_CJK_COMPAT_FORMS
Text[ chinese_traditional ] = "中日韓相容圖樣";
Text[ turkish ] = "CJK Compatibility Forms";
Text[ arabic ] = " ";
- Text[ catalan ] = "Formas de compatibilidad CJK";
+ Text[ catalan ] = "Formes de compatibilitat amb CJK";
Text[ finnish ] = "CJK-yhteensopivuuslomakkeet";
+ Text[ thai ] = "แบบฟอร์มที่เข้ากันได้ของ CJK ";
};
String RID_SUBSETSTR_SMALL_FORM_VARIANTS
{
@@ -1934,19 +2004,20 @@ String RID_SUBSETSTR_SMALL_FORM_VARIANTS
Text[ french ] = "Petites variantes de formes";
Text[ spanish ] = "Variantes de pequeas formas";
Text[ italian ] = "Piccole varianti di forma";
- Text[ danish ] = "Small Form Variants";
+ Text[ danish ] = "Sm formvarianter";
Text[ swedish ] = "Sm formatvarianter";
Text[ polish ] = "Warianty maych form";
Text[ portuguese_brazilian ] = "Small Form Variants";
Text[ japanese ] = "小字形";
- Text[ korean ] = "작은 형식 변형";
+ Text[ korean ] = "소형 문자";
Text[ chinese_simplified ] = "小写变体";
Text[ chinese_traditional ] = "小寫變體";
Text[ turkish ] = "Small Form Variants";
Text[ arabic ] = " ";
- Text[ catalan ] = "Variantes de pequeas formas";
+ Text[ catalan ] = "Variants petites del formulari";
Text[ finnish ] = "Pienimuotoiset";
+ Text[ thai ] = "ตัวแปรของแบบฟอร์มเล็ก";
};
String RID_SUBSETSTR_ARABIC_PRESENT_B
{
@@ -1960,18 +2031,19 @@ String RID_SUBSETSTR_ARABIC_PRESENT_B
Text[ french ] = "Formes-B de prsentation arabe";
Text[ spanish ] = "Formas B de presentacin rabe";
Text[ italian ] = "Forme di presentazione arabe B";
- Text[ danish ] = "Arabic Presentation Forms-B";
+ Text[ danish ] = "Arabiske prsentationsformer-B";
Text[ swedish ] = "Arabiskt presentationsformat-B";
Text[ polish ] = "Arabskie formy prezenacyjne-B";
Text[ portuguese_brazilian ] = "Arabic Presentation Forms-B";
Text[ japanese ] = "アラビア表示形 B";
- Text[ korean ] = "아랍어 프리젠테이션 유형-B";
+ Text[ korean ] = "아랍어 프레젠테이션 형식-B";
Text[ chinese_simplified ] = "阿拉伯演示形式 B";
Text[ chinese_traditional ] = "阿拉伯演示圖樣-B";
Text[ turkish ] = "Arabic Presentation Forms-B";
Text[ arabic ] = " -B";
- Text[ catalan ] = "Formas B de presentacin rabe";
+ Text[ catalan ] = "Formes B de presentaci rab";
Text[ finnish ] = "Arabiankieliset esityslomakkeet - B";
+ Text[ thai ] = "แบบฟอร์มการนำเสนอภาษาอารบิก-B";
};
String RID_SUBSETSTR_HALFW_FULLW_FORMS
{
@@ -1979,24 +2051,25 @@ String RID_SUBSETSTR_HALFW_FULLW_FORMS
Text [ ENGLISH ] = "Halfwidth And Fullwidth Forms" ;
Text[ english_us ] = "Half-width and Full-width Forms";
Text[ portuguese ] = "Formas de meia-largura e largura normal";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ greek ] = " - ";
Text[ dutch ] = "Halve en volledige breedte";
Text[ french ] = "Formes de demi et pleine chasse";
Text[ spanish ] = "Formas anchas y medio anchas";
Text[ italian ] = "Forme di spessore pieno/ridotto";
- Text[ danish ] = "Halfwidth And Fullwidth Forms";
+ Text[ danish ] = "Halvbrede og brede former";
Text[ swedish ] = "Halv- och helbreda format";
Text[ polish ] = "Formy szerokie i pszerokie";
Text[ portuguese_brazilian ] = "Halfwidth And Fullwidth Forms";
Text[ japanese ] = "半角形・全角形";
- Text[ korean ] = "반 폭과 전폭 형식";
+ Text[ korean ] = "반자 및 전자 형식";
Text[ chinese_simplified ] = "半形和全形字符";
Text[ chinese_traditional ] = "半形和全形";
Text[ turkish ] = "Halfwidth And Fullwidth Forms";
Text[ arabic ] = " ";
- Text[ catalan ] = "Formas anchas y medio anchas";
+ Text[ catalan ] = "Formularis d'amplada mitja i total";
Text[ finnish ] = "Puolilevet ja tyslevet lomakkeet";
+ Text[ thai ] = "แบบฟอร์มที่มีความกว้างครึ่งหนึ่งและความกว้างเต็ม";
};
String RID_SUBSETSTR_SPECIALS
{
@@ -2010,7 +2083,7 @@ String RID_SUBSETSTR_SPECIALS
Text[ french ] = "Symboles spciaux";
Text[ spanish ] = "Smbolos especiales";
Text[ italian ] = "Simboli speciali";
- Text[ danish ] = "Specials";
+ Text[ danish ] = "Specielle symboler";
Text[ swedish ] = "Speciella symboler";
Text[ polish ] = "Znaki specjalne";
Text[ portuguese_brazilian ] = "Specials";
@@ -2020,8 +2093,9 @@ String RID_SUBSETSTR_SPECIALS
Text[ chinese_traditional ] = "特殊字元";
Text[ turkish ] = "Specials";
Text[ arabic ] = " ";
- Text[ catalan ] = "Smbolos especiales";
+ Text[ catalan ] = "Especials";
Text[ finnish ] = "Erikoiset";
+ Text[ thai ] = "ความพิเศษ";
};
String RID_SUBSETSTR_HANGUL_GA
{
@@ -2047,6 +2121,7 @@ String RID_SUBSETSTR_HANGUL_GA
Text[ arabic ] = "Hangul Ga";
Text[ catalan ] = "Hangul Ga";
Text[ finnish ] = "hangul ga";
+ Text[ thai ] = "ภาษาฮังกุลกา";
};
String RID_SUBSETSTR_HANGUL_NA
{
@@ -2072,6 +2147,7 @@ String RID_SUBSETSTR_HANGUL_NA
Text[ arabic ] = "Hangul Na";
Text[ catalan ] = "Hangul Na";
Text[ finnish ] = "hangul na";
+ Text[ thai ] = "ภาษาฮังกุลนา";
};
String RID_SUBSETSTR_HANGUL_DA
{
@@ -2097,6 +2173,7 @@ String RID_SUBSETSTR_HANGUL_DA
Text[ arabic ] = "Hangul Da";
Text[ catalan ] = "Hangul Da";
Text[ finnish ] = "hangul da";
+ Text[ thai ] = "ภาษาฮังกุลดา";
};
String RID_SUBSETSTR_HANGUL_RA
{
@@ -2122,6 +2199,7 @@ String RID_SUBSETSTR_HANGUL_RA
Text[ arabic ] = "Hangul Ra";
Text[ catalan ] = "Hangul Ra";
Text[ finnish ] = "hangul ra";
+ Text[ thai ] = "ภาษาฮังกุลรา";
};
String RID_SUBSETSTR_HANGUL_MA
{
@@ -2147,6 +2225,7 @@ String RID_SUBSETSTR_HANGUL_MA
Text[ arabic ] = "Hangul Ma";
Text[ catalan ] = "Hangul Ma";
Text[ finnish ] = "hangul ma";
+ Text[ thai ] = "ภาษาฮังกุลมา";
};
String RID_SUBSETSTR_HANGUL_BA
{
@@ -2172,6 +2251,7 @@ String RID_SUBSETSTR_HANGUL_BA
Text[ arabic ] = "Hangul Ba";
Text[ catalan ] = "Hangul Ba";
Text[ finnish ] = "hangul ba";
+ Text[ thai ] = "ภาษาฮังกุลบา";
};
String RID_SUBSETSTR_HANGUL_SA
{
@@ -2197,6 +2277,7 @@ String RID_SUBSETSTR_HANGUL_SA
Text[ arabic ] = "Hangul Sa";
Text[ catalan ] = "Hangul Sa";
Text[ finnish ] = "hangul sa";
+ Text[ thai ] = "ภาษาฮังกุลซา";
};
String RID_SUBSETSTR_HANGUL_AH
{
@@ -2222,6 +2303,7 @@ String RID_SUBSETSTR_HANGUL_AH
Text[ arabic ] = "Hangul Ah";
Text[ catalan ] = "Hangul Ah";
Text[ finnish ] = "hangul ah";
+ Text[ thai ] = "ภาษาฮังกุลอาห์";
};
String RID_SUBSETSTR_HANGUL_JA
{
@@ -2247,6 +2329,7 @@ String RID_SUBSETSTR_HANGUL_JA
Text[ arabic ] = "Hangul Ja";
Text[ catalan ] = "Hangul Ja";
Text[ finnish ] = "hangul ja";
+ Text[ thai ] = "ภาษาฮังกุลจา";
};
String RID_SUBSETSTR_HANGUL_CHA
{
@@ -2272,6 +2355,7 @@ String RID_SUBSETSTR_HANGUL_CHA
Text[ arabic ] = "Hangul Cha";
Text[ catalan ] = "Hangul Cha";
Text[ finnish ] = "hangul cha";
+ Text[ thai ] = "ภาษาฮังกุลชา";
};
String RID_SUBSETSTR_HANGUL_KA
{
@@ -2290,13 +2374,14 @@ String RID_SUBSETSTR_HANGUL_KA
Text[ polish ] = "Hangul Ka";
Text[ portuguese_brazilian ] = "Hangul Ka";
Text[ japanese ] = "ハングル Ka";
- Text[ korean ] = "한글 가";
+ Text[ korean ] = "한글 카";
Text[ chinese_simplified ] = "韩文 Ka";
Text[ chinese_traditional ] = "韓文 Ka";
Text[ turkish ] = "Hangul Ka";
Text[ arabic ] = "Hangul Ka";
Text[ catalan ] = "Hangul Ka";
Text[ finnish ] = "hangul ka";
+ Text[ thai ] = "ภาษาฮังกุลคา";
};
String RID_SUBSETSTR_HANGUL_TA
{
@@ -2322,6 +2407,7 @@ String RID_SUBSETSTR_HANGUL_TA
Text[ arabic ] = "Hangul Ta";
Text[ catalan ] = "Hangul Ta";
Text[ finnish ] = "hangul ta";
+ Text[ thai ] = "ภาษาฮังกุลทา";
};
String RID_SUBSETSTR_HANGUL_PA
{
@@ -2347,6 +2433,7 @@ String RID_SUBSETSTR_HANGUL_PA
Text[ arabic ] = "Hangul Pa";
Text[ catalan ] = "Hangul Pa";
Text[ finnish ] = "hangul pa";
+ Text[ thai ] = "ภาษาฮังกุลพา";
};
String RID_SUBSETSTR_HANGUL_HA
{
@@ -2372,6 +2459,7 @@ String RID_SUBSETSTR_HANGUL_HA
Text[ arabic ] = "Hangul Ha";
Text[ catalan ] = "Hangul Ha";
Text[ finnish ] = "hangul ha";
+ Text[ thai ] = "ภาษาฮังกุลฮา";
};
String RID_SUBSETSTR_YI
{
@@ -2379,7 +2467,7 @@ String RID_SUBSETSTR_YI
Text [ ENGLISH ] = "Yi" ;
Text[ english_us ] = "Yi";
Text[ portuguese ] = "Yi";
- Text[ russian ] = " Yi";
+ Text[ russian ] = "Yi";
Text[ greek ] = "Yi";
Text[ dutch ] = "Yi";
Text[ french ] = "Yi";
@@ -2397,6 +2485,7 @@ String RID_SUBSETSTR_YI
Text[ arabic ] = "Yi";
Text[ catalan ] = "Yi";
Text[ finnish ] = "yi";
+ Text[ thai ] = "ภาษายิ";
};
String RID_SUBSETSTR_SINHALA
{
@@ -2422,6 +2511,7 @@ String RID_SUBSETSTR_SINHALA
Text[ arabic ] = "";
Text[ catalan ] = "Sinhala";
Text[ finnish ] = "sinhala";
+ Text[ thai ] = "ภาษาซินฮาลา";
};
String RID_SUBSETSTR_TIBETAN
{
@@ -2435,7 +2525,7 @@ String RID_SUBSETSTR_TIBETAN
Text[ french ] = "Tibtain";
Text[ spanish ] = "Tibetano";
Text[ italian ] = "Tibetano";
- Text[ danish ] = "Tibetan";
+ Text[ danish ] = "Tibetansk";
Text[ swedish ] = "Tibetansk";
Text[ polish ] = "Tybetaski";
Text[ portuguese_brazilian ] = "Tibetan";
@@ -2445,8 +2535,9 @@ String RID_SUBSETSTR_TIBETAN
Text[ chinese_traditional ] = "藏語";
Text[ turkish ] = "Tibetan";
Text[ arabic ] = "";
- Text[ catalan ] = "Tibetano";
+ Text[ catalan ] = "Tibet";
Text[ finnish ] = "tiibet";
+ Text[ thai ] = "ภาษาธิเบต";
};
String RID_SUBSETSTR_MYANMAR
{
@@ -2465,13 +2556,14 @@ String RID_SUBSETSTR_MYANMAR
Text[ polish ] = "Myanmar";
Text[ portuguese_brazilian ] = "Myanmar";
Text[ japanese ] = "ミャンマー";
- Text[ korean ] = "미얀마어";
+ Text[ korean ] = "미얀마";
Text[ chinese_simplified ] = "缅甸语";
Text[ chinese_traditional ] = "緬甸語";
Text[ turkish ] = "Myanmar";
Text[ arabic ] = "";
- Text[ catalan ] = "Birmano";
+ Text[ catalan ] = "Myanmar";
Text[ finnish ] = "myanmar";
+ Text[ thai ] = "ภาษาพม่า";
};
String RID_SUBSETSTR_KHMER
{
@@ -2497,6 +2589,7 @@ String RID_SUBSETSTR_KHMER
Text[ arabic ] = "";
Text[ catalan ] = "Khmer";
Text[ finnish ] = "khmeeri";
+ Text[ thai ] = "ภาษาเขมร";
};
String RID_SUBSETSTR_OGHAM
{
@@ -2522,6 +2615,7 @@ String RID_SUBSETSTR_OGHAM
Text[ arabic ] = "";
Text[ catalan ] = "Ogham";
Text[ finnish ] = "ogham";
+ Text[ thai ] = "ภาษาออกแฮม";
};
String RID_SUBSETSTR_RUNIC
{
@@ -2529,13 +2623,13 @@ String RID_SUBSETSTR_RUNIC
Text [ ENGLISH ] = "Runic" ;
Text[ english_us ] = "Runic";
Text[ portuguese ] = "Rnico";
- Text[ russian ] = " ";
+ Text[ russian ] = "";
Text[ greek ] = "";
Text[ dutch ] = "Runen";
Text[ french ] = "Runique";
Text[ spanish ] = "Rnico";
Text[ italian ] = "Runico";
- Text[ danish ] = "Runic";
+ Text[ danish ] = "Runer";
Text[ swedish ] = "Runor";
Text[ polish ] = "Runy";
Text[ portuguese_brazilian ] = "Runic";
@@ -2545,8 +2639,9 @@ String RID_SUBSETSTR_RUNIC
Text[ chinese_traditional ] = "古代北歐文字";
Text[ turkish ] = "Runic";
Text[ arabic ] = "";
- Text[ catalan ] = "Rnico";
+ Text[ catalan ] = "Rnic";
Text[ finnish ] = "riimukirjoitus";
+ Text[ thai ] = "ภาษารูนิก";
};
String RID_SUBSETSTR_SYRIAC
{
@@ -2560,7 +2655,7 @@ String RID_SUBSETSTR_SYRIAC
Text[ french ] = "Syriaque";
Text[ spanish ] = "Sirio";
Text[ italian ] = "Siriano";
- Text[ danish ] = "Syriac";
+ Text[ danish ] = "Syrisk";
Text[ swedish ] = "Syriska";
Text[ polish ] = "Syryjski";
Text[ portuguese_brazilian ] = "Syriac";
@@ -2570,8 +2665,9 @@ String RID_SUBSETSTR_SYRIAC
Text[ chinese_traditional ] = "古代敘利亞語";
Text[ turkish ] = "Syriac";
Text[ arabic ] = "";
- Text[ catalan ] = "Sirio";
+ Text[ catalan ] = "Siri";
Text[ finnish ] = "syyria";
+ Text[ thai ] = "ภาษาซีเรีย";
};
String RID_SUBSETSTR_THAANA
{
@@ -2579,7 +2675,7 @@ String RID_SUBSETSTR_THAANA
Text [ ENGLISH ] = "Thaana" ;
Text[ english_us ] = "Thaana";
Text[ portuguese ] = "Thaana";
- Text[ russian ] = " Thaana";
+ Text[ russian ] = "Thaana";
Text[ greek ] = "Thaana";
Text[ dutch ] = "Thaana";
Text[ french ] = "Thaana";
@@ -2597,6 +2693,7 @@ String RID_SUBSETSTR_THAANA
Text[ arabic ] = "";
Text[ catalan ] = "Thaana";
Text[ finnish ] = "thaana";
+ Text[ thai ] = "ภาษาธานา";
};
String RID_SUBSETSTR_ETHIOPIC
{
@@ -2610,7 +2707,7 @@ String RID_SUBSETSTR_ETHIOPIC
Text[ french ] = "thiopien";
Text[ spanish ] = "Etope";
Text[ italian ] = "Etiopico";
- Text[ danish ] = "Ethiopic";
+ Text[ danish ] = "Etiopisk";
Text[ swedish ] = "Etiopiska";
Text[ polish ] = "Etiopski";
Text[ portuguese_brazilian ] = "Ethiopic";
@@ -2620,8 +2717,9 @@ String RID_SUBSETSTR_ETHIOPIC
Text[ chinese_traditional ] = "衣索比亞語";
Text[ turkish ] = "Ethiopic";
Text[ arabic ] = "";
- Text[ catalan ] = "Etope";
+ Text[ catalan ] = "Etop";
Text[ finnish ] = "etiopia";
+ Text[ thai ] = "ภาษาเอธิโอเปีย";
};
String RID_SUBSETSTR_CHEROKEE
{
@@ -2630,7 +2728,7 @@ String RID_SUBSETSTR_CHEROKEE
Text[ english_us ] = "Cherokee";
Text[ portuguese ] = "Cherokee";
- Text[ russian ] = " ";
+ Text[ russian ] = "";
Text[ greek ] = "Cherokee";
Text[ dutch ] = "Cherokee";
Text[ french ] = "Cherokee";
@@ -2646,8 +2744,9 @@ String RID_SUBSETSTR_CHEROKEE
Text[ chinese_traditional ] = "查拉几族土人語";
Text[ turkish ] = "Cherokee";
Text[ arabic ] = "";
- Text[ catalan ] = "Cheroque";
+ Text[ catalan ] = "Xerokee";
Text[ finnish ] = "cherokee";
+ Text[ thai ] = "ภาษาเชโรกี";
};
String RID_SUBSETSTR_CANADIAN_ABORIGINAL
{
@@ -2657,11 +2756,11 @@ String RID_SUBSETSTR_CANADIAN_ABORIGINAL
Text[ portuguese ] = "Slabas autctones canadianas";
Text[ russian ] = " ";
Text[ greek ] = " Aborigin";
- Text[ dutch ] = "Canadese Aboriginal lettergrepen";
+ Text[ dutch ] = "Canadese Aboriginal-lettergrepen";
Text[ french ] = "Syllabaires autochtones canadiens";
Text[ spanish ] = "Slabas aborgenes canadienses";
Text[ italian ] = "Sillabe delle lingue autoctone canadesi";
- Text[ danish ] = "Canadian Aboriginal Syllables";
+ Text[ danish ] = "Canadiske urindbyggerstavelser";
Text[ swedish ] = "Kanadensiska aboriginstavelser";
Text[ polish ] = "Kanadyjskie sylaby aborygenw";
Text[ portuguese_brazilian ] = "Canadian Aboriginal Syllables";
@@ -2671,8 +2770,9 @@ String RID_SUBSETSTR_CANADIAN_ABORIGINAL
Text[ chinese_traditional ] = "加拿大土著人的語言字母";
Text[ turkish ] = "Canadian Aboriginal Syllables";
Text[ arabic ] = " ";
- Text[ catalan ] = "Slabas aborgenes canadienses";
+ Text[ catalan ] = "Sl.labes aborgens canadenques";
Text[ finnish ] = "Kanadan alkuperiskansojen kirjainmerkit";
+ Text[ thai ] = "พยางค์ภาษาอะบอริจินแคนาดา";
};
String RID_SUBSETSTR_MONGOLIAN
{
@@ -2686,7 +2786,7 @@ String RID_SUBSETSTR_MONGOLIAN
Text[ french ] = "Mongol";
Text[ spanish ] = "Mogol";
Text[ italian ] = "Mongolo";
- Text[ danish ] = "Mongolian";
+ Text[ danish ] = "Mongolsk";
Text[ swedish ] = "Mongoliska";
Text[ polish ] = "Mongolski";
Text[ portuguese_brazilian ] = "Mongolian";
@@ -2696,8 +2796,9 @@ String RID_SUBSETSTR_MONGOLIAN
Text[ chinese_traditional ] = "蒙古語";
Text[ turkish ] = "Mongolian";
Text[ arabic ] = "";
- Text[ catalan ] = "Mogol";
+ Text[ catalan ] = "Mongol";
Text[ finnish ] = "mongolia";
+ Text[ thai ] = "ภาษามองโกเลีย";
};
};
@@ -2710,3 +2811,8 @@ String RID_SUBSETSTR_MONGOLIAN
+
+
+
+
+
diff --git a/svx/source/dialog/connect.src b/svx/source/dialog/connect.src
index 243db24b5886..1f3fc4b22056 100644
--- a/svx/source/dialog/connect.src
+++ b/svx/source/dialog/connect.src
@@ -2,9 +2,9 @@
*
* $RCSfile: connect.src,v $
*
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
*
- * last change: $Author: kz $ $Date: 2001-11-16 22:52:25 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -95,7 +95,7 @@ TabPage RID_SVXPAGE_CONNECTION
Text [ danish ] = "Type" ;
Text [ italian ] = "~Tipo" ;
Text [ spanish ] = "~Tipo" ;
- Text [ french ] = "~Type" ;
+ Text [ french ] = "Type" ;
Text [ dutch ] = "~Type" ;
Text [ portuguese ] = "~Tipo" ;
Text[ chinese_simplified ] = "类型(~T)";
@@ -108,8 +108,9 @@ TabPage RID_SVXPAGE_CONNECTION
Text[ korean ] = "형태(~T)";
Text[ turkish ] = "~Tip";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "~Tipo";
+ Text[ catalan ] = "~Tipus";
Text[ finnish ] = "~Tyyppi";
+ Text[ thai ] = "~ชนิด";
};
ListBox LB_TYPE
{
@@ -135,17 +136,18 @@ TabPage RID_SVXPAGE_CONNECTION
Text [ dutch ] = "Lijnopvulling" ;
Text [ portuguese ] = "Transposio de linhas" ;
Text[ chinese_simplified ] = "线偏离";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Przesunicie linii";
Text[ japanese ] = "線のずれ";
Text[ chinese_traditional ] = "線偏離";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "선 빗김";
+ Text[ korean ] = "휘인 선";
Text[ turkish ] = "izgi erilii";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Desplazamiento de lneas";
- Text[ finnish ] = "Viivan viistotus";
+ Text[ catalan ] = "Desplaament de lnies";
+ Text[ finnish ] = "Viivanosien viistoudet";
+ Text[ thai ] = "บรรทัดเฉ";
};
FixedText FT_LINE_1
{
@@ -172,8 +174,9 @@ TabPage RID_SVXPAGE_CONNECTION
Text[ korean ] = "선1";
Text[ turkish ] = "izgi ~1";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Lnea ~1";
- Text[ finnish ] = "Rivi ~1";
+ Text[ catalan ] = "Lnia ~1";
+ Text[ finnish ] = "Viivanosa ~1";
+ Text[ thai ] = "Line ~1";
};
MetricField MTR_FLD_LINE_1
{
@@ -216,8 +219,9 @@ TabPage RID_SVXPAGE_CONNECTION
Text[ korean ] = "선2";
Text[ turkish ] = "izgi ~2";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Lnea ~2";
- Text[ finnish ] = "Rivi ~2";
+ Text[ catalan ] = "Lnia ~2";
+ Text[ finnish ] = "Viivanosa ~2";
+ Text[ thai ] = "Line ~2";
};
MetricField MTR_FLD_LINE_2
{
@@ -260,8 +264,9 @@ TabPage RID_SVXPAGE_CONNECTION
Text[ korean ] = "선3";
Text[ turkish ] = "izgi ~3";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Lnea~3";
- Text[ finnish ] = "Rivi ~3";
+ Text[ catalan ] = "Lnia ~3";
+ Text[ finnish ] = "Viivanosa ~3";
+ Text[ thai ] = "Line ~3";
};
MetricField MTR_FLD_LINE_3
{
@@ -290,12 +295,12 @@ TabPage RID_SVXPAGE_CONNECTION
Text [ swedish ] = "Linjeavstnd" ;
Text [ danish ] = "Linjeafstand" ;
Text [ italian ] = "Distanza tra le linee" ;
- Text [ spanish ] = "Distancia entre lneas" ;
+ Text [ spanish ] = "Interlineado" ;
Text [ french ] = "cart entre les lignes" ;
Text [ dutch ] = "Lijnafstand" ;
Text [ portuguese ] = "Intervalo entre linhas" ;
Text[ chinese_simplified ] = "线间隔";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Odstpy midzy liniami";
Text[ japanese ] = "線間隔";
Text[ chinese_traditional ] = "線間隔";
@@ -304,8 +309,9 @@ TabPage RID_SVXPAGE_CONNECTION
Text[ korean ] = "선 간격";
Text[ turkish ] = "izgi aral";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Distancia entre lneas";
- Text[ finnish ] = "Line spacing";
+ Text[ catalan ] = "Distncia entre lnies";
+ Text[ finnish ] = "Viivan vlit";
+ Text[ thai ] = "ระยะห่างบรรทัด";
};
FixedText FT_HORZ_1
{
@@ -315,9 +321,9 @@ TabPage RID_SVXPAGE_CONNECTION
Text [ ENGLISH ] = "Start h~orizontal" ;
Text [ english_us ] = "~Begin horizontal" ;
Text [ portuguese_brazilian ] = "H~orizontal 1" ;
- Text [ swedish ] = "Start ~horisontell" ;
+ Text [ swedish ] = "Start h~orisontellt" ;
Text [ danish ] = "Start vandret" ;
- Text [ italian ] = "Inizio o~rizzontale" ;
+ Text [ italian ] = "Inizio ~orizzontale" ;
Text [ spanish ] = "Comienzo h~orizontal" ;
Text [ french ] = "Dbut h~orizontal" ;
Text [ dutch ] = "Begin h~orizontaal" ;
@@ -332,8 +338,9 @@ TabPage RID_SVXPAGE_CONNECTION
Text[ korean ] = "가로선 시작(~B)";
Text[ turkish ] = "Ba ~yatay";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Comienzo h~orizontal";
- Text[ finnish ] = "~Aloita vaakasuunnassa";
+ Text[ catalan ] = "Inici h~oritzontal";
+ Text[ finnish ] = "Alussa, ~vaakasuuntaan";
+ Text[ thai ] = "~Begin horizontal";
};
MetricField MTR_FLD_HORZ_1
{
@@ -359,7 +366,7 @@ TabPage RID_SVXPAGE_CONNECTION
Text [ ENGLISH ] = "End ho~rizontal" ;
Text [ english_us ] = "End ~horizontal" ;
Text [ portuguese_brazilian ] = "Ho~rizontal 2" ;
- Text [ swedish ] = "Slut h~orisontellt" ;
+ Text [ swedish ] = "Slut ho~risontellt" ;
Text [ danish ] = "Slut vandret" ;
Text [ italian ] = "Fine o~rizzontale" ;
Text [ spanish ] = "Final hori~zontal" ;
@@ -376,8 +383,9 @@ TabPage RID_SVXPAGE_CONNECTION
Text[ korean ] = "가로선 끝(~H)";
Text[ turkish ] = "Sonu ya~tay";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Final hori~zontal";
- Text[ finnish ] = "~Vaakalopetus";
+ Text[ catalan ] = "Fi ~horitzontal";
+ Text[ finnish ] = "~Lopussa, vaa~kasuuntaan";
+ Text[ thai ] = "End ~horizontal";
};
MetricField MTR_FLD_HORZ_2
{
@@ -403,7 +411,7 @@ TabPage RID_SVXPAGE_CONNECTION
Text [ ENGLISH ] = "Start ~vertical" ;
Text [ english_us ] = "Begin ~vertical" ;
Text [ portuguese_brazilian ] = "~Vertikal 1" ;
- Text [ swedish ] = "Start ~vertikal" ;
+ Text [ swedish ] = "Start ~vertikalt" ;
Text [ danish ] = "Start lodret" ;
Text [ italian ] = "Inizio ~verticale" ;
Text [ spanish ] = "Comienzo ~vertical" ;
@@ -411,7 +419,7 @@ TabPage RID_SVXPAGE_CONNECTION
Text [ dutch ] = "Begin ~verticaal" ;
Text [ portuguese ] = "Incio ~vertical" ;
Text[ chinese_simplified ] = "起始部分是垂直方向(~V)";
- Text[ russian ] = " ";
+ Text[ russian ] = "~ ";
Text[ polish ] = "Pocztek pionowo";
Text[ japanese ] = "縦線の始点(~V)";
Text[ chinese_traditional ] = "起始方向是垂直方向(~V)";
@@ -420,8 +428,9 @@ TabPage RID_SVXPAGE_CONNECTION
Text[ korean ] = "세로선 시작(~V)";
Text[ turkish ] = "Ba ~dikey";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Comienzo ~vertical";
- Text[ finnish ] = "Aloita ~pystysuunnassa";
+ Text[ catalan ] = "Inici ~vertical";
+ Text[ finnish ] = "Alussa, ~pystysuuntaan";
+ Text[ thai ] = "Begin ~vertical";
};
MetricField MTR_FLD_VERT_1
{
@@ -449,7 +458,7 @@ TabPage RID_SVXPAGE_CONNECTION
Text [ portuguese_brazilian ] = "V~ertikal 2" ;
Text [ swedish ] = "Slut v~ertikalt" ;
Text [ danish ] = "Slut lodret" ;
- Text [ italian ] = "Fine v~erticale" ;
+ Text [ italian ] = "~Fine verticale" ;
Text [ spanish ] = "Final v~ertical" ;
Text [ french ] = "Fin v~erticale" ;
Text [ dutch ] = "Einde v~erticaal" ;
@@ -464,8 +473,9 @@ TabPage RID_SVXPAGE_CONNECTION
Text[ korean ] = "세로선 끝(~E)";
Text[ turkish ] = "Sonu d~ikey";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Final v~ertical";
- Text[ finnish ] = "~Pystylopetus";
+ Text[ catalan ] = "~Fi vertical";
+ Text[ finnish ] = "Lopussa, pyst~ysuuntaan";
+ Text[ thai ] = "~End vertical";
};
MetricField MTR_FLD_VERT_2
{
@@ -492,38 +502,40 @@ TabPage RID_SVXPAGE_CONNECTION
QuickHelpText = "Vorschau" ;
QuickHelpText [ ENGLISH ] = "Preview" ;
QuickHelpText[ english_us ] = "Preview";
- QuickHelpText[ portuguese ] = "Visualizar!";
+ QuickHelpText[ portuguese ] = "Visualizar";
QuickHelpText[ russian ] = "";
QuickHelpText[ greek ] = "Preview";
QuickHelpText[ dutch ] = "Voorbeeld";
QuickHelpText[ french ] = "Aperu";
QuickHelpText[ spanish ] = "Previsualizacin";
- QuickHelpText[ finnish ] = "Preview";
+ QuickHelpText[ finnish ] = "Esikatselu";
QuickHelpText[ italian ] = "Anteprima";
QuickHelpText[ danish ] = "Preview";
QuickHelpText[ swedish ] = "Frhandsvisning";
QuickHelpText[ polish ] = "Podgld";
QuickHelpText[ portuguese_brazilian ] = "Preview";
- QuickHelpText[ japanese ] = "プレビュー";
- QuickHelpText[ korean ] = "미리보기!";
+ QuickHelpText[ japanese ] = "プレビュー";
+ QuickHelpText[ korean ] = "미리보기";
QuickHelpText[ chinese_simplified ] = "预视";
QuickHelpText[ chinese_traditional ] = "預覽";
QuickHelpText[ turkish ] = "Preview";
QuickHelpText[ arabic ] = "Preview";
- QuickHelpText[ catalan ] = "Preview";
+ QuickHelpText[ catalan ] = "Previsualitza";
+ QuickHelpText[ thai ] = "Preview";
};
Text[ chinese_simplified ] = "连接符";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "cznik";
- Text[ japanese ] = "コネクタ";
+ Text[ japanese ] = "コネクタ";
Text[ chinese_traditional ] = "連接符";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "연결선";
+ Text[ korean ] = "연결자";
Text[ turkish ] = "Balayc";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Conector";
- Text[ finnish ] = "Liitin";
+ Text[ catalan ] = "Connector";
+ Text[ finnish ] = "Yhdysviiva";
+ Text[ thai ] = "ตัวเชื่อมต่อ";
};
// ******************************************************************* EOF
@@ -538,3 +550,10 @@ TabPage RID_SVXPAGE_CONNECTION
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index 0b569f16f00f..8a264f5ca608 100644
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.src
@@ -2,9 +2,9 @@
*
* $RCSfile: contdlg.src,v $
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
- * last change: $Author: kz $ $Date: 2002-11-27 16:56:53 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -98,7 +98,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
Text [ swedish ] = "Tilldela" ;
Text [ danish ] = "Tildel" ;
Text [ italian ] = "Assegna" ;
- Text [ spanish ] = "Asignar" ;
+ Text [ spanish ] = "Aplicar" ;
Text [ french ] = "Assigner" ;
Text [ dutch ] = "Toewijzen" ;
Text[ chinese_simplified ] = "指定";
@@ -208,7 +208,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
Text[ chinese_traditional ] = "矩形";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "사각형";
+ Text[ korean ] = "직사각형";
Text[ turkish ] = "Dikdrtgen";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Rectangle";
@@ -312,7 +312,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
Text [ french ] = "diter des points" ;
Text [ swedish ] = "Redigera punkter" ;
Text [ dutch ] = "Punten bewerken" ;
- Text [ spanish ] = "Modificar puntos" ;
+ Text [ spanish ] = "Editar puntos" ;
Text [ english_us ] = "Edit Points" ;
AutoCheck = TRUE ;
Text[ chinese_simplified ] = "编辑接点";
@@ -407,7 +407,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
Text [ french ] = "Supprimer des points" ;
Text [ swedish ] = "Radera punkter" ;
Text [ dutch ] = "Punten verwijderen" ;
- Text [ spanish ] = "Eliminar puntos" ;
+ Text [ spanish ] = "Borrar puntos" ;
Text [ english_us ] = "Delete Points" ;
Text[ chinese_simplified ] = "删除接点";
Text[ russian ] = " ";
@@ -448,7 +448,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
Text[ chinese_traditional ] = "自動輪廓";
Text[ arabic ] = " ";
Text[ greek ] = "";
- Text[ korean ] = "자동 외형선";
+ Text[ korean ] = "자동 윤곽";
Text[ turkish ] = "Otomatik kontur";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Contorn automtic";
@@ -514,7 +514,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
Text[ chinese_traditional ] = "恢復撤消指令";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "복원";
+ Text[ korean ] = "다시 실행";
Text[ turkish ] = "Yinele ";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Restaurar ";
@@ -736,7 +736,7 @@ String STR_CONTOURDLG_WORKPLACE
Text [ swedish ] = "Definition av ett nytt arbetsomrde\nleder till att konturen raderas.\nVill du fortstta nd?" ;
Text [ danish ] = "Hvis du definerer et nyt arbejdsomrde\nbliver konturen slettet.\nEr du sikker p at du vil fortstte?" ;
Text [ italian ] = "L'impostazione di una nuova area di lavoro\ncauser la cancellazione del contorno.\nVolete proseguire?" ;
- Text [ spanish ] = "Al establecer una nueva rea de trabajo\nse eliminar el contorno.\nDesea realmente continuar?" ;
+ Text [ spanish ] = "Al establecer una nueva rea de trabajo\nse borrar el contorno.\nDesea realmente continuar?" ;
Text [ french ] = "Assigner une nouvelle zone de travail\nsupprime le contour.\nSouhaitez-vous continuer ?" ;
Text [ dutch ] = "Door het vastleggen van een nieuw werkbereik \nwordt de contour gewist.\nWilt u werkelijk doorgaan?" ;
Text [ portuguese ] = "Ao definir uma nova rea de\ntrabalho eliminar o contorno.\nDeseja continuar?" ;
@@ -747,7 +747,7 @@ String STR_CONTOURDLG_WORKPLACE
Text[ chinese_traditional ] = "定義一個新的編輯區域會清除輪廓。\n您真要繼續?";
Text[ arabic ] = " \n . \n ";
Text[ greek ] = " \n .\n ;";
- Text[ korean ] = "새 작업 영역을 설정하면\n윤곽이 삭제됩니다.\n그래도 계속하겠습니까?";
+ Text[ korean ] = "새 작업 영역을 설정하면\n윤곽이 삭제됩니다.\n그래도 계속하시겠습니까?";
Text[ turkish ] = "Yeni bir alma alan belirlenmesi durumunda\nkontur silinecek.\nDevam etmek istiyor musunuz?";
Text[ language_user1 ] = " ";
Text[ catalan ] = "En establir una nova rea de treball\ns'eliminar el contorn.\nVoleu continuar realment?";
@@ -776,7 +776,7 @@ String STR_CONTOURDLG_LINKED
Text[ chinese_traditional ] = "這個圖形是和文件連結的。您要取消這個連結﹐編輯這個圖形?";
Text[ arabic ] = " . ɿ";
Text[ greek ] = " . ;";
- Text[ korean ] = "이 그래픽은 문서에 연결되어 있습니다. 편집하기 위해 그래픽 연결을 해제하겠습니까?";
+ Text[ korean ] = "이 그림은 문서에 연결되어 있습니다. 편집하기 위해 그림 연결을 해제하시겠습니까?";
Text[ turkish ] = "Bu grafik, belge ile balantl. Grafii dzenlemek iin bu balanty kaldrmak istiyor musunuz?";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Aquesta imatge est enllaada al document. Voleu desfer l'enlla per editar la imatge?";
@@ -789,3 +789,8 @@ String STR_CONTOURDLG_LINKED
+
+
+
+
+
diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src
index 9f93df4d80ca..43a4f62ccbd0 100644
--- a/svx/source/dialog/ctredlin.src
+++ b/svx/source/dialog/ctredlin.src
@@ -2,9 +2,9 @@
*
* $RCSfile: ctredlin.src,v $
*
- * $Revision: 1.35 $
+ * $Revision: 1.36 $
*
- * last change: $Author: kz $ $Date: 2002-11-27 16:30:57 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -302,12 +302,12 @@ TabPage SID_REDLIN_FILTER_PAGE
};
StringList [ korean ] =
{
- < "다음 이전" ; Default ; > ;
- < "다음 부터" ; Default ; > ;
+ < "다음 시점까지" ; Default ; > ;
+ < "다음 시점부터" ; Default ; > ;
< "다음 날짜 내" ; Default ; > ;
< "다음 날짜 이외" ; Default ; > ;
< "다음 날짜 사이" ; Default ; > ;
- < "저장할 때부터" ; Default ; > ;
+ < "최종 저장 이후" ; Default ; > ;
};
StringList [ turkish ] =
{
@@ -451,7 +451,7 @@ TabPage SID_REDLIN_FILTER_PAGE
Text[ chinese_traditional ] = "和";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "그리고";
+ Text[ korean ] = "와(과)";
Text[ turkish ] = "~ile";
Text[ language_user1 ] = " ";
Text[ catalan ] = "i";
@@ -589,7 +589,7 @@ TabPage SID_REDLIN_FILTER_PAGE
Text [ dutch ] = "~Bereik" ;
Text [ portuguese ] = "Intervalo" ;
Text[ chinese_simplified ] = "区域(~R)";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ polish ] = "Zakres";
Text[ japanese ] = "範囲(~R)";
Text[ chinese_traditional ] = "區域(~R)";
@@ -631,7 +631,7 @@ TabPage SID_REDLIN_FILTER_PAGE
Text[ chinese_traditional ] = "動作(~C)";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "수행(~C)";
+ Text[ korean ] = "작동(~C)";
Text[ turkish ] = "~lem";
Text[ language_user1 ] = " ";
Text[ catalan ] = "~Acci";
@@ -813,7 +813,7 @@ TabPage SID_REDLIN_VIEW_PAGE
Text[ chinese_traditional ] = "接受(~A)";
Text[ arabic ] = "";
Text[ greek ] = "~";
- Text[ korean ] = "수락(~A)";
+ Text[ korean ] = "동의(~A)";
Text[ turkish ] = "~Kabul et";
Text[ language_user1 ] = " ";
Text[ catalan ] = "~Accepto";
@@ -833,7 +833,7 @@ TabPage SID_REDLIN_VIEW_PAGE
Text [ danish ] = "Forkast" ;
Text [ italian ] = "~Rifiuta" ;
Text [ spanish ] = "~Rechazar" ;
- Text [ french ] = "~Refuser" ;
+ Text [ french ] = "~Rejeter" ;
Text [ dutch ] = "V~erwerpen" ;
Text [ portuguese ] = "~Rejeitar" ;
Text[ chinese_simplified ] = "拒绝(~R)";
@@ -873,7 +873,7 @@ TabPage SID_REDLIN_VIEW_PAGE
Text[ chinese_traditional ] = "全部接受(~C)";
Text[ arabic ] = " ";
Text[ greek ] = "~ ";
- Text[ korean ] = "모두 수락(~C)";
+ Text[ korean ] = "모두 동의(~C)";
Text[ turkish ] = "~Tmn kabul et";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Ho a~ccepto tot";
@@ -893,7 +893,7 @@ TabPage SID_REDLIN_VIEW_PAGE
Text [ danish ] = "Forkast alle" ;
Text [ italian ] = "Rifiuta tutto" ;
Text [ spanish ] = "Rechazar todo" ;
- Text [ french ] = "Tout r~efuser" ;
+ Text [ french ] = "Tout rejeter" ;
Text [ dutch ] = "Alle ver~werpen" ;
Text [ portuguese ] = "Rejeitar ~tudo" ;
Text[ chinese_simplified ] = "全部拒绝(~E)";
@@ -935,7 +935,7 @@ TabPage SID_REDLIN_VIEW_PAGE
Text[ chinese_traditional ] = "復原";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "실행취소";
+ Text[ korean ] = "실행 취소";
Text[ turkish ] = "~Geri al";
Text[ language_user1 ] = " ";
Text[ catalan ] = "~Desfs";
@@ -962,7 +962,7 @@ TabPage SID_REDLIN_VIEW_PAGE
Text[ chinese_traditional ] = "動作";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "수행";
+ Text[ korean ] = "작동";
Text[ turkish ] = "lem";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Acci";
@@ -1091,3 +1091,8 @@ TabPage SID_REDLIN_VIEW_PAGE
+
+
+
+
+
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 031bcef58c40..9ffd2f971100 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dlgctl3d.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: cl $ $Date: 2002-02-21 14:35:58 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -154,6 +154,10 @@ Svx3DPreviewControl::~Svx3DPreviewControl()
\************************************************************************/
void Svx3DPreviewControl::Construct()
{
+ // Do never mirror the preview window. This explicitly includes right
+ // to left writing environments.
+ EnableRTL (FALSE);
+
SetMapMode( MAP_100TH_MM );
// Model
@@ -379,6 +383,10 @@ SvxRectCtl3D::SvxRectCtl3D( Window* pParent,
nRadius( nCircle)
{
+ // Do never mirror the preview window. This explicitly includes right
+ // to left writing environments.
+ EnableRTL (FALSE);
+
SetMapMode( MAP_100TH_MM );
SetBackground( Wallpaper( Color( COL_LIGHTGRAY ) ) );
@@ -1053,6 +1061,10 @@ SvxLightPrevievCtl3D::SvxLightPrevievCtl3D( Window* pParent, WinBits nStyle )
void SvxLightPrevievCtl3D::Init()
{
+ // Do never mirror the preview window. This explicitly includes right
+ // to left writing environments.
+ EnableRTL (FALSE);
+
// Lokale Parameter fuellen
eSelectedLight = Base3DLightNone;
fObjectRadius = 1.414;
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index b8664fb9d3d2..2f4873c1ea42 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dlgctrl.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: aw $ $Date: 2002-11-07 12:31:06 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,6 +91,10 @@
#include <vcl/hatch.hxx>
#endif
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
#include "svxrectctaccessiblecontext.hxx"
#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_
@@ -204,6 +208,7 @@ void SvxRectCtl::InitBitmap( void )
delete pBitmap;
const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
+ svtools::ColorConfig aColorConfig;
pBitmap = new Bitmap( SVX_RES( RID_SVXCTRL_RECTBTNS ) );
@@ -224,7 +229,7 @@ void SvxRectCtl::InitBitmap( void )
pColorAry2[2] = rStyles.GetLightColor();
pColorAry2[3] = rStyles.GetShadowColor();
pColorAry2[4] = rStyles.GetDarkShadowColor();
- pColorAry2[5] = rStyles.GetWindowTextColor();
+ pColorAry2[5] = Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
pColorAry2[6] = rStyles.GetDialogColor();
#ifdef DBG_UTIL
@@ -255,7 +260,8 @@ void SvxRectCtl::InitSettings( BOOL bForeground, BOOL bBackground )
if( bForeground )
{
- Color aTextColor = rStyleSettings.GetWindowTextColor();
+ svtools::ColorConfig aColorConfig;
+ Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
if ( IsControlForeground() )
aTextColor = GetControlForeground();
@@ -1952,7 +1958,8 @@ void SvxXLinePreview::InitSettings( BOOL bForeground, BOOL bBackground )
if ( bForeground )
{
- Color aTextColor = rStyleSettings.GetWindowTextColor();
+ svtools::ColorConfig aColorConfig;
+ Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
if ( IsControlForeground() )
aTextColor = GetControlForeground();
@@ -2053,7 +2060,8 @@ void SvxXRectPreview::InitSettings( BOOL bForeground, BOOL bBackground )
if ( bForeground )
{
- Color aTextColor = rStyleSettings.GetWindowTextColor();
+ svtools::ColorConfig aColorConfig;
+ Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
if ( IsControlForeground() )
aTextColor = GetControlForeground();
@@ -2144,7 +2152,8 @@ void SvxXShadowPreview::InitSettings( BOOL bForeground, BOOL bBackground )
if ( bForeground )
{
- Color aTextColor = rStyleSettings.GetWindowTextColor();
+ svtools::ColorConfig aColorConfig;
+ Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
if ( IsControlForeground() )
aTextColor = GetControlForeground();
diff --git a/svx/source/dialog/dlgname.src b/svx/source/dialog/dlgname.src
index f85ee260133b..e4b487b5f8eb 100644
--- a/svx/source/dialog/dlgname.src
+++ b/svx/source/dialog/dlgname.src
@@ -2,9 +2,9 @@
*
* $RCSfile: dlgname.src,v $
*
- * $Revision: 1.1.1.9 $
+ * $Revision: 1.2 $
*
- * last change: $Author: kz $ $Date: 2001-11-16 22:59:10 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -127,7 +127,8 @@ ModalDialog RID_SVXDLG_NAME
Text[ korean ] = "이름";
Text[ turkish ] = "Ad";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Nombre";
+ Text[ catalan ] = "Nom";
+ Text[ thai ] = "ชื่อ";
};
// RID_SVXDLG_MESSBOX -------------------------------------------------------
ModalDialog RID_SVXDLG_MESSBOX
@@ -171,3 +172,6 @@ ModalDialog RID_SVXDLG_MESSBOX
+
+
+
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index 4f8193db865c..126598251ce9 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dlgutil.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: sj $ $Date: 2001-10-16 09:29:42 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -100,7 +100,7 @@ String GetDicInfoStr( const String& rName, const USHORT nLang, const BOOL bNeg )
{
INetURLObject aURLObj;
aURLObj.SetSmartProtocol( INET_PROT_FILE );
- aURLObj.SetSmartURL( rName );
+ aURLObj.SetSmartURL( rName, INetURLObject::ENCODE_ALL );
String aTmp( aURLObj.GetBase() );
aTmp += sal_Unicode( ' ' );
diff --git a/svx/source/dialog/dstribut.src b/svx/source/dialog/dstribut.src
index 113fd7564888..c9506dcf4016 100644
--- a/svx/source/dialog/dstribut.src
+++ b/svx/source/dialog/dstribut.src
@@ -2,9 +2,9 @@
*
* $RCSfile: dstribut.src,v $
*
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
*
- * last change: $Author: cl $ $Date: 2002-06-06 11:43:18 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -99,8 +99,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "水平";
Text[ arabic ] = "";
Text[ turkish ] = "Yatay";
- Text[ catalan ] = "Horizontal";
+ Text[ catalan ] = "Horitzontal";
Text[ finnish ] = "Vaakataso";
+ Text[ thai ] = "แนวนอน";
};
RadioButton BTN_HOR_NONE
@@ -111,14 +112,14 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text [ ENGLISH ] = "~None" ;
Text [ ENGLISH_US ] = "~None" ;
Text[ portuguese ] = "~Nenhuma";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ greek ] = "";
Text[ dutch ] = "~Geen";
Text[ french ] = "Aucun(e)";
Text[ spanish ] = "Ninguno";
Text[ italian ] = "Senza";
- Text[ danish ] = "Ingen";
- Text[ swedish ] = "~Ingen";
+ Text[ danish ] = "~Ingen";
+ Text[ swedish ] = "In~gen";
Text[ polish ] = "Brak";
Text[ portuguese_brazilian ] = "None";
Text[ japanese ] = "なし(~N)";
@@ -127,8 +128,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "無(~N)";
Text[ arabic ] = "";
Text[ turkish ] = "Yok";
- Text[ catalan ] = "Ninguno";
+ Text[ catalan ] = "Cap";
Text[ finnish ] = "Ei mitn";
+ Text[ thai ] = "ไ~ม่มี";
};
RadioButton BTN_HOR_LEFT
@@ -145,7 +147,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ french ] = " gauche";
Text[ spanish ] = "Izquierda";
Text[ italian ] = "A sinistra";
- Text[ danish ] = "Venstre";
+ Text[ danish ] = "~Venstre";
Text[ swedish ] = "~Vnster";
Text[ polish ] = "Z lewej";
Text[ portuguese_brazilian ] = "Left";
@@ -155,8 +157,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "左(~L)";
Text[ arabic ] = "";
Text[ turkish ] = "Sol";
- Text[ catalan ] = "Izquierda";
+ Text[ catalan ] = "Esquerra";
Text[ finnish ] = "Vasen";
+ Text[ thai ] = "~ซ้าย";
};
RadioButton BTN_HOR_CENTER
@@ -170,10 +173,10 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ russian ] = " ";
Text[ greek ] = "";
Text[ dutch ] = "Midden";
- Text[ french ] = "Milieu";
+ Text[ french ] = "Centre";
Text[ spanish ] = "Centrado";
Text[ italian ] = "Al centro";
- Text[ danish ] = "Midte";
+ Text[ danish ] = "~Centreret";
Text[ swedish ] = "~Mitten";
Text[ polish ] = "Porodku";
Text[ portuguese_brazilian ] = "Center";
@@ -183,8 +186,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "中心(~C)";
Text[ arabic ] = "";
Text[ turkish ] = "Orta";
- Text[ catalan ] = "Centro";
- Text[ finnish ] = "Keskell";
+ Text[ catalan ] = "Centre";
+ Text[ finnish ] = "Keskit";
+ Text[ thai ] = "~ตรงกลาง";
};
RadioButton BTN_HOR_DISTANCE
@@ -201,7 +205,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ french ] = "cart";
Text[ spanish ] = "Espacio";
Text[ italian ] = "Distanza";
- Text[ danish ] = "Afstand";
+ Text[ danish ] = "~Afstand";
Text[ swedish ] = "~Avstnd";
Text[ polish ] = "Odstp";
Text[ portuguese_brazilian ] = "Distance";
@@ -211,8 +215,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "間隔(~S)";
Text[ arabic ] = "";
Text[ turkish ] = "Aralk";
- Text[ catalan ] = "Espacio";
- Text[ finnish ] = "Objektivlit";
+ Text[ catalan ] = "Espaiat";
+ Text[ finnish ] = "Vlit";
+ Text[ thai ] = "~ระยะห่าง";
};
RadioButton BTN_HOR_RIGHT
@@ -229,7 +234,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ french ] = " droite";
Text[ spanish ] = "Derecha";
Text[ italian ] = "A destra";
- Text[ danish ] = "Hjre";
+ Text[ danish ] = "H~jre";
Text[ swedish ] = "Hge~r";
Text[ polish ] = "Z prawej";
Text[ portuguese_brazilian ] = "Right";
@@ -239,8 +244,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "右(~R)";
Text[ arabic ] = "";
Text[ turkish ] = "Sa";
- Text[ catalan ] = "Derecha";
+ Text[ catalan ] = "Dreta";
Text[ finnish ] = "Oikea";
+ Text[ thai ] = "~ขวา";
};
FixedImage IMG_HOR_LOW {
@@ -309,6 +315,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ turkish ] = "Dikey";
Text[ catalan ] = "Vertical";
Text[ finnish ] = "Pystytaso";
+ Text[ thai ] = "แนวตั้ง";
};
RadioButton BTN_VER_NONE
@@ -319,13 +326,13 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text [ ENGLISH ] = "N~one" ;
Text [ ENGLISH_US ] = "N~one" ;
Text[ portuguese ] = "~Nenhuma";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ greek ] = "";
Text[ dutch ] = "~Geen";
Text[ french ] = "Aucun(e)";
Text[ spanish ] = "Ninguno";
Text[ italian ] = "Senza";
- Text[ danish ] = "Ingen";
+ Text[ danish ] = "Ing~en";
Text[ swedish ] = "Ing~en";
Text[ polish ] = "Brak";
Text[ portuguese_brazilian ] = "None";
@@ -335,8 +342,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "無(~O)";
Text[ arabic ] = "";
Text[ turkish ] = "Yok";
- Text[ catalan ] = "Ninguno";
+ Text[ catalan ] = "Cap";
Text[ finnish ] = "Ei mitn";
+ Text[ thai ] = "ไม่~มี";
};
RadioButton BTN_VER_TOP
@@ -353,7 +361,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ french ] = "En haut";
Text[ spanish ] = "Arriba";
Text[ italian ] = "In alto";
- Text[ danish ] = "Oppe";
+ Text[ danish ] = "T~op";
Text[ swedish ] = "~Uppe";
Text[ polish ] = "U gry";
Text[ portuguese_brazilian ] = "Top";
@@ -363,8 +371,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "上(~T)";
Text[ arabic ] = "";
Text[ turkish ] = "st";
- Text[ catalan ] = "Arriba";
- Text[ finnish ] = "Ylosa";
+ Text[ catalan ] = "Superior";
+ Text[ finnish ] = "Ylreuna";
+ Text[ thai ] = "~บน";
};
RadioButton BTN_VER_CENTER
@@ -378,10 +387,10 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ russian ] = " ";
Text[ greek ] = "";
Text[ dutch ] = "~Midden";
- Text[ french ] = "Milieu";
+ Text[ french ] = "Centre";
Text[ spanish ] = "Centrado";
Text[ italian ] = "Al centro";
- Text[ danish ] = "Midte";
+ Text[ danish ] = "Ce~ntreret";
Text[ swedish ] = "M~itten";
Text[ polish ] = "Porodku";
Text[ portuguese_brazilian ] = "Center";
@@ -391,8 +400,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "中心(~E)";
Text[ arabic ] = "";
Text[ turkish ] = "Orta";
- Text[ catalan ] = "Centro";
- Text[ finnish ] = "Keskell";
+ Text[ catalan ] = "Centre";
+ Text[ finnish ] = "Keskit";
+ Text[ thai ] = "ต~รงกลาง";
};
RadioButton BTN_VER_DISTANCE
@@ -409,7 +419,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ french ] = "cart";
Text[ spanish ] = "Espacio";
Text[ italian ] = "Distanza";
- Text[ danish ] = "Afstand";
+ Text[ danish ] = "A~fstand";
Text[ swedish ] = "Av~stnd";
Text[ polish ] = "Odstp";
Text[ portuguese_brazilian ] = "Distance";
@@ -419,8 +429,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "間隔(~P)";
Text[ arabic ] = "";
Text[ turkish ] = "Aralk";
- Text[ catalan ] = "Espacio";
- Text[ finnish ] = "Objektivlit";
+ Text[ catalan ] = "Espaiat";
+ Text[ finnish ] = "Vlit";
+ Text[ thai ] = "ระ~ยะห่าง";
};
RadioButton BTN_VER_BOTTOM
@@ -437,7 +448,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ french ] = "En bas";
Text[ spanish ] = "Abajo";
Text[ italian ] = "In basso";
- Text[ danish ] = "Nede";
+ Text[ danish ] = "~Bund";
Text[ swedish ] = "~Nere";
Text[ polish ] = "Na dole";
Text[ portuguese_brazilian ] = "Bottom";
@@ -447,8 +458,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "下(~B)";
Text[ arabic ] = "";
Text[ turkish ] = "Alt";
- Text[ catalan ] = "Abajo";
- Text[ finnish ] = "Alaosa";
+ Text[ catalan ] = "Part inferior";
+ Text[ finnish ] = "Alareuna";
+ Text[ thai ] = "~ล่าง";
};
FixedImage IMG_VER_HIGH {
@@ -508,8 +520,9 @@ TabPage RID_SVXPAGE_DISTRIBUTE
Text[ chinese_traditional ] = "分布";
Text[ arabic ] = "";
Text[ turkish ] = "Dalm";
- Text[ catalan ] = "Distribucin";
+ Text[ catalan ] = "Distribuci";
Text[ finnish ] = "Jakauma";
+ Text[ thai ] = "การแจกแจง";
Image IMG_HOR_LOW_H
{
@@ -558,6 +571,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
ImageBitmap = Bitmap { File = "dstv_low_h.bmp" ; };
MaskColor = STD_MASKCOLOR ;
};
+
};
// ********************************************************************** EOF
@@ -574,3 +588,8 @@ TabPage RID_SVXPAGE_DISTRIBUTE
+
+
+
+
+
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index f3721093c35f..830cebc2fe5a 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fntctrl.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: oj $ $Date: 2002-08-13 08:42:03 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -103,6 +103,10 @@
#pragma hdrstop
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
+#endif
+
#include "fntctrl.hxx"
#include "dialogs.hrc"
#define TEXT_WIDTH 20
@@ -457,7 +461,8 @@ void SvxFontPrevWindow::InitSettings( BOOL bForeground, BOOL bBackground )
if ( bForeground )
{
- Color aTextColor = rStyleSettings.GetWindowTextColor();
+ svtools::ColorConfig aColorConfig;
+ Color aTextColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
if ( IsControlForeground() )
aTextColor = GetControlForeground();
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 7fd3a158a1dc..4d93237c76ac 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fontwork.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: aw $ $Date: 2002-11-14 14:51:57 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -467,17 +467,22 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem)
}
aTbxStyle.Enable();
+ // Make sure that there is allways exactly one checked toolbox item.
if ( pItem->GetValue() == XFT_NONE )
{
aTbxStyle.CheckItem(TBI_STYLE_ROTATE, FALSE);
aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, FALSE);
aTbxStyle.CheckItem(TBI_STYLE_SLANTX, FALSE);
aTbxStyle.CheckItem(TBI_STYLE_SLANTY, FALSE);
+
+ aTbxStyle.CheckItem(TBI_STYLE_OFF, TRUE);
}
else
+ {
aTbxStyle.CheckItem(TBI_STYLE_OFF, FALSE);
+ aTbxStyle.CheckItem(nId);
+ }
- aTbxStyle.CheckItem(nId);
nLastStyleTbxId = nId;
}
else
@@ -788,7 +793,12 @@ IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG )
{
USHORT nId = aTbxStyle.GetCurItemId();
- if ( nId != nLastStyleTbxId )
+ // Execute this block when a different toolbox item has been clicked or
+ // when the off item has been clicked. The later is necessary to
+ // override the toolbox behaviour of unchecking the item after second
+ // click on it: One of the items has to be checked at all times (when
+ // enabled that is.)
+ if (nId == TBI_STYLE_OFF || nId != nLastStyleTbxId )
{
XFormTextStyle eStyle = XFT_NONE;
diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src
index 96f8ef914c11..f83ab4fbb0e4 100644
--- a/svx/source/dialog/fontwork.src
+++ b/svx/source/dialog/fontwork.src
@@ -2,9 +2,9 @@
*
* $RCSfile: fontwork.src,v $
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
- * last change: $Author: ka $ $Date: 2002-05-22 10:37:15 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -84,15 +84,14 @@ DockingWindow RID_SVXDLG_FONTWORK
Text [ dutch ] = "FontWork" ;
Text [ spanish ] = "FontWork" ;
Text [ danish ] = "FontWork" ;
- Text [ swedish ] = "FontWork" ;
+ Text [ swedish ] = "Fontwork" ;
Text [ finnish ] = "Fonttity" ;
- Text [ english_us ] = "FontWork" ;
+ Text [ english_us ] = "Fontwork" ;
Moveable = TRUE ;
Zoomable = TRUE ;
Closeable = TRUE ;
Dockable = TRUE ;
EnableResizing = TRUE ;
- DialogControl = TRUE ;
Control VS_FORMS
{
HelpId = HID_FONTWORK_CTL_FORMS ;
@@ -105,7 +104,6 @@ DockingWindow RID_SVXDLG_FONTWORK
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 41 ) ;
- TabStop = TRUE ;
ItemList =
{
ToolBoxItem
@@ -134,8 +132,8 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ korean ] = "해제";
Text[ turkish ] = "Kapal";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Desactivado";
- Text[ finnish ] = "Off";
+ Text[ catalan ] = "Desactivat";
+ Text[ finnish ] = "Poissa kytst";
Text[ thai ] = "ปิด";
};
ToolBoxItem
@@ -169,7 +167,7 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ korean ] = "회전";
Text[ turkish ] = "evir";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Rodar";
+ Text[ catalan ] = "Gira";
Text[ finnish ] = "Kierr";
Text[ thai ] = "หมุน";
};
@@ -200,7 +198,7 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ korean ] = "똑바로";
Text[ turkish ] = "Dik";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Derecho";
+ Text[ catalan ] = "Dret";
Text[ finnish ] = "Pystyss";
Text[ thai ] = "ตั้งตรง";
};
@@ -231,7 +229,7 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ korean ] = "수평으로 기울기";
Text[ turkish ] = "Yatay eim";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Inclinar horizontalmente";
+ Text[ catalan ] = "Inclina horitzontalment";
Text[ finnish ] = "Kallista vaakasuunnassa";
Text[ thai ] = "แนวนอนเอียง";
};
@@ -262,7 +260,7 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ korean ] = "수직으로 기울기";
Text[ turkish ] = "Dikey eim";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Inclinar verticalmente";
+ Text[ catalan ] = "Inclina verticalment";
Text[ finnish ] = "Kallista pystysuunnassa";
Text[ thai ] = "แนวตั้งเอียง";
};
@@ -272,7 +270,6 @@ DockingWindow RID_SVXDLG_FONTWORK
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 63 ) ;
- TabStop = TRUE ;
ItemList =
{
ToolBoxItem
@@ -293,7 +290,7 @@ DockingWindow RID_SVXDLG_FONTWORK
Text [ portuguese ] = "Orientao" ;
Text [ portuguese_brazilian ] = "Laufrichtung" ;
Text[ chinese_simplified ] = "方向";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ polish ] = "Orientacja";
Text[ japanese ] = "方向";
Text[ chinese_traditional ] = "方向";
@@ -302,7 +299,7 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ korean ] = "방향";
Text[ turkish ] = "Metin yn";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Orientacin";
+ Text[ catalan ] = "Orientaci";
Text[ finnish ] = "Suunta";
Text[ thai ] = "การวางแนว";
};
@@ -316,13 +313,15 @@ DockingWindow RID_SVXDLG_FONTWORK
RadioCheck = TRUE ;
Identifier = TBI_ADJUST_LEFT ;
HelpId = HID_FONTWORK_TBI_ADJUST_LEFT ;
+ /* ### ACHTUNG: Neuer Text in Resource? Linksbndig : Linksbndig */
+ /* ### ACHTUNG: Neuer Text in Resource? Linksbndig : Linksbndig */
Text = "Linksbndig" ;
Text [ ENGLISH ] = "Left aligned" ;
Text [ dutch ] = "Links uitgelijnd" ;
Text [ english_us ] = "Align Left" ;
Text [ italian ] = "Allineato a sinistra" ;
Text [ spanish ] = "Alinear a la izquierda" ;
- Text [ french ] = "Align gauche" ;
+ Text [ french ] = "Aligner gauche" ;
Text [ swedish ] = "Vnsterjusterat" ;
Text [ danish ] = "Venstrejusteret" ;
Text [ portuguese ] = " esquerda" ;
@@ -334,10 +333,10 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ chinese_traditional ] = "向左對齊";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "왼쪽 배열";
+ Text[ korean ] = "왼쪽 맞춤";
Text[ turkish ] = "Sola hizala";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Alineado a la izquierda";
+ Text[ catalan ] = "Alinea a l'esquerra";
Text[ finnish ] = "Tasaa vasemmalle";
Text[ thai ] = "ชิดซ้าย";
};
@@ -368,7 +367,7 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ korean ] = "가운데";
Text[ turkish ] = "Ortala";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Centrado";
+ Text[ catalan ] = "Centre";
Text[ finnish ] = "Keskell";
Text[ thai ] = "ตรงกลาง";
};
@@ -378,12 +377,14 @@ DockingWindow RID_SVXDLG_FONTWORK
RadioCheck = TRUE ;
Identifier = TBI_ADJUST_RIGHT ;
HelpId = HID_FONTWORK_TBI_ADJUST_RIGHT ;
+ /* ### ACHTUNG: Neuer Text in Resource? Rechtsbndig : Rechtsbndig */
+ /* ### ACHTUNG: Neuer Text in Resource? Rechtsbndig : Rechtsbndig */
Text = "Rechtsbndig" ;
Text [ ENGLISH ] = "Right aligned" ;
Text [ english_us ] = "Align Right" ;
Text [ italian ] = "Allineato a destra" ;
Text [ spanish ] = "Alinear a la derecha" ;
- Text [ french ] = "Align droite" ;
+ Text [ french ] = "Aligner droite" ;
Text [ dutch ] = "Rechtslijnend" ;
Text [ swedish ] = "Hgerjusterat" ;
Text [ danish ] = "Hjrejusteret" ;
@@ -396,10 +397,10 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ chinese_traditional ] = "向右對齊";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "오른쪽 배열";
+ Text[ korean ] = "오른쪽 맞춤";
Text[ turkish ] = "Saa hizala";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Alinear a la derecha";
+ Text[ catalan ] = "Alinea a la dreta";
Text[ finnish ] = "Tasaa oikealle";
Text[ thai ] = "ชิดขวา";
};
@@ -409,12 +410,14 @@ DockingWindow RID_SVXDLG_FONTWORK
RadioCheck = TRUE ;
Identifier = TBI_ADJUST_AUTOSIZE ;
HelpId = HID_FONTWORK_TBI_ADJUST_AUTOSIZE ;
+ /* ### ACHTUNG: Neuer Text in Resource? Auto-Textgre : Auto-Textgre */
+ /* ### ACHTUNG: Neuer Text in Resource? Auto-Textgre : Auto-Textgre */
Text = "Auto-Textgre" ;
Text [ ENGLISH ] = "Autosize" ;
Text [ dutch ] = "AutoTekstgrootte" ;
Text [ english_us ] = "AutoSize Text" ;
Text [ italian ] = "Dimensione testo automatico" ;
- Text [ spanish ] = "Tamao automtico de texto" ;
+ Text [ spanish ] = "Texto - Tamao automtico" ;
Text [ french ] = "Taille du texte adapte" ;
Text [ swedish ] = "AutoTextstorlek" ;
Text [ danish ] = "AutoTekststrrelse" ;
@@ -430,7 +433,7 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ korean ] = "자동텍스트 크기";
Text[ turkish ] = "Otomatik metin boyu";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Tamao automtico de texto";
+ Text[ catalan ] = "Mida automtica del text";
Text[ finnish ] = "Automaattinen tekstin koon mritys";
Text[ thai ] = "ขนาดข้อความอัตโนมัติ";
};
@@ -477,10 +480,10 @@ DockingWindow RID_SVXDLG_FONTWORK
QuickHelpText[ chinese_traditional ] = "間隔";
QuickHelpText[ arabic ] = "";
QuickHelpText[ greek ] = "";
- QuickHelpText[ korean ] = "간격";
+ QuickHelpText[ korean ] = "거리";
CustomUnitText[ language_user1 ] = " ";
QuickHelpText[ turkish ] = "Abstand";
- QuickHelpText[ catalan ] = "Distancia";
+ QuickHelpText[ catalan ] = "Distncia";
QuickHelpText[ finnish ] = "Etisyys";
QuickHelpText[ thai ] = "Distance";
};
@@ -525,7 +528,7 @@ DockingWindow RID_SVXDLG_FONTWORK
QuickHelpText[ korean ] = "들여쓰기";
CustomUnitText[ language_user1 ] = " ";
QuickHelpText[ turkish ] = "Einzug";
- QuickHelpText[ catalan ] = "Sangra";
+ QuickHelpText[ catalan ] = "Sangria";
QuickHelpText[ finnish ] = "Sisenn";
QuickHelpText[ thai ] = "Indent";
};
@@ -533,7 +536,6 @@ DockingWindow RID_SVXDLG_FONTWORK
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 122 ) ;
- TabStop = TRUE ;
ItemList =
{
ToolBoxItem
@@ -563,7 +565,7 @@ DockingWindow RID_SVXDLG_FONTWORK
Text[ korean ] = "윤곽";
Text[ turkish ] = "Kontur";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Contorno";
+ Text[ catalan ] = "Contorn";
Text[ finnish ] = "riviiva";
Text[ thai ] = "เส้นแสดงรูปร่าง";
};
@@ -585,16 +587,16 @@ DockingWindow RID_SVXDLG_FONTWORK
Text [ portuguese ] = "Contorno de caracteres" ;
Text [ portuguese_brazilian ] = "Buchstabenumrandung" ;
Text[ chinese_simplified ] = "字母轮廓";
- Text[ russian ] = " ";
+ Text[ russian ] = " ";
Text[ polish ] = "Obramowanie liter";
Text[ japanese ] = "文字の輪郭";
Text[ chinese_traditional ] = "字母輪廓";
Text[ arabic ] = " ";
Text[ greek ] = " ";
- Text[ korean ] = "텍스트 테두리!";
+ Text[ korean ] = "문자 윤곽";
Text[ turkish ] = "Metin konturu";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Contorno de caracteres";
+ Text[ catalan ] = "Contorn del text";
Text[ finnish ] = "Tekstin riviiva";
Text[ thai ] = "เส้นแสดงรูปร่างข้อความ";
};
@@ -620,16 +622,16 @@ DockingWindow RID_SVXDLG_FONTWORK
Text [ portuguese ] = "Desactivar" ;
Text [ portuguese_brazilian ] = "Aus" ;
Text[ chinese_simplified ] = "取消阴影";
- Text[ russian ] = ".";
+ Text[ russian ] = " ";
Text[ polish ] = "Wycz";
Text[ japanese ] = "影なし";
Text[ chinese_traditional ] = "不使用";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "해제";
+ Text[ korean ] = "그림자 없음";
Text[ turkish ] = "Kapal";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Sin sombra";
+ Text[ catalan ] = "Sense ombra";
Text[ finnish ] = "Ei varjoa";
Text[ thai ] = "ไม่แรเงา";
};
@@ -682,16 +684,16 @@ DockingWindow RID_SVXDLG_FONTWORK
Text [ portuguese ] = "Inclinar" ;
Text [ portuguese_brazilian ] = "Kippen" ;
Text[ chinese_simplified ] = "倾斜";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ polish ] = "Przerzu";
Text[ japanese ] = "斜投影";
Text[ chinese_traditional ] = "傾斜";
Text[ arabic ] = "";
Text[ greek ] = "";
- Text[ korean ] = "기울이기";
+ Text[ korean ] = "기울기";
Text[ turkish ] = "Eim";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Inclinar";
+ Text[ catalan ] = "Inclina";
Text[ finnish ] = "Kallista";
Text[ thai ] = "เอียง";
};
@@ -726,7 +728,7 @@ DockingWindow RID_SVXDLG_FONTWORK
CustomUnitText [ spanish ] = "Grados" ;
CustomUnitText [ danish ] = "grader" ;
CustomUnitText [ swedish ] = " grader" ;
- CustomUnitText [ finnish ] = " asteet" ;
+ CustomUnitText [ finnish ] = " astetta" ;
CustomUnitText [ english_us ] = " degrees" ;
First = -5000000 ;
Last = 5000000 ;
@@ -743,12 +745,12 @@ DockingWindow RID_SVXDLG_FONTWORK
QuickHelpText [ portuguese_brazilian ] = "Abstand X" ;
QuickHelpText [ swedish ] = "Avstnd X" ;
CustomUnitText[ chinese_simplified ] = "度";
- CustomUnitText[ russian ] = "";
+ CustomUnitText[ russian ] = " ";
CustomUnitText[ polish ] = "Stopie";
CustomUnitText[ japanese ] = "度";
CustomUnitText[ chinese_traditional ] = "度";
CustomUnitText[ arabic ] = "/";
- QuickHelpText[ russian ] = " X";
+ QuickHelpText[ russian ] = " X";
QuickHelpText[ polish ] = "Abstand X";
QuickHelpText[ japanese ] = "間隔 X";
QuickHelpText[ chinese_simplified ] = "间隔 X";
@@ -757,11 +759,11 @@ DockingWindow RID_SVXDLG_FONTWORK
CustomUnitText[ greek ] = "";
CustomUnitText[ korean ] = "도";
QuickHelpText[ greek ] = "Distance X";
- QuickHelpText[ korean ] = "간격 X";
+ QuickHelpText[ korean ] = "거리 X";
CustomUnitText[ turkish ] = "Derece";
CustomUnitText[ language_user1 ] = " ";
QuickHelpText[ turkish ] = "Abstand X";
- CustomUnitText[ catalan ] = "Grados";
+ CustomUnitText[ catalan ] = " graus";
QuickHelpText[ catalan ] = "Distancia X";
QuickHelpText[ finnish ] = "Etisyys X";
CustomUnitText[ thai ] = " องศา";
@@ -822,7 +824,7 @@ DockingWindow RID_SVXDLG_FONTWORK
CustomUnitText[ greek ] = "%";
CustomUnitText[ korean ] = "%";
QuickHelpText[ greek ] = " Y";
- QuickHelpText[ korean ] = "간격 Y";
+ QuickHelpText[ korean ] = "거리 Y";
CustomUnitText[ turkish ] = "%";
CustomUnitText[ language_user1 ] = " ";
QuickHelpText[ turkish ] = "Abstand Y";
@@ -839,7 +841,6 @@ DockingWindow RID_SVXDLG_FONTWORK
Pos = MAP_APPFONT ( 6 , 174 ) ;
Size = MAP_APPFONT ( 71 , 60 ) ;
DropDown = TRUE ;
- TabStop = TRUE ;
QuickHelpText = "Schattenfarbe" ;
QuickHelpText [ portuguese ] = "Cor da sombra" ;
QuickHelpText [ english_us ] = "Shadow Color" ;
@@ -911,22 +912,22 @@ DockingWindow RID_SVXDLG_FONTWORK
QuickHelpText[ chinese_traditional ] = "陰影顏色";
QuickHelpText[ arabic ] = " ";
QuickHelpText[ greek ] = "Shadow Color";
- QuickHelpText[ korean ] = "음영색";
+ QuickHelpText[ korean ] = "그림자 색상";
Text[ greek ] = " ";
Text[ language_user1 ] = " ";
QuickHelpText[ turkish ] = "Schattenfarbe";
- QuickHelpText[ catalan ] = "Color sombra";
+ QuickHelpText[ catalan ] = "Color ombra";
QuickHelpText[ finnish ] = "Varjon vri";
QuickHelpText[ thai ] = "Shadow Color";
};
Text[ chinese_simplified ] = "美工字体";
- Text[ russian ] = "FontWork";
+ Text[ russian ] = "";
Text[ polish ] = "FontWork";
Text[ japanese ] = "フォントワーク";
Text[ chinese_traditional ] = "美術字型";
Text[ arabic ] = "FontWork";
Text[ greek ] = "FontWork";
- Text[ korean ] = "FontWork";
+ Text[ korean ] = "폰트워크";
Text[ turkish ] = "FontWork";
Text[ language_user1 ] = " ";
Text[ catalan ] = "FontWork";
@@ -1099,7 +1100,7 @@ String RID_SVXSTR_FONTWORK_FORM1
Text[ korean ] = "위쪽 반원";
Text[ turkish ] = "st yarm daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Semicrculo superior";
+ Text[ catalan ] = "Semicercle superior";
Text[ thai ] = "ครึ่งวงกลมบน";
};
String RID_SVXSTR_FONTWORK_FORM2
@@ -1127,7 +1128,7 @@ String RID_SVXSTR_FONTWORK_FORM2
Text[ korean ] = "아래쪽 반원";
Text[ turkish ] = "Alt yarm daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Semicrculo inferior";
+ Text[ catalan ] = "Semicercle inferior";
Text[ thai ] = "ครึ่งวงกลมล่าง";
};
String RID_SVXSTR_FONTWORK_FORM3
@@ -1155,7 +1156,7 @@ String RID_SVXSTR_FONTWORK_FORM3
Text[ korean ] = "왼쪽 반원";
Text[ turkish ] = "Sol yarm daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Semicrculo izquierdo";
+ Text[ catalan ] = "Semicercle esquerre";
Text[ thai ] = "ครึ่งวงกลมซ้าย";
};
String RID_SVXSTR_FONTWORK_FORM4
@@ -1183,7 +1184,7 @@ String RID_SVXSTR_FONTWORK_FORM4
Text[ korean ] = "오른쪽 반원";
Text[ turkish ] = "Sa yarm daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Semicrculo derecho";
+ Text[ catalan ] = "Semicercle dret";
Text[ thai ] = "ครึ่งวงกลมขวา";
};
String RID_SVXSTR_FONTWORK_FORM5
@@ -1211,7 +1212,7 @@ String RID_SVXSTR_FONTWORK_FORM5
Text[ korean ] = "위쪽 원호";
Text[ turkish ] = "st yay";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Arco superior de crculo";
+ Text[ catalan ] = "Arc superior";
Text[ thai ] = "ส่วนโค้งของวงกลมบน";
};
String RID_SVXSTR_FONTWORK_FORM6
@@ -1239,7 +1240,7 @@ String RID_SVXSTR_FONTWORK_FORM6
Text[ korean ] = "아래쪽 원호";
Text[ turkish ] = "Alt yay";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Arco inferior de crculo";
+ Text[ catalan ] = "Arc inferior";
Text[ thai ] = "ส่วนโค้งของวงกลมล่าง";
};
String RID_SVXSTR_FONTWORK_FORM7
@@ -1251,7 +1252,7 @@ String RID_SVXSTR_FONTWORK_FORM7
Text [ portuguese_brazilian ] = "Left arc" ;
Text [ portuguese ] = "Arco esquerdo" ;
Text [ french ] = "Arc gauche" ;
- Text [ dutch ] = "Linker boog" ;
+ Text [ dutch ] = "Linkerboog" ;
Text [ spanish ] = "Arco izquierdo de crculo" ;
Text [ danish ] = "Venstre bue" ;
Text [ swedish ] = "Vnster cirkelbge" ;
@@ -1267,7 +1268,7 @@ String RID_SVXSTR_FONTWORK_FORM7
Text[ korean ] = "왼쪽 원호";
Text[ turkish ] = "Sol yay";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Arco izquierdo de crculo";
+ Text[ catalan ] = "Arc esquerre";
Text[ thai ] = "ส่วนโค้งของวงกลมซ้าย";
};
String RID_SVXSTR_FONTWORK_FORM8
@@ -1279,7 +1280,7 @@ String RID_SVXSTR_FONTWORK_FORM8
Text [ portuguese_brazilian ] = "Right arc" ;
Text [ portuguese ] = "Arco direito" ;
Text [ french ] = "Arc droit" ;
- Text [ dutch ] = "Rechter boog" ;
+ Text [ dutch ] = "Rechterboog" ;
Text [ spanish ] = "Arco derecho de crculo" ;
Text [ danish ] = "Hjre bue" ;
Text [ swedish ] = "Hger cirkelbge" ;
@@ -1295,7 +1296,7 @@ String RID_SVXSTR_FONTWORK_FORM8
Text[ korean ] = "오른쪽 원호";
Text[ turkish ] = "Sa yay";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Arco derecho de crculo";
+ Text[ catalan ] = "Arc dret";
Text[ thai ] = "ส่วนโค้งของวงกลมขวา";
};
String RID_SVXSTR_FONTWORK_FORM9
@@ -1323,7 +1324,7 @@ String RID_SVXSTR_FONTWORK_FORM9
Text[ korean ] = "열린 원";
Text[ turkish ] = "Ak daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Circulo abierto";
+ Text[ catalan ] = "Cercle obert";
Text[ thai ] = "เปิดวงกลม";
};
String RID_SVXSTR_FONTWORK_FORM10
@@ -1351,7 +1352,7 @@ String RID_SVXSTR_FONTWORK_FORM10
Text[ korean ] = "닫힌 원";
Text[ turkish ] = "Kapal daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Crculo cerrado";
+ Text[ catalan ] = "Cercle tancat";
Text[ thai ] = "ปิดวงกลม";
};
String RID_SVXSTR_FONTWORK_FORM11
@@ -1379,7 +1380,7 @@ String RID_SVXSTR_FONTWORK_FORM11
Text[ korean ] = "닫힌 원 II";
Text[ turkish ] = "Kapal daire II";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Crculo cerrado II";
+ Text[ catalan ] = "Cercle tancat II";
Text[ thai ] = "ปิดวงกลม II";
};
String RID_SVXSTR_FONTWORK_FORM12
@@ -1407,34 +1408,39 @@ String RID_SVXSTR_FONTWORK_FORM12
Text[ korean ] = "수직 열린 원";
Text[ turkish ] = "Dikey ak daire";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Crculo abierto vertical";
+ Text[ catalan ] = "Cercle obert vertical";
Text[ thai ] = "เปิดวงกลมแนวตั้ง";
};
String RID_SVXSTR_FONTWORK_UNDOCREATE
{
Text = "FontWork-Objekt erzeugen" ;
Text [ ENGLISH ] = "create FontWork object" ;
- Text [ english_us ] = "Create FontWork object" ;
+ Text [ english_us ] = "Create Fontwork object" ;
Text [ italian ] = "Crea un oggetto FontWork" ;
Text [ spanish ] = "Crear objeto FontWork" ;
Text [ french ] = "Crer un objet FontWork" ;
Text [ dutch ] = "FontWork-object maken" ;
- Text [ swedish ] = "Skapa FontWork-objekt" ;
+ Text [ swedish ] = "Skapa Fontwork-objekt" ;
Text [ danish ] = "Opret FontWork-objekt" ;
Text [ portuguese_brazilian ] = "FontWork-Objekt erzeugen" ;
Text [ portuguese ] = "Criar objecto FontWork" ;
Text[ chinese_simplified ] = "生成美工字体对象";
- Text[ russian ] = " FontWork";
+ Text[ russian ] = " ";
Text[ polish ] = "Utwrz obiekt FontWork";
Text[ japanese ] = "フォントワーク オブジェクトの作成";
Text[ chinese_traditional ] = "產生美術字型物件";
Text[ arabic ] = " FontWork";
Text[ greek ] = " FontWork";
- Text[ korean ] = "FontWork 개체 생성";
+ Text[ korean ] = "폰트워크 개체 만들기";
Text[ turkish ] = "FontWork nesnesi olutur";
Text[ language_user1 ] = " ";
- Text[ catalan ] = "Crear objeto FontWork";
- Text[ finnish ] = "Luo fonttityobjekti";
+ Text[ catalan ] = "Crea un objecte FontWork";
+ Text[ finnish ] = "Luo Fonttityobjekti";
Text[ thai ] = "สร้างวัตถตัวอักษรที่ใช้งาน";
};
// ********************************************************************** EOF
+
+
+
+
+
diff --git a/svx/source/dialog/frmdirlbox.src b/svx/source/dialog/frmdirlbox.src
index a228b54ef10e..73e9d252cee2 100644
--- a/svx/source/dialog/frmdirlbox.src
+++ b/svx/source/dialog/frmdirlbox.src
@@ -2,8 +2,8 @@
*
* $RCSfile: frmdirlbox.src,v $
*
- * $Revision: 1.2 $
- * last change: $Author: kz $ $Date: 2002-09-18 19:20:45 $
+ * $Revision: 1.3 $
+ * last change: $Author: hr $ $Date: 2003-03-27 15:00:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -71,18 +71,18 @@ String RID_SVXSTR_FRAMEDIR_LTR
Text[ russian ] = "Left-to-right";
Text[ greek ] = "Left-to-right";
Text[ dutch ] = "Left-to-right";
- Text[ french ] = "Left-to-right";
- Text[ spanish ] = "Left-to-right";
+ Text[ french ] = "De gauche droite";
+ Text[ spanish ] = "De izquierda a derecha";
Text[ finnish ] = "Left-to-right";
- Text[ italian ] = "Left-to-right";
+ Text[ italian ] = "Da sinistra a destra";
Text[ danish ] = "Left-to-right";
- Text[ swedish ] = "Left-to-right";
+ Text[ swedish ] = "Vnster-till-hger";
Text[ polish ] = "Left-to-right";
Text[ portuguese_brazilian ] = "Left-to-right";
- Text[ japanese ] = "Left-to-right";
- Text[ korean ] = "Left-to-right";
- Text[ chinese_simplified ] = "Left-to-right";
- Text[ chinese_traditional ] = "Left-to-right";
+ Text[ japanese ] = "左から右へ";
+ Text[ korean ] = "왼쪽에서 오른쪽으로";
+ Text[ chinese_simplified ] = "从左向右";
+ Text[ chinese_traditional ] = "從左向右";
Text[ turkish ] = "Left-to-right";
Text[ arabic ] = "Left-to-right";
Text[ catalan ] = "Left-to-right";
@@ -98,18 +98,18 @@ String RID_SVXSTR_FRAMEDIR_RTL
Text[ russian ] = "Right-to-left";
Text[ greek ] = "Right-to-left";
Text[ dutch ] = "Right-to-left";
- Text[ french ] = "Right-to-left";
- Text[ spanish ] = "Right-to-left";
+ Text[ french ] = "De droite gauche";
+ Text[ spanish ] = "De derecha a izquierda";
Text[ finnish ] = "Right-to-left";
- Text[ italian ] = "Right-to-left";
+ Text[ italian ] = "Da destra a sinistra";
Text[ danish ] = "Right-to-left";
- Text[ swedish ] = "Right-to-left";
+ Text[ swedish ] = "Hger-till-vnster";
Text[ polish ] = "Right-to-left";
Text[ portuguese_brazilian ] = "Right-to-left";
- Text[ japanese ] = "Right-to-left";
- Text[ korean ] = "Right-to-left";
- Text[ chinese_simplified ] = "Right-to-left";
- Text[ chinese_traditional ] = "Right-to-left";
+ Text[ japanese ] = "右から左へ";
+ Text[ korean ] = "오른쪽에서 왼쪽으로";
+ Text[ chinese_simplified ] = "从右向左";
+ Text[ chinese_traditional ] = "從右向左";
Text[ turkish ] = "Right-to-left";
Text[ arabic ] = "Right-to-left";
Text[ catalan ] = "Right-to-left";
@@ -125,18 +125,18 @@ String RID_SVXSTR_FRAMEDIR_SUPER
Text[ russian ] = "Use superordinate object settings";
Text[ greek ] = "Use superordinate object settings";
Text[ dutch ] = "Use superordinate object settings";
- Text[ french ] = "Use superordinate object settings";
- Text[ spanish ] = "Use superordinate object settings";
+ Text[ french ] = "Utiliser les paramtres de l'objet suprieur";
+ Text[ spanish ] = "Utilizar la configuracin del objeto superior";
Text[ finnish ] = "Use superordinate object settings";
- Text[ italian ] = "Use superordinate object settings";
+ Text[ italian ] = "Usa le impostazioni dell'oggetto superiore";
Text[ danish ] = "Use superordinate object settings";
- Text[ swedish ] = "Use superordinate object settings";
+ Text[ swedish ] = "Anvnd det verordnade objektets instllningar";
Text[ polish ] = "Use superordinate object settings";
Text[ portuguese_brazilian ] = "Use superordinate object settings";
- Text[ japanese ] = "Use superordinate object settings";
- Text[ korean ] = "Use superordinate object settings";
- Text[ chinese_simplified ] = "Use superordinate object settings";
- Text[ chinese_traditional ] = "Use superordinate object settings";
+ Text[ japanese ] = "周りのテキストの文字方向に合わせる";
+ Text[ korean ] = "문자 방향의 상위 설정을 사용";
+ Text[ chinese_simplified ] = "沿用现有的文字方向的设定";
+ Text[ chinese_traditional ] = "沿用現有的文字方向的設定";
Text[ turkish ] = "Use superordinate object settings";
Text[ arabic ] = "Use superordinate object settings";
Text[ catalan ] = "Use superordinate object settings";
@@ -154,18 +154,18 @@ String RID_SVXSTR_PAGEDIR_LTR_HORI
Text[ russian ] = "Left-to-right (horizontal)";
Text[ greek ] = "Left-to-right (horizontal)";
Text[ dutch ] = "Left-to-right (horizontal)";
- Text[ french ] = "Left-to-right (horizontal)";
- Text[ spanish ] = "Left-to-right (horizontal)";
+ Text[ french ] = "De gauche droite (horizontal)";
+ Text[ spanish ] = "De izquierda a derecha (horizontal)";
Text[ finnish ] = "Left-to-right (horizontal)";
- Text[ italian ] = "Left-to-right (horizontal)";
+ Text[ italian ] = "Da sinistra a destra (orizzontale)";
Text[ danish ] = "Left-to-right (horizontal)";
- Text[ swedish ] = "Left-