[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 3 commits - editeng/source svgio/source

[matteocam]

 editeng/source/outliner/outliner.cxx        |    3 ++-
 svgio/source/svgreader/svgcharacternode.cxx |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c16b56a2c85f4d2405c6efa04153f1e85db24441
Author: matteocam <matteo.campane...@gmail.com>
Date:   Wed Jul 9 17:37:46 2014 +0200

    Experiment with truncating length of DrawPortionInfo
    
    Change-Id: I735d752a1817afb89028b2f8aed816860d918e2f

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 1fa6c59..34962f4 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1757,7 +1757,7 @@ void Outliner::DrawingText( const Point& rStartPos, const 
OUString& rText, sal_I
     if(aDrawPortionHdl.IsSet())
     {
         // FIXME(matteocam)
-        DrawPortionInfo aInfo( rStartPos, rText, nTextStart, 
std::max(nTextLen,2), rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
+        DrawPortionInfo aInfo( rStartPos, rText, nTextStart, 
std::min(nTextLen,2), rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
             pFieldData, pLocale, rOverlineColor, rTextLineColor, nRightToLeft, 
false, 0, bEndOfLine, bEndOfParagraph, bEndOfBullet);
 
         aDrawPortionHdl.Call( &aInfo );
commit 96a2a9c3c284092551f2750e2c5498ef06ad3d38
Author: matteocam <matteo.campane...@gmail.com>
Date:   Wed Jul 9 17:33:28 2014 +0200

    Experiment with truncating length of DrawPortionInfo
    
    Change-Id: I05fb15a227b85f153de561e0e46143b6fc58e8fe

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 36fe59f..1fa6c59 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1757,7 +1757,7 @@ void Outliner::DrawingText( const Point& rStartPos, const 
OUString& rText, sal_I
     if(aDrawPortionHdl.IsSet())
     {
         // FIXME(matteocam)
-        DrawPortionInfo aInfo( rStartPos, rText, nTextStart, 
stl::max(nTextLen,2), rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
+        DrawPortionInfo aInfo( rStartPos, rText, nTextStart, 
std::max(nTextLen,2), rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
             pFieldData, pLocale, rOverlineColor, rTextLineColor, nRightToLeft, 
false, 0, bEndOfLine, bEndOfParagraph, bEndOfBullet);
 
         aDrawPortionHdl.Call( &aInfo );
commit 94e9cc6952611d9e2aa20a18e5a5008738f43785
Author: matteocam <matteo.campane...@gmail.com>
Date:   Wed Jul 9 17:30:09 2014 +0200

    Experiment with truncating length of DrawPortionInfo
    
    Change-Id: I62763614bd60e8f7b27b37d14c895af216c553e7

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 08f0b79..36fe59f 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1756,7 +1756,8 @@ void Outliner::DrawingText( const Point& rStartPos, const 
OUString& rText, sal_I
 
     if(aDrawPortionHdl.IsSet())
     {
-        DrawPortionInfo aInfo( rStartPos, rText, nTextStart, nTextLen, rFont, 
nPara, nIndex, pDXArray, pWrongSpellVector,
+        // FIXME(matteocam)
+        DrawPortionInfo aInfo( rStartPos, rText, nTextStart, 
stl::max(nTextLen,2), rFont, nPara, nIndex, pDXArray, pWrongSpellVector,
             pFieldData, pLocale, rOverlineColor, rTextLineColor, nRightToLeft, 
false, 0, bEndOfLine, bEndOfParagraph, bEndOfBullet);
 
         aDrawPortionHdl.Call( &aInfo );
diff --git a/svgio/source/svgreader/svgcharacternode.cxx 
b/svgio/source/svgreader/svgcharacternode.cxx
index a266152..ff9237c 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -463,6 +463,7 @@ namespace svgio
                         aFontAttribute,
                         aLocale,
                         aFill,
+                        COL_TRANSPARENT,
 
                         // extra props for decorated
                         aDecoColor,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits