[Libreoffice-commits] core.git: 2 commits - sc/source sd/source

[Tor Lillqvist]

 sc/source/ui/sidebar/CellBorderStyleControl.cxx |    3 ---
 sc/source/ui/sidebar/CellLineStyleValueSet.cxx  |    2 --
 sd/source/ui/view/drviews2.cxx                  |    2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 66c315bcf2b78c4928d1e436d1a853f58f4cccdb
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue May 21 17:05:42 2013 +0300

    WaE: unused variables
    
    Change-Id: I52d43a35e621636175e6c56bc068837d3a84bec4

diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 867d1c0..85ffd6f 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -137,7 +137,6 @@ void CellBorderStyleControl::Initialize()
 IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox)
 {
     sal_uInt16 nId = pToolBox->GetCurItemId();
-    ::Color             aColBlack( COL_BLACK );
     SvxBoxItem          aBorderOuter( SID_ATTR_BORDER_OUTER );
     SvxBoxInfoItem      aBorderInner( SID_ATTR_BORDER_INNER );
     editeng::SvxBorderLine theDefLine(NULL, 1);
@@ -198,7 +197,6 @@ IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox)
 
     if( nId != TBI_BORDER2_BLTR && nId != TBI_BORDER2_TLBR )
     {
-        ::Color             aColBlack( COL_BLACK );
         SvxBoxItem          aBorderOuter( SID_ATTR_BORDER_OUTER );
         SvxBoxInfoItem      aBorderInner( SID_ATTR_BORDER_INNER );
         editeng::SvxBorderLine theDefLine(NULL, 1);
@@ -282,7 +280,6 @@ IMPL_LINK(CellBorderStyleControl, TB3SelectHdl, ToolBox *, pToolBox)
 {
     sal_uInt16 nId = pToolBox->GetCurItemId();
 
-    ::Color             aColBlack( COL_BLACK );
     SvxBoxItem          aBorderOuter( SID_ATTR_BORDER_OUTER );
     SvxBoxInfoItem      aBorderInner( SID_ATTR_BORDER_INNER );
     editeng::SvxBorderLine *pTop = 0 ,
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
index 4f823f0..fc8e5e5 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
@@ -95,8 +95,6 @@ void CellLineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     aSize.Height() = nRectHeight*3/5;
     aFont.SetSize( aSize );
 
-    Point aLineStart(aBLPos.X() + 5,            aBLPos.Y() + ( nRectHeight - nItemId )/2);
-    Point aLineEnd(aBLPos.X() + nRectWidth * 7 / 9 - 15, aBLPos.Y() + ( nRectHeight - nItemId )/2);
     long  nTLX = aBLPos.X() + 5,  nTLY = aBLPos.Y() + ( nRectHeight - nItemId )/2;
     long  nTRX = aBLPos.X() + nRectWidth * 7 / 9 - 15, nTRY = aBLPos.Y() + ( nRectHeight - nItemId )/2;
 
commit ce575889b9c46e98544c9f6f30372ac7e05e20c5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue May 21 17:00:18 2013 +0300

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

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 4e44fb7..835cc93 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2876,7 +2876,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
 {
     SdDrawDocument* pDoc = GetDoc();
     if (!pDoc || !mpDrawView)
-    return;
+        return;
 
     SfxItemSet aEditAttr( pDoc->GetPool() );
     mpDrawView->GetAttributes( aEditAttr );