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

[Tor Lillqvist]

 sal/inc/sal/log-areas.dox         |    1 +
 sw/source/filter/ww8/wrtww8gr.cxx |    2 +-
 sw/source/ui/envelp/labfmt.cxx    |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c575e7f484817e355d5451ed001b4f874b63ff68
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Mar 26 21:25:05 2013 +0200

    Fix bogus SAL_WARN use
    
    unknown log area 'IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) [loplugin], huh?
    
    Change-Id: I265102a552615208db43fc7b6617189ad99b6aad

diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index d473ff4..4f01fd5 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -260,6 +260,7 @@ certain functionality.
 @li @c sw
 @li @c sw.core - Writer core
 @li @c sw.docx
+ at li @c sw.envelp
 @li @c sw.level2
 @li @c sw.rtf - .rtf export filter
 @li @c sw.uno - Writer UNO interfaces
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index bab1b18..7cfe360 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -631,7 +631,7 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl)
     {
         if ( rCfg.IsPredefinedLabel(sMake, sType) )
         {
-            SAL_WARN( "IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl)", "label is predefined and cannot be overwritten" );
+            SAL_WARN( "sw.envelp", "label is predefined and cannot be overwritten" );
             WarningBox( this, SW_RES( WB_PREDEFINED_LABEL ) ).Execute();
             return 0;
         }
commit c947d49b5e2cd96de137460311e54952d03414d2
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Mar 26 21:19:33 2013 +0200

    Fix warning: statement aligned ... [loplugin]
    
    Change-Id: I0a0c40545101a82c9a4054c7a7ccd03e7cfa24d4

diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index d5ae614..67d5c9a 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -799,7 +799,7 @@ void SwWW8WrGrf::WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf,
         Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) );
     }
     else
-    pArr += 2;
+        pArr += 2;
 
     Set_UInt16( pArr, nCropL );                     // set dxaCropLeft
     Set_UInt16( pArr, nCropT );                     // set dyaCropTop