Attachment #13206 for issue #25571

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




				}


				sal_Int32 nTitleHeight;
				{
					sal_Int32 nDummy1, nDummy2, nDummy3;
					GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
				}


				}


				sal_Int32 nTitleHeight;
				{
					sal_Int32 nDummy1, nDummy2, nDummy3;
					GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
				}


				}


				sal_Int32 nTitleHeight;
				{
					sal_Int32 nDummy1, nDummy2, nDummy3;
					GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
				}





		pFrame->nMaximizedWindows++;
		nWinState = TT_WIN_STATE_MAX;
	}
	sal_Int32 nTitleHeight;
	{
		sal_Int32 nDummy1, nDummy2, nDummy3;
		pFrame->GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
	}


	nNr %= 10;
	nNr++;

	sal_Int32 nTitleHeight;
	{
		sal_Int32 nDummy1, nDummy2, nDummy3;
		pFrame->GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
	}





	SvNumberFormatter* pNumberFormatter;
    LanguageType    meFormatterLangType;
    DateFormat      meFormatterDateFormat;
	sal_uInt32 			nStdDateIdx, nStdTimeIdx, nStdDateTimeIdx;

	SbError      	nErr;     		// aktueller Fehlercode
	String		    aErrorMsg;		// letzte Error-Message fuer $ARG

	SbiRTLData* GetRTLData() const { return (SbiRTLData*)&aRTLData; }

	SvNumberFormatter* GetNumberFormatter();
	sal_uInt32 GetStdDateIdx() const { return nStdDateIdx; }
	sal_uInt32 GetStdTimeIdx() const { return nStdTimeIdx; }
	sal_uInt32 GetStdDateTimeIdx() const { return nStdDateTimeIdx; }

	// #39629# NumberFormatter auch statisch anbieten
	static void PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
		sal_uInt32 &rnStdDateIdx, sal_uInt32 &rnStdTimeIdx, sal_uInt32 &rnStdDateTimeIdx,
        LanguageType* peFormatterLangType=NULL, DateFormat* peFormatterDateFormat=NULL );
};





			pFormatter = pINST->GetNumberFormatter();
		else
		{
			sal_uInt32 n;	// Dummy
			SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );
		}

		sal_uInt32 nIndex;
		double fResult;
		String aStr( rPar.Get(1)->GetString() );
		BOOL bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );

			pFormatter = pINST->GetNumberFormatter();
		else
		{
			sal_uInt32 n;	// Dummy
			SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );
		}

		sal_uInt32 nIndex;
		double fResult;
		BOOL bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),
												   nIndex, fResult );


			// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden
			SvNumberFormatter* pFormatter = NULL;
			sal_uInt32 nIndex;
			if( pINST )
			{
				pFormatter = pINST->GetNumberFormatter();

			}
			else
			{
				sal_uInt32 n;	// Dummy
				SbiInstance::PrepareNumberFormatter( pFormatter, n, nIndex, n );
			}



			// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden
			SvNumberFormatter* pFormatter = NULL;
			sal_uInt32 nIndex;
			if( pINST )
			{
				pFormatter = pINST->GetNumberFormatter();

			}
			else
			{
				sal_uInt32 n;	// Dummy
				SbiInstance::PrepareNumberFormatter( pFormatter, nIndex, n, n );
			}



		// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden
		SvNumberFormatter* pFormatter = NULL;
		sal_uInt32 nIndex;
		if( pINST )
		{
			pFormatter = pINST->GetNumberFormatter();

		}
		else
		{
			sal_uInt32 n;	// Dummy
			SbiInstance::PrepareNumberFormatter( pFormatter, n, n, nIndex );
		}


Lines 365-371 Link Here

