diff options
Diffstat (limited to 'sd/source/ui/notes/EditWindow.cxx')
| -rwxr-xr-x | sd/source/ui/notes/EditWindow.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index 90e3f3a3c..4a7d91e87 100755 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,12 +41,12 @@ #include <vcl/scrbar.hxx> #include <svx/eeitem.hxx> #include "sdresid.hxx" -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/fhgtitem.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#include <svtools/linguprops.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/linguprops.hxx> +#include <unotools/lingucfg.hxx> #include <svx/fontitem.hxx> #include <svx/editstat.hxx> @@ -189,10 +189,10 @@ EditEngine* EditWindow::CreateEditEngine (void) rFntDta.nFontType, nLang, DEFAULTFONT_FLAGS_ONLYONE); mpEditEngineItemPool->SetPoolDefaultItem( SvxFontItem( - aFont.GetFamily(), + aFont.GetFamily(), aFont.GetName(), - aFont.GetStyleName(), - aFont.GetPitch(), + aFont.GetStyleName(), + aFont.GetPitch(), aFont.GetCharSet(), rFntDta.nFontInfoId)); } @@ -216,7 +216,7 @@ EditEngine* EditWindow::CreateEditEngine (void) UniString::CreateFromAscii("XXXX")))); pEditEngine->SetControlWord( - (pEditEngine->GetControlWord() + (pEditEngine->GetControlWord() | EE_CNTRL_AUTOINDENTING) & (~EE_CNTRL_UNDOATTRIBS) & (~EE_CNTRL_PASTESPECIAL)); |