Bug 34196

Thanks for your patch Albert.

(In reply to comment #0)

> You can commit the patch under the terms of LGPL3+.

Actually our preferred license is MPL 1.1 / GPLv3+ / LGPLv3+ triple license.  Can you confirm that we can commit your patch under these licenses?

Thanks!

(In reply to comment #1) 
> Can you confirm that we can commit your patch under these licenses?
> Thanks!

Yes, I hereby confirm that you can commit the patch under the terms of MPL 1.1 / GPLv3+ / LGPLv3+ triple license.

/Albert

Thanks for the clarification.

BTW, probably by accident, but you've also removed some real code here and there.  Most are minor, but the following:

@@ -651,32 +645,15 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
     const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&) pNode->GetContentAttribs().GetItem( EE_PARA_SBL );
     const BOOL bScriptSpace = ((const SvxScriptSpaceItem&) pNode->GetContentAttribs().GetItem( EE_PARA_ASIANCJKSPACING )).GetValue();
 
-//     const sal_uInt16 nInvalidEnd = ( pParaPortion->GetInvalidDiff() > 0 )
-//             ? pParaPortion->GetInvalidPosStart() + pParaPortion->GetInvalidDiff()
-//             : pNode->Len();
-    const short nInvalidDiff = pParaPortion->GetInvalidDiff();
-    const sal_uInt16 nInvalidStart = pParaPortion->GetInvalidPosStart();
-    const sal_uInt16 nInvalidEnd =  nInvalidStart + Abs( nInvalidDiff );
-
-    sal_Bool bQuickFormat = sal_False;
-    if ( !bEmptyNodeWithPolygon && !HasScriptType( nPara, i18n::ScriptType::COMPLEX ) )
-    {
-        if ( ( pParaPortion->IsSimpleInvalid() ) && ( nInvalidDiff > 0 ) &&
-             ( pNode->Search( CH_FEATURE, nInvalidStart ) > nInvalidEnd ) )
-        {
-            bQuickFormat = sal_True;
-        }
-        else if ( ( pParaPortion->IsSimpleInvalid() ) && ( nInvalidDiff < 0 ) )
-        {
-            // pruefen, ob loeschen ueber Portiongrenzen erfolgte...
-            sal_uInt16 nStart = nInvalidStart; // DOPPELT !!!!!!!!!!!!!!!
-            sal_uInt16 nEnd = nStart - nInvalidDiff;  // neg.
+            // check if delete over the portion boundaries wss done ...
+            sal_uInt16 nStart = nInvalidStart; // DOUBLE !!!!!!!!!!!!!!!
+            sal_uInt16 nEnd = nStart - nInvalidDiff;  // negative
             bQuickFormat = sal_True;
             sal_uInt16 nPos = 0;
             sal_uInt16 nPortions = pParaPortion->GetTextPortions().Count();
             for ( sal_uInt16 nTP = 0; nTP < nPortions; nTP++ )
             {
-                // Es darf kein Start/Ende im geloeschten Bereich liegen.
+                // There must be no start / end are in the deleted area.
                 TextPortion* const pTP = pParaPortion->GetTextPortions()[ nTP ];
                 nPos = nPos + pTP->GetLen();
                 if ( ( nPos > nStart ) && ( nPos < nEnd ) )

are quite substantial. ;-)

Still reviewing...

Hmm... There are a few more of this kind, in impedit3.cxx.

(In reply to comment #4)
> Hmm... There are a few more of this kind, in impedit3.cxx.

Oh, sorry for that.  Should have reviewed the patch myself more carfully before handing it over. I rememeber removing some longer sections of code which were w out-commented...

/Albert

Ok.  I went through your whole patch, fixed all code errors I could find, committed it locally with success.  However, someone was also making a huge pile of changes in the same area at the same time so running git pull -r causes a whole lot of files in conflict....  So far I've spent a whole day, but I may have to do the rest tomorrow.

For future patch submissions, please submit in smaller chunks to make it easier for us to review, and send your patches to the mailing list.

Finally pushed to master.....

Also, it would be great to do the translation and code cleanups in separate commits, to make it easier for the reviewer to spot obvious accidental code change during translation.