diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:26 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:26 +0100 |
| commit | d4e88719d67c5cadb55c85cd372d412fd969c613 (patch) | |
| tree | 7213e99d8df05f9676cacb75e43f8a0789b263ab /drawinglayer | |
| parent | dab1b528ed2e2e0f7c494b3d955d8e0ba9798c0a (diff) | |
| parent | d46e1d383278641d664dce56965c11b05ac95b4a (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
basic/source/runtime/makefile.mk
basic/source/runtime/step2.cxx
desktop/prj/build.lst
desktop/source/app/app.cxx
desktop/source/deployment/registry/dp_backend.cxx
drawinglayer/source/attribute/fontattribute.cxx
editeng/inc/editeng/fontitem.hxx
editeng/source/editeng/edtspell.cxx
editeng/source/misc/svxacorr.cxx
framework/inc/services/substitutepathvars.hxx
framework/source/services/substitutepathvars.cxx
sfx2/qa/cppunit/makefile.mk
sfx2/source/doc/SfxDocumentMetaData.cxx
sfx2/source/doc/objxtor.cxx
svx/source/dialog/svxruler.cxx
sysui/desktop/icons/so9_base_app.ico
sysui/desktop/icons/so9_calc_app.ico
sysui/desktop/icons/so9_draw_app.ico
sysui/desktop/icons/so9_impress_app.ico
sysui/desktop/icons/so9_main_app.ico
sysui/desktop/icons/so9_math_app.ico
sysui/desktop/icons/so9_writer_app.ico
xmlhelp/source/cxxhelp/provider/databases.cxx
xmlhelp/source/cxxhelp/provider/db.cxx
xmlhelp/source/cxxhelp/provider/db.hxx
Diffstat (limited to 'drawinglayer')
| -rwxr-xr-x | drawinglayer/source/attribute/fontattribute.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx index 7ec5dfd8e8..8f8d42a8af 100755 --- a/drawinglayer/source/attribute/fontattribute.cxx +++ b/drawinglayer/source/attribute/fontattribute.cxx @@ -253,9 +253,9 @@ namespace drawinglayer return mpFontAttribute->getBiDiStrong(); } - bool FontAttribute::getMonospaced() const - { - return mpFontAttribute->getMonospaced(); + bool FontAttribute::getMonospaced() const + { + return mpFontAttribute->getMonospaced(); } |