Attachment #6325 for issue #13400

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

Lines 925-931 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/eventattacher/source/eventattacher.cxx (-1 / +1 lines)
925	reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(	925	reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
926	OUString( RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME "/UNO/SERVICES") )));	926	OUString( RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME "/UNO/SERVICES") )));
927		927
928	Sequence< OUString > & rSNL =	928	const Sequence< OUString > & rSNL =
929	::comp_EventAttacher::EventAttacherImpl::getSupportedServiceNames_Static();	929	::comp_EventAttacher::EventAttacherImpl::getSupportedServiceNames_Static();
930	const OUString * pArray = rSNL.getConstArray();	930	const OUString * pArray = rSNL.getConstArray();
931	for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )	931	for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )

Lines 110-116 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/collator/chaptercollator.cxx (-1 / +1 lines)
110	if( ans != 0 )	110	if( ans != 0 )
111	return ans;	111	return ans;
112		112
113	OUString &aAddAllowed = OUString::createFromAscii("?");	113	const OUString &aAddAllowed = OUString::createFromAscii("?");
114	ParseResult res1, res2;	114	ParseResult res1, res2;
115	// Bug #100323#, since parseAnyToken does not take length as parameter, we have to copy	115	// Bug #100323#, since parseAnyToken does not take length as parameter, we have to copy
116	// it to a temp. string.	116	// it to a temp. string.

