strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#75353# use the same slots for text alignment in text boxes as in cells

Browse source
This commit is contained in:
Niklas Nebel 2002-08-19 13:39:33 +00:00
parent 966a4a4e1c
commit d1d3206940
6 changed files with 129 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sc/sdi/drtxtob.sdi
View file

@ -54,10 +54,10 @@ interface TableDrawText : Selection
SID_ATTR_CHAR_CONTOUR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_CHAR_SHADOWED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_CHAR_STRIKEOUT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_PARA_ADJUST_LEFT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_PARA_ADJUST_CENTER [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_PARA_ADJUST_RIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_PARA_ADJUST_BLOCK [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ALIGNLEFT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ALIGNCENTERHOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ALIGNRIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ALIGNBLOCK [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_PARA_LINESPACE_10 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_PARA_LINESPACE_15 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
SID_ATTR_PARA_LINESPACE_20 [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]

22
sc/sdi/scalc.sdi
View file

@ -297,8 +297,8 @@ SfxVoidItem AlignBlock SID_ALIGNBLOCK
Synchron;
/* config: */
AccelConfig = FALSE,
MenuConfig = FALSE,
AccelConfig = TRUE,
MenuConfig = TRUE,
StatusBarConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
@ -323,7 +323,7 @@ SfxVoidItem AlignBottom SID_ALIGNBOTTOM
/* config: */
AccelConfig = TRUE,
MenuConfig = FALSE,
MenuConfig = TRUE,
StatusBarConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
@ -350,8 +350,8 @@ SfxVoidItem AlignHorizontalCenter SID_ALIGNCENTERHOR
SlotType = SfxStringItem
/* config: */
AccelConfig = FALSE,
MenuConfig = FALSE,
AccelConfig = TRUE,
MenuConfig = TRUE,
StatusBarConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
@ -400,8 +400,8 @@ SfxVoidItem AlignRight SID_ALIGNRIGHT
Synchron;
/* config: */
AccelConfig = FALSE,
MenuConfig = FALSE,
AccelConfig = TRUE,
MenuConfig = TRUE,
StatusBarConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
@ -425,8 +425,8 @@ SfxVoidItem AlignTop SID_ALIGNTOP
Synchron;
/* config: */
AccelConfig = FALSE,
MenuConfig = FALSE,
AccelConfig = TRUE,
MenuConfig = TRUE,
StatusBarConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;
@ -450,8 +450,8 @@ SfxVoidItem AlignVCenter SID_ALIGNCENTERVER
Synchron;
/* config: */
AccelConfig = FALSE,
MenuConfig = FALSE,
AccelConfig = TRUE,
MenuConfig = TRUE,
StatusBarConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = GID_FORMAT;

20
sc/source/ui/drawfunc/drtxtob.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: drtxtob.cxx,v $
*
* $Revision: 1.14 $
* $Revision: 1.15 $
*
* last change: $Author: cl $ $Date: 2002-04-25 10:49:01 $
* last change: $Author: nn $ $Date: 2002-08-19 14:39:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -684,19 +684,19 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
aNewAttr.Put( (const SvxCrossedOutItem&)aEditAttr.Get( EE_CHAR_STRIKEOUT ) );
break;
case SID_ATTR_PARA_ADJUST_LEFT:
case SID_ALIGNLEFT:
aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST ) );
break;
case SID_ATTR_PARA_ADJUST_CENTER:
case SID_ALIGNCENTERHOR:
aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
break;
case SID_ATTR_PARA_ADJUST_RIGHT:
case SID_ALIGNRIGHT:
aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) );
break;
case SID_ATTR_PARA_ADJUST_BLOCK:
case SID_ALIGNBLOCK:
aNewAttr.Put( SvxAdjustItem( SVX_ADJUST_BLOCK, EE_PARA_JUST ) );
break;
@ -845,16 +845,16 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
switch( eAdj )
{
case SVX_ADJUST_LEFT:
rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, TRUE ) );
rDestSet.Put( SfxBoolItem( SID_ALIGNLEFT, TRUE ) );
break;
case SVX_ADJUST_CENTER:
rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, TRUE ) );
rDestSet.Put( SfxBoolItem( SID_ALIGNCENTERHOR, TRUE ) );
break;
case SVX_ADJUST_RIGHT:
rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, TRUE ) );
rDestSet.Put( SfxBoolItem( SID_ALIGNRIGHT, TRUE ) );
break;
case SVX_ADJUST_BLOCK:
rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, TRUE ) );
rDestSet.Put( SfxBoolItem( SID_ALIGNBLOCK, TRUE ) );
break;
}

