[Libreoffice-commits] .: 2 commits - svx/source
Lionel Elie Mamane
lmamane at kemper.freedesktop.org
Sun Sep 11 14:14:42 PDT 2011
svx/source/fmcomp/fmgridif.cxx | 1 -
svx/source/fmcomp/gridctrl.cxx | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit b71d12fbfdd4aad0b576645a0d7bbf71d1da7a3a
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Sun Sep 11 23:07:27 2011 +0200
fdo#40701: DbGridControl::RemoveColumn even if no corresponding Model column
That case crops up when nId==0 i.e. the Handle column
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index f74fdff..aea82df 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -1705,9 +1705,9 @@ sal_uInt16 DbGridControl::AppendColumn(const XubString& rName, sal_uInt16 nWidth
void DbGridControl::RemoveColumn(sal_uInt16 nId)
{
const sal_uInt16 nIndex = GetModelColumnPos(nId);
+ DbGridControl_Base::RemoveColumn(nId);
if(nIndex != GRID_COLUMN_NOT_FOUND)
{
- DbGridControl_Base::RemoveColumn(nId);
delete m_aColumns[nIndex];
m_aColumns.erase( m_aColumns.begin()+nIndex );
}
commit 1b6310433280ae4e8439dcbf17dfa763bf2826cc
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Sun Sep 11 23:02:34 2011 +0200
Don't touch handle when setting property Enabled
Handle enabling/disabling is controlled by property RecordMarker,
not by property Enabled.
Source of the error is most probably a copy/paste error in
commit 0ade87a8e309f5eb34d0a734c836bdb2f09f00db
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Nov 23 11:38:49 2010 +0100
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 6ccd37d..63dc234 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2084,7 +2084,6 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
{
sal_Bool bValue( sal_True );
OSL_VERIFY( Value >>= bValue );
- pGrid->EnableHandle( bValue );
// Im DesignModus nur das Datenfenster disablen
// Sonst kann das Control nicht mehr konfiguriert werden
More information about the Libreoffice-commits
mailing list