sc/inc/document.hxx | 2 +-
sc/inc/queryparam.hxx | 2 +-
sc/source/core/data/document.cxx | 2 +-
sc/source/core/data/table3.cxx | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit aa22ecc606ad927ef18e80488070c523e8dde2b8
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Nov 7 05:58:21 2011 +0100
forgot to amend these changes to my last commit
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index b98e428..de903d0 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -829,7 +829,7 @@ public:
bool ExtendMerge( ScRange& rRange, bool bRefresh = false );
bool ExtendTotalMerge( ScRange& rRange ) const;
SC_DLLPUBLIC bool ExtendOverlapped( SCCOL& rStartCol, SCROW&
rStartRow,
- SCCOL nEndCol, SCROW nEndRow, SCTAB nTab );
+ SCCOL nEndCol, SCROW nEndRow, SCTAB nTab )
const;
SC_DLLPUBLIC bool ExtendOverlapped( ScRange& rRange ) const;
bool RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow,
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 3892840..9bf9be1 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -65,7 +65,7 @@ struct ScQueryParamBase
SC_DLLPUBLIC ScQueryEntry& GetEntry(SCSIZE n);
void Resize(size_t nNew);
SC_DLLPUBLIC void DeleteQuery(size_t nPos);
- void FillInExcelSyntax(rtl::OUString& aCellStr, SCSIZE nIndex);
+ void FillInExcelSyntax(const rtl::OUString& aCellStr, SCSIZE nIndex);
protected:
ScQueryParamBase();
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index b1f258e..275fca3 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -142,7 +142,7 @@ void ScDocument::MakeTable( SCTAB nTab,bool
_bNeedsNameCheck )
if ( ValidTab(nTab) && ( nTab >= static_cast<SCTAB>(maTabs.size())
||!maTabs[nTab]) )
{
rtl::OUString aString = ScGlobal::GetRscString(STR_TABLE_DEF);
//"Table"
- aString += rtl::OUString::valueOf(nTab+1);
+ aString += rtl::OUString::valueOf(static_cast<SCTAB>(nTab+1));
if ( _bNeedsNameCheck )
CreateValidTabName( aString ); // no doubles
if (nTab < static_cast<SCTAB>(maTabs.size()))
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 700a2d0..b4a8ff5 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1967,7 +1967,7 @@ bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2
{
rtl::OUString rStr;
GetString(nCol1 + 3, nRow, rStr);
- rEntry.SetQueryString(aStr);
+ rEntry.SetQueryString(rStr);
rEntry.bDoQuery = true;
}
nIndex++;
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
