diff options
Diffstat (limited to 'formula')
-rw-r--r-- | formula/inc/formula/ExternalReferenceHelper.hxx | 2 | ||||
-rw-r--r-- | formula/inc/formula/FormulaCompiler.hxx | 26 | ||||
-rw-r--r-- | formula/inc/formula/FormulaOpCodeMapperObj.hxx | 12 | ||||
-rw-r--r-- | formula/inc/formula/IFunctionDescription.hxx | 18 | ||||
-rw-r--r-- | formula/inc/formula/formdata.hxx | 6 | ||||
-rw-r--r-- | formula/inc/formula/formula.hxx | 4 | ||||
-rw-r--r-- | formula/inc/formula/formulahelper.hxx | 6 | ||||
-rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 64 | ||||
-rw-r--r-- | formula/source/core/api/FormulaOpCodeMapperObj.cxx | 18 | ||||
-rw-r--r-- | formula/source/core/api/token.cxx | 6 | ||||
-rw-r--r-- | formula/source/ui/dlg/FormulaHelper.cxx | 22 | ||||
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 36 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.cxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.hxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 2 |
15 files changed, 113 insertions, 113 deletions
diff --git a/formula/inc/formula/ExternalReferenceHelper.hxx b/formula/inc/formula/ExternalReferenceHelper.hxx index 408fb130c4c5..cd9b3b5b69c6 100644 --- a/formula/inc/formula/ExternalReferenceHelper.hxx +++ b/formula/inc/formula/ExternalReferenceHelper.hxx @@ -28,7 +28,7 @@ namespace formula class FORMULA_DLLPUBLIC SAL_NO_VTABLE ExternalReferenceHelper { public: - virtual ::rtl::OUString getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const = 0; + virtual OUString getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const = 0; protected: ~ExternalReferenceHelper() {} diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx index 85295b244cb4..b53bb2df4316 100644 --- a/formula/inc/formula/FormulaCompiler.hxx +++ b/formula/inc/formula/FormulaCompiler.hxx @@ -170,7 +170,7 @@ public: /// Core implementation of XFormulaOpCodeMapper::getMappings() ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > createSequenceOfFormulaTokens(const FormulaCompiler& _rCompiler, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ) const; + const ::com::sun::star::uno::Sequence< OUString >& rNames ) const; /// Core implementation of XFormulaOpCodeMapper::getAvailableMappings() ::com::sun::star::uno::Sequence< @@ -229,21 +229,21 @@ public: bool CompileTokenArray(); void CreateStringFromTokenArray( String& rFormula ); - void CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer ); + void CreateStringFromTokenArray( OUStringBuffer& rBuffer ); FormulaToken* CreateStringFromToken( String& rFormula, FormulaToken* pToken, bool bAllowArrAdvance = false ); - FormulaToken* CreateStringFromToken( rtl::OUStringBuffer& rBuffer, FormulaToken* pToken, + FormulaToken* CreateStringFromToken( OUStringBuffer& rBuffer, FormulaToken* pToken, bool bAllowArrAdvance = false ); - void AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal ); - void AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal ); - void AppendString( rtl::OUStringBuffer& rBuffer, const String & rStr ); + void AppendBoolean( OUStringBuffer& rBuffer, bool bVal ); + void AppendDouble( OUStringBuffer& rBuffer, double fVal ); + void AppendString( OUStringBuffer& rBuffer, const String & rStr ); /** Set symbol map corresponding to one of predefined formula::FormulaGrammar::Grammar, including an address reference convention. */ inline FormulaGrammar::Grammar GetGrammar() const { return meGrammar; } - static void UpdateSeparatorsNative( const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep ); + static void UpdateSeparatorsNative( const OUString& rSep, const OUString& rArrayColSep, const OUString& rArrayRowSep ); static void ResetNativeSymbols(); static void SetNativeSymbols( const OpCodeMapPtr& xMap ); protected: @@ -260,14 +260,14 @@ protected: virtual bool HandleSingleRef(); virtual bool HandleDbData(); - virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP); - virtual void CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); - virtual void CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); - virtual void CreateStringFromMatrix(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); - virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); + virtual void CreateStringFromExternal(OUStringBuffer& rBuffer, FormulaToken* pTokenP); + virtual void CreateStringFromSingleRef(OUStringBuffer& rBuffer,FormulaToken* pTokenP); + virtual void CreateStringFromDoubleRef(OUStringBuffer& rBuffer,FormulaToken* pTokenP); + virtual void CreateStringFromMatrix(OUStringBuffer& rBuffer,FormulaToken* pTokenP); + virtual void CreateStringFromIndex(OUStringBuffer& rBuffer,FormulaToken* pTokenP); virtual void LocalizeString( String& rName ); // modify rName - input: exact name - void AppendErrorConstant( rtl::OUStringBuffer& rBuffer, sal_uInt16 nError ); + void AppendErrorConstant( OUStringBuffer& rBuffer, sal_uInt16 nError ); bool GetToken(); OpCode NextToken(); diff --git a/formula/inc/formula/FormulaOpCodeMapperObj.hxx b/formula/inc/formula/FormulaOpCodeMapperObj.hxx index cbf279df5eff..07945ca27101 100644 --- a/formula/inc/formula/FormulaOpCodeMapperObj.hxx +++ b/formula/inc/formula/FormulaOpCodeMapperObj.hxx @@ -40,8 +40,8 @@ class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2< ::std::auto_ptr<FormulaCompiler> m_pCompiler; SAL_WNODEPRECATED_DECLARATIONS_POP public: - static ::rtl::OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static(); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext); protected: @@ -57,7 +57,7 @@ private: virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (::com::sun::star::uno::RuntimeException); // Methods virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getMappings( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames, + const ::com::sun::star::uno::Sequence< OUString >& rNames, sal_Int32 nLanguage ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -67,11 +67,11 @@ private: ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx index c876ccad7f56..1747c2f2ddce 100644 --- a/formula/inc/formula/IFunctionDescription.hxx +++ b/formula/inc/formula/IFunctionDescription.hxx @@ -52,7 +52,7 @@ namespace formula virtual sal_uInt32 getCount() const = 0; virtual const IFunctionCategory* getCategory(sal_uInt32 nPos) const = 0; virtual void fillLastRecentlyUsedFunctions(::std::vector< const IFunctionDescription*>& _rLastRUFunctions) const = 0; - virtual const IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const = 0; + virtual const IFunctionDescription* getFunctionByName(const OUString& _sFunctionName) const = 0; virtual sal_Unicode getSingleToken(const EToken _eToken) const = 0; @@ -68,7 +68,7 @@ namespace formula virtual sal_uInt32 getCount() const = 0; virtual const IFunctionDescription* getFunction(sal_uInt32 _nPos) const = 0; virtual sal_uInt32 getNumber() const = 0; - virtual ::rtl::OUString getName() const = 0; + virtual OUString getName() const = 0; protected: ~IFunctionCategory() {} @@ -78,23 +78,23 @@ namespace formula { public: IFunctionDescription(){} - virtual ::rtl::OUString getFunctionName() const = 0; + virtual OUString getFunctionName() const = 0; virtual const IFunctionCategory* getCategory() const = 0; - virtual ::rtl::OUString getDescription() const = 0; + virtual OUString getDescription() const = 0; // GetSuppressedArgCount virtual xub_StrLen getSuppressedArgumentCount() const = 0; // GetFormulaString - virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const = 0; + virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const = 0; // GetVisibleArgMapping virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const = 0; virtual void initArgumentInfo() const = 0; - virtual ::rtl::OUString getSignature() const = 0; - virtual rtl::OString getHelpId() const = 0; + virtual OUString getSignature() const = 0; + virtual OString getHelpId() const = 0; // parameter virtual sal_uInt32 getParameterCount() const = 0; - virtual ::rtl::OUString getParameterName(sal_uInt32 _nPos) const = 0; - virtual ::rtl::OUString getParameterDescription(sal_uInt32 _nPos) const = 0; + virtual OUString getParameterName(sal_uInt32 _nPos) const = 0; + virtual OUString getParameterDescription(sal_uInt32 _nPos) const = 0; virtual bool isParameterOptional(sal_uInt32 _nPos) const = 0; protected: diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx index 6fe77efb0049..595ddb63fc5a 100644 --- a/formula/inc/formula/formdata.hxx +++ b/formula/inc/formula/formdata.hxx @@ -44,7 +44,7 @@ public: inline sal_uInt16 GetEdFocus() const { return nEdFocus; } inline const String& GetUndoStr() const { return aUndoStr; } inline sal_Bool GetMatrixFlag()const{ return bMatrix;} - inline rtl::OString GetUniqueId()const { return aUniqueId;} + inline OString GetUniqueId()const { return aUniqueId;} inline const Selection& GetSelection()const { return aSelection;} inline void SetMode( sal_uInt16 nNew ) { nMode = nNew; } @@ -55,7 +55,7 @@ public: inline void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; } inline void SetUndoStr( const String& rNew ) { aUndoStr = rNew; } inline void SetMatrixFlag(sal_Bool bNew) { bMatrix=bNew;} - inline void SetUniqueId(const rtl::OString nNew) { aUniqueId=nNew;} + inline void SetUniqueId(const OString nNew) { aUniqueId=nNew;} inline void SetSelection(const Selection& aSel) { aSelection=aSel;} protected: void Reset(); @@ -72,7 +72,7 @@ private: sal_uInt16 nEdFocus; String aUndoStr; sal_Bool bMatrix; - rtl::OString aUniqueId; + OString aUniqueId; Selection aSelection; }; diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx index 666750f64857..5a55f5ca81d1 100644 --- a/formula/inc/formula/formula.hxx +++ b/formula/inc/formula/formula.hxx @@ -68,7 +68,7 @@ protected: ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( sal_Bool bForced = sal_False ); - void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId); + void SetFocusWin(Window *pWin,const OString& nUniqueId); void SetMeText(const String& _sText); void Update(); @@ -112,7 +112,7 @@ protected: ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( sal_Bool bForced = sal_False ); - void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId); + void SetFocusWin(Window *pWin,const OString& nUniqueId); void HighlightFunctionParas(const String& aFormula); void SetMeText(const String& _sText); diff --git a/formula/inc/formula/formulahelper.hxx b/formula/inc/formula/formulahelper.hxx index da67a85f890c..27c9b6683964 100644 --- a/formula/inc/formula/formulahelper.hxx +++ b/formula/inc/formula/formulahelper.hxx @@ -51,7 +51,7 @@ namespace formula xub_StrLen& rFStart, // Ein- und Ausgabe xub_StrLen* pFEnd = NULL, const IFunctionDescription** ppFDesc = NULL, - ::std::vector< ::rtl::OUString>* pArgs = NULL ) const; + ::std::vector< OUString>* pArgs = NULL ) const; xub_StrLen GetFunctionStart( const String& rFormula, xub_StrLen nStart, sal_Bool bBack, String* pFuncName = NULL ) const; @@ -61,7 +61,7 @@ namespace formula xub_StrLen GetArgStart ( const String& rFormula, xub_StrLen nStart, sal_uInt16 nArg ) const; - void GetArgStrings ( ::std::vector< ::rtl::OUString >& _rArgs, + void GetArgStrings ( ::std::vector< OUString >& _rArgs, const String& rFormula, xub_StrLen nFuncPos, sal_uInt16 nArgs ) const; @@ -69,7 +69,7 @@ namespace formula void FillArgStrings ( const String& rFormula, xub_StrLen nFuncPos, sal_uInt16 nArgs, - ::std::vector< ::rtl::OUString >& _rArgs ) const; + ::std::vector< OUString >& _rArgs ) const; }; // ============================================================================= } // formula diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 3e990cbbe92e..514d11caf14e 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -183,12 +183,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp ) { if (meSepType == COMMA_BASE) { - rStr = rtl::OUString(","); + rStr = OUString(","); return true; } else if (meSepType == SEMICOLON_BASE) { - rStr = rtl::OUString(";"); + rStr = OUString(";"); return true; } } @@ -197,12 +197,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp ) { if (meSepType == COMMA_BASE) { - rStr = rtl::OUString(","); + rStr = OUString(","); return true; } else if (meSepType == SEMICOLON_BASE) { - rStr = rtl::OUString(";"); + rStr = OUString(";"); return true; } } @@ -211,12 +211,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp ) { if (meSepType == COMMA_BASE) { - rStr = rtl::OUString(";"); + rStr = OUString(";"); return true; } else if (meSepType == SEMICOLON_BASE) { - rStr = rtl::OUString("|"); + rStr = OUString("|"); return true; } } @@ -265,13 +265,13 @@ void FormulaCompiler::OpCodeMap::putExternalSoftly( const String & rSymbol, cons if (bOk) mpExternalHashMap->insert( ExternalHashMap::value_type( rSymbol, rAddIn)); } -uno::Sequence< sheet::FormulaToken > FormulaCompiler::OpCodeMap::createSequenceOfFormulaTokens(const FormulaCompiler& _rCompiler,const uno::Sequence< ::rtl::OUString >& rNames ) const +uno::Sequence< sheet::FormulaToken > FormulaCompiler::OpCodeMap::createSequenceOfFormulaTokens(const FormulaCompiler& _rCompiler,const uno::Sequence< OUString >& rNames ) const { const sal_Int32 nLen = rNames.getLength(); uno::Sequence< sheet::FormulaToken > aTokens( nLen); sheet::FormulaToken* pToken = aTokens.getArray(); - ::rtl::OUString const * pName = rNames.getConstArray(); - ::rtl::OUString const * const pStop = pName + nLen; + OUString const * pName = rNames.getConstArray(); + OUString const * const pStop = pName + nLen; for ( ; pName < pStop; ++pName, ++pToken) { OpCodeHashMap::const_iterator iLook( mpHashMap->find( *pName)); @@ -279,7 +279,7 @@ uno::Sequence< sheet::FormulaToken > FormulaCompiler::OpCodeMap::createSequenceO pToken->OpCode = (*iLook).second; else { - ::rtl::OUString aIntName; + OUString aIntName; if (hasExternals()) { ExternalHashMap::const_iterator iExt( mpExternalHashMap->find( *pName)); @@ -461,7 +461,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create { FormulaOpCodeMapEntry aEntry; aEntry.Name = (*it).first; - aEntry.Token.Data <<= ::rtl::OUString( (*it).second); + aEntry.Token.Data <<= OUString( (*it).second); aEntry.Token.OpCode = ocExternal; aVec.push_back( aEntry); } @@ -485,10 +485,10 @@ 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), - rtl::OStringBuffer( + 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(OUStringToOString(rStr, RTL_TEXTENCODING_ASCII_US)). append(')').getStr()); mpTable[eOp] = rStr; mpHashMap->insert( OpCodeHashMap::value_type( rStr, eOp)); @@ -595,7 +595,7 @@ FormulaCompiler::OpCodeMapPtr FormulaCompiler::CreateOpCodeMap( xMap->putOpCode( pArr2->Name, eOp); else { - ::rtl::OUString aExternalName; + OUString aExternalName; if (pArr2->Token.Data >>= aExternalName) xMap->putExternal( pArr2->Name, aExternalName); else @@ -672,9 +672,9 @@ void FormulaCompiler::InitSymbolsEnglishXL() const // TODO: For now, just replace the separators to the Excel English // variants. Later, if we want to properly map Excel functions with Calc // functions, we'll need to do a little more work here. - mxSymbolsEnglishXL->putOpCode(rtl::OUString(','), ocSep); - mxSymbolsEnglishXL->putOpCode(rtl::OUString(','), ocArrayColSep); - mxSymbolsEnglishXL->putOpCode(rtl::OUString(';'), ocArrayRowSep); + mxSymbolsEnglishXL->putOpCode(OUString(','), ocSep); + mxSymbolsEnglishXL->putOpCode(OUString(','), ocArrayColSep); + mxSymbolsEnglishXL->putOpCode(OUString(';'), ocArrayRowSep); } // ----------------------------------------------------------------------------- @@ -857,7 +857,7 @@ sal_uInt16 FormulaCompiler::GetErrorConstant( const String& rName ) const } -void FormulaCompiler::AppendErrorConstant( rtl::OUStringBuffer& rBuffer, sal_uInt16 nError ) +void FormulaCompiler::AppendErrorConstant( OUStringBuffer& rBuffer, sal_uInt16 nError ) { OpCode eOp; switch (nError) @@ -1615,12 +1615,12 @@ void FormulaCompiler::PopTokenArray() // ----------------------------------------------------------------------------- void FormulaCompiler::CreateStringFromTokenArray( String& rFormula ) { - rtl::OUStringBuffer aBuffer( pArr->GetLen() * 5 ); + OUStringBuffer aBuffer( pArr->GetLen() * 5 ); CreateStringFromTokenArray( aBuffer ); rFormula = aBuffer.makeStringAndClear(); } -void FormulaCompiler::CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer ) +void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer ) { rBuffer.setLength(0); if( !pArr->GetLen() ) @@ -1655,13 +1655,13 @@ void FormulaCompiler::CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer ) // ----------------------------------------------------------------------------- FormulaToken* FormulaCompiler::CreateStringFromToken( String& rFormula, FormulaToken* pTokenP,bool bAllowArrAdvance ) { - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP, bAllowArrAdvance ); rFormula += aBuffer.makeStringAndClear(); return p; } -FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP,bool bAllowArrAdvance ) +FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuffer, FormulaToken* pTokenP,bool bAllowArrAdvance ) { bool bNext = true; bool bSpaces = false; @@ -1792,7 +1792,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuff } // ----------------------------------------------------------------------------- -void FormulaCompiler::AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal ) +void FormulaCompiler::AppendDouble( OUStringBuffer& rBuffer, double fVal ) { if ( mxSymbols->isEnglish() ) { @@ -1811,12 +1811,12 @@ void FormulaCompiler::AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal ) } } // ----------------------------------------------------------------------------- -void FormulaCompiler::AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal ) +void FormulaCompiler::AppendBoolean( OUStringBuffer& rBuffer, bool bVal ) { rBuffer.append( mxSymbols->getSymbol(static_cast<OpCode>(bVal ? ocTrue : ocFalse)) ); } // ----------------------------------------------------------------------------- -void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String & rStr ) +void FormulaCompiler::AppendString( OUStringBuffer& rBuffer, const String & rStr ) { rBuffer.append(sal_Unicode('"')); if ( lcl_UnicodeStrChr( rStr.GetBuffer(), '"' ) == NULL ) @@ -1824,14 +1824,14 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String & else { String aStr( rStr ); - aStr.SearchAndReplaceAll( rtl::OUString('"'), rtl::OUString("\"\"") ); + aStr.SearchAndReplaceAll( OUString('"'), OUString("\"\"") ); rBuffer.append(aStr); } rBuffer.append(sal_Unicode('"')); } void FormulaCompiler::UpdateSeparatorsNative( - const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep ) + const OUString& rSep, const OUString& rArrayColSep, const OUString& rArrayRowSep ) { NonConstOpCodeMapPtr xSymbolsNative; lcl_fillNativeSymbols(xSymbolsNative); @@ -1992,23 +1992,23 @@ bool FormulaCompiler::HandleDbData() return true; } // ----------------------------------------------------------------------------- -void FormulaCompiler::CreateStringFromSingleRef(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/) +void FormulaCompiler::CreateStringFromSingleRef(OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/) { } // ----------------------------------------------------------------------------- -void FormulaCompiler::CreateStringFromDoubleRef(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/) +void FormulaCompiler::CreateStringFromDoubleRef(OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/) { } // ----------------------------------------------------------------------------- -void FormulaCompiler::CreateStringFromIndex(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/) +void FormulaCompiler::CreateStringFromIndex(OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/) { } // ----------------------------------------------------------------------------- -void FormulaCompiler::CreateStringFromMatrix(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/) +void FormulaCompiler::CreateStringFromMatrix(OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/) { } // ----------------------------------------------------------------------------- -void FormulaCompiler::CreateStringFromExternal(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/) +void FormulaCompiler::CreateStringFromExternal(OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/) { } // ----------------------------------------------------------------------------- diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx index 3ae91cdafc09..d7bbaf4dcec6 100644 --- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx +++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx @@ -29,7 +29,7 @@ namespace formula // ----------------------------------------------------------------------------- // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException) { return ::comphelper::findValue( getSupportedServiceNames_Static(), _rServiceName, sal_True ).getLength() != 0; } @@ -62,7 +62,7 @@ FormulaOpCodeMapperObj::~FormulaOpCodeMapperObj() ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL FormulaOpCodeMapperObj::getMappings( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames, + const ::com::sun::star::uno::Sequence< OUString >& rNames, sal_Int32 nLanguage ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) @@ -86,24 +86,24 @@ SAL_CALL FormulaOpCodeMapperObj::getAvailableMappings( return xMap->createSequenceOfAvailableMappings( *m_pCompiler,nGroups); } //-------------------------------------------------------------------------- -::rtl::OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName_Static() +OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName_Static() { - return rtl::OUString( "simple.formula.FormulaOpCodeMapperObj" ); + return OUString( "simple.formula.FormulaOpCodeMapperObj" ); } // -------------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } -uno::Sequence< rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames_Static() +uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames_Static() { - uno::Sequence< rtl::OUString > aSeq( 1 ); - aSeq[0] = ::rtl::OUString( "com.sun.star.sheet.FormulaOpCodeMapper" ); + uno::Sequence< OUString > aSeq( 1 ); + aSeq[0] = OUString( "com.sun.star.sheet.FormulaOpCodeMapper" ); return aSeq; } diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 84180f02fcf1..b341cdc19253 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -305,7 +305,7 @@ bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken& _aToken,Exter break; case uno::TypeClass_STRING: { - String aStrVal( _aToken.Data.get<rtl::OUString>() ); + String aStrVal( _aToken.Data.get<OUString>() ); if ( eOpCode == ocPush ) AddString( aStrVal ); else if ( eOpCode == ocBad ) @@ -754,7 +754,7 @@ FormulaToken* FormulaTokenArray::Add( FormulaToken* t ) FormulaToken* FormulaTokenArray::AddString( const sal_Unicode* pStr ) { - return AddString( rtl::OUString( pStr ) ); + return AddString( OUString( pStr ) ); } FormulaToken* FormulaTokenArray::AddString( const String& rStr ) @@ -769,7 +769,7 @@ FormulaToken* FormulaTokenArray::AddDouble( double fVal ) FormulaToken* FormulaTokenArray::AddExternal( const sal_Unicode* pStr ) { - return AddExternal( rtl::OUString( pStr ) ); + return AddExternal( OUString( pStr ) ); } FormulaToken* FormulaTokenArray::AddExternal( const String& rStr, diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 4c42c6bc4455..529b42a952b8 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -33,18 +33,18 @@ namespace formula OEmptyFunctionDescription(){} virtual ~OEmptyFunctionDescription(){} - virtual ::rtl::OUString getFunctionName() const { return ::rtl::OUString(); } + virtual OUString getFunctionName() const { return OUString(); } virtual const IFunctionCategory* getCategory() const { return NULL; } - virtual ::rtl::OUString getDescription() const { return ::rtl::OUString(); } + virtual OUString getDescription() const { return OUString(); } virtual xub_StrLen getSuppressedArgumentCount() const { return 0; } - virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& ) const { return ::rtl::OUString(); } + virtual OUString getFormula(const ::std::vector< OUString >& ) const { return OUString(); } virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& ) const {} virtual void initArgumentInfo() const {} - virtual ::rtl::OUString getSignature() const { return ::rtl::OUString(); } - virtual rtl::OString getHelpId() const { return ""; } + virtual OUString getSignature() const { return OUString(); } + virtual OString getHelpId() const { return ""; } virtual sal_uInt32 getParameterCount() const { return 0; } - virtual ::rtl::OUString getParameterName(sal_uInt32 ) const { return ::rtl::OUString(); } - virtual ::rtl::OUString getParameterDescription(sal_uInt32 ) const { return ::rtl::OUString(); } + virtual OUString getParameterName(sal_uInt32 ) const { return OUString(); } + virtual OUString getParameterDescription(sal_uInt32 ) const { return OUString(); } virtual bool isParameterOptional(sal_uInt32 ) const { return sal_False; } }; } @@ -70,7 +70,7 @@ sal_Bool FormulaHelper::GetNextFunc( const String& rFormula, xub_StrLen& rFStart, // Input and output xub_StrLen* pFEnd, // = NULL const IFunctionDescription** ppFDesc, // = NULL - ::std::vector< ::rtl::OUString>* pArgs ) const // = NULL + ::std::vector< OUString>* pArgs ) const // = NULL { xub_StrLen nOldStart = rFStart; String aFname; @@ -86,7 +86,7 @@ sal_Bool FormulaHelper::GetNextFunc( const String& rFormula, if ( ppFDesc ) { *ppFDesc = NULL; - const ::rtl::OUString sTemp( aFname ); + const OUString sTemp( aFname ); const sal_uInt32 nCategoryCount = m_pFunctionManager->getCount(); for(sal_uInt32 j= 0; j < nCategoryCount && !*ppFDesc; ++j) { @@ -124,7 +124,7 @@ sal_Bool FormulaHelper::GetNextFunc( const String& rFormula, void FormulaHelper::FillArgStrings( const String& rFormula, xub_StrLen nFuncPos, sal_uInt16 nArgs, - ::std::vector< ::rtl::OUString >& _rArgs ) const + ::std::vector< OUString >& _rArgs ) const { xub_StrLen nStart = 0; xub_StrLen nEnd = 0; @@ -161,7 +161,7 @@ void FormulaHelper::FillArgStrings( const String& rFormula, //------------------------------------------------------------------------ -void FormulaHelper::GetArgStrings( ::std::vector< ::rtl::OUString >& _rArgs +void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs ,const String& rFormula, xub_StrLen nFuncPos, sal_uInt16 nArgs ) const diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 414c6fc23d13..df893f624b8c 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -211,11 +211,11 @@ namespace formula FormulaHelper m_aFormulaHelper; - rtl::OString m_aEditHelpId; + OString m_aEditHelpId; - rtl::OString aOldHelp; - rtl::OString aOldUnique; - rtl::OString aActivWinId; + OString aOldHelp; + OString aOldUnique; + OString aActivWinId; sal_Bool bIsShutDown; Font aFntBold; @@ -224,7 +224,7 @@ namespace formula sal_Bool bEditFlag; const IFunctionDescription* pFuncDesc; xub_StrLen nArgs; - ::std::vector< ::rtl::OUString > m_aArguments; + ::std::vector< OUString > m_aArguments; Selection aFuncSel; FormulaDlg_Impl(Dialog* pParent @@ -433,10 +433,10 @@ uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeM m_aBinaryOpCodes = m_xOpCodeMapper->getAvailableMappings(sheet::FormulaLanguage::ODFF,sheet::FormulaMapGroup::BINARY_OPERATORS); m_pBinaryOpCodesEnd = m_aBinaryOpCodes.getConstArray() + m_aBinaryOpCodes.getLength(); - uno::Sequence< ::rtl::OUString > aArgs(3); - aArgs[TOKEN_OPEN] = ::rtl::OUString("("); - aArgs[TOKEN_CLOSE] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); - aArgs[TOKEN_SEP] = ::rtl::OUString(";"); + uno::Sequence< OUString > aArgs(3); + aArgs[TOKEN_OPEN] = OUString("("); + aArgs[TOKEN_CLOSE] = OUString(RTL_CONSTASCII_USTRINGPARAM(")")); + aArgs[TOKEN_SEP] = OUString(";"); m_aSeparatorsOpCodes = m_xOpCodeMapper->getMappings(aArgs,sheet::FormulaLanguage::ODFF); m_aSpecialOpCodes = m_xOpCodeMapper->getAvailableMappings(sheet::FormulaLanguage::ODFF,sheet::FormulaMapGroup::SPECIAL); @@ -447,7 +447,7 @@ uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeM void FormulaDlg_Impl::DeleteArgs() { - ::std::vector< ::rtl::OUString>().swap(m_aArguments); + ::std::vector< OUString>().swap(m_aArguments); nArgs = 0; } namespace @@ -845,7 +845,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev) aFtEditName.SetText( pFuncDesc->getFunctionName() ); aFtEditName.Show(); pParaWin->Show(); - const rtl::OString aHelpId = pFuncDesc->getHelpId(); + const OString aHelpId = pFuncDesc->getHelpId(); if ( !aHelpId.isEmpty() ) pMEdit->SetHelpId(aHelpId); } @@ -936,7 +936,7 @@ void FormulaDlg_Impl::ClearAllParas() } String FormulaDlg_Impl::RepairFormula(const String& aFormula) { - rtl::OUString aResult('='); + OUString aResult('='); try { UpdateTokenArray(aFormula); @@ -1171,7 +1171,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd ) for(i=0;i<=nEd;i++) { if ( m_aArguments[i].isEmpty() ) - m_aArguments[i] = ::rtl::OUString(" "); + m_aArguments[i] = OUString(" "); } if(pParaWin->GetArgument(nEd).Len()!=0) m_aArguments[nEd] = pParaWin->GetArgument(nEd); @@ -1187,7 +1187,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd ) for(i=nClearPos;i<nArgs;i++) { - m_aArguments[i] = ::rtl::OUString(); + m_aArguments[i] = OUString(); } } } @@ -1696,7 +1696,7 @@ void FormulaModalDialog::RefInputDoneAfter( sal_Bool bForced ) m_pImpl->RefInputDoneAfter( bForced ); } -void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) +void FormulaModalDialog::SetFocusWin(Window *pWin,const OString& nUniqueId) { if(pWin->GetUniqueId()==nUniqueId) { @@ -1813,7 +1813,7 @@ void FormulaDlg::RefInputDoneAfter( sal_Bool bForced ) m_pImpl->RefInputDoneAfter( bForced ); } -void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) +void FormulaDlg::SetFocusWin(Window *pWin,const OString& nUniqueId) { if(pWin->GetUniqueId()==nUniqueId) { @@ -1885,7 +1885,7 @@ IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl) if (pData) // won't be destroyed over Close; { m_pImpl->m_pHelper->setReferenceInput(pData); - rtl::OString nUniqueId(pData->GetUniqueId()); + OString nUniqueId(pData->GetUniqueId()); SetFocusWin(this,nUniqueId); } return 0; @@ -1910,7 +1910,7 @@ void FormEditData::Reset() nOffset = 0; nEdFocus = 0; bMatrix =sal_False; - aUniqueId=rtl::OString(); + aUniqueId=OString(); aSelection.Min()=0; aSelection.Max()=0; aUndoStr.Erase(); diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 1b372557f102..7094994f1049 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -169,7 +169,7 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb ) const IFunctionDescription* pDesc = GetFuncDesc( GetFunction() ); if ( pDesc ) { - const rtl::OString sHelpId = pDesc->getHelpId(); + const OString sHelpId = pDesc->getHelpId(); if ( !sHelpId.isEmpty() ) aLbFunction.SetHelpId(sHelpId); } diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index bcd59f3c11ec..6a4a36ae8a5f 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -72,7 +72,7 @@ private: m_pFunctionManager; ::std::vector< TFunctionDesc > aLRUList; - rtl::OString m_aHelpId; + OString m_aHelpId; void impl_addFunctions(const IFunctionCategory* _pCategory); diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 4c68e6d471fd..50a2d0ded967 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -313,7 +313,7 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc) nArgs = pFuncDesc->getSuppressedArgumentCount(); pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping); aSlider.Hide(); - rtl::OString sHelpId = pFuncDesc->getHelpId(); + OString sHelpId = pFuncDesc->getHelpId(); SetHelpId( sHelpId ); aEdArg1.SetHelpId( sHelpId ); aEdArg2.SetHelpId( sHelpId ); |