Attachment #49442 for issue #79712

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

Lines 134-139 Link Here

(-)old/offapi/com/sun/star/awt/VclWindowPeerAttribute.idl (+4 lines)
134	//-------------------------------------------------------------------------	134	//-------------------------------------------------------------------------
135		135
136	const long DEF_RETRY = 536870912;	136	const long DEF_RETRY = 536870912;
		137
		138	//-------------------------------------------------------------------------
		139
		140	const long NOLABEL = 536870912;
137		141
138	//-------------------------------------------------------------------------	142	//-------------------------------------------------------------------------
139		143

Lines 182-187 Link Here

(-)old/toolkit/inc/toolkit/helper/property.hxx (+1 lines)
182	#define BASEPROPERTY_DESKTOP_AS_PARENT 123 // sal_Bool	182	#define BASEPROPERTY_DESKTOP_AS_PARENT 123 // sal_Bool
183		183
184	//#define BASEPROPERTY_RESOURCERESOLVER 124 // css.resource.XStringResourceResolver	184	//#define BASEPROPERTY_RESOURCERESOLVER 124 // css.resource.XStringResourceResolver
		185	#define BASEPROPERTY_NOLABEL 132 // sal_Bool
185		186
186	#define BASEPROPERTY_TREE_START 124	187	#define BASEPROPERTY_TREE_START 124
187	#define BASEPROPERTY_TREE_SELECTIONTYPE 124	188	#define BASEPROPERTY_TREE_SELECTIONTYPE 124

Lines 312-317 Link Here

(-)old/toolkit/source/awt/vclxtoolkit.cxx (+2 lines)
312	nWinBits \|= WB_CLIPCHILDREN;	312	nWinBits \|= WB_CLIPCHILDREN;
313	if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::GROUP )	313	if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::GROUP )
314	nWinBits \|= WB_GROUP;	314	nWinBits \|= WB_GROUP;
		315	if( nComponentAttribs & ::com::sun::star::awt::VclWindowPeerAttribute::NOLABEL )
		316	nWinBits \|= WB_NOLABEL;
315		317
316	// These bits are not uniqe	318	// These bits are not uniqe
317	if ( bMessBox )	319	if ( bMessBox )




				aDescr.WindowAttributes |= VclWindowPeerAttribute::AUTOVSCROLL;
		}

		// NoLabel 
		aPropName = GetPropertyName( BASEPROPERTY_NOLABEL );
		if ( xInfo->hasPropertyByName( aPropName ) )
		{
			aVal = xPSet->getPropertyValue( aPropName );
			sal_Bool b = sal_Bool();
			if ( ( aVal >>=b ) && b )
				aDescr.WindowAttributes |= VclWindowPeerAttribute::NOLABEL;
		}
		
		// Align
		aPropName = GetPropertyName( BASEPROPERTY_ALIGN );
		if ( xInfo->hasPropertyByName( aPropName ) )




	ImplRegisterProperty( BASEPROPERTY_IMAGEPOSITION );
	ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
	ImplRegisterProperty( BASEPROPERTY_LABEL );
	ImplRegisterProperty( BASEPROPERTY_NOLABEL ); 
	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
	ImplRegisterProperty( BASEPROPERTY_PUSHBUTTONTYPE );
	ImplRegisterProperty( BASEPROPERTY_REPEAT );

	ImplRegisterProperty( BASEPROPERTY_IMAGEPOSITION );
	ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
	ImplRegisterProperty( BASEPROPERTY_LABEL );
	ImplRegisterProperty( BASEPROPERTY_NOLABEL ); 
	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
	ImplRegisterProperty( BASEPROPERTY_STATE );
	ImplRegisterProperty( BASEPROPERTY_TABSTOP );

	ImplRegisterProperty( BASEPROPERTY_IMAGEPOSITION );
	ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
	ImplRegisterProperty( BASEPROPERTY_LABEL );
	ImplRegisterProperty( BASEPROPERTY_NOLABEL ); 
	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
	ImplRegisterProperty( BASEPROPERTY_STATE );
	ImplRegisterProperty( BASEPROPERTY_TABSTOP );

	ImplRegisterProperty( BASEPROPERTY_HELPURL );
	ImplRegisterProperty( BASEPROPERTY_LABEL );
	ImplRegisterProperty( BASEPROPERTY_MULTILINE );
	ImplRegisterProperty( BASEPROPERTY_NOLABEL ); 
	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
	ImplRegisterProperty( BASEPROPERTY_TABSTOP );
	ImplRegisterProperty( BASEPROPERTY_VERTICALALIGN );

	ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
	ImplRegisterProperty( BASEPROPERTY_HELPURL );
	ImplRegisterProperty( BASEPROPERTY_LABEL );
	ImplRegisterProperty( BASEPROPERTY_NOLABEL ); 
	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
}


	ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
	ImplRegisterProperty( BASEPROPERTY_HELPURL );
	ImplRegisterProperty( BASEPROPERTY_LABEL );
	ImplRegisterProperty( BASEPROPERTY_NOLABEL ); 
    ImplRegisterProperty( BASEPROPERTY_ORIENTATION );
	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
}

