diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:51:11 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:51:11 +0200 |
commit | 200bc6c582d6cf2365001f27928c1e3d1f9c9845 (patch) | |
tree | 0f27abe75bc3603341aef715372676aee8d86835 /formula | |
parent | gnumake4: adjust ucb to gbuild (diff) | |
parent | Do not use macros from comphelper's componentmodule.hxx (diff) | |
download | core-200bc6c582d6cf2365001f27928c1e3d1f9c9845.tar.gz core-200bc6c582d6cf2365001f27928c1e3d1f9c9845.zip |
resyncing to master
Diffstat (limited to 'formula')
-rw-r--r-- | formula/Library_for.mk | 6 | ||||
-rw-r--r-- | formula/Library_forui.mk | 6 | ||||
-rw-r--r-- | formula/inc/formula/token.hxx | 10 | ||||
-rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 9 | ||||
-rw-r--r-- | formula/source/core/api/services.cxx | 7 | ||||
-rw-r--r-- | formula/source/core/api/token.cxx | 3 | ||||
-rw-r--r-- | formula/source/core/resource/core_resource.cxx | 5 |
7 files changed, 25 insertions, 21 deletions
diff --git a/formula/Library_for.mk b/formula/Library_for.mk index 0477baf0c65e..14cf9e971464 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -38,13 +38,17 @@ $(eval $(call gb_Library_set_include,for,\ -I$(realpath $(SRCDIR)/formula/inc/pch) \ -I$(realpath $(SRCDIR)/formula/source/core/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_add_defs,for,\ -DFORMULA_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_add_api,for,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,for,\ comphelper \ cppu \ diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index 5b849f97c4e4..8c7c6a9897ea 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -35,13 +35,17 @@ $(eval $(call gb_Library_set_include,forui,\ -I$(realpath $(SRCDIR)/formula/inc/pch) \ -I$(realpath $(SRCDIR)/formula/source/ui/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_add_defs,forui,\ -DFORMULA_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_add_api,forui,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,forui,\ cppu \ cppuhelper \ diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx index bc6cfc2c2793..ccbc4abb77f6 100644 --- a/formula/inc/formula/token.hxx +++ b/formula/inc/formula/token.hxx @@ -302,14 +302,16 @@ class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken { private: sal_uInt16 nIndex; + bool mbGlobal; public: - FormulaIndexToken( OpCode e, sal_uInt16 n ) : - FormulaToken( svIndex, e ), nIndex( n ) {} + FormulaIndexToken( OpCode e, sal_uInt16 n, bool bGlobal = true ) : + FormulaToken( svIndex, e ), nIndex( n ), mbGlobal( bGlobal ) {} FormulaIndexToken( const FormulaIndexToken& r ) : - FormulaToken( r ), nIndex( r.nIndex ) {} + FormulaToken( r ), nIndex( r.nIndex ), mbGlobal( r.mbGlobal ) {} virtual FormulaToken* Clone() const { return new FormulaIndexToken(*this); } - virtual sal_uInt16 GetIndex() const; + virtual sal_uInt16 GetIndex() const; + virtual sal_uInt8 GetByte() const; virtual void SetIndex( sal_uInt16 n ); virtual bool operator==( const FormulaToken& rToken ) const; }; diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 5ac4aba165ab..8fd651225676 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp> #include <com/sun/star/sheet/FormulaMapGroup.hpp> #include <com/sun/star/sheet/FormulaMapGroupSpecialOffset.hpp> +#include <rtl/strbuf.hxx> #include <stdio.h> // ============================================================================= @@ -492,9 +493,11 @@ void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const OpCode eO DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) || (eOp == ocCurrency) || (eOp == ocSep) || (eOp == ocArrayColSep) || (eOp == ocArrayRowSep), - ByteString( "OpCodeMap::putOpCode: reusing OpCode "). - Append( ByteString::CreateFromInt32( sal_Int32( eOp))).Append( " ("). - Append( ByteString( rStr, RTL_TEXTENCODING_ASCII_US)).Append( ')').GetBuffer()); + rtl::OStringBuffer( + RTL_CONSTASCII_STRINGPARAM("OpCodeMap::putOpCode: reusing OpCode ")). + append(sal_Int32(eOp)).append(RTL_CONSTASCII_STRINGPARAM(" (")). + append(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_ASCII_US)). + append(')').getStr()); mpTable[eOp] = rStr; mpHashMap->insert( OpCodeHashMap::value_type( rStr, eOp)); } diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx index fb782e927f03..9741cdcccdeb 100644 --- a/formula/source/core/api/services.cxx +++ b/formula/source/core/api/services.cxx @@ -59,13 +59,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( return cppu::component_getFactoryHelper( implName, serviceManager, registryKey, entries); } - -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - } // extern "C" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index de9258d4c8ea..703c5d6bb6b2 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -303,7 +303,7 @@ bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken& _aToken,Exter { // long is svIndex, used for name / database area, or "byte" for spaces sal_Int32 nValue = _aToken.Data.get<sal_Int32>(); - if ( eOpCode == ocName || eOpCode == ocDBArea ) + if ( eOpCode == ocDBArea ) AddToken( formula::FormulaIndexToken( eOpCode, static_cast<sal_uInt16>(nValue) ) ); else if ( eOpCode == ocSpaces ) AddToken( formula::FormulaByteToken( ocSpaces, static_cast<sal_uInt8>(nValue) ) ); @@ -1347,6 +1347,7 @@ bool FormulaStringOpToken::operator==( const FormulaToken& r ) const } sal_uInt16 FormulaIndexToken::GetIndex() const { return nIndex; } +sal_uInt8 FormulaIndexToken::GetByte() const {return static_cast<sal_uInt8>(mbGlobal); } void FormulaIndexToken::SetIndex( sal_uInt16 n ) { nIndex = n; } bool FormulaIndexToken::operator==( const FormulaToken& r ) const { diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx index 62b2bc02e357..5223879ee5f6 100644 --- a/formula/source/core/resource/core_resource.cxx +++ b/formula/source/core/resource/core_resource.cxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,9 +55,7 @@ namespace formula ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); - ByteString sFileName("for"); - - m_pImpl = ResMgr::CreateResMgr(sFileName.GetBuffer(), aLocale); + m_pImpl = ResMgr::CreateResMgr("for", aLocale); } //------------------------------------------------------------------ |