[Libreoffice-commits] core.git: sc/source
Caolán McNamara
caolanm at redhat.com
Fri Feb 22 03:25:32 PST 2013
sc/source/filter/excel/xeroot.cxx | 2 +-
sc/source/ui/docshell/docfunc.cxx | 2 +-
sc/source/ui/docshell/docsh.cxx | 6 +++---
sc/source/ui/docshell/docsh4.cxx | 6 +++---
sc/source/ui/formdlg/formula.cxx | 2 +-
sc/source/ui/inc/docfunc.hxx | 2 +-
sc/source/ui/inc/viewfunc.hxx | 2 +-
sc/source/ui/view/gridwin.cxx | 2 +-
sc/source/ui/view/viewfunc.cxx | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit def619581f3a833c4c476548c6d17a76d204dd28
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 22 11:13:35 2013 +0000
fix sc build
Change-Id: I2c5ad65863a516516f8a944fb1344753e08d6c9e
diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx
index 6016d7d..475a0c2 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -341,7 +341,7 @@ uno::Sequence< beans::NamedValue > XclExpRoot::GetEncryptionData() const
{
// try to get the encryption data from the password
SFX_ITEMSET_ARG( GetMedium().GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false );
- if ( pPasswordItem && pPasswordItem->GetValue().Len() )
+ if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() )
aEncryptionData = GenerateEncryptionData( pPasswordItem->GetValue() );
}
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index cc73064..d9d0646 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1154,7 +1154,7 @@ bool ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, sal_Boo
//------------------------------------------------------------------------
-bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate, sal_Bool bApi )
+bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate, sal_Bool bApi )
{
bool bDone = false;
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 917c88b..24e4c82 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -803,11 +803,11 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
aValues[0].Value <<= ::rtl::OUString( GetMedium()->GetFilter()->GetFilterName() );
SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false);
- if ( pPasswordItem && pPasswordItem->GetValue().Len() )
+ if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() )
{
aValues.realloc( 2 );
- aValues[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Password") );
- aValues[1].Value <<= ::rtl::OUString( pPasswordItem->GetValue() );
+ aValues[1].Name = OUString("Password");
+ aValues[1].Value <<= pPasswordItem->GetValue();
}
SC_MOD()->SetInSharedDocSaving( true );
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 4509c11..5591d60 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2345,11 +2345,11 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument()
if ( GetMedium() )
{
SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false);
- if ( pPasswordItem && pPasswordItem->GetValue().Len() )
+ if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() )
{
aArgs.realloc( 2 );
- aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Password" ));
- aArgs[1].Value <<= ::rtl::OUString( pPasswordItem->GetValue() );
+ aArgs[1].Name = OUString("Password");
+ aArgs[1].Value <<= pPasswordItem->GetValue();
}
}
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index a5db312..10dbb17 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -546,7 +546,7 @@ void ScFormulaDlg::dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked)
// Wenn durch Dokument-Umschalterei die Eingabezeile weg war/ist,
// ist der String leer. Dann nicht die alte Formel loeschen.
- if ( !aStrItem.GetValue().Len() )
+ if ( aStrItem.GetValue().isEmpty() )
aRetItem.SetValue( false ); // sal_False = Cancel
m_aHelper.SetDispatcherLock( false ); // Modal-Modus ausschalten
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 6dcdf8a..041599e 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -105,7 +105,7 @@ public:
inline bool HideNote( const ScAddress& rPos ) { return ShowNote( rPos, false ); }
virtual bool SetNoteText( const ScAddress& rPos, const String& rNoteText, sal_Bool bApi );
- virtual bool ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate, sal_Bool bApi );
+ virtual bool ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate, sal_Bool bApi );
virtual sal_Bool ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
sal_Bool bRecord, sal_Bool bApi );
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 2ef5b44..748a386 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -292,7 +292,7 @@ public:
sal_Bool bColorOnly );
void SetNoteText( const ScAddress& rPos, const String& rNoteText );
- void ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate );
+ void ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate );
void DoRefConversion( sal_Bool bRecord = sal_True );
void DoHangulHanjaConversion( sal_Bool bRecord = true );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index bafe363..ec87bd2 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -394,7 +394,7 @@ static sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPos
else
{
const ScPatternAttr* pPattern = pDoc->GetPattern( rPosX, rPosY, nTab );
- if ( ((SfxStringItem&)pPattern->GetItem(ATTR_HYPERLINK)).GetValue().Len() > 0 )
+ if ( !((SfxStringItem&)pPattern->GetItem(ATTR_HYPERLINK)).GetValue().isEmpty() )
{
rURL = ((SfxStringItem&)pPattern->GetItem(ATTR_HYPERLINK)).GetValue();
bFound = true;
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 02e7366..4b7c02a 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2535,7 +2535,7 @@ void ScViewFunc::SetNoteText( const ScAddress& rPos, const String& rNoteText )
GetViewData()->GetDocShell()->GetDocFunc().SetNoteText( rPos, rNoteText, false );
}
-void ScViewFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate )
+void ScViewFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate )
{
GetViewData()->GetDocShell()->GetDocFunc().ReplaceNote( rPos, rNoteText, pAuthor, pDate, false );
}
More information about the Libreoffice-commits
mailing list