diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-09 09:49:44 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-09 09:49:44 +0100 |
| commit | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (patch) | |
| tree | 31528d76013d09428fad98a3dbc6265345dbbeb9 /sw/source/ui/vba | |
| parent | e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc (diff) | |
| parent | 9730661364792059168a06bfbaacf47fc8daf53c (diff) | |
CWS swlayoutrefactoring: resync to m100
Diffstat (limited to 'sw/source/ui/vba')
| -rw-r--r-- | sw/source/ui/vba/vbadocumentproperties.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbafield.cxx | 10 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbaselection.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 50ab62dd904f..d68df940810b 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -150,7 +150,7 @@ public: SwFEShell* pFEShell = mpDocShell->GetFEShell(); if(pFEShell) { - aReturn <<= pFEShell->GetLineCount(FALSE); + aReturn <<= pFEShell->GetLineCount(sal_False); } } } diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index a33b3c208c8f..1b4fc953b04d 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -239,10 +239,10 @@ xub_StrLen _ReadFieldParams::FindNextStringPiece(const xub_StrLen nStart) // read parameters "1-3" or 1-3 with both values between 1 and nMax -bool _ReadFieldParams::GetTokenSttFromTo(USHORT* pFrom, USHORT* pTo, USHORT nMax) +bool _ReadFieldParams::GetTokenSttFromTo(sal_uInt16* pFrom, sal_uInt16* pTo, sal_uInt16 nMax) { - USHORT nStart = 0; - USHORT nEnd = 0; + sal_uInt16 nStart = 0; + sal_uInt16 nEnd = 0; xub_StrLen n = GoToTokenParam(); if( STRING_NOTFOUND != n ) { @@ -253,8 +253,8 @@ bool _ReadFieldParams::GetTokenSttFromTo(USHORT* pFrom, USHORT* pTo, USHORT nMax String sStart( sParams.GetToken(0, '-', nIndex) ); if( STRING_NOTFOUND != nIndex ) { - nStart = static_cast<USHORT>(sStart.ToInt32()); - nEnd = static_cast<USHORT>(sParams.Copy(nIndex).ToInt32()); + nStart = static_cast<sal_uInt16>(sStart.ToInt32()); + nEnd = static_cast<sal_uInt16>(sParams.Copy(nIndex).ToInt32()); } } if( pFrom ) *pFrom = nStart; diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index 620e44fa413b..2143cd079a93 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -112,7 +112,7 @@ SwVbaSelection::setText( const rtl::OUString& rText ) throw ( uno::RuntimeExcept void SAL_CALL SwVbaSelection::TypeText( const rtl::OUString& rText ) throw ( uno::RuntimeException ) { - // FIXME: handle the property Options.ReplaceSelection, the default value is TRUE + // FIXME: handle the property Options.ReplaceSelection, the default value is sal_True setText( rText ); } |