diff options
| author | Noel Power <noel.power@suse.com> | 2012-08-24 20:46:27 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2012-08-26 09:49:24 +0100 |
| commit | 44dc8746f3d521b73123522f345d0f676622c2b3 (patch) | |
| tree | d15b49ee6e23701fe0f1bbfc1c624ae0988aedf8 /sc/source/ui | |
| parent | 6573690587f63f6402e24e2db2e986570a2490f0 (diff) | |
remove VBA_OOBUILD_HACK and friends
Change-Id: I5c21a407bcae1b668976b94a757d564120973b1a
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/vba/vbarange.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbaworksheet.cxx | 4 |
2 files changed, 0 insertions, 16 deletions
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 7caa0e84a919..34578e3c6f6f 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -2954,11 +2954,7 @@ getPasteFlags (sal_Int32 Paste) nFlags = IDF_FORMULA;break; case excel::XlPasteType::xlPasteFormulasAndNumberFormats : case excel::XlPasteType::xlPasteValues: -#ifdef VBA_OOBUILD_HACK nFlags = ( IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_SPECIAL_BOOLEAN ); break; -#else - nFlags = ( IDF_VALUE | IDF_DATETIME | IDF_STRING ); break; -#endif case excel::XlPasteType::xlPasteValuesAndNumberFormats: nFlags = IDF_VALUE | IDF_ATTRIB; break; case excel::XlPasteType::xlPasteColumnWidths: @@ -3566,17 +3562,13 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& if ( nOrientation == excel::XlSortOrientation::xlSortRows ) bIsSortColumns = sal_True; sal_Int16 nHeader = 0; -#ifdef VBA_OOBUILD_HACK nHeader = aSortParam.nCompatHeader; -#endif sal_Bool bContainsHeader = false; if ( Header.hasValue() ) { nHeader = ::comphelper::getINT16( Header ); -#ifdef VBA_OOBUILD_HACK aSortParam.nCompatHeader = nHeader; -#endif } if ( nHeader == excel::XlYesNoGuess::xlGuess ) @@ -3587,9 +3579,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& nHeader = excel::XlYesNoGuess::xlYes; else nHeader = excel::XlYesNoGuess::xlNo; -#ifdef VBA_OOBUILD_HACK aSortParam.nCompatHeader = nHeader; -#endif } if ( nHeader == excel::XlYesNoGuess::xlYes ) @@ -5574,12 +5564,10 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const break; } } -#ifdef VBA_OOBUILD_HACK double fEndValue = MAXDOUBLE; ScDocShell* pDocSh = excel::GetDocShellFromRange( mxRange ); pDocSh->GetDocFunc().FillAuto( aSourceRange, NULL, eDir, eCmd, eDateCmd, nCount, fStep, fEndValue, sal_True, sal_True ); -#endif } sal_Bool SAL_CALL ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange >& ChangingCell ) throw (uno::RuntimeException) diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index d7fac723ccfa..a2e738475743 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -960,7 +960,6 @@ ScVbaWorksheet::Spinners( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeExcept void SAL_CALL ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException) { -#ifdef VBA_OOBUILD_HACK uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW ); ScTabViewShell* pTabViewShell = excel::getBestViewShell( xModel ); @@ -971,9 +970,6 @@ ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException) OSL_ENSURE(pDlg, "Dialog create fail!"); pDlg->Execute(); -#else - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); -#endif } uno::Any SAL_CALL |