[Libreoffice-commits] core.git: framework/source include/sal

[Luboš Luňák]

 framework/source/fwe/classes/addonsoptions.cxx |    6 +++---
 include/sal/log-areas.dox                      |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 386af68921d8ae658b3704943b5f58603d7fbf83
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Jul 11 16:00:53 2013 +0200

    remove duplicate debug area for framework/
    
    It'd be probably better to rename all the cryptic abbreviations instead,
    but two different debug areas for the same thing simply doesn't work well.
    
    Change-Id: I895fadb47ebf408a36d13dbb32386caa3f472f1c

diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index ec96841..6bbb176 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -651,7 +651,7 @@ static Image ScaleImage( const Image &rImage, bool bBig )
 {
     Size aSize = ToolBox::GetDefaultImageSize(bBig);
     BitmapEx aScaleBmp(rImage.GetBitmapEx());
-    SAL_INFO("framework", "Addons: expensive scale image from "
+    SAL_INFO("fwk", "Addons: expensive scale image from "
              << aScaleBmp.GetSizePixel() << " to " << aSize);
     aScaleBmp.Scale(aSize, BMP_SCALE_BESTQUALITY);
     return Image(aScaleBmp);
@@ -664,7 +664,7 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, sal_Bool bBig,
     int nIdx = (int)eSize;
     int nOtherIdx = nIdx ? 0 : 1;
 
-    SAL_INFO("framework", "Expensive: Addons GetImageFromURL " << aURL <<
+    SAL_INFO("fwk", "Expensive: Addons GetImageFromURL " << aURL <<
              " big " << (bBig?"big":"litte") <<
              " scale " << (bNoScale ? "noscale" : "scale"));
 
@@ -681,7 +681,7 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, sal_Bool bBig,
             aImage = ScaleImage(ReadImageFromURL(rEntry.aURL[nOtherIdx]), bBig);
             rEntry.aImage[nIdx] = aImage;
             if (!rEntry.aImage[nIdx])
-                SAL_WARN("framework", "failed to load addons image " << aURL);
+                SAL_WARN("fwk", "failed to load addons image " << aURL);
         }
 
         // FIXME: bNoScale is not terribly meaningful or useful
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index b809956..122bf00 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -147,7 +147,6 @@ certain functionality.
 
 @section framework
 
- at li @c framework
 @li @c fwk - framework (abbreviation)
 @li @c fwk.desktop
 @li @c fwk.dispatch