summaryrefslogtreecommitdiff
path: root/svx/source/table
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@gmx.com>2012-12-25 15:18:26 +0100
committerMichael Stahl <mstahl@redhat.com>2013-01-07 13:14:57 +0000
commita4c7ded1fd2a879e66760a8fc3846af538da4b9d (patch)
tree128cbfa620ba4de837f78d7f831951a73c1f7b25 /svx/source/table
parent07969f6effe89b8cdc65764135337054751f280e (diff)
Cleanup: #include <tools/gen.hxx>
Change-Id: Ic547b4a59102afc8bdbc85ec95ac312e32ef2530 Reviewed-on: https://gerrit.libreoffice.org/1484 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx/source/table')
-rw-r--r--svx/source/table/tablelayouter.cxx2
-rw-r--r--svx/source/table/tablelayouter.hxx4
-rw-r--r--svx/source/table/tablemodel.cxx4
-rw-r--r--svx/source/table/tablemodel.hxx4
4 files changed, 9 insertions, 5 deletions
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 599bf61a134f..eecf16d80bf3 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -21,6 +21,8 @@
#include <com/sun/star/table/XMergeableCell.hpp>
#include <com/sun/star/awt/XLayoutConstrains.hpp>
+#include <tools/gen.hxx>
+
#include "cell.hxx"
#include "cellrange.hxx"
#include "tablemodel.hxx"
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index 9bd48726ed54..6d2fd9e19af2 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -23,15 +23,17 @@
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/text/WritingMode.hpp>
#include <com/sun/star/table/XTable.hpp>
+#include <sal/types.h>
#include <basegfx/range/b2irectangle.hxx>
#include <basegfx/tuple/b2ituple.hxx>
-#include <tools/gen.hxx>
#include <boost/shared_ptr.hpp>
#include <vector>
#include <map>
#include "svx/svdotable.hxx"
+class Rectangle;
+
// -----------------------------------------------------------------------------
namespace editeng {
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 46b1c9a6f462..5387babf17eb 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -311,11 +311,11 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeExcep
// -----------------------------------------------------------------------------
-Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& Range ) throw (IllegalArgumentException, RuntimeException)
+Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& rRange ) throw (IllegalArgumentException, RuntimeException)
{
::SolarMutexGuard aGuard;
- ICellRange* pRange = dynamic_cast< ICellRange* >( Range.get() );
+ ICellRange* pRange = dynamic_cast< ICellRange* >( rRange.get() );
if( (pRange == 0) || (pRange->getTable().get() != this) )
throw IllegalArgumentException();
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index df0bca41317e..9aabdfa8bffa 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -20,6 +20,7 @@
#ifndef _SVX_TABLE_TABLEMODEL_HXX_
#define _SVX_TABLE_TABLEMODEL_HXX_
+#include <sal/types.h>
#include <com/sun/star/util/XBroadcaster.hpp>
#include <com/sun/star/table/XTable.hpp>
#include <basegfx/range/b2irectangle.hxx>
@@ -27,7 +28,6 @@
#include <cppuhelper/compbase2.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/listenernotification.hxx>
-#include <tools/gen.hxx>
#include "celltypes.hxx"
// -----------------------------------------------------------------------------
@@ -100,7 +100,7 @@ public:
// XTable
virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellCursor > SAL_CALL createCursor( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellCursor > SAL_CALL createCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& Range ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellCursor > SAL_CALL createCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& rRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getRowCount() throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getColumnCount() throw (::com::sun::star::uno::RuntimeException);