diff options
| author | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
| commit | e5ce011c3f32f53ef073aec5485450b2588b656a (patch) | |
| tree | 8a838a53bcdd70cc3d4cdbca0ebe07504790952e /basctl/source/basicide/linenumberwindow.cxx | |
| parent | Use isFuzzy() instead of getFuzzy() (diff) | |
| parent | tubes: use new .ui format for contacts dialog (diff) | |
| download | core-e5ce011c3f32f53ef073aec5485450b2588b656a.tar.gz core-e5ce011c3f32f53ef073aec5485450b2588b656a.zip | |
Merge branch 'master' into feature/killsdf
Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk
Diffstat (limited to 'basctl/source/basicide/linenumberwindow.cxx')
| -rw-r--r-- | basctl/source/basicide/linenumberwindow.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index 56445830d8ac..6e8107521403 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -41,7 +41,7 @@ LineNumberWindow::LineNumberWindow (Window* pParent, ModulWindow* pModulWindow) m_nCurYOffset(0) { SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetFieldColor())); - m_nBaseWidth = GetTextWidth(rtl::OUString('8')); + m_nBaseWidth = GetTextWidth('8'); m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2; } @@ -75,7 +75,7 @@ void LineNumberWindow::Paint( const Rectangle& ) // FIXME: it would be best if we could get notified of a font change // rather than doing that re-calculation at each Paint event - m_nBaseWidth = GetTextWidth(rtl::OUString('8')); + m_nBaseWidth = GetTextWidth(OUString('8')); // reserve enough for 3 sigit minimum, with a bit to spare for confort m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2; @@ -88,7 +88,7 @@ void LineNumberWindow::Paint( const Rectangle& ) sal_Int64 y = (nStartLine - 1) * nLineHeight; for(sal_Int32 n = nStartLine; n <= nEndLine; ++n, y += nLineHeight) - DrawText(Point(0, y - m_nCurYOffset), rtl::OUString::valueOf(n)); + DrawText(Point(0, y - m_nCurYOffset), OUString::valueOf(n)); } void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt) |