diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-31 21:54:22 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-06-01 03:12:09 +0200 |
| commit | a11be8a87a749f56d5c5514bbd9ffd90b3f75392 (patch) | |
| tree | 45d26e7c62616e9a46a56a08402b1eacb321d9c8 /sc/source/filter | |
| parent | 789c46b931672aabf79cc3b3823bdfc8736bdc8f (diff) | |
use size_t where possible and fix some more places
Change-Id: I43c315aa9867cf871657064fd9455700b31879ab
Diffstat (limited to 'sc/source/filter')
| -rw-r--r-- | sc/source/filter/excel/xelink.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xestyle.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xml/XMLDDELinksContext.cxx | 13 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 5b6e37ab8115..6ba061220580 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -1052,7 +1052,7 @@ sal_uInt16 XclExpExtNameBuffer::InsertDde( sal_uInt16 nIndex = GetIndex( rItem ); if( nIndex == 0 ) { - sal_uInt16 nPos; + size_t nPos; if( GetDoc().FindDdeLink( rApplic, rTopic, rItem, SC_DDE_IGNOREMODE, nPos ) ) { // create the leading 'StdDocumentName' EXTERNNAME record diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 0623ae549779..c5cb5a30ea4c 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -1552,7 +1552,7 @@ void lclGetBorderLine( rnXclLine = EXC_LINE_NONE; if( pLine ) { - sal_uInt16 nOuterWidth = pLine->GetOutWidth(); + sal_uInt16 nOuterWidth = pLine->GetWidth(); sal_uInt16 nDistance = pLine->GetDistance(); if( nDistance > 0 ) rnXclLine = EXC_LINE_DOUBLE; diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 184de3b502c1..4f6d51fb568c 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -116,16 +116,15 @@ void ScXMLDDELinkContext::CreateDDELink() !sTopic.isEmpty() && !sItem.isEmpty()) { - String sAppl(sApplication); - String sTop(sTopic); - String sIt(sItem); - GetScImport().GetDocument()->CreateDdeLink(sAppl, sTop, sIt, nMode, ScMatrixRef()); - sal_uInt16 nPos; - if(GetScImport().GetDocument()->FindDdeLink(sAppl, sTop, sIt, nMode, nPos)) + GetScImport().GetDocument()->CreateDdeLink(sApplication, sTopic, sItem, nMode, ScMatrixRef()); + size_t nPos; + if(GetScImport().GetDocument()->FindDdeLink(sApplication, sTopic, sItem, nMode, nPos)) nPosition = nPos; else + { nPosition = -1; - OSL_ENSURE(nPosition > -1, "DDE Link not inserted"); + SAL_WARN("sc" , "DDE Link not inserted"); + } } } |