[Libreoffice-commits] core.git: 2 commits - include/sal sfx2/source sw/source

[Tor Lillqvist]

 include/sal/log-areas.dox        |    2 ++
 sfx2/source/appl/sfxpicklist.cxx |    7 +++++--
 sw/source/core/layout/layact.cxx |    4 ++++
 sw/source/core/view/viewsh.cxx   |    3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 66acee112a3b6ac7238ac825a40d5cde00cc96eb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Mar 18 20:53:45 2014 +0200

    Add a couple SAL_INFOs
    
    Change-Id: I3773f5432ff4e2a005e0c67d9c65fdb00de6f16b

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 3c5b5df..792d4a7 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -386,8 +386,10 @@ certain functionality.
 @li @c sw.docx
 @li @c sw.envelp
 @li @c sw.filter
+ at li @c sw.idle
 @li @c sw.level2
 @li @c sw.rtf - .rtf export filter
+ at li @c sw.tiled
 @li @c sw.ui
 @li @c sw.uno - Writer UNO interfaces
 @li @c sw.ww8 - .doc/.docx export filter, .doc import filter (not writerfilter)
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index eee9e31..5f72ea6 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2159,6 +2159,8 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
     , m_bIndicator( false )
 #endif
 {
+    SAL_INFO("sw.idle", "SwLayIdle() entry");
+
     pImp->pIdleAct = this;
 
     SHOW_IDLE( COL_LIGHTRED );
@@ -2330,6 +2332,8 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
     if( pImp->IsAccessible() )
         pImp->FireAccessibleEvents();
 
+    SAL_INFO("sw.idle", "SwLayIdle() return");
+
 #ifdef DBG_UTIL
     if ( m_bIndicator && pImp->GetShell()->GetWin() )
     {
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 9bf78f7..aad5f47 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1784,7 +1784,7 @@ extern "C"
 void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, MLODpxPoint tileDpxPosition, MLODpxSize tileDpxSize)
 {
 #ifdef IOS
-    SAL_INFO("sw", "touch_lo_draw_tile(" << contextWidth << ", " << contextHeight << ", (" << tileDpxPosition.x << "," << tileDpxPosition.y << "), " << tileDpxSize.width << "x" << tileDpxSize.height << ")");
+    SAL_INFO("sw.tiled", "touch_lo_draw_tile(" << contextWidth << "x" << contextHeight << ", (" << tileDpxPosition.x << "," << tileDpxPosition.y << "), " << tileDpxSize.width << "x" << tileDpxSize.height << ")");
     MLORipPoint tileRipPosition = MLORipPointByDpxPoint(tileDpxPosition);
     MLORipSize rileRipSize = MLORipSizeByDpxSize(tileDpxSize);
     MLORip tileRipPosX = tileRipPosition.x;
@@ -1823,6 +1823,7 @@ void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, MLOD
         pViewShell->PaintTile(aDevice, contextWidth, contextHeight, tilePosX, tilePosY, tileWidth, tileHeight);
     }
     Application::ReleaseSolarMutex();
+    SAL_INFO("sw.tiled", "touch_lo_draw_tile(" << contextWidth << "x" << contextHeight << ", (" << tileDpxPosition.x << "," << tileDpxPosition.y << "), " << tileDpxSize.width << "x" << tileDpxSize.height << ") return");
 #else
     (void) context;
     (void) contextWidth;
commit 3de77b853bdda5205460fc04942b4f99079e03f3
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Mar 18 20:49:24 2014 +0200

    Don't bother creating thumbnails on non-desktop, at least for now
    
    It seems that it was the thumbmail creation which through some
    mechanism caused the blank tile problem for the first tile(s) for some
    documents in TiledLibreOffice. Go figure.
    
    Change-Id: I2b3d64e0bbd3bf39023c67aed56992048ea4ebcf

diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index fcdcee1..fa2a848 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <unotools/historyoptions.hxx>
 #include <unotools/useroptions.hxx>
@@ -192,7 +194,8 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
 
     // generate a thumbnail
     OUString aThumbnail;
-    // don't generate thumbnail when in headless mode
+    // don't generate thumbnail when in headless mode, or on non-desktop (?)
+#if HAVE_FEATURE_DESKTOP
     if (!pDocSh->IsModified() && !Application::IsHeadlessModeRequested())
     {
         // not modified => the document matches what is in the shell
@@ -211,7 +214,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
             }
         }
     }
-
+#endif
     // add to svtool history options
     SvtHistoryOptions().AppendItem( ePICKLIST,
             aURL.GetURLNoPass( INetURLObject::NO_DECODE ),