diff options
Diffstat (limited to 'svx/source/editeng')
24 files changed, 58 insertions, 55 deletions
diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.cxx b/svx/source/editeng/SvXMLAutoCorrectExport.cxx index 460212a112..71bc790664 100644 --- a/svx/source/editeng/SvXMLAutoCorrectExport.cxx +++ b/svx/source/editeng/SvXMLAutoCorrectExport.cxx @@ -33,7 +33,7 @@ #include <SvXMLAutoCorrectExport.hxx> #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <xmloff/xmltoken.hxx> using namespace ::com::sun::star::uno; diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.cxx b/svx/source/editeng/SvXMLAutoCorrectImport.cxx index 692557307d..28b8f493dc 100644 --- a/svx/source/editeng/SvXMLAutoCorrectImport.cxx +++ b/svx/source/editeng/SvXMLAutoCorrectImport.cxx @@ -37,7 +37,7 @@ #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <xmloff/xmltoken.hxx> using namespace ::com::sun::star; diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx index 0745a5e259..439691d4ca 100644 --- a/svx/source/editeng/acorrcfg.cxx +++ b/svx/source/editeng/acorrcfg.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 @@ -35,8 +35,8 @@ #include <sfx2/app.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/urihelper.hxx> +#include <unotools/pathoptions.hxx> +#include <svl/urihelper.hxx> #include <svx/svxacorr.hxx> #include <com/sun/star/uno/Any.hxx> @@ -369,7 +369,7 @@ Sequence<OUString> SvxSwAutoCorrCfg::GetPropertyNames() "Format/Option/ChangeToBullets/Enable", //15 "Format/Option/ChangeToBullets/SpecialCharacter/Char", //16 "Format/Option/ChangeToBullets/SpecialCharacter/Font", //17 - "Format/Option/ChangeToBullets/SpecialCharacter/FontFamily", //18 + "Format/Option/ChangeToBullets/SpecialCharacter/FontFamily", //18 "Format/Option/ChangeToBullets/SpecialCharacter/FontCharset", //19 "Format/Option/ChangeToBullets/SpecialCharacter/FontPitch", //20 "Format/Option/ReplaceQuote", //21 diff --git a/svx/source/editeng/editattr.hxx b/svx/source/editeng/editattr.hxx index a24b1697c3..818ae1f710 100644 --- a/svx/source/editeng/editattr.hxx +++ b/svx/source/editeng/editattr.hxx @@ -54,7 +54,7 @@ class SvxFieldItem; class SvxLanguageItem; class SvxEmphasisMarkItem; class SvxCharReliefItem; -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SfxVoidItem; diff --git a/svx/source/editeng/editdoc.cxx b/svx/source/editeng/editdoc.cxx index 7160a4197a..d5f9ee16ee 100644 --- a/svx/source/editeng/editdoc.cxx +++ b/svx/source/editeng/editdoc.cxx @@ -1427,9 +1427,11 @@ XubString EditDoc::GetParaAsString( ContentNode* pNode, USHORT nStartPos, USHORT else pNextFeature = 0; // Feature interessiert unten nicht - DBG_ASSERT( nEnd >= nIndex, "Ende vorm Index?" ); - aStr += XubString( *pNode, nIndex, nEnd-nIndex ); + //!! beware of sub string length of -1 which is also defined as STRING_LEN and + //!! thus would result in adding the whole sub string up to the end of the node !! + if (nEnd > nIndex) + aStr += XubString( *pNode, nIndex, nEnd - nIndex ); if ( pNextFeature ) { @@ -1790,7 +1792,12 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi } if ( bChanged ) + { + // char attributes need to be sorted by start again + pNode->GetCharAttribs().ResortAttribs(); + SetModified( TRUE ); + } return bChanged; } diff --git a/svx/source/editeng/editdoc.hxx b/svx/source/editeng/editdoc.hxx index 90efe213b6..0828f9dc4e 100644 --- a/svx/source/editeng/editdoc.hxx +++ b/svx/source/editeng/editdoc.hxx @@ -38,9 +38,9 @@ #include <editattr.hxx> #include <edtspell.hxx> #include <svx/svxfont.hxx> -#include <svtools/itemset.hxx> -#include <svtools/style.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/style.hxx> +#include <svl/itempool.hxx> #include <tools/table.hxx> class ImpEditEngine; diff --git a/svx/source/editeng/editdoc2.cxx b/svx/source/editeng/editdoc2.cxx index e0d5fc27e9..4aba92347e 100644 --- a/svx/source/editeng/editdoc2.cxx +++ b/svx/source/editeng/editdoc2.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <eeng_pch.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <tools/rtti.hxx> #include <svx/lspcitem.hxx> #include <svx/adjitem.hxx> diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx index 77ae82fde0..67f8cb69ad 100644 --- a/svx/source/editeng/editeng.cxx +++ b/svx/source/editeng/editeng.cxx @@ -36,8 +36,8 @@ #define USE_SVXFONT #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/svstdarr.hxx> +#include <svl/ctloptions.hxx> #include <svtools/ctrltool.hxx> #include <svx/svxfont.hxx> @@ -1128,7 +1128,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie break; default: { - #if (OSL_DEBUG_LEVEL > 1) && !defined( PRODUCT ) + #if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL) if ( ( nCode == KEY_W ) && rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() ) { SfxItemSet aAttribs = pEditView->GetAttribs(); diff --git a/svx/source/editeng/editobj.cxx b/svx/source/editeng/editobj.cxx index d8f0a332b9..496106efb0 100644 --- a/svx/source/editeng/editobj.cxx +++ b/svx/source/editeng/editobj.cxx @@ -50,8 +50,8 @@ #include <svx/numitem.hxx> #include <svx/brshitem.hxx> #include <vcl/graph.hxx> -#include <svtools/intitem.hxx> -#include <vcl/fontcvt.hxx> +#include <svl/intitem.hxx> +#include <unotools/fontcvt.hxx> #include <tools/tenccvt.hxx> DBG_NAME( EE_EditTextObject ) diff --git a/svx/source/editeng/editobj2.hxx b/svx/source/editeng/editobj2.hxx index b37ceabbd7..ab8d1c9347 100644 --- a/svx/source/editeng/editobj2.hxx +++ b/svx/source/editeng/editobj2.hxx @@ -34,7 +34,7 @@ #include <svx/editobj.hxx> #include <editdoc.hxx> -#include <vcl/fontcvt.hxx> +#include <unotools/fontcvt.hxx> class SfxStyleSheetPool; 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 ) diff --git a/svx/source/editeng/edtspell.cxx b/svx/source/editeng/edtspell.cxx index 2fb92641ef..09768f67bf 100644 --- a/svx/source/editeng/edtspell.cxx +++ b/svx/source/editeng/edtspell.cxx @@ -39,8 +39,8 @@ #include <edtspell.hxx> #include <svx/flditem.hxx> #include <fontitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <unolingu.hxx> #include <linguistic/lngprops.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/svx/source/editeng/eehtml.hxx b/svx/source/editeng/eehtml.hxx index 1396a89307..0399553998 100644 --- a/svx/source/editeng/eehtml.hxx +++ b/svx/source/editeng/eehtml.hxx @@ -31,7 +31,7 @@ #ifndef _EEHTML_HXX #define _EEHTML_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <editdoc.hxx> #include <sfx2/sfxhtml.hxx> diff --git a/svx/source/editeng/eeobj.cxx b/svx/source/editeng/eeobj.cxx index 4079f53348..8ab5389ee1 100644 --- a/svx/source/editeng/eeobj.cxx +++ b/svx/source/editeng/eeobj.cxx @@ -38,7 +38,7 @@ #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <svx/editeng.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/svx/source/editeng/eerdll.cxx b/svx/source/editeng/eerdll.cxx index f98e21ef9d..8b3d76434e 100644 --- a/svx/source/editeng/eerdll.cxx +++ b/svx/source/editeng/eerdll.cxx @@ -46,7 +46,7 @@ #include <svx/flditem.hxx> #include <svx/emphitem.hxx> #include <svx/scriptspaceitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/editeng/eertfpar.cxx b/svx/source/editeng/eertfpar.cxx index 65c1b6c516..39100e88ab 100644 --- a/svx/source/editeng/eertfpar.cxx +++ b/svx/source/editeng/eertfpar.cxx @@ -35,7 +35,7 @@ #include <eertfpar.hxx> #include <impedit.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/escpitem.hxx> #include <svx/fhgtitem.hxx> #include "fontitem.hxx" diff --git a/svx/source/editeng/impedit.cxx b/svx/source/editeng/impedit.cxx index 51dff075be..cc5e08e5f7 100644 --- a/svx/source/editeng/impedit.cxx +++ b/svx/source/editeng/impedit.cxx @@ -57,7 +57,7 @@ #include <vos/mutex.hxx> #include <svx/flditem.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svtools/transfer.hxx> #include <sot/exchange.hxx> diff --git a/svx/source/editeng/impedit.hxx b/svx/source/editeng/impedit.hxx index adf6afb7c2..39cbb85a8e 100644 --- a/svx/source/editeng/impedit.hxx +++ b/svx/source/editeng/impedit.hxx @@ -42,7 +42,7 @@ #include <vcl/cursor.hxx> #include <vcl/dndhelp.hxx> -#include <svtools/ondemand.hxx> +#include <svl/ondemand.hxx> #include <com/sun/star/linguistic2/XSpellAlternatives.hpp> #include <com/sun/star/linguistic2/SpellFailure.hpp> #include <com/sun/star/linguistic2/XSpellChecker.hpp> diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx index 6be5fc0ef0..769a5c7ca0 100644 --- a/svx/source/editeng/impedit2.cxx +++ b/svx/source/editeng/impedit2.cxx @@ -44,9 +44,9 @@ #include <edtspell.hxx> #include <eeobj.hxx> #include <txtrange.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> #include <acorrcfg.hxx> #include <svx/fhgtitem.hxx> diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx index 8316d9a94f..a51824ec34 100644 --- a/svx/source/editeng/impedit3.cxx +++ b/svx/source/editeng/impedit3.cxx @@ -36,7 +36,7 @@ #include <vcl/gdimtf.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> @@ -68,7 +68,7 @@ #include <svx/numitem.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> #include <forbiddencharacterstable.hxx> diff --git a/svx/source/editeng/impedit5.cxx b/svx/source/editeng/impedit5.cxx index fde4e22e8c..02535744fe 100644 --- a/svx/source/editeng/impedit5.cxx +++ b/svx/source/editeng/impedit5.cxx @@ -37,7 +37,7 @@ #include <svx/editeng.hxx> #include <editdbg.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <svx/lrspitem.hxx> diff --git a/svx/source/editeng/svxacorr.cxx b/svx/source/editeng/svxacorr.cxx index b7861e9154..3169b34cb2 100644 --- a/svx/source/editeng/svxacorr.cxx +++ b/svx/source/editeng/svxacorr.cxx @@ -50,13 +50,13 @@ // fuer die Sort-String-Arrays aus dem SVMEM.HXX #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #ifndef SVTOOLS_FSTATHELPER_HXX -#include <svtools/fstathelper.hxx> +#include <svl/fstathelper.hxx> #endif #include <svtools/helpopt.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <unotools/charclass.hxx> #ifndef _COM_SUN_STAR_I18N_UNICODETYPE_HDL_ #include <com/sun/star/i18n/UnicodeType.hdl> @@ -1354,10 +1354,6 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, else if( nRet & ChgOrdinalNumber) nHelpId = 22; } - DBG_ASSERT( nHelpId && nHelpId < (HID_AUTOCORR_HELP_END - - HID_AUTOCORR_HELP_START + 1), - "wrong HelpId Range" ); - if( nHelpId ) { nHelpId += HID_AUTOCORR_HELP_START - 1; @@ -1385,7 +1381,7 @@ void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang ) if( pLists ) pLists->SaveCplSttExceptList(); } -#ifndef PRODUCT +#ifdef DBG_UTIL else { DBG_ERROR("speichern einer leeren Liste?"); @@ -1401,7 +1397,7 @@ void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang) if(pLists) pLists->SaveWrdSttExceptList(); } -#ifndef PRODUCT +#ifdef DBG_UTIL else { DBG_ERROR("speichern einer leeren Liste?"); diff --git a/svx/source/editeng/txtrange.cxx b/svx/source/editeng/txtrange.cxx index f79c3530f6..6ddbda37d2 100644 --- a/svx/source/editeng/txtrange.cxx +++ b/svx/source/editeng/txtrange.cxx @@ -67,7 +67,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const baseg bInner( bInnr ), bVertical( bVert ) { -#ifndef PRODUCT +#ifdef DBG_UTIL bFlag3 = bFlag4 = bFlag5 = bFlag6 = bFlag7 = FALSE; #endif pRangeArr = new Range[ nCacheSize ]; diff --git a/svx/source/editeng/unolingu.cxx b/svx/source/editeng/unolingu.cxx index d6a2d2d96e..65d5c3b0c2 100644 --- a/svx/source/editeng/unolingu.cxx +++ b/svx/source/editeng/unolingu.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 @@ -40,7 +40,7 @@ #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <rtl/logfile.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/XEventListener.hpp> @@ -57,7 +57,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase1.hxx> // helper for implementations #include <i18npool/mslangid.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/localfilehelper.hxx> #include <ucbhelper/commandenvironment.hxx> @@ -422,7 +422,7 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck ) // In OOo 3.0 we will not need the respective code anymore at all. // aAny <<= nCurrentDataFilesChangedCheckValue; aAny <<= (INT32) -1; // keep the value set to 'need to check' - + aCfg.SetProperty( A2OU( "DataFilesChangedCheckValue" ), aAny ); //! Note 1: the new values are commited when the 'aCfg' object |