[Libreoffice-commits] .: 2 commits - svx/source

[Joseph Powers]

 svx/source/fmcomp/fmgridcl.cxx |    6 +++---
 svx/source/fmcomp/fmgridif.cxx |    2 +-
 svx/source/fmcomp/gridcell.cxx |    4 ++--
 svx/source/form/filtnav.cxx    |    6 +++++-
 4 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit acf7b1d013d68b602807febffc2bc887bd8d3aa5
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Mon Jan 3 19:51:01 2011 -0800

    Remove unused header

diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 15d19e5..36b6aca 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -36,12 +36,15 @@
 #include "fmitems.hxx"
 #include "fmprop.hrc"
 #include "fmresids.hrc"
-#include "gridcell.hxx"
 
 /** === begin UNO includes === **/
+#include <com/sun/star/awt/XControlModel.hpp>
+#include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/form/runtime/XFormController.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
+#include <com/sun/star/beans/XFastPropertySet.hpp>
 /** === end UNO includes === **/
 
 #include <comphelper/processfactory.hxx>
@@ -63,6 +66,7 @@
 #include <svx/svxids.hrc>
 #include <tools/shl.hxx>
 #include <vcl/wrkwin.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <functional>
 
commit 9cb99dc3204d91cb2f2df441a7420e0b28c2990a
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Mon Jan 3 19:50:34 2011 -0800

    White space cleanp

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index f8f0be5..f3e7f8f 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -1694,7 +1694,7 @@ void FmGridControl::InitColumnByField(
     Reference< XPropertySet > xField;
     _rxColumnModel->getPropertyValue( FM_PROP_BOUNDFIELD ) >>= xField;
 
-    
+
     if ( !xField.is() && /*sFieldName.getLength() && */_rxFieldsByNames->hasByName( sFieldName ) ) // #i93452# do not check for name length
         _rxFieldsByNames->getByName( sFieldName ) >>= xField;
 
@@ -2020,7 +2020,7 @@ namespace
                             GetModelColumnPos(
                                 sal::static_int_cast< sal_uInt16 >(_nPosition)),
                             FM_PROP_DESCRIPTION);
-                    
+
             break;
         default:
             sRetText = DbGridControl::GetAccessibleObjectDescription(_eObjType,_nPosition);
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 77a0288..df78776 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 3abf290..a5148ca 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -3093,7 +3093,7 @@ void DbFilterField::Update()
         Reference< ::com::sun::star::container::XNameAccess >    xFieldNames = xSupCol->getColumns();
         if (!xFieldNames->hasByName(aName))
             return;
-        
+
         Reference< ::com::sun::star::container::XNameAccess >    xTablesNames = xSupTab->getTables();
         Reference< ::com::sun::star::beans::XPropertySet >       xComposerFieldAsSet(xFieldNames->getByName(aName),UNO_QUERY);