Attachment #12000 for issue #23518

View | Details | Raw Unified | Return to issue 23518
Collapse All | Expand All

Lines 101-106 Link Here

(-)sdi/drtxtob.sdi (+1 lines)
101	SID_DRAWTEXT_ATTR_DLG [ ExecMethod = ExecuteAttr; StateMethod = GetState; Export = FALSE; ]	101	SID_DRAWTEXT_ATTR_DLG [ ExecMethod = ExecuteAttr; StateMethod = GetState; Export = FALSE; ]
102	SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]	102	SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
103	SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]	103	SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
		104	SID_ATTR_CHAR_LANGUAGE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
104	SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]	105	SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
105	SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]	106	SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
106	SID_ATTR_CHAR_POSTURE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]	107	SID_ATTR_CHAR_POSTURE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]

Lines 88-93 Link Here

(-)sdi/editsh.sdi (+1 lines)
88	// ---- Attribute:	88	// ---- Attribute:
89	SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]	89	SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
90	SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]	90	SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
		91	SID_ATTR_CHAR_LANGUAGE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
91	SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]	92	SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ]
92		93
93	// ---- Attribut - Toggles:	94	// ---- Attribut - Toggles:

Lines 67-72 Link Here

(-)sdi/formatsh.sdi (+1 lines)
67	{	67	{
68	SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]	68	SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
69	SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]	69	SID_ATTR_CHAR_FONTHEIGHT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
		70	SID_ATTR_CHAR_LANGUAGE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
70	SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]	71	SID_ATTR_CHAR_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
71	SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]	72	SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]
72	SID_ATTR_CHAR_POSTURE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]	73	SID_ATTR_CHAR_POSTURE [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ]

Lines 272-277 Link Here

(-)source/ui/app/scdll.cxx (+1 lines)
272	SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY, pMod);	272	SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY, pMod);
273	SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod);	273	SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod);
274	SvxFontHeightToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);	274	SvxFontHeightToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
		275	SvxLanguageToolBoxControl ::RegisterControl(SID_ATTR_CHAR_LANGUAGE, pMod);
275	SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod);	276	SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod);
276	SvxColorToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod);	277	SvxColorToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod);
277	SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER, pMod);	278	SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER, pMod);

Lines 430-435 Link Here

(-)source/ui/src/toolbox.src (+24 lines)
430	//--------------------------------------------------------------------	430	//--------------------------------------------------------------------
431	ToolBoxItem	431	ToolBoxItem
432	{	432	{
		433	Identifier = SID_ATTR_CHAR_LANGUAGE ;
		434	HelpID = SID_ATTR_CHAR_LANGUAGE ;
		435	};
		436	//--------------------------------------------------------------------
		437	ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
		438	//--------------------------------------------------------------------
		439	ToolBoxItem
		440	{
433	Identifier = SID_ATTR_CHAR_WEIGHT ;	441	Identifier = SID_ATTR_CHAR_WEIGHT ;
434	HelpID = SID_ATTR_CHAR_WEIGHT ;	442	HelpID = SID_ATTR_CHAR_WEIGHT ;
435	};	443	};
Lines 678-683 Link Here
678	//--------------------------------------------------------------------	686	//--------------------------------------------------------------------
679	ToolBoxItem	687	ToolBoxItem
680	{	688	{
		689	Identifier = SID_ATTR_CHAR_LANGUAGE ;
		690	HelpID = SID_ATTR_CHAR_LANGUAGE ;
		691	};
		692	//--------------------------------------------------------------------
		693	ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
		694	//--------------------------------------------------------------------
		695	ToolBoxItem
		696	{
681	Identifier = SID_ATTR_CHAR_WEIGHT ;	697	Identifier = SID_ATTR_CHAR_WEIGHT ;
682	HelpID = SID_ATTR_CHAR_WEIGHT ;	698	HelpID = SID_ATTR_CHAR_WEIGHT ;
683	};	699	};
Lines 920-925 Link Here
920	{	936	{
921	Identifier = SID_ATTR_CHAR_FONTHEIGHT ;	937	Identifier = SID_ATTR_CHAR_FONTHEIGHT ;
922	HelpID = SID_ATTR_CHAR_FONTHEIGHT ;	938	HelpID = SID_ATTR_CHAR_FONTHEIGHT ;
		939	};
		940	//--------------------------------------------------------------------
		941	ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
		942	//--------------------------------------------------------------------
		943	ToolBoxItem
		944	{
		945	Identifier = SID_ATTR_CHAR_LANGUAGE ;
		946	HelpID = SID_ATTR_CHAR_LANGUAGE ;
923	};	947	};
924	//--------------------------------------------------------------------	948	//--------------------------------------------------------------------
925	ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };	949	ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };

Lines 304-309 Link Here

(-)source/ui/view/drawview.cxx (+1 lines)
304		304
305	rBindings.Invalidate( SID_ATTR_CHAR_FONT );	305	rBindings.Invalidate( SID_ATTR_CHAR_FONT );
306	rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );	306	rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
		307	rBindings.Invalidate( SID_ATTR_CHAR_LANGUAGE );
307	rBindings.Invalidate( SID_ATTR_CHAR_WEIGHT );	308	rBindings.Invalidate( SID_ATTR_CHAR_WEIGHT );
308	rBindings.Invalidate( SID_ATTR_CHAR_POSTURE );	309	rBindings.Invalidate( SID_ATTR_CHAR_POSTURE );
309	rBindings.Invalidate( SID_ATTR_CHAR_UNDERLINE );	310	rBindings.Invalidate( SID_ATTR_CHAR_UNDERLINE );

Lines 709-714 Link Here

(-)source/ui/view/editsh.cxx (+3 lines)
709	{	709	{
710	case SID_ATTR_CHAR_FONTHEIGHT:	710	case SID_ATTR_CHAR_FONTHEIGHT:
711	case SID_ATTR_CHAR_FONT:	711	case SID_ATTR_CHAR_FONT:
		712	case SID_ATTR_CHAR_LANGUAGE:
712	{	713	{
713	if (pArgs)	714	if (pArgs)
714	{	715	{
Lines 896-901 Link Here
896	ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_FONTINFO, nScript );	897	ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_FONTINFO, nScript );
897	if ( rSet.GetItemState( EE_CHAR_FONTHEIGHT ) != SFX_ITEM_UNKNOWN )	898	if ( rSet.GetItemState( EE_CHAR_FONTHEIGHT ) != SFX_ITEM_UNKNOWN )
898	ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_FONTHEIGHT, nScript );	899	ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_FONTHEIGHT, nScript );
		900	if ( rSet.GetItemState( EE_CHAR_LANGUAGE ) != SFX_ITEM_UNKNOWN )
		901	ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_LANGUAGE, nScript );
899	if ( rSet.GetItemState( EE_CHAR_WEIGHT ) != SFX_ITEM_UNKNOWN )	902	if ( rSet.GetItemState( EE_CHAR_WEIGHT ) != SFX_ITEM_UNKNOWN )
900	ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_WEIGHT, nScript );	903	ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_WEIGHT, nScript );
901	if ( rSet.GetItemState( EE_CHAR_ITALIC ) != SFX_ITEM_UNKNOWN )	904	if ( rSet.GetItemState( EE_CHAR_ITALIC ) != SFX_ITEM_UNKNOWN )




	pTabViewShell->HideListBox();					// Autofilter-DropDown-Listbox

	if (  (nSlot == SID_ATTR_CHAR_WEIGHT)
		||(nSlot == SID_ATTR_CHAR_LANGUAGE)
		||(nSlot == SID_ATTR_CHAR_POSTURE)
		||(nSlot == SID_ATTR_CHAR_UNDERLINE)
		||(nSlot == SID_ULINE_VAL_NONE)


		switch ( nSlot )
		{
			case SID_ATTR_CHAR_LANGUAGE:
			{
				BYTE nScript = pTabViewShell->GetSelectionScriptType();
				SfxItemPool& rPool = GetPool();
				SvxScriptSetItem aSetItem( nSlot, rPool );

			        if ( pSet ) {
					USHORT nWhich = rPool.GetWhich( nSlot );
					aSetItem.PutItemForScriptType( nScript, pNewSet->Get( nWhich ) );
				} else {
				    // what do we do if there are no new attributes? anything?
				}
				pTabViewShell->ApplyUserItemSet( aSetItem.GetItemSet() );
				pNewSet->Put( aSetItem.GetItemSet(), FALSE );

                        }
			break;

			case SID_ATTR_CHAR_WEIGHT:
			{
				BYTE nScript = pTabViewShell->GetSelectionScriptType();


		switch ( nSlot )
		{
			case SID_ATTR_CHAR_LANGUAGE:
			{
				BYTE nScript = pTabViewShell->GetSelectionScriptType();
				SfxItemPool& rPool = GetPool();
				SvxScriptSetItem aSetItem( nSlot, rPool );
				pTabViewShell->ApplyUserItemSet( aSetItem.GetItemSet() );
				SfxAllItemSet aNewSet( GetPool() );
				aNewSet.Put( aSetItem.GetItemSet(), FALSE );
				rBindings.Invalidate( nSlot );
			        rBindings.Update( nSlot );
                        }
			break;

			case SID_ATTR_CHAR_FONT:
			case SID_ATTR_CHAR_FONTHEIGHT:
				pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONT );	    // wenn ToolBar vertikal


			case SID_ATTR_CHAR_FONT:
			case SID_ATTR_CHAR_FONTHEIGHT:
			case SID_ATTR_CHAR_LANGUAGE:
				{
					BYTE nScript = pTabViewShell->GetSelectionScriptType();


		if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
		ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_HEIGHT, nScript );
	}
	if ( rSet.GetItemState( ATTR_FONT_LANGUAGE ) != SFX_ITEM_UNKNOWN )
	{
		if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
		ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_LANGUAGE, nScript );
	}

	while ( nWhich )
	{

	{
		if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
		ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_POSTURE, nScript );
	}
	if ( rSet.GetItemState( ATTR_FONT_LANGUAGE ) != SFX_ITEM_UNKNOWN )
	{
		if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
		ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_LANGUAGE, nScript );
	}

	SfxItemState eState;