12
sc/source/ui/drawfunc/futext.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: futext.cxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: aw $ $Date: 2002-07-18 09:57:13 $
* last change: $Author: nn $ $Date: 2002-08-19 14:39:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -106,10 +106,10 @@ void lcl_InvalidateAttribs( SfxBindings& rBindings )
rBindings.Invalidate( SID_ATTR_CHAR_COLOR );
rBindings.Invalidate( SID_ATTR_CHAR_FONT );
rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_LEFT );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_CENTER );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_RIGHT );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_BLOCK );
rBindings.Invalidate( SID_ALIGNLEFT );
rBindings.Invalidate( SID_ALIGNCENTERHOR );
rBindings.Invalidate( SID_ALIGNRIGHT );
rBindings.Invalidate( SID_ALIGNBLOCK );
rBindings.Invalidate( SID_ATTR_PARA_LINESPACE_10 );
rBindings.Invalidate( SID_ATTR_PARA_LINESPACE_15 );
rBindings.Invalidate( SID_ATTR_PARA_LINESPACE_20 );

102
sc/source/ui/drawfunc/objdraw.src
View file

@ -2,9 +2,9 @@
*
* $RCSfile: objdraw.src,v $
*
* $Revision: 1.44 $
* $Revision: 1.45 $
*
* last change: $Author: obo $ $Date: 2002-08-05 20:28:45 $
* last change: $Author: nn $ $Date: 2002-08-19 14:39:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -247,22 +247,104 @@
{\
MenuItem\
{\
ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT\
Identifier = SID_ALIGNLEFT ; \
HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \
RadioCheck = TRUE ; \
Text = "~Links" ; \
Text [ English ] = "~Left" ; \
Text [ norwegian ] = "~Left" ; \
Text [ italian ] = "Sinistra" ; \
Text [ portuguese_brazilian ] = "~Esquerda" ; \
Text [ portuguese ] = "~Esquerda" ; \
Text [ finnish ] = "~Vasen:" ; \
Text [ danish ] = "~Venstre" ; \
Text [ french ] = "À ~gauche" ; \
Text [ swedish ] = "~Vänster" ; \
Text [ dutch ] = "~Links" ; \
Text [ spanish ] = "~Izquierda" ; \
Text [ english_us ] = "~Left" ;\
Text[ chinese_simplified ] = "å·¦(~L)"; \
Text[ russian ] = "Ñëåâà"; \
Text[ polish ] = "Do l~ewej"; \
Text[ japanese ] = "å·¦æ<C2A6>ƒã<C692>ˆ(~L)"; \
Text[ chinese_traditional ] = "å·¦(~L)"; \
Text[ arabic ] = "íÓÇÑ"; \
Text[ dutch ] = "~Links"; \
Text[ chinese_simplified ] = "å·¦(~L)"; \
Text[ greek ] = "Á~ñéóôåñÜ"; \
Text[ korean ] = "왼쪽(~L)"; \
Text[ turkish ] = "S~ola"; \
Text[ language_user1 ] = " "; \
Text[ catalan ] = "~Esquerra"; \
Text[ thai ] = "~ซ้าย"; \
};\
MenuItem\
{\
ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT\
Identifier = SID_ALIGNRIGHT ; \
HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \
RadioCheck = TRUE ; \
Text = "~Rechts" ; \
Text [ English ] = "~Right" ; \
Text [ norwegian ] = "~Right" ; \
Text [ italian ] = "Destra" ; \
Text [ portuguese_brazilian ] = "~Direita" ; \
Text [ portuguese ] = "~Direita" ; \
Text [ finnish ] = "~Oikea" ; \
Text [ danish ] = "H~øjre" ; \
Text [ french ] = "À ~droite" ; \
Text [ swedish ] = "Höge~r" ; \
Text [ dutch ] = "~Rechts" ; \
Text [ spanish ] = "Derecha" ; \
Text [ english_us ] = "~Right" ;\
Text[ chinese_simplified ] = "å<>³(~R)"; \
Text[ russian ] = "Ñïðàâà"; \
Text[ polish ] = "Do prawej"; \
Text[ japanese ] = "å<>³æ<C2B3>ƒã<C692>ˆ(~R)"; \
Text[ chinese_traditional ] = "å<>³(~R)"; \
Text[ arabic ] = "íãíä"; \
Text[ dutch ] = "~Rechts"; \
Text[ chinese_simplified ] = "å<>³(~R)"; \
Text[ greek ] = "Äå~îéÜ"; \
Text[ korean ] = "오른쪽(~R)"; \
Text[ turkish ] = "S~aða"; \
Text[ catalan ] = "~Dreta"; \
Text[ thai ] = "~ขวา"; \
};\
MenuItem\
{\
ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER\
Identifier = SID_ALIGNCENTERHOR ; \
HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \
RadioCheck = TRUE ; \
Text = "~Zentriert" ; \
Text [ English ] = "~Centered" ; \
Text [ norwegian ] = "~Centered" ; \
Text [ italian ] = "~Centrato" ; \
Text [ portuguese_brazilian ] = "~Centralizado" ; \
Text [ portuguese ] = "~Centrado" ; \
Text [ finnish ] = "~Keskitetty" ; \
Text [ danish ] = "~Centreret" ; \
Text [ french ] = "~Centré" ; \
Text [ swedish ] = "~Centrerat" ; \
Text [ dutch ] = "~Gecentreerd" ; \
Text [ spanish ] = "~Centrado" ; \
Text [ english_us ] = "~Centered" ;\
Text[ chinese_simplified ] = "居中(~C)"; \
Text[ russian ] = "Ïî öåíòðó"; \
Text[ polish ] = "~Do œrodka"; \
Text[ japanese ] = "中央æ<C2AE>ƒã<C692>ˆ(~C)"; \
Text[ chinese_traditional ] = "置中(~C)"; \
Text[ arabic ] = "ÊæÓíØ"; \
Text[ dutch ] = "~Gecentreerd"; \
Text[ chinese_simplified ] = "居中(~C)"; \
Text[ greek ] = "Êåíôñáñé~óìÝíá"; \
Text[ korean ] = "가운ë<C2B4>°(~C)"; \
Text[ turkish ] = "Ortala"; \
Text[ catalan ] = "~Centrat"; \
Text[ thai ] = "~ตรงà¸<C3A0>ลาง";\
};\
MenuItem\
{\
Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
Identifier = SID_ALIGNBLOCK ; \
HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \
RadioCheck = TRUE ; \
Text = "~Blocksatz" ; \
@ -1143,28 +1225,28 @@ ToolBox RID_TEXT_TOOLBOX
//---------------------------------------------
ToolBoxItem
{
Identifier = SID_ATTR_PARA_ADJUST_LEFT ;
Identifier = SID_ALIGNLEFT ;
HelpId = SID_ATTR_PARA_ADJUST_LEFT ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
};
ToolBoxItem
{
Identifier = SID_ATTR_PARA_ADJUST_CENTER ;
Identifier = SID_ALIGNCENTERHOR ;
HelpId = SID_ATTR_PARA_ADJUST_CENTER ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
};
ToolBoxItem
{
Identifier = SID_ATTR_PARA_ADJUST_RIGHT ;
Identifier = SID_ALIGNRIGHT ;
HelpId = SID_ATTR_PARA_ADJUST_RIGHT ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
};
ToolBoxItem
{
Identifier = SID_ATTR_PARA_ADJUST_BLOCK ;
Identifier = SID_ALIGNBLOCK ;
HelpId = SID_ATTR_PARA_ADJUST_BLOCK ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;

12
sc/source/ui/view/drawview.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: drawview.cxx,v $
*
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* last change: $Author: sab $ $Date: 2002-06-13 12:18:00 $
* last change: $Author: nn $ $Date: 2002-08-19 14:39:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -311,10 +311,10 @@ void ScDrawView::InvalidateDrawTextAttrs()
rBindings.Invalidate( SID_ULINE_VAL_DOUBLE );
rBindings.Invalidate( SID_ULINE_VAL_DOTTED );
rBindings.Invalidate( SID_ATTR_CHAR_COLOR );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_LEFT );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_CENTER );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_RIGHT );
rBindings.Invalidate( SID_ATTR_PARA_ADJUST_BLOCK );
rBindings.Invalidate( SID_ALIGNLEFT );
rBindings.Invalidate( SID_ALIGNCENTERHOR );
rBindings.Invalidate( SID_ALIGNRIGHT );
rBindings.Invalidate( SID_ALIGNBLOCK );
rBindings.Invalidate( SID_ATTR_PARA_LINESPACE_10 );
rBindings.Invalidate( SID_ATTR_PARA_LINESPACE_15 );
rBindings.Invalidate( SID_ATTR_PARA_LINESPACE_20 );