diff options
| author | jan Iversen <jani@libreoffice.org> | 2018-01-08 11:52:17 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2018-01-08 13:18:36 +0100 |
| commit | ee4b074ce26029092d0e5f27c22a358abe101312 (patch) | |
| tree | ca40adc5ac677e61488bb4ed98103fc2be1f4bb6 /basic/source/sbx/sbxscan.cxx | |
| parent | 3dc21da3b01811e9e26890e3a30ea73589f36ea1 (diff) | |
basic, solve link problems
When not using scripting, there were a number of
unresolved symbols. First aproach did not work, so this
commit is the more extensive.
Change-Id: Iaf78bde10d9a43862d58d1aa8f46b14aa075eddb
Diffstat (limited to 'basic/source/sbx/sbxscan.cxx')
| -rw-r--r-- | basic/source/sbx/sbxscan.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index 370e73c8ae58..2e9a723542d6 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -629,6 +629,7 @@ const VbaFormatInfo pFormatInfoTable[] = { VbaFormatType::Null, OUStringLiteral(""), NF_INDEX_TABLE_ENTRIES, nullptr } }; +#if HAVE_FEATURE_SCRIPTING const VbaFormatInfo* getFormatInfo( const OUString& rFmt ) { const VbaFormatInfo* pInfo = pFormatInfoTable; @@ -640,9 +641,11 @@ const VbaFormatInfo* getFormatInfo( const OUString& rFmt ) } return pInfo; } +#endif } // namespace +#if HAVE_FEATURE_SCRIPTING #define VBAFORMAT_GENERALDATE "General Date" #define VBAFORMAT_C "c" #define VBAFORMAT_N "n" @@ -651,6 +654,7 @@ const VbaFormatInfo* getFormatInfo( const OUString& rFmt ) #define VBAFORMAT_Y "y" #define VBAFORMAT_LOWERCASE "<" #define VBAFORMAT_UPPERCASE ">" +#endif void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const { @@ -660,6 +664,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const // pflin, It is better to use SvNumberFormatter to handle the date/time/number format. // the SvNumberFormatter output is mostly compatible with // VBA output besides the OOo-basic output +#if HAVE_FEATURE_SCRIPTING if( pFmt && !SbxBasicFormater::isBasicFormat( *pFmt ) ) { OUString aStr = GetOUString(); @@ -784,6 +789,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const return; } } +#endif SbxDataType eType = GetType(); switch( eType ) |