Lines 246-252 Link Here

(-)old/toolkit/source/helper/property.cxx (-1 / +2 lines)
246	DECL_PROP_1 ( "MouseTransparent", MOUSETRANSPARENT, bool, BOUND ),	246	DECL_PROP_1 ( "MouseTransparent", MOUSETRANSPARENT, bool, BOUND ),
247	DECL_PROP_2 ( "MultiLine", MULTILINE, bool, BOUND, MAYBEDEFAULT ),	247	DECL_PROP_2 ( "MultiLine", MULTILINE, bool, BOUND, MAYBEDEFAULT ),
248	DECL_PROP_2 ( "MultiSelection", MULTISELECTION, bool, BOUND, MAYBEDEFAULT ),	248	DECL_PROP_2 ( "MultiSelection", MULTISELECTION, bool, BOUND, MAYBEDEFAULT ),
249	DECL_PROP_2 ( "NativeWidgetLook", NATIVE_WIDGET_LOOK, bool, BOUND, MAYBEDEFAULT ),	249	DECL_PROP_2 ( "NativeWidgetLook", NATIVE_WIDGET_LOOK, bool, BOUND, MAYBEDEFAULT ),
		250	DECL_PROP_2 ( "NoLabel", NOLABEL, bool, BOUND, MAYBEDEFAULT ),
250	DECL_PROP_2 ( "Orientation", ORIENTATION, sal_Int32, BOUND, MAYBEDEFAULT ),	251	DECL_PROP_2 ( "Orientation", ORIENTATION, sal_Int32, BOUND, MAYBEDEFAULT ),
251	DECL_PROP_2 ( "PaintTransparent", PAINTTRANSPARENT, bool, BOUND, MAYBEDEFAULT ),	252	DECL_PROP_2 ( "PaintTransparent", PAINTTRANSPARENT, bool, BOUND, MAYBEDEFAULT ),
252	DECL_PROP_2 ( "PluginParent", PLUGINPARENT, sal_Int64, BOUND, MAYBEDEFAULT ),	253	DECL_PROP_2 ( "PluginParent", PLUGINPARENT, sal_Int64, BOUND, MAYBEDEFAULT ),

Return to issue 79712

Lines 1335-1340 Link Here

(-)old/toolkit/source/controls/unocontrol.cxx (+10 lines)
1335	aDescr.WindowAttributes \|= VclWindowPeerAttribute::AUTOVSCROLL;	1335	aDescr.WindowAttributes \|= VclWindowPeerAttribute::AUTOVSCROLL;
1336	}	1336	}
1337		1337
		1338	// NoLabel
		1339	aPropName = GetPropertyName( BASEPROPERTY_NOLABEL );
		1340	if ( xInfo->hasPropertyByName( aPropName ) )
		1341	{
		1342	aVal = xPSet->getPropertyValue( aPropName );
		1343	sal_Bool b = sal_Bool();
		1344	if ( ( aVal >>=b ) && b )
		1345	aDescr.WindowAttributes \|= VclWindowPeerAttribute::NOLABEL;
		1346	}
		1347
1338	// Align	1348	// Align
1339	aPropName = GetPropertyName( BASEPROPERTY_ALIGN );	1349	aPropName = GetPropertyName( BASEPROPERTY_ALIGN );
1340	if ( xInfo->hasPropertyByName( aPropName ) )	1350	if ( xInfo->hasPropertyByName( aPropName ) )

Lines 860-865 Link Here

(-)old/toolkit/source/controls/unocontrols.cxx (+6 lines)
860	ImplRegisterProperty( BASEPROPERTY_IMAGEPOSITION );	860	ImplRegisterProperty( BASEPROPERTY_IMAGEPOSITION );
861	ImplRegisterProperty( BASEPROPERTY_IMAGEURL );	861	ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
862	ImplRegisterProperty( BASEPROPERTY_LABEL );	862	ImplRegisterProperty( BASEPROPERTY_LABEL );
		863	ImplRegisterProperty( BASEPROPERTY_NOLABEL );