(-)ooo_1.1.0_src.orig/basic/source/runtime/runtime.cxx (-1 / +1 lines)
365		365
366	// #39629 NumberFormatter auch statisch anbieten	366	// #39629 NumberFormatter auch statisch anbieten
367	void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,	367	void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
368	ULONG &rnStdDateIdx, ULONG &rnStdTimeIdx, ULONG &rnStdDateTimeIdx,	368	sal_uInt32 &rnStdDateIdx, sal_uInt32 &rnStdTimeIdx, sal_uInt32 &rnStdDateTimeIdx,
369	LanguageType* peFormatterLangType, DateFormat* peFormatterDateFormat )	369	LanguageType* peFormatterLangType, DateFormat* peFormatterDateFormat )
370	{	370	{
371	com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >	371	com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >

Return to issue 25571

Lines 1578-1586 Link Here

(-)ooo_1.1.0_src.orig/basic/source/app/app.cxx (-6 / +6 lines)
1578	}	1578	}
1579		1579
1580		1580
1581	long nTitleHeight;	1581	sal_Int32 nTitleHeight;
1582	{	1582	{
1583	long nDummy1, nDummy2, nDummy3;	1583	sal_Int32 nDummy1, nDummy2, nDummy3;
1584	GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );	1584	GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
1585	}	1585	}
1586		1586
Lines 1602-1610 Link Here
1602	}	1602	}
1603		1603
1604		1604
1605	long nTitleHeight;	1605	sal_Int32 nTitleHeight;
1606	{	1606	{
1607	long nDummy1, nDummy2, nDummy3;	1607	sal_Int32 nDummy1, nDummy2, nDummy3;
1608	GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );	1608	GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
1609	}	1609	}
1610		1610
Lines 1630-1638 Link Here
1630	}	1630	}
1631		1631
1632		1632
1633	long nTitleHeight;	1633	sal_Int32 nTitleHeight;
1634	{	1634	{
1635	long nDummy1, nDummy2, nDummy3;	1635	sal_Int32 nDummy1, nDummy2, nDummy3;
1636	GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );	1636	GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
1637	}	1637	}
1638		1638

Lines 154-162 Link Here

(-)ooo_1.1.0_src.orig/basic/source/app/appwin.cxx (-4 / +4 lines)
154	pFrame->nMaximizedWindows++;	154	pFrame->nMaximizedWindows++;
155	nWinState = TT_WIN_STATE_MAX;	155	nWinState = TT_WIN_STATE_MAX;
156	}	156	}
157	long nTitleHeight;	157	sal_Int32 nTitleHeight;
158	{	158	{
159	long nDummy1, nDummy2, nDummy3;	159	sal_Int32 nDummy1, nDummy2, nDummy3;
160	pFrame->GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );	160	pFrame->GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
161	}	161	}
162		162
Lines 198-206 Link Here
198	nNr %= 10;	198	nNr %= 10;
199	nNr++;	199	nNr++;
200		200
201	long nTitleHeight;	201	sal_Int32 nTitleHeight;
202	{	202	{
203	long nDummy1, nDummy2, nDummy3;	203	sal_Int32 nDummy1, nDummy2, nDummy3;
204	pFrame->GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );	204	pFrame->GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
205	}	205	}
206		206

Lines 1622-1632 Link Here

(-)ooo_1.1.0_src.orig/basic/source/runtime/methods.cxx (-10 / +10 lines)
1622	pFormatter = pINST->GetNumberFormatter();	1622	pFormatter = pINST->GetNumberFormatter();
1623	else	1623	else
1624	{	1624	{
1625	ULONG n; // Dummy	1625	sal_uInt32 n; // Dummy
1626	SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );	1626	SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );
1627	}	1627	}
1628		1628
1629	ULONG nIndex;	1629	sal_uInt32 nIndex;
1630	double fResult;	1630	double fResult;
1631	String aStr( rPar.Get(1)->GetString() );	1631	String aStr( rPar.Get(1)->GetString() );
1632	BOOL bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );	1632	BOOL bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );
Lines 1665-1675 Link Here
1665	pFormatter = pINST->GetNumberFormatter();	1665	pFormatter = pINST->GetNumberFormatter();
1666	else	1666	else
1667	{	1667	{
1668	ULONG n; // Dummy	1668	sal_uInt32 n; // Dummy
1669	SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );	1669	SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );
1670	}	1670	}
1671		1671
1672	ULONG nIndex;	1672	sal_uInt32 nIndex;
1673	double fResult;	1673	double fResult;
1674	BOOL bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),	1674	BOOL bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),
1675	nIndex, fResult );	1675	nIndex, fResult );
Lines 1847-1853 Link Here
1847		1847
1848	// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden	1848	// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden
1849	SvNumberFormatter* pFormatter = NULL;	1849	SvNumberFormatter* pFormatter = NULL;
1850	ULONG nIndex;	1850	sal_uInt32 nIndex;
1851	if( pINST )	1851	if( pINST )
1852	{	1852	{
1853	pFormatter = pINST->GetNumberFormatter();	1853	pFormatter = pINST->GetNumberFormatter();
Lines 1855-1861 Link Here
1855	}	1855	}
1856	else	1856	else
1857	{	1857	{
1858	ULONG n; // Dummy	1858	sal_uInt32 n; // Dummy
1859	SbiInstance::PrepareNumberFormatter( pFormatter, n, nIndex, n );	1859	SbiInstance::PrepareNumberFormatter( pFormatter, n, nIndex, n );
1860	}	1860	}
1861		1861
Lines 1898-1904 Link Here
1898		1898
1899	// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden	1899	// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden
1900	SvNumberFormatter* pFormatter = NULL;	1900	SvNumberFormatter* pFormatter = NULL;
1901	ULONG nIndex;	1901	sal_uInt32 nIndex;
1902	if( pINST )	1902	if( pINST )
1903	{	1903	{
1904	pFormatter = pINST->GetNumberFormatter();	1904	pFormatter = pINST->GetNumberFormatter();
Lines 1906-1912 Link Here
1906	}	1906	}
1907	else	1907	else
1908	{	1908	{
1909	ULONG n; // Dummy	1909	sal_uInt32 n; // Dummy
1910	SbiInstance::PrepareNumberFormatter( pFormatter, nIndex, n, n );	1910	SbiInstance::PrepareNumberFormatter( pFormatter, nIndex, n, n );
1911	}	1911	}
1912		1912
Lines 2777-2783 Link Here
2777		2777
2778	// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden	2778	// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden
2779	SvNumberFormatter* pFormatter = NULL;	2779	SvNumberFormatter* pFormatter = NULL;
2780	ULONG nIndex;	2780	sal_uInt32 nIndex;
2781	if( pINST )	2781	if( pINST )
2782	{	2782	{
2783	pFormatter = pINST->GetNumberFormatter();	2783	pFormatter = pINST->GetNumberFormatter();
Lines 2785-2791 Link Here
2785	}	2785	}
2786	else	2786	else
2787	{	2787	{
2788	ULONG n; // Dummy	2788	sal_uInt32 n; // Dummy
2789	SbiInstance::PrepareNumberFormatter( pFormatter, n, n, nIndex );	2789	SbiInstance::PrepareNumberFormatter( pFormatter, n, n, nIndex );
2790	}	2790	}
2791		2791

