diff options
Diffstat (limited to 'svx/source/editeng/editview.cxx')
| -rw-r--r-- | svx/source/editeng/editview.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/editeng/editview.cxx b/svx/source/editeng/editview.cxx index 39cc8debaa..ff0928954e 100644 --- a/svx/source/editeng/editview.cxx +++ b/svx/source/editeng/editview.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 @@ -38,13 +38,13 @@ #define _SOLAR__PRIVATE 1 #include <i18npool/mslangid.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <svtools/ctrltool.hxx> #include <sfx2/srchitem.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <impedit.hxx> #include <svx/editeng.hxx> @@ -72,7 +72,7 @@ #include <linguistic/lngprops.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> using ::rtl::OUString; @@ -521,10 +521,10 @@ void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs ) pImpEditView->DrawSelection(); PIMPEE->UndoActionStart( EDITUNDO_RESETATTRIBS ); EditSelection aSelection( pImpEditView->GetEditSelection() ); - + for (sal_uInt16 nWID = EE_ITEMS_START; nWID <= EE_ITEMS_END; ++nWID) { - bool bIsLang = EE_CHAR_LANGUAGE == nWID || + bool bIsLang = EE_CHAR_LANGUAGE == nWID || EE_CHAR_LANGUAGE_CJK == nWID || EE_CHAR_LANGUAGE_CTL == nWID; if (!bIsLang) @@ -533,7 +533,7 @@ void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs ) PIMPEE->UndoActionEnd( EDITUNDO_RESETATTRIBS ); PIMPEE->FormatAndUpdate( this ); -} +} void EditView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) { @@ -1439,7 +1439,7 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList ) { USHORT nPortionEnd = aPortions.GetObject( nPos ); USHORT nPortionStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0; - + if( (nPortionEnd < nBeginPos) || (nPortionStart > nEndPos) ) continue; @@ -1494,7 +1494,7 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo nHeight = *pAry; break; } - pAry++; + pAry++; } if( *pAry == 0 ) |