diff options
Diffstat (limited to 'svx/source/editeng')
47 files changed, 175 insertions, 317 deletions
diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.cxx b/svx/source/editeng/SvXMLAutoCorrectExport.cxx index 460212a112..2453bf423c 100644 --- a/svx/source/editeng/SvXMLAutoCorrectExport.cxx +++ b/svx/source/editeng/SvXMLAutoCorrectExport.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: SvXMLAutoCorrectExport.cxx,v $ - * $Revision: 1.9 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.hxx b/svx/source/editeng/SvXMLAutoCorrectExport.hxx index 6620168ca3..d9020cf198 100644 --- a/svx/source/editeng/SvXMLAutoCorrectExport.hxx +++ b/svx/source/editeng/SvXMLAutoCorrectExport.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: SvXMLAutoCorrectExport.hxx,v $ - * $Revision: 1.9 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.cxx b/svx/source/editeng/SvXMLAutoCorrectImport.cxx index 692557307d..a08a597485 100644 --- a/svx/source/editeng/SvXMLAutoCorrectImport.cxx +++ b/svx/source/editeng/SvXMLAutoCorrectImport.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: SvXMLAutoCorrectImport.cxx,v $ - * $Revision: 1.14 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.hxx b/svx/source/editeng/SvXMLAutoCorrectImport.hxx index 4b1bfb4b5e..f311704318 100644 --- a/svx/source/editeng/SvXMLAutoCorrectImport.hxx +++ b/svx/source/editeng/SvXMLAutoCorrectImport.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: SvXMLAutoCorrectImport.hxx,v $ - * $Revision: 1.11 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx index 0745a5e259..3662f81e45 100644 --- a/svx/source/editeng/acorrcfg.cxx +++ b/svx/source/editeng/acorrcfg.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: acorrcfg.cxx,v $ - * $Revision: 1.11 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editattr.cxx b/svx/source/editeng/editattr.cxx index 1ac66fb300..5fdc7dceb0 100644 --- a/svx/source/editeng/editattr.cxx +++ b/svx/source/editeng/editattr.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editattr.cxx,v $ - * $Revision: 1.16.212.1 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editattr.hxx b/svx/source/editeng/editattr.hxx index a24b1697c3..8624a98af0 100644 --- a/svx/source/editeng/editattr.hxx +++ b/svx/source/editeng/editattr.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editattr.hxx,v $ - * $Revision: 1.13.212.1 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editdbg.cxx b/svx/source/editeng/editdbg.cxx index c93e7bc63f..c95b510018 100644 --- a/svx/source/editeng/editdbg.cxx +++ b/svx/source/editeng/editdbg.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editdbg.cxx,v $ - * $Revision: 1.22.148.1 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editdbg.hxx b/svx/source/editeng/editdbg.hxx index eb4e7caf8b..31d3a5d4ac 100644 --- a/svx/source/editeng/editdbg.hxx +++ b/svx/source/editeng/editdbg.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editdbg.hxx,v $ - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editdoc.cxx b/svx/source/editeng/editdoc.cxx index d5f9ee16ee..409639158a 100644 --- a/svx/source/editeng/editdoc.cxx +++ b/svx/source/editeng/editdoc.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editdoc.cxx,v $ - * $Revision: 1.48.148.1 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editdoc.hxx b/svx/source/editeng/editdoc.hxx index 90efe213b6..e875330b57 100644 --- a/svx/source/editeng/editdoc.hxx +++ b/svx/source/editeng/editdoc.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editdoc.hxx,v $ - * $Revision: 1.29 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editdoc2.cxx b/svx/source/editeng/editdoc2.cxx index e0d5fc27e9..868ef91f69 100644 --- a/svx/source/editeng/editdoc2.cxx +++ b/svx/source/editeng/editdoc2.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: editdoc2.cxx,v $ - * $Revision: 1.19 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx index 77ae82fde0..b3087e0cad 100644 --- a/svx/source/editeng/editeng.cxx +++ b/svx/source/editeng/editeng.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: editeng.cxx,v $ - * $Revision: 1.117.12.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/source/editeng/editeng.hrc b/svx/source/editeng/editeng.hrc index fa1fa19db7..a0ede86702 100644 --- a/svx/source/editeng/editeng.hrc +++ b/svx/source/editeng/editeng.hrc @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editeng.hrc,v $ - * $Revision: 1.5 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editeng.src b/svx/source/editeng/editeng.src index 1204ba1661..b65f20c365 100644 --- a/svx/source/editeng/editeng.src +++ b/svx/source/editeng/editeng.src @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editeng.src,v $ - * $Revision: 1.47 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editobj.cxx b/svx/source/editeng/editobj.cxx index d8f0a332b9..e953f5dea9 100644 --- a/svx/source/editeng/editobj.cxx +++ b/svx/source/editeng/editobj.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editobj.cxx,v $ - * $Revision: 1.30 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editobj2.hxx b/svx/source/editeng/editobj2.hxx index b37ceabbd7..4d5dc29b25 100644 --- a/svx/source/editeng/editobj2.hxx +++ b/svx/source/editeng/editobj2.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editobj2.hxx,v $ - * $Revision: 1.14 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editsel.cxx b/svx/source/editeng/editsel.cxx index 90e1ea91d2..d753244e94 100644 --- a/svx/source/editeng/editsel.cxx +++ b/svx/source/editeng/editsel.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editsel.cxx,v $ - * $Revision: 1.7 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editsel.hxx b/svx/source/editeng/editsel.hxx index bc4b78bb1d..2cc6aeedcf 100644 --- a/svx/source/editeng/editsel.hxx +++ b/svx/source/editeng/editsel.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editsel.hxx,v $ - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editstt2.hxx b/svx/source/editeng/editstt2.hxx index 896c1768d9..483def35be 100644 --- a/svx/source/editeng/editstt2.hxx +++ b/svx/source/editeng/editstt2.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editstt2.hxx,v $ - * $Revision: 1.3 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editundo.cxx b/svx/source/editeng/editundo.cxx index be57d52112..d318815966 100644 --- a/svx/source/editeng/editundo.cxx +++ b/svx/source/editeng/editundo.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editundo.cxx,v $ - * $Revision: 1.10 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editundo.hxx b/svx/source/editeng/editundo.hxx index 1def47b7e9..71ef3f3708 100644 --- a/svx/source/editeng/editundo.hxx +++ b/svx/source/editeng/editundo.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editundo.hxx,v $ - * $Revision: 1.9 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/editview.cxx b/svx/source/editeng/editview.cxx index 39cc8debaa..a9e10e115a 100644 --- a/svx/source/editeng/editview.cxx +++ b/svx/source/editeng/editview.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: editview.cxx,v $ - * $Revision: 1.52.74.1 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * @@ -1547,53 +1544,53 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo return bRet; } -String EditView::GetSurroundingText() const
-{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
- EditSelection aSel( pImpEditView->GetEditSelection() );
- aSel.Adjust( PIMPEE->GetEditDoc() );
-
- if( HasSelection() )
- {
- XubString aStr = PIMPEE->GetSelected( aSel );
-
- // Stop reconversion if the selected text includes a line break.
- if ( aStr.Search( 0x0A ) == STRING_NOTFOUND )
- return aStr;
- else
- return String();
- }
- else
- {
- aSel.Min().SetIndex( 0 );
- aSel.Max().SetIndex( aSel.Max().GetNode()->Len() );
- return PIMPEE->GetSelected( aSel );
- }
-}
-
-Selection EditView::GetSurroundingTextSelection() const
-{
- DBG_CHKTHIS( EditView, 0 );
-
- ESelection aSelection( GetSelection() );
- aSelection.Adjust();
-
- if( HasSelection() )
- {
- EditSelection aSel( pImpEditView->GetEditSelection() );
- aSel.Adjust( PIMPEE->GetEditDoc() );
- XubString aStr = PIMPEE->GetSelected( aSel );
-
- // Stop reconversion if the selected text includes a line break.
- if ( aStr.Search( 0x0A ) == STRING_NOTFOUND )
- return Selection( 0, aSelection.nEndPos - aSelection.nStartPos );
- else
- return Selection( 0, 0 );
- }
- else
- {
- return Selection( aSelection.nStartPos, aSelection.nEndPos );
- }
-}
+String EditView::GetSurroundingText() const +{ + DBG_CHKTHIS( EditView, 0 ); + DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); + + EditSelection aSel( pImpEditView->GetEditSelection() ); + aSel.Adjust( PIMPEE->GetEditDoc() ); + + if( HasSelection() ) + { + XubString aStr = PIMPEE->GetSelected( aSel ); + + // Stop reconversion if the selected text includes a line break. + if ( aStr.Search( 0x0A ) == STRING_NOTFOUND ) + return aStr; + else + return String(); + } + else + { + aSel.Min().SetIndex( 0 ); + aSel.Max().SetIndex( aSel.Max().GetNode()->Len() ); + return PIMPEE->GetSelected( aSel ); + } +} + +Selection EditView::GetSurroundingTextSelection() const +{ + DBG_CHKTHIS( EditView, 0 ); + + ESelection aSelection( GetSelection() ); + aSelection.Adjust(); + + if( HasSelection() ) + { + EditSelection aSel( pImpEditView->GetEditSelection() ); + aSel.Adjust( PIMPEE->GetEditDoc() ); + XubString aStr = PIMPEE->GetSelected( aSel ); + + // Stop reconversion if the selected text includes a line break. + if ( aStr.Search( 0x0A ) == STRING_NOTFOUND ) + return Selection( 0, aSelection.nEndPos - aSelection.nStartPos ); + else + return Selection( 0, 0 ); + } + else + { + return Selection( aSelection.nStartPos, aSelection.nEndPos ); + } +} diff --git a/svx/source/editeng/edtspell.cxx b/svx/source/editeng/edtspell.cxx index 2fb92641ef..d35ed1be44 100644 --- a/svx/source/editeng/edtspell.cxx +++ b/svx/source/editeng/edtspell.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: edtspell.cxx,v $ - * $Revision: 1.16 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/eehtml.cxx b/svx/source/editeng/eehtml.cxx index a497b8a5c3..91fa476446 100644 --- a/svx/source/editeng/eehtml.cxx +++ b/svx/source/editeng/eehtml.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: eehtml.cxx,v $ - * $Revision: 1.20 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/eehtml.hxx b/svx/source/editeng/eehtml.hxx index 1396a89307..434311b4fe 100644 --- a/svx/source/editeng/eehtml.hxx +++ b/svx/source/editeng/eehtml.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: eehtml.hxx,v $ - * $Revision: 1.6 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/eeng_pch.cxx b/svx/source/editeng/eeng_pch.cxx index d9afbde59b..f86dffb1fd 100644 --- a/svx/source/editeng/eeng_pch.cxx +++ b/svx/source/editeng/eeng_pch.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: eeng_pch.cxx,v $ - * $Revision: 1.5 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/eeng_pch.hxx b/svx/source/editeng/eeng_pch.hxx index f4dd0ab7f2..18c170d975 100644 --- a/svx/source/editeng/eeng_pch.hxx +++ b/svx/source/editeng/eeng_pch.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: eeng_pch.hxx,v $ - * $Revision: 1.5 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/eeobj.cxx b/svx/source/editeng/eeobj.cxx index 4079f53348..a0c8d5c3ce 100644 --- a/svx/source/editeng/eeobj.cxx +++ b/svx/source/editeng/eeobj.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: eeobj.cxx,v $ - * $Revision: 1.11 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/eeobj.hxx b/svx/source/editeng/eeobj.hxx index c013d040b3..fb33a515c6 100644 --- a/svx/source/editeng/eeobj.hxx +++ b/svx/source/editeng/eeobj.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: eeobj.hxx,v $ - * $Revision: 1.5 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/eerdll.cxx b/svx/source/editeng/eerdll.cxx index ce23a1e00e..50043625bf 100644 --- a/svx/source/editeng/eerdll.cxx +++ b/svx/source/editeng/eerdll.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: eerdll.cxx,v $ - * $Revision: 1.31.148.1 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/eerdll2.hxx b/svx/source/editeng/eerdll2.hxx index 8b8a584545..fc20a7682e 100644 --- a/svx/source/editeng/eerdll2.hxx +++ b/svx/source/editeng/eerdll2.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: eerdll2.hxx,v $ - * $Revision: 1.6 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/eertfpar.cxx b/svx/source/editeng/eertfpar.cxx index 65c1b6c516..3aae1af55a 100644 --- a/svx/source/editeng/eertfpar.cxx +++ b/svx/source/editeng/eertfpar.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: eertfpar.cxx,v $ - * $Revision: 1.16 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/eertfpar.hxx b/svx/source/editeng/eertfpar.hxx index 6969fa62fe..bc2ac43c29 100644 --- a/svx/source/editeng/eertfpar.hxx +++ b/svx/source/editeng/eertfpar.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: eertfpar.hxx,v $ - * $Revision: 1.6 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/forbiddencharacterstable.cxx b/svx/source/editeng/forbiddencharacterstable.cxx index 862e4ec7fd..dc8e557d1e 100644 --- a/svx/source/editeng/forbiddencharacterstable.cxx +++ b/svx/source/editeng/forbiddencharacterstable.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: forbiddencharacterstable.cxx,v $ - * $Revision: 1.5 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/impedit.cxx b/svx/source/editeng/impedit.cxx index 51dff075be..c5e3ab59af 100644 --- a/svx/source/editeng/impedit.cxx +++ b/svx/source/editeng/impedit.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: impedit.cxx,v $ - * $Revision: 1.64 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/impedit.hxx b/svx/source/editeng/impedit.hxx index adf6afb7c2..7a718bc94c 100644 --- a/svx/source/editeng/impedit.hxx +++ b/svx/source/editeng/impedit.hxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: impedit.hxx,v $ - * $Revision: 1.89.40.1 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx index 6be5fc0ef0..63280a304c 100644 --- a/svx/source/editeng/impedit2.cxx +++ b/svx/source/editeng/impedit2.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: impedit2.cxx,v $ - * $Revision: 1.124.40.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -641,41 +638,41 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView ) pView->GetWindow()->SetCursorRect(); } } - else if ( rCEvt.GetCommand() == COMMAND_SELECTIONCHANGE )
- {
- const CommandSelectionChangeData *pData = rCEvt.GetSelectionChangeData();
-
- ESelection aSelection = pView->GetSelection();
- aSelection.Adjust();
-
- if( pView->HasSelection() )
- {
- aSelection.nEndPos = aSelection.nStartPos;
- aSelection.nStartPos += pData->GetStart();
- aSelection.nEndPos += pData->GetEnd();
- }
- else
- {
- aSelection.nStartPos = pData->GetStart();
- aSelection.nEndPos = pData->GetEnd();
- }
- pView->SetSelection( aSelection );
- }
- else if ( rCEvt.GetCommand() == COMMAND_PREPARERECONVERSION )
- {
- if ( pView->HasSelection() )
- {
- ESelection aSelection = pView->GetSelection();
- aSelection.Adjust();
-
- if ( aSelection.nStartPara != aSelection.nEndPara )
- {
- xub_StrLen aParaLen = pEditEngine->GetTextLen( aSelection.nStartPara );
- aSelection.nEndPara = aSelection.nStartPara;
- aSelection.nEndPos = aParaLen;
- pView->SetSelection( aSelection );
- }
- }
+ else if ( rCEvt.GetCommand() == COMMAND_SELECTIONCHANGE ) + { + const CommandSelectionChangeData *pData = rCEvt.GetSelectionChangeData(); + + ESelection aSelection = pView->GetSelection(); + aSelection.Adjust(); + + if( pView->HasSelection() ) + { + aSelection.nEndPos = aSelection.nStartPos; + aSelection.nStartPos += pData->GetStart(); + aSelection.nEndPos += pData->GetEnd(); + } + else + { + aSelection.nStartPos = pData->GetStart(); + aSelection.nEndPos = pData->GetEnd(); + } + pView->SetSelection( aSelection ); + } + else if ( rCEvt.GetCommand() == COMMAND_PREPARERECONVERSION ) + { + if ( pView->HasSelection() ) + { + ESelection aSelection = pView->GetSelection(); + aSelection.Adjust(); + + if ( aSelection.nStartPara != aSelection.nEndPara ) + { + xub_StrLen aParaLen = pEditEngine->GetTextLen( aSelection.nStartPara ); + aSelection.nEndPara = aSelection.nStartPara; + aSelection.nEndPos = aParaLen; + pView->SetSelection( aSelection ); + } + } } GetSelEngine().Command( rCEvt ); diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx index 8316d9a94f..d1bce996a1 100644 --- a/svx/source/editeng/impedit3.cxx +++ b/svx/source/editeng/impedit3.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: impedit3.cxx,v $ - * $Revision: 1.124.82.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/source/editeng/impedit4.cxx b/svx/source/editeng/impedit4.cxx index 98d8c7eb03..282aa61696 100644 --- a/svx/source/editeng/impedit4.cxx +++ b/svx/source/editeng/impedit4.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: impedit4.cxx,v $ - * $Revision: 1.78.54.1 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/impedit5.cxx b/svx/source/editeng/impedit5.cxx index fde4e22e8c..9552c2a882 100644 --- a/svx/source/editeng/impedit5.cxx +++ b/svx/source/editeng/impedit5.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: impedit5.cxx,v $ - * $Revision: 1.34 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/makefile.mk b/svx/source/editeng/makefile.mk index 6df91a78f8..70d92002da 100644 --- a/svx/source/editeng/makefile.mk +++ b/svx/source/editeng/makefile.mk @@ -1,14 +1,10 @@ #************************************************************************* # # 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 -# -# $RCSfile: makefile.mk,v $ +# Copyright 2000, 2010 Oracle and/or its affiliates. # -# $Revision: 1.18 $ +# OpenOffice.org - a multi-platform office productivity suite # # This file is part of OpenOffice.org. # diff --git a/svx/source/editeng/svxacorr.cxx b/svx/source/editeng/svxacorr.cxx index b7861e9154..91248e3677 100644 --- a/svx/source/editeng/svxacorr.cxx +++ b/svx/source/editeng/svxacorr.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: svxacorr.cxx,v $ - * $Revision: 1.62 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/swafopt.cxx b/svx/source/editeng/swafopt.cxx index 0940a4e736..0a5ae16d63 100644 --- a/svx/source/editeng/swafopt.cxx +++ b/svx/source/editeng/swafopt.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: swafopt.cxx,v $ - * $Revision: 1.9 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/textconv.cxx b/svx/source/editeng/textconv.cxx index 4975b0cf7f..c694760df2 100644 --- a/svx/source/editeng/textconv.cxx +++ b/svx/source/editeng/textconv.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: textconv.cxx,v $ - * $Revision: 1.14 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/txtrange.cxx b/svx/source/editeng/txtrange.cxx index f79c3530f6..178ce2a200 100644 --- a/svx/source/editeng/txtrange.cxx +++ b/svx/source/editeng/txtrange.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: txtrange.cxx,v $ - * $Revision: 1.15 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * diff --git a/svx/source/editeng/unolingu.cxx b/svx/source/editeng/unolingu.cxx index d6a2d2d96e..5121383ca2 100644 --- a/svx/source/editeng/unolingu.cxx +++ b/svx/source/editeng/unolingu.cxx @@ -1,13 +1,10 @@ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: unolingu.cxx,v $ - * $Revision: 1.39 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * |