--- ../build-tree-old/oo_1.1beta1.prebeta2_src/eventattacher/source/eventattacher.cxx 2003-05-17 23:55:48.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/eventattacher/source/eventattacher.cxx 2003-05-19 17:06:25.000000000 +0300 @@ -925,7 +925,7 @@ reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME "/UNO/SERVICES") ))); - Sequence< OUString > & rSNL = + const Sequence< OUString > & rSNL = ::comp_EventAttacher::EventAttacherImpl::getSupportedServiceNames_Static(); const OUString * pArray = rSNL.getConstArray(); for ( sal_Int32 nPos = rSNL.getLength(); nPos--; ) --- ../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/collator/chaptercollator.cxx 2003-05-17 23:55:52.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/i18npool/source/collator/chaptercollator.cxx 2003-05-19 17:30:09.000000000 +0300 @@ -110,7 +110,7 @@ if( ans != 0 ) return ans; - OUString &aAddAllowed = OUString::createFromAscii("?"); + const OUString &aAddAllowed = OUString::createFromAscii("?"); ParseResult res1, res2; // Bug #100323#, since parseAnyToken does not take length as parameter, we have to copy // it to a temp. string. --- ../build-tree-old/oo_1.1beta1.prebeta2_src/cppu/inc/com/sun/star/uno/Sequence.hxx 2003-05-17 23:55:23.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/cppu/inc/com/sun/star/uno/Sequence.hxx 2003-05-19 17:29:05.000000000 +0300 @@ -227,7 +227,7 @@ if (! ::com::sun::star::uno::Sequence< E >::s_pType) { const ::com::sun::star::uno::Type & rElementType = ::getCppuType( - (::com::sun::star::uno::Sequence< E >::ElementType *)0 ); + (typename ::com::sun::star::uno::Sequence< E >::ElementType *)0 ); ::typelib_static_sequence_type_init( & ::com::sun::star::uno::Sequence< E >::s_pType, rElementType.getTypeLibType() ); --- ../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/collator/collatorImpl.cxx 2003-05-17 23:55:52.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/i18npool/source/collator/collatorImpl.cxx 2003-05-19 18:05:26.000000000 +0300 @@ -118,7 +118,7 @@ sal_Int32 SAL_CALL CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException) { - Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale); + const Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale); for (sal_Int16 i = 0; i < imp.getLength(); i++) if (imp[i].isDefault) return loadCollatorAlgorithm(imp[i].unoID, rLocale, collatorOptions); @@ -156,7 +156,7 @@ CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(RuntimeException) { nLocale = rLocale; - Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale); + const Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale); Sequence< OUString > list(imp.getLength()); for (sal_Int32 i = 0; i < imp.getLength(); i++) { --- ../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/collator/collator_icu.cxx 2003-05-17 23:55:52.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/i18npool/source/collator/collator_icu.cxx 2003-05-19 18:13:24.000000000 +0300 @@ -93,8 +93,8 @@ { if (collator) { if (tranModules & TransliterationModules_IGNORE_KANA) { - OUString& s1 = ignore->transliterateString2String(str1, off1, len1); - OUString& s2 = ignore->transliterateString2String(str2, off2, len2); + const OUString& s1 = ignore->transliterateString2String(str1, off1, len1); + const OUString& s2 = ignore->transliterateString2String(str2, off2, len2); return collator->compare(s1.getStr(), s1.getLength(), s2.getStr(), s2.getLength()); } else --- ../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/localedata/localedata.cxx 2003-05-17 23:55:52.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/i18npool/source/localedata/localedata.cxx 2003-05-19 18:56:23.000000000 +0300 @@ -273,7 +273,7 @@ cals = getAllCalendars(loc); len = cals.getLength(); } - OUString& id = name.getToken(0, under, index); + const OUString& id = name.getToken(0, under, index); for (index = 0; index < cals.getLength(); index++) { if (id.equals(cals[index].Name)) { ref_cal = cals[index]; --- ../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/fullwidthToHalfwidth.cxx 2003-05-17 23:55:52.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/fullwidthToHalfwidth.cxx 2003-05-19 19:52:41.000000000 +0300 @@ -90,11 +90,11 @@ throw(RuntimeException) { // Decomposition: GA --> KA + voice-mark - OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset); + const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset); // One to One mapping useOffset = sal_False; - OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset); + const OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset); useOffset = sal_True; return tmp; } --- ../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/halfwidthToFullwidth.cxx 2003-05-17 23:55:52.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/halfwidthToFullwidth.cxx 2003-05-19 19:59:28.000000000 +0300 @@ -87,7 +87,7 @@ sal_Bool _useOffset = useOffset; // One to One mapping useOffset = sal_False; - OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset); + const OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset); useOffset = _useOffset; // Composition: KA + voice-mark --> GA --- ../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/transliterationImpl.cxx 2003-05-17 23:55:52.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/transliterationImpl.cxx 2003-05-19 20:13:01.000000000 +0300 @@ -303,7 +303,7 @@ Sequence SAL_CALL TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) throw(RuntimeException) { - Sequence &translist = localedata->getTransliterations(rLocale); + const Sequence &translist = localedata->getTransliterations(rLocale); Sequence &r = *new Sequence< OUString > (translist.getLength()); Reference body; sal_Int32 n = 0; @@ -532,7 +532,7 @@ sal_Int32 j_tmp = 0; Sequence< OUString > ostr(MaxOutput*length); for (sal_Int32 j = 0; j < length; j+=2) { - Sequence< OUString >& temp = bodyCascade[_numCascade]->transliterateRange(inStrs[j], inStrs[j+1]); + const Sequence< OUString >& temp = bodyCascade[_numCascade]->transliterateRange(inStrs[j], inStrs[j+1]); for ( sal_Int32 k = 0; k < temp.getLength(); k++) { if ( j_tmp >= MaxOutput*length ) throw ERROR; --- ../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/transliteration_commonclass.cxx 2003-05-17 23:55:52.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/i18npool/source/transliteration/transliteration_commonclass.cxx 2003-05-19 20:28:31.000000000 +0300 @@ -162,7 +162,7 @@ { static Sequence < sal_Int32 > dummy_offset; useOffset = sal_False; - OUString &tmpStr = transliterate(inStr, startPos, nCount, dummy_offset); + const OUString &tmpStr = transliterate(inStr, startPos, nCount, dummy_offset); useOffset = sal_True; return tmpStr; } --- ../build-tree-old/oo_1.1beta1.prebeta2_src/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 2003-05-17 23:55:52.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 2003-05-19 20:36:47.000000000 +0300 @@ -346,7 +346,7 @@ break; case TRANSLITERATION: try { - OUString &tmp = OUString::valueOf( number ); + const OUString &tmp = OUString::valueOf( number ); OUString transliteration; getPropertyByName(aProperties, "Transliteration", sal_True) >>= transliteration; translit->loadModuleByImplName(transliteration, aLocale); --- ../build-tree-old/oo_1.1beta1.prebeta2_src/vcl/unx/source/gdi/salgdi2.cxx 2003-05-17 23:55:18.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/vcl/unx/source/gdi/salgdi2.cxx 2003-05-19 21:09:29.000000000 +0300 @@ -573,7 +573,7 @@ SalPrinterBmp::GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const { Scanline pScan = mpScanAccess + nRow * mnScanOffset; - BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); + BitmapColor aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); return ColorOf (aColor); } @@ -582,7 +582,7 @@ SalPrinterBmp::GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const { Scanline pScan = mpScanAccess + nRow * mnScanOffset; - BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); + BitmapColor aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); return GrayOf (aColor); } @@ -591,7 +591,7 @@ SalPrinterBmp::GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const { Scanline pScan = mpScanAccess + nRow * mnScanOffset; - BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); + BitmapColor aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask); if (aColor.IsIndex()) return aColor.GetIndex(); --- ../build-tree-old/oo_1.1beta1.prebeta2_src/svtools/inc/communi.hxx 2003-05-17 23:55:55.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/svtools/inc/communi.hxx 2003-05-19 22:56:49.000000000 +0300 @@ -141,7 +141,7 @@ class CommunicationManagerServerViaSocket : public CommunicationManagerServer { - friend CommunicationManagerServerAcceptThread; + friend class CommunicationManagerServerAcceptThread; public: CommunicationManagerServerViaSocket( ULONG nPort, USHORT nMaxCon, BOOL bUseMultiChannel = FALSE ); virtual ~CommunicationManagerServerViaSocket(); --- ../build-tree-old/oo_1.1beta1.prebeta2_src/automation/source/testtool/objtest.cxx 2003-05-17 23:55:55.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/automation/source/testtool/objtest.cxx 2003-05-19 22:52:38.000000000 +0300 @@ -1266,7 +1266,7 @@ aDialogHandlerName.Erase(); ULONG nRememberSequence = nSequence; // Da sich die Sequence im DialogHandler ändert - (StarBASIC*)GetParent()->Call( aName ); + ((StarBASIC*)GetParent())->Call( aName ); nSequence = nRememberSequence; // Die Sequenznummern werden dann zwar doppelt vergeben, aber wen kümmerts. --- ../build-tree-old/oo_1.1beta1.prebeta2_src/xmloff/source/core/nmspmap.cxx 2003-05-17 23:56:37.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/xmloff/source/core/nmspmap.cxx 2003-05-19 23:19:37.000000000 +0300 @@ -256,7 +256,7 @@ sQName.append ( (*aIter).second->sPrefix); sQName.append ( sal_Unicode(':') ); sQName.append ( rLocalName ); - OUString *pString = new OUString ( rLocalName ), &rString = sQName.makeStringAndClear(); + const OUString *pString = new OUString ( rLocalName ), &rString = sQName.makeStringAndClear(); const_cast < QNameCache * > (&aQNameCache)->operator[] ( QNamePair ( nKey, pString ) ) = rString; return rString; } --- ../build-tree-old/oo_1.1beta1.prebeta2_src/xmloff/source/text/XMLChangeImportContext.cxx 2003-05-17 23:56:37.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/xmloff/source/text/XMLChangeImportContext.cxx 2003-05-19 23:36:07.000000000 +0300 @@ -133,7 +133,7 @@ // prepare parameters UniReference rHelper = GetImport().GetTextImport(); - OUString& rID = xAttrList->getValueByIndex(nAttr); + OUString rID = xAttrList->getValueByIndex(nAttr); // call for bStart and bEnd (may both be true) if (bIsStart) --- ../build-tree-old/oo_1.1beta1.prebeta2_src/xmloff/source/text/XMLChangedRegionImportContext.cxx 2003-05-17 23:56:37.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/xmloff/source/text/XMLChangedRegionImportContext.cxx 2003-05-19 23:38:18.000000000 +0300 @@ -137,7 +137,7 @@ GetKeyByAttrName( xAttrList->getNameByIndex(nAttr), &sLocalName ); - OUString& rValue = xAttrList->getValueByIndex(nAttr); + const OUString& rValue = xAttrList->getValueByIndex(nAttr); if ( XML_NAMESPACE_TEXT == nPrefix ) { if( IsXMLToken( sLocalName, XML_ID ) ) --- ../build-tree-old/oo_1.1beta1.prebeta2_src/xmloff/source/text/txtflde.cxx 2003-05-17 23:56:37.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/xmloff/source/text/txtflde.cxx 2003-05-19 23:57:20.000000000 +0300 @@ -1506,7 +1506,7 @@ case FIELD_ID_DATABASE_DISPLAY: { // get database, table and column name from field master - Reference & xMaster = GetMasterPropertySet(rTextField); + const Reference & xMaster = GetMasterPropertySet(rTextField); ProcessString(XML_DATABASE_NAME, GetStringProperty(sPropertyDataBaseName, xMaster)); ProcessString(XML_TABLE_NAME, --- ../build-tree-old/oo_1.1beta1.prebeta2_src/svx/source/options/optcolor.cxx 2003-05-17 23:55:07.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/svx/source/options/optcolor.cxx 2003-05-20 09:20:56.000000000 +0300 @@ -946,7 +946,7 @@ } else { - Color& rColor = pBox->GetSelectEntryColor(); + const Color& rColor = pBox->GetSelectEntryColor(); aColorEntry.nColor = rColor.GetColor(); if(aScrollWindow.aWindows[i]) aScrollWindow.aWindows[i]->SetBackground(Wallpaper(rColor)); --- ../build-tree-old/./oo_1.1beta1.prebeta2_src/comphelper/inc/comphelper/proparrhlp.hxx 2003-05-17 23:55:51.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/comphelper/inc/comphelper/proparrhlp.hxx 2003-05-20 09:54:31.000000000 +0300 @@ -175,6 +175,6 @@ } //... namespace comphelper ................................................ -#endif _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ +#endif // _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ --- ../build-tree-old/oo_1.1beta1.prebeta2_src/basctl/source/basicide/basidesh.cxx 2003-05-17 23:55:54.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/basctl/source/basicide/basidesh.cxx 2003-05-20 11:39:31.000000000 +0300 @@ -412,7 +412,7 @@ else ++nPos; - if ( nPos >= 0 && nPos < pTabBar->GetPageCount() ) + if ( nPos < pTabBar->GetPageCount() ) { IDEBaseWindow* pWin = aIDEWindowTable.Get( pTabBar->GetPageId( nPos ) ); SetCurWindow( pWin, TRUE ); --- ../build-tree-old/oo_1.1beta1.prebeta2_src/starmath/source/register.cxx 2003-05-17 23:56:36.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/starmath/source/register.cxx 2003-05-20 12:14:46.000000000 +0300 @@ -154,7 +154,7 @@ RTL_CONSTASCII_USTRINGPARAM("/") ) + SmXMLImport_getImplementationName() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - ::com::sun::star::uno::Sequence< rtl::OUString > &rServices = + const ::com::sun::star::uno::Sequence< rtl::OUString > &rServices = SmXMLImport_getSupportedServiceNames(); for(i = 0; i < rServices.getLength(); i++ ) xNewKey->createKey( rServices.getConstArray()[i]); --- ../build-tree-old/oo_1.1beta1.prebeta2_src/sch/source/ui/unoidl/register.cxx 2003-05-17 23:54:54.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/sch/source/ui/unoidl/register.cxx 2003-05-21 07:49:03.000000000 +0300 @@ -95,7 +95,7 @@ RTL_CONSTASCII_USTRINGPARAM("/") ) + SchDocument_getImplementationName() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - uno::Sequence< rtl::OUString > &rServices = SchDocument_getSupportedServiceNames(); + const uno::Sequence< rtl::OUString > &rServices = SchDocument_getSupportedServiceNames(); for(i = 0; i < rServices.getLength(); i++ ) xNewKey->createKey( rServices.getConstArray()[i]); --- ../build-tree-old/oo_1.1beta1.prebeta2_src/sc/source/core/tool/compiler.cxx 2003-05-17 23:54:30.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/sc/source/core/tool/compiler.cxx 2003-05-21 10:47:07.000000000 +0300 @@ -2989,7 +2989,7 @@ for( ScToken* t = pArr->GetNextReference(); t; t = pArr->GetNextReference() ) { - SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? + const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? SingleDoubleRefModifier( t->GetSingleRef() ) : SingleDoubleRefModifier( t->GetDoubleRef() )); ComplRefData& rRef = rMod.Ref(); @@ -3029,7 +3029,7 @@ // Absolute references have been already adjusted in the named // shared formula itself prior to breaking the shared formula // and calling this function. Don't readjust them again. - SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? + const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? SingleDoubleRefModifier( t->GetSingleRef() ) : SingleDoubleRefModifier( t->GetDoubleRef() )); ComplRefData& rRef = rMod.Ref(); --- ../build-tree-old/oo_1.1beta1.prebeta2_src/sc/source/core/tool/rangenam.cxx 2003-05-17 23:54:30.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/sc/source/core/tool/rangenam.cxx 2003-05-21 11:01:51.000000000 +0300 @@ -390,7 +390,7 @@ { if( t->GetType() != svIndex ) { - SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? + const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? SingleDoubleRefModifier( t->GetSingleRef() ) : SingleDoubleRefModifier( t->GetDoubleRef() )); ComplRefData& rRef = rMod.Ref(); @@ -420,7 +420,7 @@ { if( t->GetType() != svIndex ) { - SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? + const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? SingleDoubleRefModifier( t->GetSingleRef() ) : SingleDoubleRefModifier( t->GetDoubleRef() )); ComplRefData& rRef = rMod.Ref(); --- ../build-tree-old/oo_1.1beta1.prebeta2_src/sc/source/core/data/cell2.cxx 2003-05-17 23:54:30.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/sc/source/core/data/cell2.cxx 2003-05-21 11:21:27.000000000 +0300 @@ -1198,7 +1198,7 @@ t->CalcAbsIfRel( aOldPos ); BOOL bMod; { // own scope for SingleDoubleRefModifier dtor if SingleRef - SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? + const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? SingleDoubleRefModifier( t->GetSingleRef() ) : SingleDoubleRefModifier( t->GetDoubleRef() )); ComplRefData& rRef = rMod.Ref(); @@ -1227,7 +1227,7 @@ t->CalcAbsIfRel( aOldPos ); BOOL bMod; { // own scope for SingleDoubleRefModifier dtor if SingleRef - SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? + const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? SingleDoubleRefModifier( t->GetSingleRef() ) : SingleDoubleRefModifier( t->GetDoubleRef() )); ComplRefData& rRef = rMod.Ref(); @@ -1286,7 +1286,7 @@ t->CalcAbsIfRel( aPos ); BOOL bMod; { // own scope for SingleDoubleRefModifier dtor if SingleRef - SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? + const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? SingleDoubleRefModifier( t->GetSingleRef() ) : SingleDoubleRefModifier( t->GetDoubleRef() )); ComplRefData& rRef = rMod.Ref(); @@ -1315,7 +1315,7 @@ t->CalcAbsIfRel( aPos ); BOOL bMod; { // own scope for SingleDoubleRefModifier dtor if SingleRef - SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? + const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ? SingleDoubleRefModifier( t->GetSingleRef() ) : SingleDoubleRefModifier( t->GetDoubleRef() )); ComplRefData& rRef = rMod.Ref(); --- ../build-tree-old/oo_1.1beta1.prebeta2_src/sw/source/filter/xml/xmltexti.cxx 2003-05-17 23:54:43.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/sw/source/filter/xml/xmltexti.cxx 2003-05-21 13:26:48.000000000 +0300 @@ -827,7 +827,7 @@ void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor( sal_Bool bStart) { - OUString& rId = GetOpenRedlineId(); + const OUString& rId = GetOpenRedlineId(); if ((NULL != pRedlineHelper) && (rId.getLength() > 0)) { Reference xTextRange( GetCursor()->getStart() ); --- ../build-tree-old/oo_1.1beta1.prebeta2_src/sw/source/ui/dbui/dbtree.cxx 2003-05-17 23:54:39.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/sw/source/ui/dbui/dbtree.cxx 2003-05-21 14:04:40.000000000 +0300 @@ -349,8 +349,8 @@ const OUString* pDBNames = aDBNames.getConstArray(); long nCount = aDBNames.getLength(); - Image& rImg = aImageList.GetImage(IMG_DB); - Image& rHCImg = aImageListHC.GetImage(IMG_DB); + 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]); @@ -499,8 +499,8 @@ String sTableName; long nCount = aTblNames.getLength(); const OUString* pTblNames = aTblNames.getConstArray(); - Image& rImg = aImageList.GetImage(IMG_DBTABLE); - Image& rHCImg = aImageListHC.GetImage(IMG_DBTABLE); + const Image& rImg = aImageList.GetImage(IMG_DBTABLE); + const Image& rHCImg = aImageListHC.GetImage(IMG_DBTABLE); for (long i = 0; i < nCount; i++) { sTableName = pTblNames[i]; @@ -520,8 +520,8 @@ String sQueryName; long nCount = aQueryNames.getLength(); const OUString* pQueryNames = aQueryNames.getConstArray(); - Image& rImg = aImageList.GetImage(IMG_DBQUERY); - Image& rHCImg = aImageListHC.GetImage(IMG_DBQUERY); + const Image& rImg = aImageList.GetImage(IMG_DBQUERY); + const Image& rHCImg = aImageListHC.GetImage(IMG_DBQUERY); for (long i = 0; i < nCount; i++) { sQueryName = pQueryNames[i]; --- ../build-tree-old/oo_1.1beta1.prebeta2_src/sw/source/ui/uno/SwXDocumentSettings.cxx 2003-05-17 23:54:39.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/sw/source/ui/uno/SwXDocumentSettings.cxx 2003-05-21 14:24:30.000000000 +0300 @@ -471,21 +471,21 @@ break; case HANDLE_CURRENT_DATABASE_DATA_SOURCE: { - SwDBData& rData = mpDoc->GetDBData(); + const SwDBData& rData = mpDoc->GetDBData(); if ( rValue >>= rData.sDataSource ) mpDoc->ChgDBData( rData ); } break; case HANDLE_CURRENT_DATABASE_COMMAND: { - SwDBData& rData = mpDoc->GetDBData(); + const SwDBData& rData = mpDoc->GetDBData(); if ( rValue >>= rData.sCommand ) mpDoc->ChgDBData( rData ); } break; case HANDLE_CURRENT_DATABASE_COMMAND_TYPE: { - SwDBData& rData = mpDoc->GetDBData(); + const SwDBData& rData = mpDoc->GetDBData(); if ( rValue >>= rData.nCommandType ) mpDoc->ChgDBData( rData ); } --- ../build-tree-old/oo_1.1beta1.prebeta2_src/sw/source/ui/fldui/changedb.cxx 2003-05-17 23:54:39.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/sw/source/ui/fldui/changedb.cxx 2003-05-21 15:08:43.000000000 +0300 @@ -258,14 +258,14 @@ USHORT nParent = 0; USHORT nChild = 0; - Image& rTableImg = aImageList.GetImage(IMG_DBTABLE); - Image& rDBImg = aImageList.GetImage(IMG_DB); - Image& rQueryImg = aImageList.GetImage(IMG_DBQUERY); - Image& rHCTableImg = aImageListHC.GetImage(IMG_DBTABLE); - Image& rHCDBImg = aImageListHC.GetImage(IMG_DB); - Image& rHCQueryImg = aImageListHC.GetImage(IMG_DBQUERY); - Image& rToInsert = nCommandType ? rQueryImg : rTableImg; - Image& rHCToInsert = nCommandType ? rHCQueryImg : rHCTableImg; + 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)) --- ../build-tree-old/oo_1.1beta1.prebeta2_src/sw/source/ui/shells/basesh.cxx 2003-05-17 23:54:40.000000000 +0300 +++ oo_1.1beta1.prebeta2_src/sw/source/ui/shells/basesh.cxx 2003-05-21 15:23:47.000000000 +0300 @@ -752,7 +752,7 @@ { case FN_REPAGINATE: { - Reference < XModel > & xModel = GetView().GetDocShell()->GetModel(); + const Reference < XModel > & xModel = GetView().GetDocShell()->GetModel(); Reference < XUnoTunnel > xDocTunnel ( xModel, UNO_QUERY ); SwXTextDocument *pDoc = reinterpret_cast < SwXTextDocument * > ( xDocTunnel->getSomething ( SwXTextDocument::getUnoTunnelId() ) ); pDoc->notifyRefreshListeners();