Lines 227-233 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/cppu/inc/com/sun/star/uno/Sequence.hxx (-1 / +1 lines)
227	if (! ::com::sun::star::uno::Sequence< E >::s_pType)	227	if (! ::com::sun::star::uno::Sequence< E >::s_pType)
228	{	228	{
229	const ::com::sun::star::uno::Type & rElementType = ::getCppuType(	229	const ::com::sun::star::uno::Type & rElementType = ::getCppuType(
230	(::com::sun::star::uno::Sequence< E >::ElementType *)0 );	230	(typename ::com::sun::star::uno::Sequence< E >::ElementType *)0 );
231	::typelib_static_sequence_type_init(	231	::typelib_static_sequence_type_init(
232	& ::com::sun::star::uno::Sequence< E >::s_pType,	232	& ::com::sun::star::uno::Sequence< E >::s_pType,
233	rElementType.getTypeLibType() );	233	rElementType.getTypeLibType() );

Lines 118-124 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/collator/collatorImpl.cxx (-2 / +2 lines)
118	sal_Int32 SAL_CALL	118	sal_Int32 SAL_CALL
119	CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException)	119	CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException)
120	{	120	{
121	Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);	121	const Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
122	for (sal_Int16 i = 0; i < imp.getLength(); i++)	122	for (sal_Int16 i = 0; i < imp.getLength(); i++)
123	if (imp[i].isDefault)	123	if (imp[i].isDefault)
124	return loadCollatorAlgorithm(imp[i].unoID, rLocale, collatorOptions);	124	return loadCollatorAlgorithm(imp[i].unoID, rLocale, collatorOptions);
Lines 156-162 Link Here
156	CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(RuntimeException)	156	CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(RuntimeException)
157	{	157	{
158	nLocale = rLocale;	158	nLocale = rLocale;
159	Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);	159	const Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
160	Sequence< OUString > list(imp.getLength());	160	Sequence< OUString > list(imp.getLength());
161		161
162	for (sal_Int32 i = 0; i < imp.getLength(); i++) {	162	for (sal_Int32 i = 0; i < imp.getLength(); i++) {

Lines 93-100 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/collator/collator_icu.cxx (-2 / +2 lines)
93	{	93	{
94	if (collator) {	94	if (collator) {
95	if (tranModules & TransliterationModules_IGNORE_KANA) {	95	if (tranModules & TransliterationModules_IGNORE_KANA) {
96	OUString& s1 = ignore->transliterateString2String(str1, off1, len1);	96	const OUString& s1 = ignore->transliterateString2String(str1, off1, len1);
97	OUString& s2 = ignore->transliterateString2String(str2, off2, len2);	97	const OUString& s2 = ignore->transliterateString2String(str2, off2, len2);
98	return collator->compare(s1.getStr(), s1.getLength(), s2.getStr(), s2.getLength());	98	return collator->compare(s1.getStr(), s1.getLength(), s2.getStr(), s2.getLength());
99	}	99	}
100	else	100	else

Lines 273-279 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/localedata/localedata.cxx (-1 / +1 lines)
273	cals = getAllCalendars(loc);	273	cals = getAllCalendars(loc);
274	len = cals.getLength();	274	len = cals.getLength();
275	}	275	}
276	OUString& id = name.getToken(0, under, index);	276	const OUString& id = name.getToken(0, under, index);
277	for (index = 0; index < cals.getLength(); index++) {	277	for (index = 0; index < cals.getLength(); index++) {
278	if (id.equals(cals[index].Name)) {	278	if (id.equals(cals[index].Name)) {
279	ref_cal = cals[index];	279	ref_cal = cals[index];

Lines 90-100 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/fullwidthToHalfwidth.cxx (-2 / +2 lines)
90	throw(RuntimeException)	90	throw(RuntimeException)
91	{	91	{
92	// Decomposition: GA --> KA + voice-mark	92	// Decomposition: GA --> KA + voice-mark
93	OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);	93	const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
94		94
95	// One to One mapping	95	// One to One mapping
96	useOffset = sal_False;	96	useOffset = sal_False;
97	OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset);	97	const OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset);
98	useOffset = sal_True;	98	useOffset = sal_True;
99	return tmp;	99	return tmp;
100	}	100	}

Lines 87-93 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/halfwidthToFullwidth.cxx (-1 / +1 lines)
87	sal_Bool _useOffset = useOffset;	87	sal_Bool _useOffset = useOffset;
88	// One to One mapping	88	// One to One mapping
89	useOffset = sal_False;	89	useOffset = sal_False;
90	OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset);	90	const OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset);
91	useOffset = _useOffset;	91	useOffset = _useOffset;
92		92
93	// Composition: KA + voice-mark --> GA	93	// Composition: KA + voice-mark --> GA

Lines 303-309 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/transliterationImpl.cxx (-2 / +2 lines)
303	Sequence<OUString> SAL_CALL	303	Sequence<OUString> SAL_CALL
304	TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) throw(RuntimeException)	304	TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) throw(RuntimeException)
305	{	305	{
306	Sequence<OUString> &translist = localedata->getTransliterations(rLocale);	306	const Sequence<OUString> &translist = localedata->getTransliterations(rLocale);
307	Sequence<OUString> &r = *new Sequence< OUString > (translist.getLength());	307	Sequence<OUString> &r = *new Sequence< OUString > (translist.getLength());
308	Reference<XExtendedTransliteration> body;	308	Reference<XExtendedTransliteration> body;
309	sal_Int32 n = 0;	309	sal_Int32 n = 0;
Lines 532-538 Link Here
532	sal_Int32 j_tmp = 0;	532	sal_Int32 j_tmp = 0;
533	Sequence< OUString > ostr(MaxOutput*length);	533	Sequence< OUString > ostr(MaxOutput*length);
534	for (sal_Int32 j = 0; j < length; j+=2) {	534	for (sal_Int32 j = 0; j < length; j+=2) {
535	Sequence< OUString >& temp = bodyCascade[_numCascade]->transliterateRange(inStrs[j], inStrs[j+1]);	535	const Sequence< OUString >& temp = bodyCascade[_numCascade]->transliterateRange(inStrs[j], inStrs[j+1]);
536		536
537	for ( sal_Int32 k = 0; k < temp.getLength(); k++) {	537	for ( sal_Int32 k = 0; k < temp.getLength(); k++) {
538	if ( j_tmp >= MaxOutput*length ) throw ERROR;	538	if ( j_tmp >= MaxOutput*length ) throw ERROR;

Lines 162-168 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/transliteration_commonclass.cxx (-1 / +1 lines)
162	{	162	{
163	static Sequence < sal_Int32 > dummy_offset;	163	static Sequence < sal_Int32 > dummy_offset;
164	useOffset = sal_False;	164	useOffset = sal_False;
165	OUString &tmpStr = transliterate(inStr, startPos, nCount, dummy_offset);	165	const OUString &tmpStr = transliterate(inStr, startPos, nCount, dummy_offset);
166	useOffset = sal_True;	166	useOffset = sal_True;
167	return tmpStr;	167	return tmpStr;
168	}	168	}

Lines 346-352 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx (-1 / +1 lines)
346	break;	346	break;
347	case TRANSLITERATION:	347	case TRANSLITERATION:
348	try {	348	try {
349	OUString &tmp = OUString::valueOf( number );	349	const OUString &tmp = OUString::valueOf( number );
350	OUString transliteration;	350	OUString transliteration;
351	getPropertyByName(aProperties, "Transliteration", sal_True) >>= transliteration;	351	getPropertyByName(aProperties, "Transliteration", sal_True) >>= transliteration;
352	translit->loadModuleByImplName(transliteration, aLocale);	352	translit->loadModuleByImplName(transliteration, aLocale);




SalPrinterBmp::GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const
{
	Scanline pScan = mpScanAccess + nRow * mnScanOffset;
	BitmapColor aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);

	return ColorOf (aColor);
}

SalPrinterBmp::GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const
{
	Scanline pScan = mpScanAccess + nRow * mnScanOffset;
	BitmapColor aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);

	return GrayOf (aColor);
}

SalPrinterBmp::GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const
{
	Scanline pScan = mpScanAccess + nRow * mnScanOffset;
	BitmapColor aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);

	if (aColor.IsIndex())
		return aColor.GetIndex();

Lines 141-147 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/svtools/inc/communi.hxx (-1 / +1 lines)
141		141
142	class CommunicationManagerServerViaSocket : public CommunicationManagerServer	142	class CommunicationManagerServerViaSocket : public CommunicationManagerServer
143	{	143	{
144	friend CommunicationManagerServerAcceptThread;	144	friend class CommunicationManagerServerAcceptThread;
145	public:	145	public:
146	CommunicationManagerServerViaSocket( ULONG nPort, USHORT nMaxCon, BOOL bUseMultiChannel = FALSE );	146	CommunicationManagerServerViaSocket( ULONG nPort, USHORT nMaxCon, BOOL bUseMultiChannel = FALSE );
147	virtual ~CommunicationManagerServerViaSocket();	147	virtual ~CommunicationManagerServerViaSocket();

Lines 1266-1272 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/automation/source/testtool/objtest.cxx (-1 / +1 lines)
1266	aDialogHandlerName.Erase();	1266	aDialogHandlerName.Erase();
1267		1267
1268	ULONG nRememberSequence = nSequence; // Da sich die Sequence im DialogHandler ändert	1268	ULONG nRememberSequence = nSequence; // Da sich die Sequence im DialogHandler ändert
1269	(StarBASIC*)GetParent()->Call( aName );	1269	((StarBASIC*)GetParent())->Call( aName );
1270	nSequence = nRememberSequence;	1270	nSequence = nRememberSequence;
1271	// Die Sequenznummern werden dann zwar doppelt vergeben, aber wen kümmerts.	1271	// Die Sequenznummern werden dann zwar doppelt vergeben, aber wen kümmerts.
1272		1272

Lines 256-262 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/xmloff/source/core/nmspmap.cxx (-1 / +1 lines)
256	sQName.append ( (*aIter).second->sPrefix);	256	sQName.append ( (*aIter).second->sPrefix);
257	sQName.append ( sal_Unicode(':') );	257	sQName.append ( sal_Unicode(':') );
258	sQName.append ( rLocalName );	258	sQName.append ( rLocalName );
259	OUString *pString = new OUString ( rLocalName ), &rString = sQName.makeStringAndClear();	259	const OUString *pString = new OUString ( rLocalName ), &rString = sQName.makeStringAndClear();
260	const_cast < QNameCache * > (&aQNameCache)->operator[] ( QNamePair ( nKey, pString ) ) = rString;	260	const_cast < QNameCache * > (&aQNameCache)->operator[] ( QNamePair ( nKey, pString ) ) = rString;
261	return rString;	261	return rString;
262	}	262	}

Lines 133-139 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/xmloff/source/text/XMLChangeImportContext.cxx (-1 / +1 lines)
133	// prepare parameters	133	// prepare parameters
134	UniReference<XMLTextImportHelper> rHelper =	134	UniReference<XMLTextImportHelper> rHelper =
135	GetImport().GetTextImport();	135	GetImport().GetTextImport();
136	OUString& rID = xAttrList->getValueByIndex(nAttr);	136	OUString rID = xAttrList->getValueByIndex(nAttr);
137		137
138	// call for bStart and bEnd (may both be true)	138	// call for bStart and bEnd (may both be true)
139	if (bIsStart)	139	if (bIsStart)

Lines 137-143 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/xmloff/source/text/XMLChangedRegionImportContext.cxx (-1 / +1 lines)
137	GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),	137	GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
138	&sLocalName );	138	&sLocalName );
139		139
140	OUString& rValue = xAttrList->getValueByIndex(nAttr);	140	const OUString& rValue = xAttrList->getValueByIndex(nAttr);
141	if ( XML_NAMESPACE_TEXT == nPrefix )	141	if ( XML_NAMESPACE_TEXT == nPrefix )
142	{	142	{
143	if( IsXMLToken( sLocalName, XML_ID ) )	143	if( IsXMLToken( sLocalName, XML_ID ) )

Lines 1506-1512 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/xmloff/source/text/txtflde.cxx (-1 / +1 lines)
1506	case FIELD_ID_DATABASE_DISPLAY:	1506	case FIELD_ID_DATABASE_DISPLAY:
1507	{	1507	{
1508	// get database, table and column name from field master	1508	// get database, table and column name from field master
1509	Reference<XPropertySet> & xMaster = GetMasterPropertySet(rTextField);	1509	const Reference<XPropertySet> & xMaster = GetMasterPropertySet(rTextField);
1510	ProcessString(XML_DATABASE_NAME,	1510	ProcessString(XML_DATABASE_NAME,
1511	GetStringProperty(sPropertyDataBaseName, xMaster));	1511	GetStringProperty(sPropertyDataBaseName, xMaster));
1512	ProcessString(XML_TABLE_NAME,	1512	ProcessString(XML_TABLE_NAME,

Lines 946-952 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/svx/source/options/optcolor.cxx (-1 / +1 lines)
946	}	946	}
947	else	947	else
948	{	948	{
949	Color& rColor = pBox->GetSelectEntryColor();	949	const Color& rColor = pBox->GetSelectEntryColor();
950	aColorEntry.nColor = rColor.GetColor();	950	aColorEntry.nColor = rColor.GetColor();
951	if(aScrollWindow.aWindows[i])	951	if(aScrollWindow.aWindows[i])
952	aScrollWindow.aWindows[i]->SetBackground(Wallpaper(rColor));	952	aScrollWindow.aWindows[i]->SetBackground(Wallpaper(rColor));

Lines 175-180 Link Here

(-)../build-tree-old/./oo_1.1beta1.prebeta2_src/comphelper/inc/comphelper/proparrhlp.hxx (-1 / +1 lines)
175	}	175	}
176	//... namespace comphelper ................................................	176	//... namespace comphelper ................................................
177		177
178	#endif _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_	178	#endif // _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_
179		179
180		180

Lines 412-418 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/basctl/source/basicide/basidesh.cxx (-1 / +1 lines)
412	else	412	else
413	++nPos;	413	++nPos;
414		414
415	if ( nPos >= 0 && nPos < pTabBar->GetPageCount() )	415	if ( nPos < pTabBar->GetPageCount() )
416	{	416	{
417	IDEBaseWindow* pWin = aIDEWindowTable.Get( pTabBar->GetPageId( nPos ) );	417	IDEBaseWindow* pWin = aIDEWindowTable.Get( pTabBar->GetPageId( nPos ) );
418	SetCurWindow( pWin, TRUE );	418	SetCurWindow( pWin, TRUE );

Lines 154-160 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/starmath/source/register.cxx (-1 / +1 lines)
154	RTL_CONSTASCII_USTRINGPARAM("/") ) + SmXMLImport_getImplementationName() +	154	RTL_CONSTASCII_USTRINGPARAM("/") ) + SmXMLImport_getImplementationName() +
155	::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );	155	::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
156		156
157	::com::sun::star::uno::Sequence< rtl::OUString > &rServices =	157	const ::com::sun::star::uno::Sequence< rtl::OUString > &rServices =
158	SmXMLImport_getSupportedServiceNames();	158	SmXMLImport_getSupportedServiceNames();
159	for(i = 0; i < rServices.getLength(); i++ )	159	for(i = 0; i < rServices.getLength(); i++ )
160	xNewKey->createKey( rServices.getConstArray()[i]);	160	xNewKey->createKey( rServices.getConstArray()[i]);

Lines 95-101 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/sch/source/ui/unoidl/register.cxx (-1 / +1 lines)
95	RTL_CONSTASCII_USTRINGPARAM("/") ) + SchDocument_getImplementationName() +	95	RTL_CONSTASCII_USTRINGPARAM("/") ) + SchDocument_getImplementationName() +
96	::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );	96	::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
97		97
98	uno::Sequence< rtl::OUString > &rServices = SchDocument_getSupportedServiceNames();	98	const uno::Sequence< rtl::OUString > &rServices = SchDocument_getSupportedServiceNames();
99	for(i = 0; i < rServices.getLength(); i++ )	99	for(i = 0; i < rServices.getLength(); i++ )
100	xNewKey->createKey( rServices.getConstArray()[i]);	100	xNewKey->createKey( rServices.getConstArray()[i]);
101		101

Lines 390-396 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/sc/source/core/tool/rangenam.cxx (-2 / +2 lines)
390	{	390	{
391	if( t->GetType() != svIndex )	391	if( t->GetType() != svIndex )
392	{	392	{
393	SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?	393	const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
394	SingleDoubleRefModifier( t->GetSingleRef() ) :	394	SingleDoubleRefModifier( t->GetSingleRef() ) :
395	SingleDoubleRefModifier( t->GetDoubleRef() ));	395	SingleDoubleRefModifier( t->GetDoubleRef() ));
396	ComplRefData& rRef = rMod.Ref();	396	ComplRefData& rRef = rMod.Ref();
Lines 420-426 Link Here
420	{	420	{
421	if( t->GetType() != svIndex )	421	if( t->GetType() != svIndex )
422	{	422	{
423	SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?	423	const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
424	SingleDoubleRefModifier( t->GetSingleRef() ) :	424	SingleDoubleRefModifier( t->GetSingleRef() ) :
425	SingleDoubleRefModifier( t->GetDoubleRef() ));	425	SingleDoubleRefModifier( t->GetDoubleRef() ));
426	ComplRefData& rRef = rMod.Ref();	426	ComplRefData& rRef = rMod.Ref();




            t->CalcAbsIfRel( aOldPos );
            BOOL bMod;
            {   // own scope for SingleDoubleRefModifier dtor if SingleRef
                const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
                    SingleDoubleRefModifier( t->GetSingleRef() ) :
                    SingleDoubleRefModifier( t->GetDoubleRef() ));
                ComplRefData& rRef = rMod.Ref();

                t->CalcAbsIfRel( aOldPos );
                BOOL bMod;
                {   // own scope for SingleDoubleRefModifier dtor if SingleRef
                    const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
                        SingleDoubleRefModifier( t->GetSingleRef() ) :
                        SingleDoubleRefModifier( t->GetDoubleRef() ));
                    ComplRefData& rRef = rMod.Ref();

            t->CalcAbsIfRel( aPos );
            BOOL bMod;
            {   // own scope for SingleDoubleRefModifier dtor if SingleRef
                const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
                    SingleDoubleRefModifier( t->GetSingleRef() ) :
                    SingleDoubleRefModifier( t->GetDoubleRef() ));
                ComplRefData& rRef = rMod.Ref();

                t->CalcAbsIfRel( aPos );
                BOOL bMod;
                {   // own scope for SingleDoubleRefModifier dtor if SingleRef
                    const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
                        SingleDoubleRefModifier( t->GetSingleRef() ) :
                        SingleDoubleRefModifier( t->GetDoubleRef() ));
                    ComplRefData& rRef = rMod.Ref();

Lines 827-833 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/sw/source/filter/xml/xmltexti.cxx (-1 / +1 lines)
827	void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor(	827	void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor(
828	sal_Bool bStart)	828	sal_Bool bStart)
829	{	829	{
830	OUString& rId = GetOpenRedlineId();	830	const OUString& rId = GetOpenRedlineId();
831	if ((NULL != pRedlineHelper) && (rId.getLength() > 0))	831	if ((NULL != pRedlineHelper) && (rId.getLength() > 0))
832	{	832	{
833	Reference<XTextRange> xTextRange( GetCursor()->getStart() );	833	Reference<XTextRange> xTextRange( GetCursor()->getStart() );




	const OUString* pDBNames = aDBNames.getConstArray();
	long nCount = aDBNames.getLength();

    const Image& rImg = aImageList.GetImage(IMG_DB);
    const Image& rHCImg = aImageListHC.GetImage(IMG_DB);
    for(long i = 0; i < nCount; i++)
	{
		String sDBName(pDBNames[i]);

                        String sTableName;
                        long nCount = aTblNames.getLength();
                        const OUString* pTblNames = aTblNames.getConstArray();
                        const Image& rImg = aImageList.GetImage(IMG_DBTABLE);
                        const Image& rHCImg = aImageListHC.GetImage(IMG_DBTABLE);
                        for (long i = 0; i < nCount; i++)
                        {
                            sTableName = pTblNames[i];

                        String sQueryName;
                        long nCount = aQueryNames.getLength();
                        const OUString* pQueryNames = aQueryNames.getConstArray();
                        const Image& rImg = aImageList.GetImage(IMG_DBQUERY);
                        const Image& rHCImg = aImageListHC.GetImage(IMG_DBQUERY);
                        for (long i = 0; i < nCount; i++)
                        {
                            sQueryName = pQueryNames[i];




		break;
		case HANDLE_CURRENT_DATABASE_DATA_SOURCE:
		{
			const SwDBData& rData = mpDoc->GetDBData();
			if ( rValue >>= rData.sDataSource )
				mpDoc->ChgDBData( rData );
		}
		break;
		case HANDLE_CURRENT_DATABASE_COMMAND:
		{
			const SwDBData& rData = mpDoc->GetDBData();
			if ( rValue >>= rData.sCommand )
				mpDoc->ChgDBData( rData );
		}
		break;
		case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:
		{
			const SwDBData& rData = mpDoc->GetDBData();
			if ( rValue >>= rData.nCommandType )
				mpDoc->ChgDBData( rData );
		}




	USHORT nParent = 0;
	USHORT nChild = 0;

    const Image& rTableImg = aImageList.GetImage(IMG_DBTABLE);
    const Image& rDBImg = aImageList.GetImage(IMG_DB);
    const Image& rQueryImg = aImageList.GetImage(IMG_DBQUERY);
    const Image& rHCTableImg = aImageListHC.GetImage(IMG_DBTABLE);
    const Image& rHCDBImg = aImageListHC.GetImage(IMG_DB);
    const Image& rHCQueryImg = aImageListHC.GetImage(IMG_DBQUERY);
    const Image& rToInsert = nCommandType ? rQueryImg : rTableImg;
    const Image& rHCToInsert = nCommandType ? rHCQueryImg : rHCTableImg;
    while ((pParent = aUsedDBTLB.GetEntry(nParent++)) != NULL)
	{
		if (sDBName == aUsedDBTLB.GetEntryText(pParent))

Lines 752-758 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/sw/source/ui/shells/basesh.cxx (-1 / +1 lines)
752	{	752	{
753	case FN_REPAGINATE:	753	case FN_REPAGINATE:
754	{	754	{
755	Reference < XModel > & xModel = GetView().GetDocShell()->GetModel();	755	const Reference < XModel > & xModel = GetView().GetDocShell()->GetModel();
756	Reference < XUnoTunnel > xDocTunnel ( xModel, UNO_QUERY );	756	Reference < XUnoTunnel > xDocTunnel ( xModel, UNO_QUERY );
757	SwXTextDocument pDoc = reinterpret_cast < SwXTextDocument > ( xDocTunnel->getSomething ( SwXTextDocument::getUnoTunnelId() ) );	757	SwXTextDocument pDoc = reinterpret_cast < SwXTextDocument > ( xDocTunnel->getSomething ( SwXTextDocument::getUnoTunnelId() ) );
758	pDoc->notifyRefreshListeners();	758	pDoc->notifyRefreshListeners();

Return to issue 13400

Lines 573-579 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/vcl/unx/source/gdi/salgdi2.cxx (-3 / +3 lines)
573	SalPrinterBmp::GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const	573	SalPrinterBmp::GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const
574	{	574	{
575	Scanline pScan = mpScanAccess + nRow * mnScanOffset;	575	Scanline pScan = mpScanAccess + nRow * mnScanOffset;
576	BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);	576	BitmapColor aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);
577		577
578	return ColorOf (aColor);	578	return ColorOf (aColor);
579	}	579	}
Lines 582-588 Link Here
582	SalPrinterBmp::GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const	582	SalPrinterBmp::GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const
583	{	583	{
584	Scanline pScan = mpScanAccess + nRow * mnScanOffset;	584	Scanline pScan = mpScanAccess + nRow * mnScanOffset;
585	BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);	585	BitmapColor aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);
586		586
587	return GrayOf (aColor);	587	return GrayOf (aColor);
588	}	588	}
Lines 591-597 Link Here
591	SalPrinterBmp::GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const	591	SalPrinterBmp::GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const
592	{	592	{
593	Scanline pScan = mpScanAccess + nRow * mnScanOffset;	593	Scanline pScan = mpScanAccess + nRow * mnScanOffset;
594	BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);	594	BitmapColor aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);
595		595
596	if (aColor.IsIndex())	596	if (aColor.IsIndex())
597	return aColor.GetIndex();	597	return aColor.GetIndex();

Lines 471-491 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/sw/source/ui/uno/SwXDocumentSettings.cxx (-3 / +3 lines)
471	break;	471	break;
472	case HANDLE_CURRENT_DATABASE_DATA_SOURCE:	472	case HANDLE_CURRENT_DATABASE_DATA_SOURCE:
473	{	473	{
474	SwDBData& rData = mpDoc->GetDBData();	474	const SwDBData& rData = mpDoc->GetDBData();
475	if ( rValue >>= rData.sDataSource )	475	if ( rValue >>= rData.sDataSource )
476	mpDoc->ChgDBData( rData );	476	mpDoc->ChgDBData( rData );
477	}	477	}
478	break;	478	break;
479	case HANDLE_CURRENT_DATABASE_COMMAND:	479	case HANDLE_CURRENT_DATABASE_COMMAND:
480	{	480	{
481	SwDBData& rData = mpDoc->GetDBData();	481	const SwDBData& rData = mpDoc->GetDBData();
482	if ( rValue >>= rData.sCommand )	482	if ( rValue >>= rData.sCommand )
483	mpDoc->ChgDBData( rData );	483	mpDoc->ChgDBData( rData );
484	}	484	}
485	break;	485	break;
486	case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:	486	case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:
487	{	487	{
488	SwDBData& rData = mpDoc->GetDBData();	488	const SwDBData& rData = mpDoc->GetDBData();
489	if ( rValue >>= rData.nCommandType )	489	if ( rValue >>= rData.nCommandType )
490	mpDoc->ChgDBData( rData );	490	mpDoc->ChgDBData( rData );
491	}	491	}

Lines 2989-2995 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/sc/source/core/tool/compiler.cxx (-2 / +2 lines)
2989	for( ScToken* t = pArr->GetNextReference(); t;	2989	for( ScToken* t = pArr->GetNextReference(); t;
2990	t = pArr->GetNextReference() )	2990	t = pArr->GetNextReference() )
2991	{	2991	{
2992	SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?	2992	const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
2993	SingleDoubleRefModifier( t->GetSingleRef() ) :	2993	SingleDoubleRefModifier( t->GetSingleRef() ) :
2994	SingleDoubleRefModifier( t->GetDoubleRef() ));	2994	SingleDoubleRefModifier( t->GetDoubleRef() ));
2995	ComplRefData& rRef = rMod.Ref();	2995	ComplRefData& rRef = rMod.Ref();
Lines 3029-3035 Link Here
3029	// Absolute references have been already adjusted in the named	3029	// Absolute references have been already adjusted in the named
3030	// shared formula itself prior to breaking the shared formula	3030	// shared formula itself prior to breaking the shared formula
3031	// and calling this function. Don't readjust them again.	3031	// and calling this function. Don't readjust them again.
3032	SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?	3032	const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
3033	SingleDoubleRefModifier( t->GetSingleRef() ) :	3033	SingleDoubleRefModifier( t->GetSingleRef() ) :
3034	SingleDoubleRefModifier( t->GetDoubleRef() ));	3034	SingleDoubleRefModifier( t->GetDoubleRef() ));
3035	ComplRefData& rRef = rMod.Ref();	3035	ComplRefData& rRef = rMod.Ref();

Lines 1198-1204 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/sc/source/core/data/cell2.cxx (-4 / +4 lines)
1198	t->CalcAbsIfRel( aOldPos );	1198	t->CalcAbsIfRel( aOldPos );
1199	BOOL bMod;	1199	BOOL bMod;
1200	{ // own scope for SingleDoubleRefModifier dtor if SingleRef	1200	{ // own scope for SingleDoubleRefModifier dtor if SingleRef
1201	SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?	1201	const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
1202	SingleDoubleRefModifier( t->GetSingleRef() ) :	1202	SingleDoubleRefModifier( t->GetSingleRef() ) :
1203	SingleDoubleRefModifier( t->GetDoubleRef() ));	1203	SingleDoubleRefModifier( t->GetDoubleRef() ));
1204	ComplRefData& rRef = rMod.Ref();	1204	ComplRefData& rRef = rMod.Ref();
Lines 1227-1233 Link Here
1227	t->CalcAbsIfRel( aOldPos );	1227	t->CalcAbsIfRel( aOldPos );
1228	BOOL bMod;	1228	BOOL bMod;
1229	{ // own scope for SingleDoubleRefModifier dtor if SingleRef	1229	{ // own scope for SingleDoubleRefModifier dtor if SingleRef
1230	SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?	1230	const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
1231	SingleDoubleRefModifier( t->GetSingleRef() ) :	1231	SingleDoubleRefModifier( t->GetSingleRef() ) :
1232	SingleDoubleRefModifier( t->GetDoubleRef() ));	1232	SingleDoubleRefModifier( t->GetDoubleRef() ));
1233	ComplRefData& rRef = rMod.Ref();	1233	ComplRefData& rRef = rMod.Ref();
Lines 1286-1292 Link Here
1286	t->CalcAbsIfRel( aPos );	1286	t->CalcAbsIfRel( aPos );
1287	BOOL bMod;	1287	BOOL bMod;
1288	{ // own scope for SingleDoubleRefModifier dtor if SingleRef	1288	{ // own scope for SingleDoubleRefModifier dtor if SingleRef
1289	SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?	1289	const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
1290	SingleDoubleRefModifier( t->GetSingleRef() ) :	1290	SingleDoubleRefModifier( t->GetSingleRef() ) :
1291	SingleDoubleRefModifier( t->GetDoubleRef() ));	1291	SingleDoubleRefModifier( t->GetDoubleRef() ));
1292	ComplRefData& rRef = rMod.Ref();	1292	ComplRefData& rRef = rMod.Ref();
Lines 1315-1321 Link Here
1315	t->CalcAbsIfRel( aPos );	1315	t->CalcAbsIfRel( aPos );
1316	BOOL bMod;	1316	BOOL bMod;
1317	{ // own scope for SingleDoubleRefModifier dtor if SingleRef	1317	{ // own scope for SingleDoubleRefModifier dtor if SingleRef
1318	SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?	1318	const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
1319	SingleDoubleRefModifier( t->GetSingleRef() ) :	1319	SingleDoubleRefModifier( t->GetSingleRef() ) :
1320	SingleDoubleRefModifier( t->GetDoubleRef() ));	1320	SingleDoubleRefModifier( t->GetDoubleRef() ));
1321	ComplRefData& rRef = rMod.Ref();	1321	ComplRefData& rRef = rMod.Ref();

Lines 349-356 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/sw/source/ui/dbui/dbtree.cxx (-6 / +6 lines)
349	const OUString* pDBNames = aDBNames.getConstArray();	349	const OUString* pDBNames = aDBNames.getConstArray();
350	long nCount = aDBNames.getLength();	350	long nCount = aDBNames.getLength();
351		351
352	Image& rImg = aImageList.GetImage(IMG_DB);	352	const Image& rImg = aImageList.GetImage(IMG_DB);
353	Image& rHCImg = aImageListHC.GetImage(IMG_DB);	353	const Image& rHCImg = aImageListHC.GetImage(IMG_DB);
354	for(long i = 0; i < nCount; i++)	354	for(long i = 0; i < nCount; i++)
355	{	355	{
356	String sDBName(pDBNames[i]);	356	String sDBName(pDBNames[i]);
Lines 499-506 Link Here
499	String sTableName;	499	String sTableName;
500	long nCount = aTblNames.getLength();	500	long nCount = aTblNames.getLength();
501	const OUString* pTblNames = aTblNames.getConstArray();	501	const OUString* pTblNames = aTblNames.getConstArray();
502	Image& rImg = aImageList.GetImage(IMG_DBTABLE);	502	const Image& rImg = aImageList.GetImage(IMG_DBTABLE);
503	Image& rHCImg = aImageListHC.GetImage(IMG_DBTABLE);	503	const Image& rHCImg = aImageListHC.GetImage(IMG_DBTABLE);
504	for (long i = 0; i < nCount; i++)	504	for (long i = 0; i < nCount; i++)
505	{	505	{
506	sTableName = pTblNames[i];	506	sTableName = pTblNames[i];
Lines 520-527 Link Here
520	String sQueryName;	520	String sQueryName;
521	long nCount = aQueryNames.getLength();	521	long nCount = aQueryNames.getLength();
522	const OUString* pQueryNames = aQueryNames.getConstArray();	522	const OUString* pQueryNames = aQueryNames.getConstArray();
523	Image& rImg = aImageList.GetImage(IMG_DBQUERY);	523	const Image& rImg = aImageList.GetImage(IMG_DBQUERY);
524	Image& rHCImg = aImageListHC.GetImage(IMG_DBQUERY);	524	const Image& rHCImg = aImageListHC.GetImage(IMG_DBQUERY);
525	for (long i = 0; i < nCount; i++)	525	for (long i = 0; i < nCount; i++)
526	{	526	{
527	sQueryName = pQueryNames[i];	527	sQueryName = pQueryNames[i];

Lines 258-271 Link Here

(-)../build-tree-old/oo_1.1beta1.prebeta2_src/sw/source/ui/fldui/changedb.cxx (-8 / +8 lines)
258	USHORT nParent = 0;	258	USHORT nParent = 0;
259	USHORT nChild = 0;	259	USHORT nChild = 0;
260		260
261	Image& rTableImg = aImageList.GetImage(IMG_DBTABLE);	261	const Image& rTableImg = aImageList.GetImage(IMG_DBTABLE);
262	Image& rDBImg = aImageList.GetImage(IMG_DB);	262	const Image& rDBImg = aImageList.GetImage(IMG_DB);
263	Image& rQueryImg = aImageList.GetImage(IMG_DBQUERY);	263	const Image& rQueryImg = aImageList.GetImage(IMG_DBQUERY);
264	Image& rHCTableImg = aImageListHC.GetImage(IMG_DBTABLE);	264	const Image& rHCTableImg = aImageListHC.GetImage(IMG_DBTABLE);
265	Image& rHCDBImg = aImageListHC.GetImage(IMG_DB);	265	const Image& rHCDBImg = aImageListHC.GetImage(IMG_DB);
266	Image& rHCQueryImg = aImageListHC.GetImage(IMG_DBQUERY);	266	const Image& rHCQueryImg = aImageListHC.GetImage(IMG_DBQUERY);
267	Image& rToInsert = nCommandType ? rQueryImg : rTableImg;	267	const Image& rToInsert = nCommandType ? rQueryImg : rTableImg;
268	Image& rHCToInsert = nCommandType ? rHCQueryImg : rHCTableImg;	268	const Image& rHCToInsert = nCommandType ? rHCQueryImg : rHCTableImg;
269	while ((pParent = aUsedDBTLB.GetEntry(nParent++)) != NULL)	269	while ((pParent = aUsedDBTLB.GetEntry(nParent++)) != NULL)
270	{	270	{
271	if (sDBName == aUsedDBTLB.GetEntryText(pParent))	271	if (sDBName == aUsedDBTLB.GetEntryText(pParent))