Lines 306-311 Link Here

(-)source/ui/view/tabview3.cxx (+1 lines)
306		306
307	rBindings.Invalidate( SID_ATTR_CHAR_FONT );	307	rBindings.Invalidate( SID_ATTR_CHAR_FONT );
308	rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );	308	rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
		309	rBindings.Invalidate( SID_ATTR_CHAR_LANGUAGE );
309	rBindings.Invalidate( SID_ATTR_CHAR_COLOR );	310	rBindings.Invalidate( SID_ATTR_CHAR_COLOR );
310		311
311	rBindings.Invalidate( SID_ATTR_CHAR_WEIGHT );	312	rBindings.Invalidate( SID_ATTR_CHAR_WEIGHT );

Return to issue 23518

Lines 1064-1069 Link Here

(-)source/ui/view/formatsh.cxx (+43 lines)
1064	pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox	1064	pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
1065		1065
1066	if ( (nSlot == SID_ATTR_CHAR_WEIGHT)	1066	if ( (nSlot == SID_ATTR_CHAR_WEIGHT)
		1067	\|\|(nSlot == SID_ATTR_CHAR_LANGUAGE)
1067	\|\|(nSlot == SID_ATTR_CHAR_POSTURE)	1068	\|\|(nSlot == SID_ATTR_CHAR_POSTURE)
1068	\|\|(nSlot == SID_ATTR_CHAR_UNDERLINE)	1069	\|\|(nSlot == SID_ATTR_CHAR_UNDERLINE)
1069	\|\|(nSlot == SID_ULINE_VAL_NONE)	1070	\|\|(nSlot == SID_ULINE_VAL_NONE)
Lines 1075-1080 Link Here
1075		1076
1076	switch ( nSlot )	1077	switch ( nSlot )
1077	{	1078	{
		1079	case SID_ATTR_CHAR_LANGUAGE:
		1080	{
		1081	BYTE nScript = pTabViewShell->GetSelectionScriptType();
		1082	SfxItemPool& rPool = GetPool();
		1083	SvxScriptSetItem aSetItem( nSlot, rPool );
		1084
		1085	if ( pSet ) {
		1086	USHORT nWhich = rPool.GetWhich( nSlot );
		1087	aSetItem.PutItemForScriptType( nScript, pNewSet->Get( nWhich ) );
		1088	} else {
		1089	// what do we do if there are no new attributes? anything?
		1090	}
		1091	pTabViewShell->ApplyUserItemSet( aSetItem.GetItemSet() );
		1092	pNewSet->Put( aSetItem.GetItemSet(), FALSE );
		1093
		1094	}
		1095	break;
		1096
1078	case SID_ATTR_CHAR_WEIGHT:	1097	case SID_ATTR_CHAR_WEIGHT:
1079	{	1098	{
1080	BYTE nScript = pTabViewShell->GetSelectionScriptType();	1099	BYTE nScript = pTabViewShell->GetSelectionScriptType();
Lines 1323-1328 Link Here
1323		1342
1324	switch ( nSlot )	1343	switch ( nSlot )
1325	{	1344	{
		1345	case SID_ATTR_CHAR_LANGUAGE:
		1346	{
		1347	BYTE nScript = pTabViewShell->GetSelectionScriptType();
		1348	SfxItemPool& rPool = GetPool();
		1349	SvxScriptSetItem aSetItem( nSlot, rPool );
		1350	pTabViewShell->ApplyUserItemSet( aSetItem.GetItemSet() );
		1351	SfxAllItemSet aNewSet( GetPool() );
		1352	aNewSet.Put( aSetItem.GetItemSet(), FALSE );
		1353	rBindings.Invalidate( nSlot );
		1354	rBindings.Update( nSlot );
		1355	}
		1356	break;
		1357
1326	case SID_ATTR_CHAR_FONT:	1358	case SID_ATTR_CHAR_FONT:
1327	case SID_ATTR_CHAR_FONTHEIGHT:	1359	case SID_ATTR_CHAR_FONTHEIGHT:
1328	pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONT ); // wenn ToolBar vertikal	1360	pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONT ); // wenn ToolBar vertikal
Lines 1378-1383 Link Here
1378		1410
1379	case SID_ATTR_CHAR_FONT:	1411	case SID_ATTR_CHAR_FONT:
1380	case SID_ATTR_CHAR_FONTHEIGHT:	1412	case SID_ATTR_CHAR_FONTHEIGHT:
		1413	case SID_ATTR_CHAR_LANGUAGE:
1381	{	1414	{
1382	BYTE nScript = pTabViewShell->GetSelectionScriptType();	1415	BYTE nScript = pTabViewShell->GetSelectionScriptType();
1383		1416
Lines 1594-1599 Link Here
1594	if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();	1627	if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
1595	ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_HEIGHT, nScript );	1628	ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_HEIGHT, nScript );
1596	}	1629	}
		1630	if ( rSet.GetItemState( ATTR_FONT_LANGUAGE ) != SFX_ITEM_UNKNOWN )
		1631	{
		1632	if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
		1633	ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_LANGUAGE, nScript );
		1634	}
1597		1635
1598	while ( nWhich )	1636	while ( nWhich )
1599	{	1637	{
Lines 1651-1656 Link Here
1651	{	1689	{
1652	if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();	1690	if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
1653	ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_POSTURE, nScript );	1691	ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_POSTURE, nScript );
		1692	}
		1693	if ( rSet.GetItemState( ATTR_FONT_LANGUAGE ) != SFX_ITEM_UNKNOWN )
		1694	{
		1695	if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
		1696	ScViewUtil::PutItemScript( rSet, rAttrSet, ATTR_FONT_LANGUAGE, nScript );
1654	}	1697	}
1655		1698
1656	SfxItemState eState;	1699	SfxItemState eState;