summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2013-10-22 08:54:47 +0100
committerMichael Meeks <michael.meeks@collabora.com>2013-10-22 08:56:17 +0100
commite847e6758ef51cc2f2f6622c40bf6c7b0bc0cdae (patch)
tree59d5a5aa209101cc3e05600950390763a2dc0da1
parentc2ccd20c0fd92bddfff76447754541705e3eb8f3 (diff)
fixup ScDocFunc OUString changes.
Change-Id: I2f319d9e168b2ba950c5d831163e946b52b76137
-rw-r--r--sc/source/ui/collab/sendfunc.cxx14
-rw-r--r--sc/source/ui/collab/sendfunc.hxx14
2 files changed, 14 insertions, 14 deletions
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 1ee3da715680..8bf3e1496929 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -321,7 +321,7 @@ void ScDocFuncSend::EndListAction()
SendMessage( aOp );
}
-sal_Bool ScDocFuncSend::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const String& rText, sal_Bool bApi )
+sal_Bool ScDocFuncSend::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, sal_Bool bApi )
{
ScChangeOpWriter aOp( "setNormalString" );
aOp.appendAddress( rPos );
@@ -404,7 +404,7 @@ bool ScDocFuncSend::ShowNote( const ScAddress& rPos, bool bShow )
return true; // needs some code auditing action
}
-bool ScDocFuncSend::SetNoteText( const ScAddress& rPos, const String& rNoteText, sal_Bool bApi )
+bool ScDocFuncSend::SetNoteText( const ScAddress& rPos, const OUString& rNoteText, sal_Bool bApi )
{
ScChangeOpWriter aOp( "setNoteText" );
aOp.appendAddress( rPos );
@@ -414,8 +414,8 @@ bool ScDocFuncSend::SetNoteText( const ScAddress& rPos, const String& rNoteText,
return true; // needs some code auditing action
}
-sal_Bool ScDocFuncSend::RenameTable( SCTAB nTab, const String& rName,
- sal_Bool bRecord, sal_Bool bApi )
+sal_Bool ScDocFuncSend::RenameTable( SCTAB nTab, const OUString& rName,
+ sal_Bool bRecord, sal_Bool bApi )
{
ScChangeOpWriter aOp( "renameTable" );
aOp.appendInt( nTab );
@@ -427,14 +427,14 @@ sal_Bool ScDocFuncSend::RenameTable( SCTAB nTab, const String& rName,
}
sal_Bool ScDocFuncSend::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
- sal_Bool bRecord, sal_Bool bApi )
+ sal_Bool bRecord, sal_Bool bApi )
{
SAL_INFO( "sc.tubes", "ApplyAttributes not implemented!" );
return ScDocFunc::ApplyAttributes( rMark, rPattern, bRecord, bApi );
}
-sal_Bool ScDocFuncSend::ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
- sal_Bool bRecord, sal_Bool bApi )
+sal_Bool ScDocFuncSend::ApplyStyle( const ScMarkData& rMark, const OUString& rStyleName,
+ sal_Bool bRecord, sal_Bool bApi )
{
SAL_INFO( "sc.tubes", "ApplyStyle not implemented!" );
return ScDocFunc::ApplyStyle( rMark, rStyleName, bRecord, bApi );
diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx
index 6efeb2562e33..5dad4211f577 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -33,7 +33,7 @@ public:
virtual void EnterListAction( sal_uInt16 nNameResId );
virtual void EndListAction();
- virtual sal_Bool SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const String& rText, sal_Bool bApi );
+ virtual sal_Bool SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, sal_Bool bApi );
virtual bool SetValueCell( const ScAddress& rPos, double fVal, bool bInteraction );
virtual bool SetStringCell( const ScAddress& rPos, const OUString& rStr, bool bInteraction );
virtual bool SetEditCell( const ScAddress& rPos, const EditTextObject& rStr, bool bInteraction );
@@ -43,14 +43,14 @@ public:
const ScAddress& rPos, const OUString& rText, bool bInterpret, bool bEnglish,
bool bApi, const formula::FormulaGrammar::Grammar eGrammar );
virtual bool ShowNote( const ScAddress& rPos, bool bShow = true );
- virtual bool SetNoteText( const ScAddress& rPos, const String& rNoteText, sal_Bool bApi );
- virtual sal_Bool RenameTable( SCTAB nTab, const String& rName, sal_Bool bRecord, sal_Bool bApi );
+ virtual bool SetNoteText( const ScAddress& rPos, const OUString& rNoteText, sal_Bool bApi );
+ virtual sal_Bool RenameTable( SCTAB nTab, const OUString& rName, sal_Bool bRecord, sal_Bool bApi );
virtual sal_Bool ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
- sal_Bool bRecord, sal_Bool bApi );
- virtual sal_Bool ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
- sal_Bool bRecord, sal_Bool bApi );
+ sal_Bool bRecord, sal_Bool bApi );
+ virtual sal_Bool ApplyStyle( const ScMarkData& rMark, const OUString& rStyleName,
+ sal_Bool bRecord, sal_Bool bApi );
virtual sal_Bool MergeCells( const ScCellMergeOption& rOption, sal_Bool bContents,
- sal_Bool bRecord, sal_Bool bApi );
+ sal_Bool bRecord, sal_Bool bApi );
};
#endif