Lines 204-210 Link Here

(-)ooo_1.1.0_src.orig/basic/source/inc/runtime.hxx (-5 / +5 lines)
204	SvNumberFormatter* pNumberFormatter;	204	SvNumberFormatter* pNumberFormatter;
205	LanguageType meFormatterLangType;	205	LanguageType meFormatterLangType;
206	DateFormat meFormatterDateFormat;	206	DateFormat meFormatterDateFormat;
207	ULONG nStdDateIdx, nStdTimeIdx, nStdDateTimeIdx;	207	sal_uInt32 nStdDateIdx, nStdTimeIdx, nStdDateTimeIdx;
208		208
209	SbError nErr; // aktueller Fehlercode	209	SbError nErr; // aktueller Fehlercode
210	String aErrorMsg; // letzte Error-Message fuer $ARG	210	String aErrorMsg; // letzte Error-Message fuer $ARG
Lines 251-263 Link Here
251	SbiRTLData* GetRTLData() const { return (SbiRTLData*)&aRTLData; }	251	SbiRTLData* GetRTLData() const { return (SbiRTLData*)&aRTLData; }
252		252
253	SvNumberFormatter* GetNumberFormatter();	253	SvNumberFormatter* GetNumberFormatter();
254	ULONG GetStdDateIdx() const { return nStdDateIdx; }	254	sal_uInt32 GetStdDateIdx() const { return nStdDateIdx; }
255	ULONG GetStdTimeIdx() const { return nStdTimeIdx; }	255	sal_uInt32 GetStdTimeIdx() const { return nStdTimeIdx; }
256	ULONG GetStdDateTimeIdx() const { return nStdDateTimeIdx; }	256	sal_uInt32 GetStdDateTimeIdx() const { return nStdDateTimeIdx; }
257		257
258	// #39629# NumberFormatter auch statisch anbieten	258	// #39629# NumberFormatter auch statisch anbieten
259	static void PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,	259	static void PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
260	ULONG &rnStdDateIdx, ULONG &rnStdTimeIdx, ULONG &rnStdDateTimeIdx,	260	sal_uInt32 &rnStdDateIdx, sal_uInt32 &rnStdTimeIdx, sal_uInt32 &rnStdDateTimeIdx,
261	LanguageType* peFormatterLangType=NULL, DateFormat* peFormatterDateFormat=NULL );	261	LanguageType* peFormatterLangType=NULL, DateFormat* peFormatterDateFormat=NULL );
262	};	262	};
263		263