[Libreoffice-commits] .: 4 commits - sfx2/inc sfx2/source
Michael Stahl
mst at kemper.freedesktop.org
Fri Jul 6 03:39:41 PDT 2012
sfx2/inc/sfx2/thumbnailviewitem.hxx | 2 +-
sfx2/source/control/thumbnailview.cxx | 6 ++----
sfx2/source/control/thumbnailviewacc.cxx | 5 +++--
3 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 23d947c947d90f4383f9744d5b65cd30afd8dd74
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 6 12:33:39 2012 +0200
ThumbnailView::SelectItem: -Werror=unused-but-set-variable
Change-Id: I90c626dd1285f725b3008399a71c1ef56887a970
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 111165b..3897f38 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -957,7 +957,6 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId )
mnSelItemId = nItemId;
bool bNewOut = IsReallyVisible() && IsUpdateMode();
- bool bNewLine = false;
// if necessary scroll to the visible area
if ( mbScroll && nItemId )
@@ -966,12 +965,10 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId )
if ( nNewLine < mnFirstLine )
{
mnFirstLine = nNewLine;
- bNewLine = true;
}
else if ( nNewLine > (sal_uInt16)(mnFirstLine+mnVisLines-1) )
{
mnFirstLine = (sal_uInt16)(nNewLine-mnVisLines+1);
- bNewLine = true;
}
}
commit 2cc9e1614e410e5f70db420122bdbf0601252f89
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 6 12:31:08 2012 +0200
ThumbnailView::ImplEndTracking: -Werror=unused-parameter
Change-Id: Iae4be27a184be20db6f42194382347078d0fb6c2
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 92938eb..111165b 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -535,8 +535,9 @@ void ThumbnailView::ImplTracking( const Point& rPos, bool bRepeat )
}
}
-void ThumbnailView::ImplEndTracking( const Point& rPos, bool bCancel )
+void ThumbnailView::ImplEndTracking(const Point& /*rPos*/, bool const /*bCancel*/)
{
+ //FIXME TODO
}
IMPL_LINK (ThumbnailView, OnFolderSelected, ThumbnailViewItem*, pItem)
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 7fe5d42..48a6ce9 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -545,6 +545,7 @@ void SAL_CALL ThumbnailViewAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
// the specified child is currently selected.
//FIXME TODO if (isAccessibleChildSelected(nChildIndex))
//FIXME TODO ;
+ (void) nChildIndex;
}
sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException )
commit 67f63a9057c3f3f3bc2aff807426fdf133963524
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 6 12:28:59 2012 +0200
ThumbnailViewAcc::deselectAccessibleChild: -Werror=empty-body
Change-Id: Ieed8eff3e3e39821ea7efd3d3b349af9b7088112
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 680a469..7fe5d42 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -543,8 +543,8 @@ void SAL_CALL ThumbnailViewAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
const SolarMutexGuard aSolarGuard;
// Because of the single selection we can reset the whole selection when
// the specified child is currently selected.
- if (isAccessibleChildSelected(nChildIndex))
- ;
+//FIXME TODO if (isAccessibleChildSelected(nChildIndex))
+//FIXME TODO ;
}
sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException )
commit 15f32aac7b874eee5f7b7ebe90f50c31ebd5efac
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 6 12:26:30 2012 +0200
ThumbnailViewItem: -Werror=non-virtual-dtor
Change-Id: Id5de82fd51e92473bf602216226fd432ec48bad5
diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index e771db3..ac61170 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx
@@ -71,7 +71,7 @@ struct ThumbnailViewItem
ThumbnailViewItem (ThumbnailView &rView, Window *pParent);
- ~ThumbnailViewItem ();
+ virtual ~ThumbnailViewItem ();
bool isVisible () const { return mbVisible; }
More information about the Libreoffice-commits
mailing list