863	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );	864	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
864	ImplRegisterProperty( BASEPROPERTY_PUSHBUTTONTYPE );	865	ImplRegisterProperty( BASEPROPERTY_PUSHBUTTONTYPE );
865	ImplRegisterProperty( BASEPROPERTY_REPEAT );	866	ImplRegisterProperty( BASEPROPERTY_REPEAT );
Lines 1168-1173 Link Here
1168	ImplRegisterProperty( BASEPROPERTY_IMAGEPOSITION );	1169	ImplRegisterProperty( BASEPROPERTY_IMAGEPOSITION );
1169	ImplRegisterProperty( BASEPROPERTY_IMAGEURL );	1170	ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
1170	ImplRegisterProperty( BASEPROPERTY_LABEL );	1171	ImplRegisterProperty( BASEPROPERTY_LABEL );
		1172	ImplRegisterProperty( BASEPROPERTY_NOLABEL );
1171	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );	1173	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
1172	ImplRegisterProperty( BASEPROPERTY_STATE );	1174	ImplRegisterProperty( BASEPROPERTY_STATE );
1173	ImplRegisterProperty( BASEPROPERTY_TABSTOP );	1175	ImplRegisterProperty( BASEPROPERTY_TABSTOP );
Lines 1391-1396 Link Here
1391	ImplRegisterProperty( BASEPROPERTY_IMAGEPOSITION );	1393	ImplRegisterProperty( BASEPROPERTY_IMAGEPOSITION );
1392	ImplRegisterProperty( BASEPROPERTY_IMAGEURL );	1394	ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
1393	ImplRegisterProperty( BASEPROPERTY_LABEL );	1395	ImplRegisterProperty( BASEPROPERTY_LABEL );
		1396	ImplRegisterProperty( BASEPROPERTY_NOLABEL );
1394	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );	1397	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
1395	ImplRegisterProperty( BASEPROPERTY_STATE );	1398	ImplRegisterProperty( BASEPROPERTY_STATE );
1396	ImplRegisterProperty( BASEPROPERTY_TABSTOP );	1399	ImplRegisterProperty( BASEPROPERTY_TABSTOP );
Lines 1593-1598 Link Here
1593	ImplRegisterProperty( BASEPROPERTY_HELPURL );	1596	ImplRegisterProperty( BASEPROPERTY_HELPURL );
1594	ImplRegisterProperty( BASEPROPERTY_LABEL );	1597	ImplRegisterProperty( BASEPROPERTY_LABEL );
1595	ImplRegisterProperty( BASEPROPERTY_MULTILINE );	1598	ImplRegisterProperty( BASEPROPERTY_MULTILINE );
		1599	ImplRegisterProperty( BASEPROPERTY_NOLABEL );
1596	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );	1600	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
1597	ImplRegisterProperty( BASEPROPERTY_TABSTOP );	1601	ImplRegisterProperty( BASEPROPERTY_TABSTOP );
1598	ImplRegisterProperty( BASEPROPERTY_VERTICALALIGN );	1602	ImplRegisterProperty( BASEPROPERTY_VERTICALALIGN );
Lines 1731-1736 Link Here
1731	ImplRegisterProperty( BASEPROPERTY_HELPTEXT );	1735	ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
1732	ImplRegisterProperty( BASEPROPERTY_HELPURL );	1736	ImplRegisterProperty( BASEPROPERTY_HELPURL );
1733	ImplRegisterProperty( BASEPROPERTY_LABEL );	1737	ImplRegisterProperty( BASEPROPERTY_LABEL );
		1738	ImplRegisterProperty( BASEPROPERTY_NOLABEL );
1734	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );	1739	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
1735	}	1740	}
1736		1741
Lines 3822-3827 Link Here
3822	ImplRegisterProperty( BASEPROPERTY_HELPTEXT );	3827	ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
3823	ImplRegisterProperty( BASEPROPERTY_HELPURL );	3828	ImplRegisterProperty( BASEPROPERTY_HELPURL );
3824	ImplRegisterProperty( BASEPROPERTY_LABEL );	3829	ImplRegisterProperty( BASEPROPERTY_LABEL );
		3830	ImplRegisterProperty( BASEPROPERTY_NOLABEL );
3825	ImplRegisterProperty( BASEPROPERTY_ORIENTATION );	3831	ImplRegisterProperty( BASEPROPERTY_ORIENTATION );
3826	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );	3832	ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
3827	}	3833	}