sc/source/core/data/column3.cxx | 2 +-
sfx2/source/dialog/templdlg.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b81cd3d1162f70b548b619fa92ce81275679bdbd
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu May 29 15:33:51 2014 +0100
MAXROWCOUNT-1 -> MAXROW, same number but tidier
Change-Id: I710365e8e44923c320203f749da84323ffa3d063
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index aa84d8d..34a9506 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -182,7 +182,7 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
// Check if there are any cells below the end row that will get shifted.
bool bShiftCells = false;
- if (nEndRow < MAXROWCOUNT-1) //only makes sense to do this if there *is* a
row after the end row
+ if (nEndRow < MAXROW) //only makes sense to do this if there *is* a row
after the end row
{
aPos = maCells.position(itCell, nEndRow+1);
itCell = aPos.first;
commit f48f5138ecedd3bb9ec0b454b9fe216001610156
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu May 29 15:31:25 2014 +0100
convert from NId to FamilyId instead of FamilyId to NId
should be equivalent for comparison purposes
Change-Id: I45ed21ee3b45425b5e1ca39e0774c6d34cd2ee76
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 58d903a..011a736 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -253,8 +253,8 @@ sal_Int8 DropListBox_Impl::AcceptDrop( const
AcceptDropEvent& rEvt )
{
// special case: page styles are allowed to create new styles by
example
// but not allowed to be created by drag and drop
- if( pDialog->nActFamily ==
SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SFX_STYLE_FAMILY_PAGE ) ||
- pDialog->bNewByExampleDisabled )
+ if (pDialog->GetActualFamily() == SFX_STYLE_FAMILY_PAGE ||
+ pDialog->bNewByExampleDisabled)
return DND_ACTION_NONE;
else
return DND_ACTION_COPY;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
