Kaydet (Commit) f55deeb5 authored tarafından Michael Stahl's avatar Michael Stahl

fix previous string conversion:

- unconverted assertion in dinfdlg.cxx
- wrong replaceAt in SidebarWin.cxx
- obsolete cast in SpellDialog.cxx

Change-Id: I18450c0c6fdd275b7f81a7fce58cdf98bb806e27
üst e3f11c10
...@@ -1491,7 +1491,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) ...@@ -1491,7 +1491,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
sal_Int32 nStart = pErrorAttr->GetStart(); sal_Int32 nStart = pErrorAttr->GetStart();
sal_Int32 nEnd = pErrorAttr->GetEnd(); sal_Int32 nEnd = pErrorAttr->GetEnd();
pTextEngine->RemoveAttrib( 0, *pErrorAttr ); pTextEngine->RemoveAttrib( 0, *pErrorAttr );
nStart = nStart - (sal_uInt16)nAddedChars; nStart = nStart - nAddedChars;
SetAttrib( *pNewError, 0, nStart - nAddedChars, nEnd ); SetAttrib( *pNewError, 0, nStart - nAddedChars, nEnd );
//only if the error is active the mark is moved here //only if the error is active the mark is moved here
if(bIsErrorActive) if(bIsErrorActive)
......
...@@ -1340,7 +1340,8 @@ sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet ) ...@@ -1340,7 +1340,8 @@ sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet )
nDelay = static_cast<sal_uIntPtr>(m_pNFReload->GetValue()); nDelay = static_cast<sal_uIntPtr>(m_pNFReload->GetValue());
break; break;
case S_Forward: case S_Forward:
DBG_ASSERT( m_pEDForwardURL->GetText().Len(), "+SfxInternetPage::FillItemSet(): empty URL should be not possible for forward option!" ); SAL_WARN_IF(m_pEDForwardURL->GetText().isEmpty(), "sfx2",
"+SfxInternetPage::FillItemSet(): empty URL should be not possible for forward option!");
bEnableReload = sal_True; bEnableReload = sal_True;
SAL_WNODEPRECATED_DECLARATIONS_PUSH SAL_WNODEPRECATED_DECLARATIONS_PUSH
......
...@@ -384,8 +384,7 @@ void SwSidebarWin::CheckMetaText() ...@@ -384,8 +384,7 @@ void SwSidebarWin::CheckMetaText()
} }
else if (sMeta.getLength() > 22) else if (sMeta.getLength() > 22)
{ {
sMeta.replaceAt(20, sMeta.getLength()-20, ""); sMeta = sMeta.copy(0, 20) + OUString("...");
sMeta = sMeta + OUString("...");
} }
if ( mpMetadataAuthor->GetText() != sMeta ) if ( mpMetadataAuthor->GetText() != sMeta )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment