Fix CDEFS definition.
Set it after including settings.mk because this file resets CDEFS. This one enables VBA_OOBUILD_HACK, so we need nCount in a higher scope.
This commit is contained in:
parent
247d7184d3
commit
c58b67eaf3
2 changed files with 5 additions and 2 deletions
|
@ -31,7 +31,7 @@ PRJNAME=sc
|
|||
TARGET=vbaobj
|
||||
ENABLE_EXCEPTIONS=TRUE
|
||||
VISIBILITY_HIDDEN=TRUE
|
||||
CDEFS+=-DVBA_OOBUILD_HACK
|
||||
|
||||
# --- Settings -----------------------------------------------------
|
||||
|
||||
.INCLUDE : settings.mk
|
||||
|
@ -41,6 +41,9 @@ DLLPRE =
|
|||
dummy:
|
||||
@echo "not building vba..."
|
||||
.ENDIF
|
||||
|
||||
CDEFS+=-DVBA_OOBUILD_HACK
|
||||
|
||||
.IF "$(L10N_framework)"==""
|
||||
INCPRE=$(INCCOM)$/$(TARGET)
|
||||
|
||||
|
|
|
@ -5390,10 +5390,10 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const
|
|||
|
||||
// default to include the number of Rows in the source range;
|
||||
SCCOLROW nSourceCount = ( sourceRange.aEnd.Row() - sourceRange.aStart.Row() ) + 1;
|
||||
SCCOLROW nCount = 0;
|
||||
|
||||
if ( sourceRange != destRange )
|
||||
{
|
||||
SCCOLROW nCount = 0;
|
||||
// Find direction of fill, vertical or horizontal
|
||||
if ( sourceRange.aStart == destRange.aStart )
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue