diff options
| -rw-r--r-- | svx/source/editeng/eehtml.cxx | 6 | ||||
| -rw-r--r-- | svx/source/editeng/svxacorr.cxx | 12 | ||||
| -rw-r--r-- | svx/source/editeng/unolingu.cxx | 12 |
3 files changed, 15 insertions, 15 deletions
diff --git a/svx/source/editeng/eehtml.cxx b/svx/source/editeng/eehtml.cxx index 93f868b2f4b6..5391e03fa618 100644 --- a/svx/source/editeng/eehtml.cxx +++ b/svx/source/editeng/eehtml.cxx @@ -2,9 +2,9 @@ * * $RCSfile: eehtml.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: mt $ $Date: 2002-07-12 13:31:14 $ + * last change: $Author: pb $ $Date: 2002-12-03 08:05:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -823,7 +823,7 @@ void EditHTMLParser::AnchorStart() INetURLObject aTargetURL; INetURLObject aRootURL( INetURLObject::GetBaseURL() ); aRootURL.GetNewAbsURL( aRef, &aTargetURL ); - aURL = aTargetURL.GetMainURL(); + aURL = aTargetURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); } pCurAnchor = new AnchorInfo; pCurAnchor->aHRef = aURL; diff --git a/svx/source/editeng/svxacorr.cxx b/svx/source/editeng/svxacorr.cxx index 8f68e9b20d8b..96b1dd4613d6 100644 --- a/svx/source/editeng/svxacorr.cxx +++ b/svx/source/editeng/svxacorr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svxacorr.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: thb $ $Date: 2002-09-17 12:28:37 $ + * last change: $Author: pb $ $Date: 2002-12-03 08:05:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2715,7 +2715,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() { try { - String sMain(aDest.GetMainURL()); + String sMain(aDest.GetMainURL( INetURLObject::DECODE_TO_IURI )); sal_Unicode cSlash = '/'; xub_StrLen nSlashPos = sMain.SearchBackward(cSlash); sMain.Erase(nSlashPos); @@ -2724,7 +2724,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() TransferInfo aInfo; aInfo.NameClash = NameClash::OVERWRITE; aInfo.NewTitle = aDest.GetName(); - aInfo.SourceURL = aSource.GetMainURL(); + aInfo.SourceURL = aSource.GetMainURL( INetURLObject::DECODE_TO_IURI ); aInfo.MoveData = FALSE; aAny <<= aInfo; aNewContent.executeCommand( OUString ( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), aAny); @@ -2736,7 +2736,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() } if (bConvert && !bError) { - SfxMedium aSrcMedium( aDest.GetMainURL(), STREAM_STD_READ, TRUE ); + SfxMedium aSrcMedium( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), STREAM_STD_READ, TRUE ); SvStorageRef xSrcStg = aSrcMedium.GetStorage(); SfxMedium aDstMedium( sUserAutoCorrFile, STREAM_STD_WRITE, TRUE ); // Copy it to a UCBStorage @@ -2783,7 +2783,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() aDstMedium.Commit(); try { - ::ucb::Content aContent ( aDest.GetMainURL(), Reference < XCommandEnvironment > ()); + ::ucb::Content aContent ( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), Reference < XCommandEnvironment > ()); aContent.executeCommand ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "delete" ) ), makeAny ( sal_Bool (sal_True ) ) ); } catch (...) diff --git a/svx/source/editeng/unolingu.cxx b/svx/source/editeng/unolingu.cxx index 0dead40db0b1..188a2103abf0 100644 --- a/svx/source/editeng/unolingu.cxx +++ b/svx/source/editeng/unolingu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unolingu.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2002-09-26 09:28:54 $ + * last change: $Author: pb $ $Date: 2002-12-03 08:05:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -927,8 +927,8 @@ SvxAlternativeSpelling SvxGetAltSpelling( aAltWord( rHyphWord->getHyphenatedWord() ); INT16 nHyphenationPos = rHyphWord->getHyphenationPos(), nHyphenPos = rHyphWord->getHyphenPos(); - INT16 nLen = aWord.getLength(); - INT16 nAltLen = aAltWord.getLength(); + INT16 nLen = (INT16)aWord.getLength(); + INT16 nAltLen = (INT16)aAltWord.getLength(); const sal_Unicode *pWord = aWord.getStr(), *pAltWord = aAltWord.getStr(); @@ -993,7 +993,7 @@ String SvxGetDictionaryURL(const String &rDicName, sal_Bool bIsUserDic) aURLObj.Append( rDicName ); DBG_ASSERT(!aURLObj.HasError(), "lng : invalid URL"); - return aURLObj.GetMainURL(); + return aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); } //TL:TODO: soll mal den rictigen Rckgabetyp bekommen! @@ -1034,7 +1034,7 @@ sal_Bool SvxAddEntryToDic( } } - return nRes; + return (sal_Bool)nRes; } short SvxDicError( Window *pParent, sal_Int16 nError ) |