[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sfx2/source svx/source

[Pavel Janík]

 sfx2/source/sidebar/Layouter.cxx                   |    2 +-
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 41a2a272d406ae367a4351a0c71f48c60a20370b
Author: Pavel Janík <paveljanik at apache.org>
Date:   Sat Jul 6 09:24:41 2013 +0000

    Comment out unused variable to prevent compiler warning.

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 7f136a4..fab2240 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -1683,7 +1683,7 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
     FreeResource();
 
     // Setup the grid layouter.
-    const sal_Int32 nMappedImageWidth (Layouter::MapWidth(*this, IMAGE_SIZE));
+    // const sal_Int32 nMappedImageWidth (Layouter::MapWidth(*this, IMAGE_SIZE));
     const sal_Int32 nMappedImageOffset (Layouter::MapWidth(*this, -3));
     const sal_Int32 nMappedToolBoxItemWidth (Layouter::MapWidth(*this, TOOLBOX_ITEM_WIDTH));
     const sal_Int32 nMappedControlWidth (Layouter::MapWidth(*this, CONTROL_WIDTH -10));
commit 71285338958c5ee32a8050c0940d357d14e4e7c0
Author: Pavel Janík <paveljanik at apache.org>
Date:   Sat Jul 6 09:23:34 2013 +0000

    Unname unused argument to prevent compiler warning.

diff --git a/sfx2/source/sidebar/Layouter.cxx b/sfx2/source/sidebar/Layouter.cxx
index 5b651e3..696406b 100644
--- a/sfx2/source/sidebar/Layouter.cxx
+++ b/sfx2/source/sidebar/Layouter.cxx
@@ -90,7 +90,7 @@ void Layouter::SetHorizontalPosition (
 
 
 void Layouter::PrepareForLayouting (
-    Window& rControl)
+    Window& /* rControl */)
 {
     //    rControl.SetStyle(rControl.GetStyle() | WB_PATHELLIPSIS | WB_INFO);
 }