summaryrefslogtreecommitdiff
path: root/formula/inc
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /formula/inc
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'formula/inc')
-rw-r--r--formula/inc/formula/ExternalReferenceHelper.hxx2
-rw-r--r--formula/inc/formula/FormulaCompiler.hxx26
-rw-r--r--formula/inc/formula/FormulaOpCodeMapperObj.hxx12
-rw-r--r--formula/inc/formula/IFunctionDescription.hxx18
-rw-r--r--formula/inc/formula/formdata.hxx6
-rw-r--r--formula/inc/formula/formula.hxx4
-rw-r--r--formula/inc/formula/formulahelper.hxx6
7 files changed, 37 insertions, 37 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