diff options
Diffstat (limited to 'editeng/source')
113 files changed, 3523 insertions, 3523 deletions
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx index ee41d062c6a0..846801961fe1 100644 --- a/editeng/source/accessibility/AccessibleComponentBase.cxx +++ b/editeng/source/accessibility/AccessibleComponentBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ using namespace ::rtl; using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::accessibility; namespace accessibility { @@ -67,7 +67,7 @@ AccessibleComponentBase::~AccessibleComponentBase (void) //===== XAccessibleComponent ================================================ sal_Bool SAL_CALL AccessibleComponentBase::containsPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException) { awt::Size aSize (getSize()); @@ -80,9 +80,9 @@ sal_Bool SAL_CALL AccessibleComponentBase::containsPoint ( -uno::Reference<XAccessible > SAL_CALL +uno::Reference<XAccessible > SAL_CALL AccessibleComponentBase::getAccessibleAtPoint ( - const awt::Point& /*aPoint*/) + const awt::Point& /*aPoint*/) throw (uno::RuntimeException) { return uno::Reference<XAccessible>(); @@ -100,7 +100,7 @@ awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds (void) -awt::Point SAL_CALL AccessibleComponentBase::getLocation (void) +awt::Point SAL_CALL AccessibleComponentBase::getLocation (void) throw (::com::sun::star::uno::RuntimeException) { awt::Rectangle aBBox (getBounds()); @@ -110,7 +110,7 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocation (void) -awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen (void) +awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen (void) throw (::com::sun::star::uno::RuntimeException) { return awt::Point(); @@ -119,7 +119,7 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen (void) -::com::sun::star::awt::Size SAL_CALL AccessibleComponentBase::getSize (void) +::com::sun::star::awt::Size SAL_CALL AccessibleComponentBase::getSize (void) throw (::com::sun::star::uno::RuntimeException) { awt::Rectangle aBBox (getBounds()); @@ -131,7 +131,7 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen (void) void SAL_CALL AccessibleComponentBase::addFocusListener ( const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XFocusListener >& /*xListener*/) + ::com::sun::star::awt::XFocusListener >& /*xListener*/) throw (::com::sun::star::uno::RuntimeException) { // Ignored @@ -141,7 +141,7 @@ void SAL_CALL AccessibleComponentBase::addFocusListener ( void SAL_CALL AccessibleComponentBase::removeFocusListener (const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XFocusListener >& /*xListener*/ ) + ::com::sun::star::awt::XFocusListener >& /*xListener*/ ) throw (::com::sun::star::uno::RuntimeException) { // Ignored @@ -150,7 +150,7 @@ void SAL_CALL AccessibleComponentBase::removeFocusListener (const ::com::sun::st -void SAL_CALL AccessibleComponentBase::grabFocus (void) +void SAL_CALL AccessibleComponentBase::grabFocus (void) throw (::com::sun::star::uno::RuntimeException) { uno::Reference<XAccessibleContext> xContext (this, uno::UNO_QUERY); @@ -167,7 +167,7 @@ void SAL_CALL AccessibleComponentBase::grabFocus (void) -sal_Int32 SAL_CALL AccessibleComponentBase::getForeground (void) +sal_Int32 SAL_CALL AccessibleComponentBase::getForeground (void) throw (::com::sun::star::uno::RuntimeException) { return Color(COL_BLACK).GetColor(); @@ -176,7 +176,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getForeground (void) -sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void) +sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void) throw (::com::sun::star::uno::RuntimeException) { return Color(COL_WHITE).GetColor(); @@ -187,7 +187,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void) //===== XAccessibleExtendedComponent ======================================== -::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL +::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL AccessibleComponentBase::getFont (void) throw (::com::sun::star::uno::RuntimeException) { @@ -197,7 +197,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void) -::rtl::OUString SAL_CALL AccessibleComponentBase::getTitledBorderText (void) +::rtl::OUString SAL_CALL AccessibleComponentBase::getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii (""); @@ -206,7 +206,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void) -::rtl::OUString SAL_CALL AccessibleComponentBase::getToolTipText (void) +::rtl::OUString SAL_CALL AccessibleComponentBase::getToolTipText (void) throw (::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii (""); @@ -216,7 +216,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void) //===== XTypeProvider =================================================== - + uno::Sequence<uno::Type> SAL_CALL AccessibleComponentBase::getTypes (void) throw (uno::RuntimeException) @@ -224,9 +224,9 @@ uno::Sequence<uno::Type> SAL_CALL // Get list of types from the context base implementation... uno::Sequence<uno::Type> aTypeList (2); // ...and add the additional type for the component. - const uno::Type aComponentType = + const uno::Type aComponentType = ::getCppuType((const uno::Reference<XAccessibleComponent>*)0); - const uno::Type aExtendedComponentType = + const uno::Type aExtendedComponentType = ::getCppuType((const uno::Reference<XAccessibleExtendedComponent>*)0); aTypeList[0] = aComponentType; aTypeList[1] = aExtendedComponentType; diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index 2c33b83e2250..695ec888f3c6 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,9 +46,9 @@ #include <utility> -using namespace ::rtl; -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::rtl; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; namespace accessibility { @@ -267,9 +267,9 @@ sal_Int32 SAL_CALL throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); - // Use a simple but slow solution for now. Optimize later. + // Use a simple but slow solution for now. Optimize later. - // Iterate over all the parent's children and search for this object. + // Iterate over all the parent's children and search for this object. if (mxParent.is()) { uno::Reference<XAccessibleContext> xParentContext ( @@ -290,8 +290,8 @@ sal_Int32 SAL_CALL } } - // Return -1 to indicate that this object's parent does not know about the - // object. + // Return -1 to indicate that this object's parent does not know about the + // object. return -1; } @@ -314,7 +314,7 @@ sal_Int16 SAL_CALL throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); - + return msDescription; } @@ -334,14 +334,14 @@ OUString SAL_CALL msName = CreateAccessibleName(); meNameOrigin = AutomaticallyCreated; } - + return msName; } -/** Return a copy of the relation set. +/** Return a copy of the relation set. */ uno::Reference<XAccessibleRelationSet> SAL_CALL AccessibleContextBase::getAccessibleRelationSet (void) @@ -364,7 +364,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL -/** Return a copy of the state set. +/** Return a copy of the state set. Possible states are: ENABLED SHOWING @@ -426,8 +426,8 @@ lang::Locale SAL_CALL return xParentContext->getLocale (); } - // No locale and no parent. Therefore throw exception to indicate this - // cluelessness. + // No locale and no parent. Therefore throw exception to indicate this + // cluelessness. throw IllegalAccessibleComponentStateException (); } diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index f6e4ff48d2d7..727b994f2c84 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -185,7 +185,7 @@ namespace accessibility { DBG_CHKTHIS( AccessibleEditableTextPara, NULL ); - lang::Locale aLocale; + lang::Locale aLocale; DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleEditableTextPara::getLocale: paragraph index value overflow"); @@ -226,8 +226,8 @@ namespace accessibility { DBG_CHKTHIS( AccessibleEditableTextPara, NULL ); - SvxTextForwarder& rCacheTF = GetTextForwarder(); - const sal_Int32 nParaIndex = GetParagraphIndex(); + SvxTextForwarder& rCacheTF = GetTextForwarder(); + const sal_Int32 nParaIndex = GetParagraphIndex(); DBG_ASSERT(nParaIndex >= 0 && nParaIndex <= USHRT_MAX, "AccessibleEditableTextPara::implGetLineBoundary: paragraph index value overflow"); @@ -424,7 +424,7 @@ namespace accessibility if( nIndex < 0 || nIndex >= getCharacterCount() ) throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleEditableTextPara: character index out of bounds")), uno::Reference< uno::XInterface > - ( static_cast< ::cppu::OWeakObject* > (this) ) ); // disambiguate hierarchy + ( static_cast< ::cppu::OWeakObject* > (this) ) ); // disambiguate hierarchy } void AccessibleEditableTextPara::CheckPosition( sal_Int32 nIndex ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException)) @@ -434,7 +434,7 @@ namespace accessibility if( nIndex < 0 || nIndex > getCharacterCount() ) throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleEditableTextPara: character position out of bounds")), uno::Reference< uno::XInterface > - ( static_cast< ::cppu::OWeakObject* > (this) ) ); // disambiguate hierarchy + ( static_cast< ::cppu::OWeakObject* > (this) ) ); // disambiguate hierarchy } void AccessibleEditableTextPara::CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException)) @@ -549,7 +549,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No edit source, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy } SvxAccessibleTextAdapter& AccessibleEditableTextPara::GetTextForwarder() const SAL_THROW((uno::RuntimeException)) @@ -563,7 +563,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to fetch text forwarder, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy if( pTextForwarder->IsValid() ) return *pTextForwarder; @@ -571,7 +571,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text forwarder is invalid, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy } SvxViewForwarder& AccessibleEditableTextPara::GetViewForwarder() const SAL_THROW((uno::RuntimeException)) @@ -586,7 +586,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to fetch view forwarder, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy } if( pViewForwarder->IsValid() ) @@ -595,7 +595,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("View forwarder is invalid, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy } SvxAccessibleTextEditViewAdapter& AccessibleEditableTextPara::GetEditViewForwarder( sal_Bool bCreate ) const SAL_THROW((uno::RuntimeException)) @@ -611,12 +611,12 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to fetch view forwarder, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy else throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No view forwarder, object not in edit mode")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy } if( pTextEditViewForwarder->IsValid() ) @@ -627,12 +627,12 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("View forwarder is invalid, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy else throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("View forwarder is invalid, object not in edit mode")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy } } @@ -859,12 +859,12 @@ namespace accessibility if( !HaveChildren() ) throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No childs available")), uno::Reference< uno::XInterface > - ( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy + ( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy if( i != 0 ) throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid child index")), uno::Reference< uno::XInterface > - ( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy + ( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy WeakBullet::HardRefType aChild( maImageBullet.get() ); @@ -1151,7 +1151,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot access parent")), uno::Reference< uno::XInterface > - ( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy + ( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy } awt::Size SAL_CALL AccessibleEditableTextPara::getSize( ) throw (uno::RuntimeException) @@ -1242,7 +1242,7 @@ namespace accessibility DBG_CHKTHIS( AccessibleEditableTextPara, NULL ); SolarMutexGuard aGuard; - CheckIndex(nIndex); // may throw IndexOutOfBoundsException + CheckIndex(nIndex); // may throw IndexOutOfBoundsException // get default attribues... ::comphelper::SequenceAsHashMap aPropHashMap( getDefaultAttributes( rRequestedAttributes ) ); @@ -1464,7 +1464,7 @@ namespace accessibility ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getText() throw (uno::RuntimeException) { DBG_CHKTHIS( AccessibleEditableTextPara, NULL ); - + SolarMutexGuard aGuard; DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, @@ -1684,7 +1684,7 @@ namespace accessibility try { SvxEditViewForwarder& rCacheVF = GetEditViewForwarder( sal_True ); - SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs + SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleEditableTextPara::cutText: index value overflow"); @@ -1714,7 +1714,7 @@ namespace accessibility try { SvxEditViewForwarder& rCacheVF = GetEditViewForwarder( sal_True ); - SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs + SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleEditableTextPara::pasteText: index value overflow"); @@ -1746,7 +1746,7 @@ namespace accessibility // #102710# Request edit view when doing changes // AccessibleEmptyEditSource relies on this behaviour GetEditViewForwarder( sal_True ); - SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs + SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleEditableTextPara::deleteText: index value overflow"); @@ -1779,7 +1779,7 @@ namespace accessibility // #102710# Request edit view when doing changes // AccessibleEmptyEditSource relies on this behaviour GetEditViewForwarder( sal_True ); - SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs + SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleEditableTextPara::insertText: index value overflow"); @@ -1814,7 +1814,7 @@ namespace accessibility // #102710# Request edit view when doing changes // AccessibleEmptyEditSource relies on this behaviour GetEditViewForwarder( sal_True ); - SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs + SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleEditableTextPara::replaceText: index value overflow"); @@ -1849,7 +1849,7 @@ namespace accessibility // #102710# Request edit view when doing changes // AccessibleEmptyEditSource relies on this behaviour GetEditViewForwarder( sal_True ); - SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs + SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs USHORT nPara = static_cast< USHORT >( GetParagraphIndex() ); DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, @@ -1872,7 +1872,7 @@ namespace accessibility // convert from PropertyValue to Any sal_Int32 i, nLength( aAttributeSet.getLength() ); - const beans::PropertyValue* pPropArray = aAttributeSet.getConstArray(); + const beans::PropertyValue* pPropArray = aAttributeSet.getConstArray(); for(i=0; i<nLength; ++i) { try @@ -2092,7 +2092,7 @@ namespace accessibility return aOutSequence; } - + // XAccessibleHypertext ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkCount( ) throw (::com::sun::star::uno::RuntimeException) { @@ -2140,12 +2140,12 @@ namespace accessibility return xRef; } - + ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkIndex( ::sal_Int32 nCharIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { const sal_Int32 nPara = GetParagraphIndex(); SvxAccessibleTextAdapter& rT = GetTextForwarder(); - + // SvxAccessibleTextIndex aIndex; // aIndex.SetIndex(nPara, nCharIndex, rT); // const USHORT nEEIndex = aIndex.GetEEIndex(); @@ -2167,10 +2167,10 @@ namespace accessibility nHyperLink++; } } - + return nHLIndex; } - + // XAccessibleMultiLineText sal_Int32 SAL_CALL AccessibleEditableTextPara::getLineNumberAtIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx index 88b3036fe10b..d0b427558e10 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.cxx +++ b/editeng/source/accessibility/AccessibleHyperlink.cxx @@ -2,7 +2,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 @@ -53,17 +53,17 @@ using namespace ::com::sun::star; namespace accessibility { - AccessibleHyperlink::AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, USHORT nP, USHORT nR, sal_Int32 nStt, sal_Int32 nEnd, const ::rtl::OUString& rD ) + AccessibleHyperlink::AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, USHORT nP, USHORT nR, sal_Int32 nStt, sal_Int32 nEnd, const ::rtl::OUString& rD ) : rTA( r ) - { - pFld = p; - nPara = nP; - nRealIdx = nR; - nStartIdx = nStt; - nEndIdx = nEnd; + { + pFld = p; + nPara = nP; + nRealIdx = nR; + nStartIdx = nStt; + nEndIdx = nEnd; aDescription = rD; } - + AccessibleHyperlink::~AccessibleHyperlink() { delete pFld; @@ -74,7 +74,7 @@ namespace accessibility { return isValid() ? 1 : 0; } - + sal_Bool SAL_CALL AccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { sal_Bool bRet = sal_False; @@ -85,26 +85,26 @@ namespace accessibility } return bRet; } - + ::rtl::OUString SAL_CALL AccessibleHyperlink::getAccessibleActionDescription( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { ::rtl::OUString aDesc; if ( isValid() && ( nIndex == 0 ) ) aDesc = aDescription; - + return aDesc; } - + uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL AccessibleHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > xKeyBinding; - + if( isValid() && ( nIndex == 0 ) ) { ::comphelper::OAccessibleKeyBindingHelper* pKeyBindingHelper = new ::comphelper::OAccessibleKeyBindingHelper(); xKeyBinding = pKeyBindingHelper; - + awt::KeyStroke aKeyStroke; aKeyStroke.Modifiers = 0; aKeyStroke.KeyCode = KEY_RETURN; @@ -112,7 +112,7 @@ namespace accessibility aKeyStroke.KeyFunc = 0; pKeyBindingHelper->AddKeyBinding( aKeyStroke ); } - + return xKeyBinding; } @@ -121,22 +121,22 @@ namespace accessibility { return uno::Any(); } - + uno::Any SAL_CALL AccessibleHyperlink::getAccessibleActionObject( sal_Int32 /*nIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { return uno::Any(); } - + sal_Int32 SAL_CALL AccessibleHyperlink::getStartIndex() throw (uno::RuntimeException) { return nStartIdx; } - + sal_Int32 SAL_CALL AccessibleHyperlink::getEndIndex() throw (uno::RuntimeException) { return nEndIdx; } - + sal_Bool SAL_CALL AccessibleHyperlink::isValid( ) throw (uno::RuntimeException) { return rTA.IsValid(); diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx index cb60f4713e7c..b02156670132 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.hxx +++ b/editeng/source/accessibility/AccessibleHyperlink.hxx @@ -2,7 +2,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 @@ -52,7 +52,7 @@ namespace accessibility class AccessibleHyperlink : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleHyperlink > { private: - + SvxAccessibleTextAdapter& rTA; SvxFieldItem* pFld; USHORT nPara, nRealIdx; // EE values @@ -62,13 +62,13 @@ namespace accessibility public: AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, USHORT nP, USHORT nR, sal_Int32 nStt, sal_Int32 nEnd, const ::rtl::OUString& rD ); ~AccessibleHyperlink(); - + // XAccessibleAction virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + // XAccessibleHyperlink virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 7400004bd132..3d65307c4cc5 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,7 +140,7 @@ namespace accessibility throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No childs available")), uno::Reference< uno::XInterface > - ( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy + ( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy } uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleParent() throw (uno::RuntimeException) @@ -213,7 +213,7 @@ namespace accessibility SolarMutexGuard aGuard; - lang::Locale aLocale; + lang::Locale aLocale; DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleImageBullet::getLocale: paragraph index value overflow"); @@ -336,7 +336,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot access parent")), uno::Reference< uno::XInterface > - ( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy + ( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy } awt::Size SAL_CALL AccessibleImageBullet::getSize( ) throw (uno::RuntimeException) @@ -356,7 +356,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Not focusable")), uno::Reference< uno::XInterface > - ( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy + ( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy } sal_Int32 SAL_CALL AccessibleImageBullet::getForeground( ) throw (::com::sun::star::uno::RuntimeException) @@ -592,7 +592,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No edit source, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy } SvxTextForwarder& AccessibleImageBullet::GetTextForwarder() const SAL_THROW((uno::RuntimeException)) @@ -606,7 +606,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to fetch text forwarder, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy if( pTextForwarder->IsValid() ) return *pTextForwarder; @@ -614,7 +614,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text forwarder is invalid, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy } SvxViewForwarder& AccessibleImageBullet::GetViewForwarder() const SAL_THROW((uno::RuntimeException)) @@ -629,7 +629,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to fetch view forwarder, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy } if( pViewForwarder->IsValid() ) @@ -638,7 +638,7 @@ namespace accessibility throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("View forwarder is invalid, object is defunct")), uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > - ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy + ( const_cast< AccessibleImageBullet* > (this) ) ) ); // disambiguate hierarchy } const Point& AccessibleImageBullet::GetEEOffset() const diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index c0b95ef6b5a6..99932e13fe55 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -181,10 +181,10 @@ namespace accessibility } } - AccessibleParaManager::Child AccessibleParaManager::CreateChild( sal_Int32 nChild, - const uno::Reference< XAccessible >& xFrontEnd, - SvxEditSourceAdapter& rEditSource, - sal_uInt32 nParagraphIndex ) + AccessibleParaManager::Child AccessibleParaManager::CreateChild( sal_Int32 nChild, + const uno::Reference< XAccessible >& xFrontEnd, + SvxEditSourceAdapter& rEditSource, + sal_uInt32 nParagraphIndex ) { DBG_ASSERT( maChildren.size() > nParagraphIndex, "AccessibleParaManager::CreateChild: invalid index" ); @@ -253,10 +253,10 @@ namespace accessibility SetState( mnFocusedChild, AccessibleStateType::FOCUSED ); } - void AccessibleParaManager::InitChild( AccessibleEditableTextPara& rChild, - SvxEditSourceAdapter& rEditSource, - sal_Int32 nChild, - sal_uInt32 nParagraphIndex ) const + void AccessibleParaManager::InitChild( AccessibleEditableTextPara& rChild, + SvxEditSourceAdapter& rEditSource, + sal_Int32 nChild, + sal_uInt32 nParagraphIndex ) const { rChild.SetEditSource( &rEditSource ); rChild.SetIndexInParent( nChild ); diff --git a/editeng/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx index c86d4fc23a74..7235169368be 100644 --- a/editeng/source/accessibility/AccessibleSelectionBase.cxx +++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,9 +33,9 @@ using namespace ::rtl; using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::com::sun::star::accessibility; -namespace accessibility +namespace accessibility { // --------------------------- // - AccessibleSelectionBase - @@ -46,7 +46,7 @@ namespace accessibility } //-------------------------------------------------------------------- - + AccessibleSelectionBase::~AccessibleSelectionBase() { } diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 41ec49fb2dd1..ad35aab519e7 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -170,17 +170,17 @@ namespace accessibility #endif AccessibleEditableTextPara& GetParagraph( sal_Int32 nPara ) const; - sal_Int32 GetParagraphCount() const; + sal_Int32 GetParagraphCount() const; sal_Int32 GetParagraphIndex() const; sal_Int32 GetLineCount( sal_Int32 nParagraph ) const; - + EPosition Index2Internal( sal_Int32 nFlatIndex ) const { DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL ); return ImpCalcInternal( nFlatIndex, false ); } - + EPosition Range2Internal( sal_Int32 nFlatIndex ) const { DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL ); @@ -188,21 +188,21 @@ namespace accessibility return ImpCalcInternal( nFlatIndex, true ); } - sal_Int32 Internal2Index( EPosition nEEIndex ) const; + sal_Int32 Internal2Index( EPosition nEEIndex ) const; - void CorrectTextSegment( TextSegment& aTextSegment, - int nPara ) const; + void CorrectTextSegment( TextSegment& aTextSegment, + int nPara ) const; - sal_Bool SetSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex, + sal_Bool SetSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex, sal_Int32 nEndPara, sal_Int32 nEndIndex ); - sal_Bool CopyText( sal_Int32 nStartPara, sal_Int32 nStartIndex, + sal_Bool CopyText( sal_Int32 nStartPara, sal_Int32 nStartIndex, sal_Int32 nEndPara, sal_Int32 nEndIndex ); Rectangle GetParagraphBoundingBox() const; private: - EPosition ImpCalcInternal( sal_Int32 nFlatIndex, bool bExclusive ) const; + EPosition ImpCalcInternal( sal_Int32 nFlatIndex, bool bExclusive ) const; // our frontend class (the one implementing the actual // interface). That's not necessarily the one containing the impl @@ -338,7 +338,7 @@ namespace accessibility nIndex = mpTextParagraph->GetParagraphIndex(); return nIndex; } - + sal_Int32 AccessibleStaticTextBase_Impl::GetLineCount( sal_Int32 nParagraph ) const { DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL ); @@ -347,7 +347,7 @@ namespace accessibility if( mpTextParagraph ) nIndex = mpTextParagraph->GetTextForwarder().GetLineCount( static_cast< USHORT >(nParagraph) ); return nIndex; - } + } sal_Int32 AccessibleStaticTextBase_Impl::Internal2Index( EPosition nEEIndex ) const { @@ -359,8 +359,8 @@ namespace accessibility return aRes + nEEIndex.nIndex; } - void AccessibleStaticTextBase_Impl::CorrectTextSegment( TextSegment& aTextSegment, - int nPara ) const + void AccessibleStaticTextBase_Impl::CorrectTextSegment( TextSegment& aTextSegment, + int nPara ) const { // Keep 'invalid' values at the TextSegment if( aTextSegment.SegmentStart != -1 && @@ -449,7 +449,7 @@ namespace accessibility try { SvxEditViewForwarder& rCacheVF = mpTextParagraph->GetEditViewForwarder( sal_True ); - mpTextParagraph->GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs + mpTextParagraph->GetTextForwarder(); // MUST be after GetEditViewForwarder(), see method docs sal_Bool aRetVal; // save current selection @@ -489,7 +489,7 @@ namespace accessibility // //------------------------------------------------------------------------ - AccessibleStaticTextBase::AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource ) : + AccessibleStaticTextBase::AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource ) : mpImpl( new AccessibleStaticTextBase_Impl() ) { SolarMutexGuard aGuard; @@ -1027,7 +1027,7 @@ namespace accessibility { return mpImpl->GetParagraphBoundingBox(); } - + sal_Int32 AccessibleStaticTextBase::GetParagraphIndex() const { return mpImpl->GetParagraphIndex(); @@ -1037,11 +1037,11 @@ namespace accessibility { return mpImpl->GetParagraphCount(); } - + sal_Int32 AccessibleStaticTextBase::GetLineCount( sal_Int32 nParagraph ) const { return mpImpl->GetLineCount( nParagraph ); - } + } } // end of namespace accessibility diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx index adec29371cae..30d646722773 100644 --- a/editeng/source/accessibility/AccessibleStringWrap.cxx +++ b/editeng/source/accessibility/AccessibleStringWrap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ AccessibleStringWrap::AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, sal_Bool AccessibleStringWrap::GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect ) { - DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX, + DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX, "SvxAccessibleStringWrap::GetCharacterBounds: index value overflow"); mrFont.SetPhysFont( &mrDev ); @@ -74,7 +74,7 @@ sal_Bool AccessibleStringWrap::GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect.SetSize( Size(mrDev.GetTextHeight(), labs(aXArray[0] - aXArray[1])) ); rRect.Move( ::std::min(aXArray[0], aXArray[1]), 0 ); } - + if( mrFont.IsVertical() ) { // #101701# Rotate to vertical diff --git a/editeng/source/accessibility/accessibility.src b/editeng/source/accessibility/accessibility.src index 430af128e58e..51d2a49e6e5b 100644 --- a/editeng/source/accessibility/accessibility.src +++ b/editeng/source/accessibility/accessibility.src @@ -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 diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index 20f668f0dd23..8f50b3437374 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,10 +79,10 @@ EditAttrib::~EditAttrib() EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, USHORT nS, USHORT nE ) : EditAttrib( rAttr ) { - nStart = nS; - nEnd = nE; - bFeature = FALSE; - bEdge = FALSE; + nStart = nS; + nEnd = nE; + bFeature = FALSE; + bEdge = FALSE; DBG_ASSERT( ( rAttr.Which() >= EE_ITEMS_START ) && ( rAttr.Which() <= EE_ITEMS_END ), "EditCharAttrib CTOR: Invalid id!" ); DBG_ASSERT( ( rAttr.Which() < EE_FEATURE_START ) || ( rAttr.Which() > EE_FEATURE_END ) || ( nE == (nS+1) ), "EditCharAttrib CTOR: Invalid feature!" ); @@ -152,7 +152,7 @@ EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr, void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev ) { rFont.SetUnderline( (FontUnderline)((const SvxUnderlineItem*)GetItem())->GetValue() ); - if ( pOutDev ) + if ( pOutDev ) pOutDev->SetTextLineColor( ((const SvxUnderlineItem*)GetItem())->GetColor() ); } @@ -334,7 +334,7 @@ void EditCharAttribLineBreak::SetFont( SvxFont&, OutputDevice* ) EditCharAttribField::EditCharAttribField( const SvxFieldItem& rAttr, USHORT nPos ) : EditCharAttrib( rAttr, nPos, nPos+1 ) { - SetFeature( TRUE ); // !!! + SetFeature( TRUE ); // !!! pTxtColor = 0; pFldColor = 0; } diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index e4f942bb8b11..27e20f32187e 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _EDITATTR_HXX -#define _EDITATTR_HXX +#define _EDITATTR_HXX #include <editeng/eeitem.hxx> @@ -57,13 +57,13 @@ class SvxCharReliefItem; class SfxVoidItem; -#define CH_FEATURE_OLD (BYTE) 0xFF -#define CH_FEATURE (sal_Unicode) 0x01 +#define CH_FEATURE_OLD (BYTE) 0xFF +#define CH_FEATURE (sal_Unicode) 0x01 // DEF_METRIC: Bei meinem Pool sollte immer die DefMetric bei // GetMetric( nWhich ) ankommen! // => Zum ermitteln der DefMetrik einfach ein GetMetric( 0 ) -#define DEF_METRIC 0 +#define DEF_METRIC 0 // ------------------------------------------------------------------------- // class EditAttrib @@ -75,17 +75,17 @@ private: EditAttrib( const EditAttrib & ) {;} protected: - const SfxPoolItem* pItem; + const SfxPoolItem* pItem; EditAttrib( const SfxPoolItem& rAttr ); - virtual ~EditAttrib(); + virtual ~EditAttrib(); public: // RemoveFromPool muss immer vorm DTOR Aufruf erfolgen!! - void RemoveFromPool( SfxItemPool& rPool ); + void RemoveFromPool( SfxItemPool& rPool ); - USHORT Which() const { return pItem->Which(); } - const SfxPoolItem* GetItem() const { return pItem; } + USHORT Which() const { return pItem->Which(); } + const SfxPoolItem* GetItem() const { return pItem; } }; // ------------------------------------------------------------------------- @@ -97,42 +97,42 @@ class EditCharAttrib : public EditAttrib { protected: - USHORT nStart; - USHORT nEnd; - BOOL bFeature :1; - BOOL bEdge :1; + USHORT nStart; + USHORT nEnd; + BOOL bFeature :1; + BOOL bEdge :1; public: EditCharAttrib( const SfxPoolItem& rAttr, USHORT nStart, USHORT nEnd ); - USHORT& GetStart() { return nStart; } - USHORT& GetEnd() { return nEnd; } + USHORT& GetStart() { return nStart; } + USHORT& GetEnd() { return nEnd; } - USHORT GetStart() const { return nStart; } - USHORT GetEnd() const { return nEnd; } + USHORT GetStart() const { return nStart; } + USHORT GetEnd() const { return nEnd; } - inline USHORT GetLen() const; + inline USHORT GetLen() const; - inline void MoveForward( USHORT nDiff ); - inline void MoveBackward( USHORT nDiff ); + inline void MoveForward( USHORT nDiff ); + inline void MoveBackward( USHORT nDiff ); - inline void Expand( USHORT nDiff ); - inline void Collaps( USHORT nDiff ); + inline void Expand( USHORT nDiff ); + inline void Collaps( USHORT nDiff ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); - BOOL IsIn( USHORT nIndex ) + BOOL IsIn( USHORT nIndex ) { return ( ( nStart <= nIndex ) && ( nEnd >= nIndex ) ); } - BOOL IsInside( USHORT nIndex ) + BOOL IsInside( USHORT nIndex ) { return ( ( nStart < nIndex ) && ( nEnd > nIndex ) ); } - BOOL IsEmpty() + BOOL IsEmpty() { return nStart == nEnd; } - BOOL IsFeature() const { return bFeature; } - void SetFeature( BOOL b) { bFeature = b; } + BOOL IsFeature() const { return bFeature; } + void SetFeature( BOOL b) { bFeature = b; } - BOOL IsEdge() const { return bEdge; } - void SetEdge( BOOL b ) { bEdge = b; } + BOOL IsEdge() const { return bEdge; } + void SetEdge( BOOL b ) { bEdge = b; } }; inline USHORT EditCharAttrib::GetLen() const @@ -155,14 +155,14 @@ inline void EditCharAttrib::MoveBackward( USHORT nDiff ) nEnd = nEnd - nDiff; } -inline void EditCharAttrib::Expand( USHORT nDiff ) +inline void EditCharAttrib::Expand( USHORT nDiff ) { DBG_ASSERT( ( ((long)nEnd + nDiff) <= (long)0xFFFF ), "EditCharAttrib: Expand?!" ); DBG_ASSERT( !bFeature, "Bitte keine Features expandieren!" ); nEnd = nEnd + nDiff; } -inline void EditCharAttrib::Collaps( USHORT nDiff ) +inline void EditCharAttrib::Collaps( USHORT nDiff ) { DBG_ASSERT( (long)nEnd - nDiff >= (long)nStart, "EditCharAttrib: Collaps?!" ); DBG_ASSERT( !bFeature, "Bitte keine Features schrumpfen!" ); @@ -177,7 +177,7 @@ class EditCharAttribFont: public EditCharAttrib public: EditCharAttribFont( const SvxFontItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -188,7 +188,7 @@ class EditCharAttribWeight : public EditCharAttrib public: EditCharAttribWeight( const SvxWeightItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- // class EditCharAttribItalic @@ -198,7 +198,7 @@ class EditCharAttribItalic : public EditCharAttrib public: EditCharAttribItalic( const SvxPostureItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -209,7 +209,7 @@ class EditCharAttribShadow : public EditCharAttrib public: EditCharAttribShadow( const SvxShadowedItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -220,7 +220,7 @@ class EditCharAttribEscapement : public EditCharAttrib public: EditCharAttribEscapement( const SvxEscapementItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -231,7 +231,7 @@ class EditCharAttribOutline : public EditCharAttrib public: EditCharAttribOutline( const SvxContourItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -242,7 +242,7 @@ class EditCharAttribStrikeout : public EditCharAttrib public: EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -253,7 +253,7 @@ class EditCharAttribUnderline : public EditCharAttrib public: EditCharAttribUnderline( const SvxUnderlineItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -264,7 +264,7 @@ class EditCharAttribOverline : public EditCharAttrib public: EditCharAttribOverline( const SvxOverlineItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -275,7 +275,7 @@ class EditCharAttribEmphasisMark : public EditCharAttrib public: EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -286,7 +286,7 @@ class EditCharAttribRelief : public EditCharAttrib public: EditCharAttribRelief( const SvxCharReliefItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -297,7 +297,7 @@ class EditCharAttribFontHeight : public EditCharAttrib public: EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -308,7 +308,7 @@ class EditCharAttribFontWidth : public EditCharAttrib public: EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -319,7 +319,7 @@ class EditCharAttribColor : public EditCharAttrib public: EditCharAttribColor( const SvxColorItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -330,7 +330,7 @@ class EditCharAttribLanguage : public EditCharAttrib public: EditCharAttribLanguage( const SvxLanguageItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -341,7 +341,7 @@ class EditCharAttribTab : public EditCharAttrib public: EditCharAttribTab( const SfxVoidItem& rAttr, USHORT nPos ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -352,7 +352,7 @@ class EditCharAttribLineBreak : public EditCharAttrib public: EditCharAttribLineBreak( const SfxVoidItem& rAttr, USHORT nPos ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -360,9 +360,9 @@ public: // ------------------------------------------------------------------------- class EditCharAttribField: public EditCharAttrib { - XubString aFieldValue; - Color* pTxtColor; - Color* pFldColor; + XubString aFieldValue; + Color* pTxtColor; + Color* pFldColor; EditCharAttribField& operator = ( const EditCharAttribField& rAttr ) const; @@ -375,14 +375,14 @@ public: BOOL operator != ( const EditCharAttribField& rAttr ) const { return !(operator == ( rAttr ) ); } - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); - Color*& GetTxtColor() { return pTxtColor; } - Color*& GetFldColor() { return pFldColor; } + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + Color*& GetTxtColor() { return pTxtColor; } + Color*& GetFldColor() { return pFldColor; } - const XubString& GetFieldValue() const { return aFieldValue; } - XubString& GetFieldValue() { return aFieldValue; } + const XubString& GetFieldValue() const { return aFieldValue; } + XubString& GetFieldValue() { return aFieldValue; } - void Reset() + void Reset() { aFieldValue.Erase(); delete pTxtColor; pTxtColor = 0; @@ -398,7 +398,7 @@ class EditCharAttribPairKerning : public EditCharAttrib public: EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -409,7 +409,7 @@ class EditCharAttribKerning : public EditCharAttrib public: EditCharAttribKerning( const SvxKerningItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; // ------------------------------------------------------------------------- @@ -420,7 +420,7 @@ class EditCharAttribWordLineMode: public EditCharAttrib public: EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, USHORT nStart, USHORT nEnd ); - virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); + virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 08f59ff380be..1011ba13421f 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -466,7 +466,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox ) fprintf( fp, "\nMinAutoPaperSize: %li x %li", pEE->GetMinAutoPaperSize().Width(), pEE->GetMinAutoPaperSize().Height() ); fprintf( fp, "\nUpdate: %i", pEE->GetUpdateMode() ); fprintf( fp, "\nAnzahl der Views: %i", pEE->GetViewCount() ); - for ( USHORT nView = 0; nView < pEE->GetViewCount(); nView++ ) + for ( USHORT nView = 0; nView < pEE->GetViewCount(); nView++ ) { EditView* pV = pEE->GetView( nView ); DBG_ASSERT( pV, "View nicht gefunden!" ); diff --git a/editeng/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx index 03b78ff3a0d4..45cff0d21096 100644 --- a/editeng/source/editeng/editdbg.hxx +++ b/editeng/source/editeng/editdbg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,17 +41,17 @@ class SfxItemSet; class SfxItemPool; class SfxPoolItem; -ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem ); -void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, BOOL bSearchInParent, BOOL bShowALL ); +ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem ); +void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, BOOL bSearchInParent, BOOL bShowALL ); class EditDbg { public: - static void ShowEditEngineData( EditEngine* pEditEngine, BOOL bInfoBox = TRUE ); - static void ShowPortionData( ParaPortion* pPortion ); - static ByteString GetPortionInfo( ParaPortion* pPPortion ); - static ByteString GetTextPortionInfo( TextPortionList& rPortions ); - static ByteString GetUndoDebStr( EditUndoList* pUndoList ); + static void ShowEditEngineData( EditEngine* pEditEngine, BOOL bInfoBox = TRUE ); + static void ShowPortionData( ParaPortion* pPortion ); + static ByteString GetPortionInfo( ParaPortion* pPPortion ); + static ByteString GetTextPortionInfo( TextPortionList& rPortions ); + static ByteString GetUndoDebStr( EditUndoList* pUndoList ); }; diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 7b4cd9408173..e9e1e49f134e 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ #include <tools/shl.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/i18n/ScriptType.hpp> -#include <stdlib.h> // qsort +#include <stdlib.h> // qsort using namespace ::com::sun::star; @@ -75,11 +75,11 @@ using namespace ::com::sun::star; USHORT GetScriptItemId( USHORT nItemId, short nScriptType ) { USHORT nId = nItemId; - + if ( ( nScriptType == i18n::ScriptType::ASIAN ) || ( nScriptType == i18n::ScriptType::COMPLEX ) ) { - switch ( nItemId ) + switch ( nItemId ) { case EE_CHAR_LANGUAGE: nId = ( nScriptType == i18n::ScriptType::ASIAN ) ? EE_CHAR_LANGUAGE_CJK : EE_CHAR_LANGUAGE_CTL; @@ -98,15 +98,15 @@ USHORT GetScriptItemId( USHORT nItemId, short nScriptType ) break; } } - + return nId; } BOOL IsScriptItemValid( USHORT nItemId, short nScriptType ) { BOOL bValid = TRUE; - - switch ( nItemId ) + + switch ( nItemId ) { case EE_CHAR_LANGUAGE: bValid = nScriptType == i18n::ScriptType::LATIN; @@ -171,14 +171,14 @@ DBG_NAME( EE_CharAttribList ); SfxItemInfo aItemInfos[EDITITEMCOUNT] = { { SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, // EE_PARA_WRITINGDIR - { 0, SFX_ITEM_POOLABLE }, // EE_PARA_XMLATTRIBS - { SID_ATTR_PARA_HANGPUNCTUATION, SFX_ITEM_POOLABLE }, // EE_PARA_HANGINGPUNCTUATION + { 0, SFX_ITEM_POOLABLE }, // EE_PARA_XMLATTRIBS + { SID_ATTR_PARA_HANGPUNCTUATION, SFX_ITEM_POOLABLE }, // EE_PARA_HANGINGPUNCTUATION { SID_ATTR_PARA_FORBIDDEN_RULES, SFX_ITEM_POOLABLE }, - { SID_ATTR_PARA_SCRIPTSPACE, SFX_ITEM_POOLABLE }, // EE_PARA_ASIANCJKSPACING - { SID_ATTR_NUMBERING_RULE, SFX_ITEM_POOLABLE }, // EE_PARA_NUMBULL - { 0, SFX_ITEM_POOLABLE }, // EE_PARA_HYPHENATE - { 0, SFX_ITEM_POOLABLE }, // EE_PARA_BULLETSTATE - { 0, SFX_ITEM_POOLABLE }, // EE_PARA_OUTLLRSPACE + { SID_ATTR_PARA_SCRIPTSPACE, SFX_ITEM_POOLABLE }, // EE_PARA_ASIANCJKSPACING + { SID_ATTR_NUMBERING_RULE, SFX_ITEM_POOLABLE }, // EE_PARA_NUMBULL + { 0, SFX_ITEM_POOLABLE }, // EE_PARA_HYPHENATE + { 0, SFX_ITEM_POOLABLE }, // EE_PARA_BULLETSTATE + { 0, SFX_ITEM_POOLABLE }, // EE_PARA_OUTLLRSPACE { SID_ATTR_PARA_OUTLLEVEL, SFX_ITEM_POOLABLE }, // EE_PARA_OUTLLEVEL { SID_ATTR_PARA_BULLET, SFX_ITEM_POOLABLE }, // EE_PARA_BULLET { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, // EE_PARA_LRSPACE @@ -215,12 +215,12 @@ SfxItemInfo aItemInfos[EDITITEMCOUNT] = { { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE }, { SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEM_POOLABLE }, { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, - { 0, SFX_ITEM_POOLABLE }, // EE_CHAR_RUBI_DUMMY - { 0, SFX_ITEM_POOLABLE }, // EE_CHAR_XMLATTRIBS + { 0, SFX_ITEM_POOLABLE }, // EE_CHAR_RUBI_DUMMY + { 0, SFX_ITEM_POOLABLE }, // EE_CHAR_XMLATTRIBS { SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE }, - { 0, SFX_ITEM_POOLABLE }, // EE_FEATURE_TAB - { 0, SFX_ITEM_POOLABLE }, // EE_FEATURE_LINEBR - { SID_ATTR_CHAR_CHARSETCOLOR, SFX_ITEM_POOLABLE }, // EE_FEATURE_NOTCONV + { 0, SFX_ITEM_POOLABLE }, // EE_FEATURE_TAB + { 0, SFX_ITEM_POOLABLE }, // EE_FEATURE_LINEBR + { SID_ATTR_CHAR_CHARSETCOLOR, SFX_ITEM_POOLABLE }, // EE_FEATURE_NOTCONV { SID_FIELD, SFX_ITEM_POOLABLE } }; @@ -230,22 +230,22 @@ USHORT aV1Map[] = { }; USHORT aV2Map[] = { - 3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4008, 4009, + 3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, 4014, 4015, 4016, 4018, 4019, 4020 }; USHORT aV3Map[] = { - 3997, 3998, 3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007, + 3997, 3998, 3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4009, 4010, 4011, 4012, 4013, 4014, 4015, 4016, 4017, 4018, 4019, 4020, 4021 }; USHORT aV4Map[] = { - 3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003, - 4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, - 4014, 4015, 4016, 4017, 4018, + 3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003, + 4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, + 4014, 4015, 4016, 4017, 4018, /* CJK Items inserted here: EE_CHAR_LANGUAGE - EE_CHAR_XMLATTRIBS */ - 4034, 4035, 4036, 4037 + 4034, 4035, 4036, 4037 }; USHORT aV5Map[] = { @@ -382,7 +382,7 @@ EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, US break; case EE_CHAR_XMLATTRIBS: { - pNew = new EditCharAttrib( rNew, nS, nE ); // Attrib is only for holding XML information... + pNew = new EditCharAttrib( rNew, nS, nE ); // Attrib is only for holding XML information... } break; case EE_FEATURE_TAB: @@ -417,7 +417,7 @@ EditLine::EditLine() DBG_CTOR( EE_EditLine, 0 ); nStart = nEnd = 0; - nStartPortion = 0; // damit in ungueltiger Zeile ohne Portions von einer gueltigen Zeile mit der Portion Nr0 unterscieden werden kann. + nStartPortion = 0; // damit in ungueltiger Zeile ohne Portions von einer gueltigen Zeile mit der Portion Nr0 unterscieden werden kann. nEndPortion = 0; nHeight = 0; nStartPosX = 0; @@ -460,16 +460,16 @@ EditLine* EditLine::Clone() const { pL->aPositions.Insert (aPositions.GetData(), aPositions.Count(), 0); } - pL->nStartPosX = nStartPosX; - pL->nStart = nStart; - pL->nEnd = nEnd; - pL->nStartPortion = nStartPortion; - pL->nEndPortion = nEndPortion; - pL->nHeight = nHeight; - pL->nTxtWidth = nTxtWidth; - pL->nTxtHeight = nTxtHeight; - pL->nCrsrHeight = nCrsrHeight; - pL->nMaxAscent = nMaxAscent; + pL->nStartPosX = nStartPosX; + pL->nStart = nStart; + pL->nEnd = nEnd; + pL->nStartPortion = nStartPortion; + pL->nEndPortion = nEndPortion; + pL->nHeight = nHeight; + pL->nTxtWidth = nTxtWidth; + pL->nTxtHeight = nTxtHeight; + pL->nCrsrHeight = nCrsrHeight; + pL->nMaxAscent = nMaxAscent; return pL; } @@ -532,7 +532,7 @@ Size EditLine::CalcTextSize( ParaPortion& rParaPortion ) } break; case PORTIONKIND_TAB: -// case PORTIONKIND_EXTRASPACE: +// case PORTIONKIND_EXTRASPACE: { aSz.Width() += pPortion->GetSize().Width(); } @@ -768,7 +768,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP // Wenn spaeter doch Ueberpruefung: // Spezialfall: Start == 0; AbsLen == 1, nNew = 1 => Expand, weil durch Absatzumbruch! // Start <= nIndex, End >= nIndex => Start=End=nIndex! -// if ( pAttrib->GetStart() == nIndex ) +// if ( pAttrib->GetStart() == nIndex ) pAttrib->Expand( nNew ); if ( pAttrib->GetStart() == 0 ) bExpandedEmptyAtIndexNull = TRUE; @@ -779,7 +779,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP // Nur expandieren, wenn kein Feature, // und wenn nicht in ExcludeListe! // Sonst geht z.B. ein UL bis zum neuen ULDB, beide expandieren -// if ( !pAttrib->IsFeature() && !rExclList.FindAttrib( pAttrib->Which() ) ) +// if ( !pAttrib->IsFeature() && !rExclList.FindAttrib( pAttrib->Which() ) ) if ( !pAttrib->IsFeature() && !aCharAttribList.FindEmptyAttrib( pAttrib->Which(), nIndex ) ) { if ( !pAttrib->IsEdge() ) @@ -902,7 +902,7 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r // Spezialfall: Attrubt deckt genau den Bereich ab // => als leeres Attribut behalten. if ( !pAttrib->IsFeature() && ( pAttrib->GetStart() == nIndex ) && ( pAttrib->GetEnd() == nEndChanges ) ) - pAttrib->GetEnd() = nIndex; // leer + pAttrib->GetEnd() = nIndex; // leer else bDelAttr = TRUE; } @@ -910,10 +910,10 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r else if ( ( pAttrib->GetStart() <= nIndex ) && ( pAttrib->GetEnd() > nIndex ) ) { DBG_ASSERT( !pAttrib->IsFeature(), "Collapsing Feature!" ); - if ( pAttrib->GetEnd() <= nEndChanges ) // endet drinnen + if ( pAttrib->GetEnd() <= nEndChanges ) // endet drinnen pAttrib->GetEnd() = nIndex; else - pAttrib->Collaps( nDeleted ); // endet dahinter + pAttrib->Collaps( nDeleted ); // endet dahinter } // 3. Attribut beginnt drinnen, endet dahinter... else if ( ( pAttrib->GetStart() >= nIndex ) && ( pAttrib->GetEnd() > nEndChanges ) ) @@ -1001,7 +1001,7 @@ void ContentNode::CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, else { // alle dahinter verschieben in den neuen Node (this) -// pPrevNode->GetCharAttribs().RemoveAttrib( pAttrib ); +// pPrevNode->GetCharAttribs().RemoveAttrib( pAttrib ); pPrevNode->GetCharAttribs().GetAttribs().Remove( nAttr ); aCharAttribList.InsertAttrib( pAttrib ); DBG_ASSERT( pAttrib->GetStart() >= nCut, "Start < nCut!" ); @@ -1079,7 +1079,7 @@ void ContentNode::CreateDefFont() SfxStyleSheet* pS = aContentAttribs.GetStyleSheet(); if ( pS ) CreateFont( GetCharAttribs().GetDefFont(), pS->GetItemSet() ); - + // ... dann die harte Absatzformatierung rueberbuegeln... CreateFont( GetCharAttribs().GetDefFont(), GetContentAttribs().GetItems(), pS == NULL ); @@ -1088,7 +1088,7 @@ void ContentNode::CreateDefFont() void ContentNode::SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyle ) { aContentAttribs.SetStyleSheet( pS ); - + // Erst alle Informationen aus dem Style verwenden... GetCharAttribs().GetDefFont() = rFontFromStyle; // ... dann die harte Absatzformatierung rueberbuegeln... @@ -1119,10 +1119,10 @@ void ContentNode::CreateWrongList() #endif } -void ContentNode::SetWrongList( WrongList* p ) -{ +void ContentNode::SetWrongList( WrongList* p ) +{ DBG_ASSERT( !pWrongList, "WrongList existiert schon!" ); - pWrongList = p; + pWrongList = p; } // ------------------------------------------------------------------------- @@ -1203,9 +1203,9 @@ BOOL ContentAttribs::HasItem( USHORT nWhich ) - // ---------------------------------------------------------------------- -// class ItemList -// ---------------------------------------------------------------------- + // ---------------------------------------------------------------------- +// class ItemList +// ---------------------------------------------------------------------- const SfxPoolItem* ItemList::FindAttrib( USHORT nWhich ) { const SfxPoolItem* pItem = First(); @@ -1220,7 +1220,7 @@ const SfxPoolItem* ItemList::FindAttrib( USHORT nWhich ) // ------------------------------------------------------------------------- EditDoc::EditDoc( SfxItemPool* pPool ) { - if ( pPool ) + if ( pPool ) { pItemPool = pPool; bOwnerOfPool = FALSE; @@ -1230,7 +1230,7 @@ EditDoc::EditDoc( SfxItemPool* pPool ) pItemPool = new EditEngineItemPool( FALSE ); bOwnerOfPool = TRUE; } - + nDefTab = DEFTAB; bIsVertical = FALSE; bIsFixedCellHeight = FALSE; @@ -1243,7 +1243,7 @@ EditDoc::EditDoc( SfxItemPool* pPool ) EditDoc::~EditDoc() { ImplDestroyContents(); - if ( bOwnerOfPool ) + if ( bOwnerOfPool ) SfxItemPool::Free(pItemPool); } @@ -1333,7 +1333,7 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, s // So ggf ein MakeUniqFont im Font mehr, dafuer bei Aenderung schnellerer // Abbruch der Abfrage, oder ich musste noch jedesmal ein bChanged pflegen. if ( rFont == aPrevFont ) - rFont = aPrevFont; // => Gleicher ImpPointer fuer IsSameInstance + rFont = aPrevFont; // => Gleicher ImpPointer fuer IsSameInstance } void EditDoc::CreateDefFont( BOOL bUseStyles ) @@ -1424,10 +1424,10 @@ XubString EditDoc::GetParaAsString( ContentNode* pNode, USHORT nStartPos, USHORT if ( pNextFeature && ( pNextFeature->GetStart() < nEnd ) ) nEnd = pNextFeature->GetStart(); else - pNextFeature = 0; // Feature interessiert unten nicht + pNextFeature = 0; // Feature interessiert unten nicht DBG_ASSERT( nEnd >= nIndex, "Ende vorm Index?" ); - //!! beware of sub string length of -1 which is also defined as STRING_LEN and + //!! 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 ); @@ -1436,14 +1436,14 @@ XubString EditDoc::GetParaAsString( ContentNode* pNode, USHORT nStartPos, USHORT { switch ( pNextFeature->GetItem()->Which() ) { - case EE_FEATURE_TAB: aStr += '\t'; + case EE_FEATURE_TAB: aStr += '\t'; break; - case EE_FEATURE_LINEBR: aStr += '\x0A'; + case EE_FEATURE_LINEBR: aStr += '\x0A'; break; - case EE_FEATURE_FIELD: if ( bResolveFields ) + case EE_FEATURE_FIELD: if ( bResolveFields ) aStr += ((EditCharAttribField*)pNextFeature)->GetFieldValue(); break; - default: DBG_ERROR( "Was fuer ein Feature ?" ); + default: DBG_ERROR( "Was fuer ein Feature ?" ); } pNextFeature = pNode->GetCharAttribs().FindFeature( ++nEnd ); } @@ -1492,8 +1492,8 @@ EditPaM EditDoc::Clear() return aPaM; } -void EditDoc::SetModified( BOOL b ) -{ +void EditDoc::SetModified( BOOL b ) +{ bModified = b; if ( bModified ) { @@ -1721,10 +1721,10 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi bChanged = TRUE; if ( pAttr->GetEnd() > nEnd ) { - pAttr->GetStart() = nEnd; // dann faengt es dahinter an + pAttr->GetStart() = nEnd; // dann faengt es dahinter an rpStarting = pAttr; if ( nWhich ) - break; // es kann kein weiteres Attrib hier liegen + break; // es kann kein weiteres Attrib hier liegen } else if ( !pAttr->IsFeature() || ( pAttr->GetStart() == nStart ) ) { @@ -1739,7 +1739,7 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi bChanged = TRUE; if ( ( pAttr->GetStart() < nStart ) && !pAttr->IsFeature() ) { - pAttr->GetEnd() = nStart; // dann hoert es hier auf + pAttr->GetEnd() = nStart; // dann hoert es hier auf rpEnding = pAttr; } else if ( !pAttr->IsFeature() || ( pAttr->GetStart() == nStart ) ) @@ -1757,14 +1757,14 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi pAttr->GetStart() = nEnd; rpStarting = pAttr; if ( nWhich ) - break; // es kann weitere Attribute geben! + break; // es kann weitere Attribute geben! } else if ( pAttr->GetEnd() == nEnd ) { pAttr->GetEnd() = nStart; rpEnding = pAttr; if ( nWhich ) - break; // es kann weitere Attribute geben! + break; // es kann weitere Attribute geben! } else // Attribut muss gesplittet werden... { @@ -1773,7 +1773,7 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi rpEnding = pAttr; InsertAttrib( *pAttr->GetItem(), pNode, nEnd, nOldEnd ); if ( nWhich ) - break; // es kann weitere Attribute geben! + break; // es kann weitere Attribute geben! } } } @@ -1834,7 +1834,7 @@ void EditDoc::InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd, cons pAttr = pNode->GetCharAttribs().FindAttrib( rPoolItem.Which(), nStart ); if ( pAttr ) { - if ( pAttr->IsInside( nStart ) ) // splitten + if ( pAttr->IsInside( nStart ) ) // splitten { // ??????????????????????????????? // eigentlich noch pruefen, ob wirklich splittet, oder return ! @@ -1888,7 +1888,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos, // Attribut beginnt hier else if ( ( pAttr->GetStart() == nStartPos ) && ( pAttr->GetEnd() > nStartPos ) ) { - if ( nStartPos == 0 ) // Sonderfall + if ( nStartPos == 0 ) // Sonderfall pItem = pAttr->GetItem(); } @@ -1912,7 +1912,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos, pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr ); } } - else // Selektion + else // Selektion { while ( pAttr && ( pAttr->GetStart() < nEndPos) ) { @@ -2156,7 +2156,7 @@ EditCharAttrib* CharAttribList::FindEmptyAttrib( USHORT nWhich, USHORT nPos ) return 0; } -EditCharAttrib* CharAttribList::FindFeature( USHORT nPos ) const +EditCharAttrib* CharAttribList::FindFeature( USHORT nPos ) const { USHORT nAttr = 0; diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index ad11aa6f0d93..188992bebe3e 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,8 +45,8 @@ class SvtCTLOptions; DBG_NAMEEX( EE_TextPortion ) -#define CHARPOSGROW 16 -#define DEFTAB 720 +#define CHARPOSGROW 16 +#define DEFTAB 720 void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent = true, short nScriptType = 0 ); USHORT GetScriptItemId( USHORT nItemId, short nScriptType ); @@ -62,10 +62,10 @@ struct EPaM USHORT nPara; USHORT nIndex; - EPaM() { nPara = 0; nIndex = 0; } - EPaM( USHORT nP, USHORT nI ) { nPara = nP; nIndex = nI; } - EPaM( const EPaM& r) { nPara = r.nPara; nIndex = r.nIndex; } - EPaM& operator = ( const EPaM& r ) { nPara = r.nPara; nIndex = r.nIndex; return *this; } + EPaM() { nPara = 0; nIndex = 0; } + EPaM( USHORT nP, USHORT nI ) { nPara = nP; nIndex = nI; } + EPaM( const EPaM& r) { nPara = r.nPara; nIndex = r.nIndex; } + EPaM& operator = ( const EPaM& r ) { nPara = r.nPara; nIndex = r.nIndex; return *this; } inline BOOL operator == ( const EPaM& r ) const; inline BOOL operator < ( const EPaM& r ) const; }; @@ -83,9 +83,9 @@ inline BOOL EPaM::operator == ( const EPaM& r ) const struct ScriptTypePosInfo { - short nScriptType; - USHORT nStartPos; - USHORT nEndPos; + short nScriptType; + USHORT nStartPos; + USHORT nEndPos; ScriptTypePosInfo( short _Type, USHORT _Start, USHORT _End ) { @@ -99,9 +99,9 @@ SV_DECL_VARARR( ScriptTypePosInfos, ScriptTypePosInfo, 0, 4 ) struct WritingDirectionInfo { - BYTE nType; - USHORT nStartPos; - USHORT nEndPos; + BYTE nType; + USHORT nStartPos; + USHORT nEndPos; WritingDirectionInfo( BYTE _Type, USHORT _Start, USHORT _End ) { @@ -119,24 +119,24 @@ SV_DECL_PTRARR( CharAttribArray, EditCharAttribPtr, 0, 4 ) class ContentAttribsInfo { private: - SfxItemSet aPrevParaAttribs; - CharAttribArray aPrevCharAttribs; + SfxItemSet aPrevParaAttribs; + CharAttribArray aPrevCharAttribs; public: ContentAttribsInfo( const SfxItemSet& rParaAttribs ); - const SfxItemSet& GetPrevParaAttribs() const { return aPrevParaAttribs; } - const CharAttribArray& GetPrevCharAttribs() const { return aPrevCharAttribs; } + const SfxItemSet& GetPrevParaAttribs() const { return aPrevParaAttribs; } + const CharAttribArray& GetPrevCharAttribs() const { return aPrevCharAttribs; } - CharAttribArray& GetPrevCharAttribs() { return aPrevCharAttribs; } + CharAttribArray& GetPrevCharAttribs() { return aPrevCharAttribs; } }; typedef ContentAttribsInfo* ContentAttribsInfoPtr; SV_DECL_PTRARR( ContentInfoArray, ContentAttribsInfoPtr, 1, 1 ) -// ---------------------------------------------------------------------- -// class SvxFontTable -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// class SvxFontTable +// ---------------------------------------------------------------------- DECLARE_TABLE( DummyFontTable, SvxFontItem* ) class SvxFontTable : public DummyFontTable { @@ -144,12 +144,12 @@ public: SvxFontTable(); ~SvxFontTable(); - ULONG GetId( const SvxFontItem& rFont ); + ULONG GetId( const SvxFontItem& rFont ); }; -// ---------------------------------------------------------------------- -// class SvxColorList -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// class SvxColorList +// ---------------------------------------------------------------------- typedef ContentNode* ContentNodePtr; DECLARE_LIST( DummyColorList, SvxColorItem* ) class SvxColorList : public DummyColorList @@ -158,18 +158,18 @@ public: SvxColorList(); ~SvxColorList(); - ULONG GetId( const SvxColorItem& rColor ); + ULONG GetId( const SvxColorItem& rColor ); }; -// ---------------------------------------------------------------------- -// class ItemList -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// class ItemList +// ---------------------------------------------------------------------- typedef const SfxPoolItem* ConstPoolItemPtr; DECLARE_LIST( DummyItemList, ConstPoolItemPtr ) class ItemList : public DummyItemList { public: - const SfxPoolItem* FindAttrib( USHORT nWhich ); + const SfxPoolItem* FindAttrib( USHORT nWhich ); }; // ------------------------------------------------------------------------- @@ -178,21 +178,21 @@ public: class ContentAttribs { private: - SfxStyleSheet* pStyle; - SfxItemSet aAttribSet; + SfxStyleSheet* pStyle; + SfxItemSet aAttribSet; public: ContentAttribs( SfxItemPool& rItemPool ); ContentAttribs( const ContentAttribs& ); - ~ContentAttribs(); // erst bei umfangreicheren Tabs + ~ContentAttribs(); // erst bei umfangreicheren Tabs - SvxTabStop FindTabStop( long nCurPos, USHORT nDefTab ); - SfxItemSet& GetItems() { return aAttribSet; } - SfxStyleSheet* GetStyleSheet() const { return pStyle; } - void SetStyleSheet( SfxStyleSheet* pS ); + SvxTabStop FindTabStop( long nCurPos, USHORT nDefTab ); + SfxItemSet& GetItems() { return aAttribSet; } + SfxStyleSheet* GetStyleSheet() const { return pStyle; } + void SetStyleSheet( SfxStyleSheet* pS ); - const SfxPoolItem& GetItem( USHORT nWhich ); - BOOL HasItem( USHORT nWhich ); + const SfxPoolItem& GetItem( USHORT nWhich ); + BOOL HasItem( USHORT nWhich ); }; // ------------------------------------------------------------------------- @@ -201,9 +201,9 @@ public: class CharAttribList { private: - CharAttribArray aAttribs; - SvxFont aDefFont; // schneller, als jedesmal vom Pool! - BOOL bHasEmptyAttribs; + CharAttribArray aAttribs; + SvxFont aDefFont; // schneller, als jedesmal vom Pool! + BOOL bHasEmptyAttribs; CharAttribList( const CharAttribList& ) {;} @@ -211,35 +211,35 @@ public: CharAttribList(); ~CharAttribList(); - void DeleteEmptyAttribs( SfxItemPool& rItemPool ); - void RemoveItemsFromPool( SfxItemPool* pItemPool ); + void DeleteEmptyAttribs( SfxItemPool& rItemPool ); + void RemoveItemsFromPool( SfxItemPool* pItemPool ); - EditCharAttrib* FindAttrib( USHORT nWhich, USHORT nPos ); - EditCharAttrib* FindNextAttrib( USHORT nWhich, USHORT nFromPos ) const; - EditCharAttrib* FindEmptyAttrib( USHORT nWhich, USHORT nPos ); - EditCharAttrib* FindFeature( USHORT nPos ) const; + EditCharAttrib* FindAttrib( USHORT nWhich, USHORT nPos ); + EditCharAttrib* FindNextAttrib( USHORT nWhich, USHORT nFromPos ) const; + EditCharAttrib* FindEmptyAttrib( USHORT nWhich, USHORT nPos ); + EditCharAttrib* FindFeature( USHORT nPos ) const; - void ResortAttribs(); + void ResortAttribs(); void OptimizeRanges( SfxItemPool& rItemPool ); - USHORT Count() { return aAttribs.Count(); } - void Clear() { aAttribs.Remove( 0, aAttribs.Count()); } - void InsertAttrib( EditCharAttrib* pAttrib ); + USHORT Count() { return aAttribs.Count(); } + void Clear() { aAttribs.Remove( 0, aAttribs.Count()); } + void InsertAttrib( EditCharAttrib* pAttrib ); - SvxFont& GetDefFont() { return aDefFont; } + SvxFont& GetDefFont() { return aDefFont; } - BOOL HasEmptyAttribs() const { return bHasEmptyAttribs; } - BOOL& HasEmptyAttribs() { return bHasEmptyAttribs; } - BOOL HasBoundingAttrib( USHORT nBound ); - BOOL HasAttrib( USHORT nWhich ) const; - BOOL HasAttrib( USHORT nStartPos, USHORT nEndPos ) const; + BOOL HasEmptyAttribs() const { return bHasEmptyAttribs; } + BOOL& HasEmptyAttribs() { return bHasEmptyAttribs; } + BOOL HasBoundingAttrib( USHORT nBound ); + BOOL HasAttrib( USHORT nWhich ) const; + BOOL HasAttrib( USHORT nStartPos, USHORT nEndPos ) const; - CharAttribArray& GetAttribs() { return aAttribs; } - const CharAttribArray& GetAttribs() const { return aAttribs; } + CharAttribArray& GetAttribs() { return aAttribs; } + const CharAttribArray& GetAttribs() const { return aAttribs; } // Debug: - BOOL DbgCheckAttribs(); + BOOL DbgCheckAttribs(); }; // ------------------------------------------------------------------------- @@ -248,36 +248,36 @@ public: class ContentNode : public XubString { private: - ContentAttribs aContentAttribs; - CharAttribList aCharAttribList; - WrongList* pWrongList; + ContentAttribs aContentAttribs; + CharAttribList aCharAttribList; + WrongList* pWrongList; public: ContentNode( SfxItemPool& rItemPool ); ContentNode( const XubString& rStr, const ContentAttribs& rContentAttribs ); ~ContentNode(); - ContentAttribs& GetContentAttribs() { return aContentAttribs; } - CharAttribList& GetCharAttribs() { return aCharAttribList; } + ContentAttribs& GetContentAttribs() { return aContentAttribs; } + CharAttribList& GetCharAttribs() { return aCharAttribList; } - void ExpandAttribs( USHORT nIndex, USHORT nNewChars, SfxItemPool& rItemPool ); - void CollapsAttribs( USHORT nIndex, USHORT nDelChars, SfxItemPool& rItemPool ); - void AppendAttribs( ContentNode* pNextNode ); - void CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, BOOL bKeepEndingAttribs ); + void ExpandAttribs( USHORT nIndex, USHORT nNewChars, SfxItemPool& rItemPool ); + void CollapsAttribs( USHORT nIndex, USHORT nDelChars, SfxItemPool& rItemPool ); + void AppendAttribs( ContentNode* pNextNode ); + void CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, BOOL bKeepEndingAttribs ); - void SetStyleSheet( SfxStyleSheet* pS, BOOL bRecalcFont = TRUE ); - void SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyle ); - SfxStyleSheet* GetStyleSheet() { return aContentAttribs.GetStyleSheet(); } + void SetStyleSheet( SfxStyleSheet* pS, BOOL bRecalcFont = TRUE ); + void SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyle ); + SfxStyleSheet* GetStyleSheet() { return aContentAttribs.GetStyleSheet(); } - void CreateDefFont(); + void CreateDefFont(); - WrongList* GetWrongList() { return pWrongList; } - void SetWrongList( WrongList* p ); + WrongList* GetWrongList() { return pWrongList; } + void SetWrongList( WrongList* p ); - void CreateWrongList(); - void DestroyWrongList(); + void CreateWrongList(); + void DestroyWrongList(); - BOOL IsFeature( USHORT nPos ) const { return ( GetChar( nPos ) == CH_FEATURE ); } + BOOL IsFeature( USHORT nPos ) const { return ( GetChar( nPos ) == CH_FEATURE ); } }; typedef ContentNode* ContentNodePtr; @@ -297,40 +297,40 @@ public: class EditPaM { private: - ContentNode* pNode; - USHORT nIndex; + ContentNode* pNode; + USHORT nIndex; public: - EditPaM() { pNode = NULL; nIndex = 0; } - EditPaM( ContentNode* p, USHORT n ) { pNode = p; nIndex = n; } + EditPaM() { pNode = NULL; nIndex = 0; } + EditPaM( ContentNode* p, USHORT n ) { pNode = p; nIndex = n; } - ContentNode* GetNode() const { return pNode; } - void SetNode( ContentNode* p) { pNode = p; } + ContentNode* GetNode() const { return pNode; } + void SetNode( ContentNode* p) { pNode = p; } - USHORT GetIndex() const { return nIndex; } - USHORT& GetIndex() { return nIndex; } - void SetIndex( USHORT n ) { nIndex = n; } + USHORT GetIndex() const { return nIndex; } + USHORT& GetIndex() { return nIndex; } + void SetIndex( USHORT n ) { nIndex = n; } - BOOL IsParaStart() const { return nIndex == 0; } - BOOL IsParaEnd() const { return nIndex == pNode->Len(); } + BOOL IsParaStart() const { return nIndex == 0; } + BOOL IsParaEnd() const { return nIndex == pNode->Len(); } - BOOL DbgIsBuggy( EditDoc& rDoc ); + BOOL DbgIsBuggy( EditDoc& rDoc ); - EditPaM& operator = ( const EditPaM& rPaM ); + EditPaM& operator = ( const EditPaM& rPaM ); friend BOOL operator == ( const EditPaM& r1, const EditPaM& r2 ); friend BOOL operator != ( const EditPaM& r1, const EditPaM& r2 ); }; -#define PORTIONKIND_TEXT 0 +#define PORTIONKIND_TEXT 0 #define PORTIONKIND_TAB 1 -#define PORTIONKIND_LINEBREAK 2 -#define PORTIONKIND_FIELD 3 -#define PORTIONKIND_HYPHENATOR 4 -// #define PORTIONKIND_EXTRASPACE 5 +#define PORTIONKIND_LINEBREAK 2 +#define PORTIONKIND_FIELD 3 +#define PORTIONKIND_HYPHENATOR 4 +// #define PORTIONKIND_EXTRASPACE 5 -#define DELMODE_SIMPLE 0 -#define DELMODE_RESTOFWORD 1 -#define DELMODE_RESTOFCONTENT 2 +#define DELMODE_SIMPLE 0 +#define DELMODE_RESTOFWORD 1 +#define DELMODE_RESTOFCONTENT 2 #define CHAR_NORMAL 0x00 #define CHAR_KANA 0x01 @@ -371,44 +371,44 @@ class TextPortion { private: ExtraPortionInfo* pExtraInfos; - USHORT nLen; - Size aOutSz; - BYTE nKind; + USHORT nLen; + Size aOutSz; + BYTE nKind; BYTE nRightToLeft; - sal_Unicode nExtraValue; + sal_Unicode nExtraValue; - TextPortion() { DBG_CTOR( EE_TextPortion, 0 ); + TextPortion() { DBG_CTOR( EE_TextPortion, 0 ); pExtraInfos = NULL; nLen = 0; nKind = PORTIONKIND_TEXT; nExtraValue = 0; nRightToLeft = FALSE;} public: TextPortion( USHORT nL ) : aOutSz( -1, -1 ) - { DBG_CTOR( EE_TextPortion, 0 ); + { DBG_CTOR( EE_TextPortion, 0 ); pExtraInfos = NULL; nLen = nL; nKind = PORTIONKIND_TEXT; nExtraValue = 0; nRightToLeft = FALSE;} - TextPortion( const TextPortion& r ) : aOutSz( r.aOutSz ) + TextPortion( const TextPortion& r ) : aOutSz( r.aOutSz ) { DBG_CTOR( EE_TextPortion, 0 ); pExtraInfos = NULL; nLen = r.nLen; nKind = r.nKind; nExtraValue = r.nExtraValue; nRightToLeft = r.nRightToLeft; } - ~TextPortion() { DBG_DTOR( EE_TextPortion, 0 ); delete pExtraInfos; } + ~TextPortion() { DBG_DTOR( EE_TextPortion, 0 ); delete pExtraInfos; } - USHORT GetLen() const { return nLen; } - USHORT& GetLen() { return nLen; } - void SetLen( USHORT nL ) { nLen = nL; } + USHORT GetLen() const { return nLen; } + USHORT& GetLen() { return nLen; } + void SetLen( USHORT nL ) { nLen = nL; } - Size& GetSize() { return aOutSz; } - Size GetSize() const { return aOutSz; } + Size& GetSize() { return aOutSz; } + Size GetSize() const { return aOutSz; } - BYTE& GetKind() { return nKind; } - BYTE GetKind() const { return nKind; } + BYTE& GetKind() { return nKind; } + BYTE GetKind() const { return nKind; } void SetRightToLeft( BYTE b ) { nRightToLeft = b; } BYTE GetRightToLeft() const { return nRightToLeft; } BOOL IsRightToLeft() const { return (nRightToLeft&1); } - sal_Unicode GetExtraValue() const { return nExtraValue; } - void SetExtraValue( sal_Unicode n ) { nExtraValue = n; } + sal_Unicode GetExtraValue() const { return nExtraValue; } + void SetExtraValue( sal_Unicode n ) { nExtraValue = n; } - BOOL HasValidSize() const { return aOutSz.Width() != (-1); } + BOOL HasValidSize() const { return aOutSz.Width() != (-1); } ExtraPortionInfo* GetExtraInfos() const { return pExtraInfos; } void SetExtraInfos( ExtraPortionInfo* p ) { delete pExtraInfos; pExtraInfos = p; } @@ -426,10 +426,10 @@ public: TextPortionList(); ~TextPortionList(); - void Reset(); - USHORT FindPortion( USHORT nCharPos, USHORT& rPortionStart, BOOL bPreferStartingPortion = FALSE ); + void Reset(); + USHORT FindPortion( USHORT nCharPos, USHORT& rPortionStart, BOOL bPreferStartingPortion = FALSE ); USHORT GetStartPos( USHORT nPortion ); - void DeleteFromPortion( USHORT nDelFrom ); + void DeleteFromPortion( USHORT nDelFrom ); }; class ParaPortion; @@ -442,84 +442,84 @@ SV_DECL_VARARR( CharPosArray, sal_Int32, 0, CHARPOSGROW ) class EditLine { private: - CharPosArray aPositions; + CharPosArray aPositions; long nTxtWidth; - USHORT nStartPosX; - USHORT nStart; // koennte durch nStartPortion ersetzt werden - USHORT nEnd; // koennte durch nEndPortion ersetzt werden - USHORT nStartPortion; - USHORT nEndPortion; - USHORT nHeight; // Gesamthoehe der Zeile - USHORT nTxtHeight; // Reine Texthoehe - USHORT nCrsrHeight; // Bei Konturfluss hohe Zeilen => Cursor zu groá. - USHORT nMaxAscent; - BOOL bHangingPunctuation; - BOOL bInvalid; // fuer geschickte Formatierung + USHORT nStartPosX; + USHORT nStart; // koennte durch nStartPortion ersetzt werden + USHORT nEnd; // koennte durch nEndPortion ersetzt werden + USHORT nStartPortion; + USHORT nEndPortion; + USHORT nHeight; // Gesamthoehe der Zeile + USHORT nTxtHeight; // Reine Texthoehe + USHORT nCrsrHeight; // Bei Konturfluss hohe Zeilen => Cursor zu groá. + USHORT nMaxAscent; + BOOL bHangingPunctuation; + BOOL bInvalid; // fuer geschickte Formatierung public: EditLine(); EditLine( const EditLine& ); ~EditLine(); - BOOL IsIn( USHORT nIndex ) const + BOOL IsIn( USHORT nIndex ) const { return ( (nIndex >= nStart ) && ( nIndex < nEnd ) ); } - BOOL IsIn( USHORT nIndex, BOOL bInclEnd ) const + BOOL IsIn( USHORT nIndex, BOOL bInclEnd ) const { return ( ( nIndex >= nStart ) && ( bInclEnd ? ( nIndex <= nEnd ) : ( nIndex < nEnd ) ) ); } - void SetStart( USHORT n ) { nStart = n; } - USHORT GetStart() const { return nStart; } - USHORT& GetStart() { return nStart; } + void SetStart( USHORT n ) { nStart = n; } + USHORT GetStart() const { return nStart; } + USHORT& GetStart() { return nStart; } - void SetEnd( USHORT n ) { nEnd = n; } - USHORT GetEnd() const { return nEnd; } - USHORT& GetEnd() { return nEnd; } + void SetEnd( USHORT n ) { nEnd = n; } + USHORT GetEnd() const { return nEnd; } + USHORT& GetEnd() { return nEnd; } - void SetStartPortion( USHORT n ) { nStartPortion = n; } - USHORT GetStartPortion() const { return nStartPortion; } - USHORT& GetStartPortion() { return nStartPortion; } + void SetStartPortion( USHORT n ) { nStartPortion = n; } + USHORT GetStartPortion() const { return nStartPortion; } + USHORT& GetStartPortion() { return nStartPortion; } - void SetEndPortion( USHORT n ) { nEndPortion = n; } - USHORT GetEndPortion() const { return nEndPortion; } - USHORT& GetEndPortion() { return nEndPortion; } + void SetEndPortion( USHORT n ) { nEndPortion = n; } + USHORT GetEndPortion() const { return nEndPortion; } + USHORT& GetEndPortion() { return nEndPortion; } - void SetHeight( USHORT nH, USHORT nTxtH = 0, USHORT nCrsrH = 0 ) - { nHeight = nH; + void SetHeight( USHORT nH, USHORT nTxtH = 0, USHORT nCrsrH = 0 ) + { nHeight = nH; nTxtHeight = ( nTxtH ? nTxtH : nH ); nCrsrHeight = ( nCrsrH ? nCrsrH : nTxtHeight ); } - USHORT GetHeight() const { return nHeight; } - USHORT GetTxtHeight() const { return nTxtHeight; } - USHORT GetCrsrHeight() const { return nCrsrHeight; } + USHORT GetHeight() const { return nHeight; } + USHORT GetTxtHeight() const { return nTxtHeight; } + USHORT GetCrsrHeight() const { return nCrsrHeight; } void SetTextWidth( long n ) { nTxtWidth = n; } long GetTextWidth() const { return nTxtWidth; } - void SetMaxAscent( USHORT n ) { nMaxAscent = n; } - USHORT GetMaxAscent() const { return nMaxAscent; } + void SetMaxAscent( USHORT n ) { nMaxAscent = n; } + USHORT GetMaxAscent() const { return nMaxAscent; } - void SetHangingPunctuation( BOOL b ) { bHangingPunctuation = b; } - BOOL IsHangingPunctuation() const { return bHangingPunctuation; } + void SetHangingPunctuation( BOOL b ) { bHangingPunctuation = b; } + BOOL IsHangingPunctuation() const { return bHangingPunctuation; } - USHORT GetLen() const { return nEnd - nStart; } + USHORT GetLen() const { return nEnd - nStart; } - USHORT GetStartPosX() const { return nStartPosX; } - void SetStartPosX( USHORT start ) { nStartPosX = start; } + USHORT GetStartPosX() const { return nStartPosX; } + void SetStartPosX( USHORT start ) { nStartPosX = start; } - Size CalcTextSize( ParaPortion& rParaPortion ); + Size CalcTextSize( ParaPortion& rParaPortion ); - BOOL IsInvalid() const { return bInvalid; } - BOOL IsValid() const { return !bInvalid; } - void SetInvalid() { bInvalid = TRUE; } - void SetValid() { bInvalid = FALSE; } + BOOL IsInvalid() const { return bInvalid; } + BOOL IsValid() const { return !bInvalid; } + void SetInvalid() { bInvalid = TRUE; } + void SetValid() { bInvalid = FALSE; } - BOOL IsEmpty() const { return (nEnd > nStart) ? FALSE : TRUE; } + BOOL IsEmpty() const { return (nEnd > nStart) ? FALSE : TRUE; } - CharPosArray& GetCharPosArray() { return aPositions; } + CharPosArray& GetCharPosArray() { return aPositions; } - EditLine* Clone() const; + EditLine* Clone() const; - EditLine& operator = ( const EditLine& rLine ); + EditLine& operator = ( const EditLine& rLine ); friend BOOL operator == ( const EditLine& r1, const EditLine& r2 ); friend BOOL operator != ( const EditLine& r1, const EditLine& r2 ); }; @@ -537,9 +537,9 @@ public: EditLineList(); ~EditLineList(); - void Reset(); - void DeleteFromLine( USHORT nDelFrom ); - USHORT FindLine( USHORT nChar, BOOL bInclEnd ); + void Reset(); + void DeleteFromLine( USHORT nDelFrom ); + USHORT FindLine( USHORT nChar, BOOL bInclEnd ); }; // ------------------------------------------------------------------------- @@ -547,25 +547,25 @@ public: // ------------------------------------------------------------------------- class ParaPortion { - friend class ImpEditEngine; // zum Einstellen der Hoehe + friend class ImpEditEngine; // zum Einstellen der Hoehe private: - EditLineList aLineList; - TextPortionList aTextPortionList; - ContentNode* pNode; - long nHeight; + EditLineList aLineList; + TextPortionList aTextPortionList; + ContentNode* pNode; + long nHeight; - ScriptTypePosInfos aScriptInfos; + ScriptTypePosInfos aScriptInfos; WritingDirectionInfos aWritingDirectionInfos; - USHORT nInvalidPosStart; - USHORT nFirstLineOffset; // Fuer Writer-LineSpacing-Interpretation - USHORT nBulletX; - short nInvalidDiff; + USHORT nInvalidPosStart; + USHORT nFirstLineOffset; // Fuer Writer-LineSpacing-Interpretation + USHORT nBulletX; + short nInvalidDiff; - BOOL bInvalid : 1; - BOOL bSimple : 1; // nur lineares Tippen - BOOL bVisible : 1; // MT 05/00: Gehoert an den Node!!! - BOOL bForceRepaint : 1; + BOOL bInvalid : 1; + BOOL bSimple : 1; // nur lineares Tippen + BOOL bVisible : 1; // MT 05/00: Gehoert an den Node!!! + BOOL bForceRepaint : 1; ParaPortion( const ParaPortion& ); @@ -573,39 +573,39 @@ public: ParaPortion( ContentNode* pNode ); ~ParaPortion(); - USHORT GetLineNumber( USHORT nIndex ); + USHORT GetLineNumber( USHORT nIndex ); - EditLineList& GetLines() { return aLineList; } + EditLineList& GetLines() { return aLineList; } - BOOL IsInvalid() const { return bInvalid; } - BOOL IsSimpleInvalid() const { return bSimple; } - void SetValid() { bInvalid = FALSE; bSimple = TRUE;} + BOOL IsInvalid() const { return bInvalid; } + BOOL IsSimpleInvalid() const { return bSimple; } + void SetValid() { bInvalid = FALSE; bSimple = TRUE;} - BOOL MustRepaint() const { return bForceRepaint; } - void SetMustRepaint( BOOL bRP ) { bForceRepaint = bRP; } + BOOL MustRepaint() const { return bForceRepaint; } + void SetMustRepaint( BOOL bRP ) { bForceRepaint = bRP; } - USHORT GetBulletX() const { return nBulletX; } - void SetBulletX( USHORT n ) { nBulletX = n; } + USHORT GetBulletX() const { return nBulletX; } + void SetBulletX( USHORT n ) { nBulletX = n; } - void MarkInvalid( USHORT nStart, short nDiff); - void MarkSelectionInvalid( USHORT nStart, USHORT nEnd ); + void MarkInvalid( USHORT nStart, short nDiff); + void MarkSelectionInvalid( USHORT nStart, USHORT nEnd ); - void SetVisible( BOOL bVisible ); - BOOL IsVisible() { return bVisible; } + void SetVisible( BOOL bVisible ); + BOOL IsVisible() { return bVisible; } - long GetHeight() const { return ( bVisible ? nHeight : 0 ); } - USHORT GetFirstLineOffset() const { return ( bVisible ? nFirstLineOffset : 0 ); } - void ResetHeight() { nHeight = 0; nFirstLineOffset = 0; } + long GetHeight() const { return ( bVisible ? nHeight : 0 ); } + USHORT GetFirstLineOffset() const { return ( bVisible ? nFirstLineOffset : 0 ); } + void ResetHeight() { nHeight = 0; nFirstLineOffset = 0; } - ContentNode* GetNode() const { return pNode; } - TextPortionList& GetTextPortions() { return aTextPortionList; } + ContentNode* GetNode() const { return pNode; } + TextPortionList& GetTextPortions() { return aTextPortionList; } - USHORT GetInvalidPosStart() const { return nInvalidPosStart; } - short GetInvalidDiff() const { return nInvalidDiff; } + USHORT GetInvalidPosStart() const { return nInvalidPosStart; } + short GetInvalidDiff() const { return nInvalidDiff; } - void CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLine ); + void CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLine ); - BOOL DbgCheckTextPortions(); + BOOL DbgCheckTextPortions(); }; typedef ParaPortion* ParaPortionPtr; @@ -621,17 +621,17 @@ public: ParaPortionList(); ~ParaPortionList(); - void Reset(); - long GetYOffset( ParaPortion* pPPortion ); - USHORT FindParagraph( long nYOffset ); + void Reset(); + long GetYOffset( ParaPortion* pPPortion ); + USHORT FindParagraph( long nYOffset ); - inline ParaPortion* SaveGetObject( USHORT nPos ) const + inline ParaPortion* SaveGetObject( USHORT nPos ) const { return ( nPos < Count() ) ? GetObject( nPos ) : 0; } USHORT GetPos( const ParaPortionPtr &rPtr ) const; // temporaer: - void DbgCheck( EditDoc& rDoc ); + void DbgCheck( EditDoc& rDoc ); }; // ------------------------------------------------------------------------- @@ -640,31 +640,31 @@ public: class EditSelection { private: - EditPaM aStartPaM; - EditPaM aEndPaM; + EditPaM aStartPaM; + EditPaM aEndPaM; public: - EditSelection(); // kein CCTOR und DTOR, geht autom. richtig! + EditSelection(); // kein CCTOR und DTOR, geht autom. richtig! EditSelection( const EditPaM& rStartAndAnd ); EditSelection( const EditPaM& rStart, const EditPaM& rEnd ); - EditPaM& Min() { return aStartPaM; } - EditPaM& Max() { return aEndPaM; } + EditPaM& Min() { return aStartPaM; } + EditPaM& Max() { return aEndPaM; } - const EditPaM& Min() const { return aStartPaM; } - const EditPaM& Max() const { return aEndPaM; } + const EditPaM& Min() const { return aStartPaM; } + const EditPaM& Max() const { return aEndPaM; } - BOOL HasRange() const { return aStartPaM != aEndPaM; } + BOOL HasRange() const { return aStartPaM != aEndPaM; } BOOL IsInvalid() const; - BOOL DbgIsBuggy( EditDoc& rDoc ); + BOOL DbgIsBuggy( EditDoc& rDoc ); - BOOL Adjust( const ContentList& rNodes ); + BOOL Adjust( const ContentList& rNodes ); - EditSelection& operator = ( const EditPaM& r ); - BOOL operator == ( const EditSelection& r ) const + EditSelection& operator = ( const EditPaM& r ); + BOOL operator == ( const EditSelection& r ) const { return ( ( aStartPaM == r.aStartPaM ) && ( aEndPaM == r.aEndPaM ) ) ? TRUE : FALSE; } - BOOL operator != ( const EditSelection& r ) const { return !( r == *this ); } + BOOL operator != ( const EditSelection& r ) const { return !( r == *this ); } }; // ------------------------------------------------------------------------- @@ -673,16 +673,16 @@ public: class DeletedNodeInfo { private: - ULONG nInvalidAdressPtr; - USHORT nInvalidParagraph; + ULONG nInvalidAdressPtr; + USHORT nInvalidParagraph; public: DeletedNodeInfo( ULONG nInvAdr, USHORT nPos ) - { nInvalidAdressPtr = nInvAdr; + { nInvalidAdressPtr = nInvAdr; nInvalidParagraph = nPos; } - ULONG GetInvalidAdress() { return nInvalidAdressPtr; } - USHORT GetPosition() { return nInvalidParagraph; } + ULONG GetInvalidAdress() { return nInvalidAdressPtr; } + USHORT GetPosition() { return nInvalidParagraph; } }; typedef DeletedNodeInfo* DeletedNodeInfoPtr; @@ -694,76 +694,76 @@ SV_DECL_PTRARR( DeletedNodesList, DeletedNodeInfoPtr, 0, 4 ) class EditDoc : public ContentList { private: - SfxItemPool* pItemPool; + SfxItemPool* pItemPool; Link aModifyHdl; - SvxFont aDefFont; //schneller, als jedesmal vom Pool! - USHORT nDefTab; - BOOL bIsVertical; - BOOL bIsFixedCellHeight; + SvxFont aDefFont; //schneller, als jedesmal vom Pool! + USHORT nDefTab; + BOOL bIsVertical; + BOOL bIsFixedCellHeight; - BOOL bOwnerOfPool; - BOOL bModified; + BOOL bOwnerOfPool; + BOOL bModified; protected: - void ImplDestroyContents(); + void ImplDestroyContents(); public: EditDoc( SfxItemPool* pItemPool ); ~EditDoc(); - BOOL IsModified() const { return bModified; } - void SetModified( BOOL b ); + BOOL IsModified() const { return bModified; } + void SetModified( BOOL b ); void SetModifyHdl( const Link& rLink ) { aModifyHdl = rLink; } Link GetModifyHdl() const { return aModifyHdl; } - void CreateDefFont( BOOL bUseStyles ); - const SvxFont& GetDefFont() { return aDefFont; } + void CreateDefFont( BOOL bUseStyles ); + const SvxFont& GetDefFont() { return aDefFont; } - void SetDefTab( USHORT nTab ) { nDefTab = nTab ? nTab : DEFTAB; } - USHORT GetDefTab() const { return nDefTab; } + void SetDefTab( USHORT nTab ) { nDefTab = nTab ? nTab : DEFTAB; } + USHORT GetDefTab() const { return nDefTab; } - void SetVertical( BOOL bVertical ) { bIsVertical = bVertical; } - BOOL IsVertical() const { return bIsVertical; } + void SetVertical( BOOL bVertical ) { bIsVertical = bVertical; } + BOOL IsVertical() const { return bIsVertical; } - void SetFixedCellHeight( BOOL bUseFixedCellHeight ) { bIsFixedCellHeight = bUseFixedCellHeight; } - BOOL IsFixedCellHeight() const { return bIsFixedCellHeight; } + void SetFixedCellHeight( BOOL bUseFixedCellHeight ) { bIsFixedCellHeight = bUseFixedCellHeight; } + BOOL IsFixedCellHeight() const { return bIsFixedCellHeight; } - EditPaM Clear(); - EditPaM RemoveText(); - EditPaM RemoveChars( EditPaM aPaM, USHORT nChars ); + EditPaM Clear(); + EditPaM RemoveText(); + EditPaM RemoveChars( EditPaM aPaM, USHORT nChars ); void InsertText( const EditPaM& rPaM, xub_Unicode c ); - EditPaM InsertText( EditPaM aPaM, const XubString& rStr ); - EditPaM InsertParaBreak( EditPaM aPaM, BOOL bKeepEndingAttribs ); - EditPaM InsertFeature( EditPaM aPaM, const SfxPoolItem& rItem ); - EditPaM ConnectParagraphs( ContentNode* pLeft, ContentNode* pRight ); - - String GetText( LineEnd eEnd ) const; - ULONG GetTextLen() const; + EditPaM InsertText( EditPaM aPaM, const XubString& rStr ); + EditPaM InsertParaBreak( EditPaM aPaM, BOOL bKeepEndingAttribs ); + EditPaM InsertFeature( EditPaM aPaM, const SfxPoolItem& rItem ); + EditPaM ConnectParagraphs( ContentNode* pLeft, ContentNode* pRight ); - XubString GetParaAsString( USHORT nNode ) const; - XubString GetParaAsString( ContentNode* pNode, USHORT nStartPos = 0, USHORT nEndPos = 0xFFFF, BOOL bResolveFields = TRUE ) const; + String GetText( LineEnd eEnd ) const; + ULONG GetTextLen() const; - inline EditPaM GetStartPaM() const; - inline EditPaM GetEndPaM() const; + XubString GetParaAsString( USHORT nNode ) const; + XubString GetParaAsString( ContentNode* pNode, USHORT nStartPos = 0, USHORT nEndPos = 0xFFFF, BOOL bResolveFields = TRUE ) const; - SfxItemPool& GetItemPool() { return *pItemPool; } - const SfxItemPool& GetItemPool() const { return *pItemPool; } + inline EditPaM GetStartPaM() const; + inline EditPaM GetEndPaM() const; - void RemoveItemsFromPool( ContentNode* pNode ); + SfxItemPool& GetItemPool() { return *pItemPool; } + const SfxItemPool& GetItemPool() const { return *pItemPool; } + + void RemoveItemsFromPool( ContentNode* pNode ); - void InsertAttrib( const SfxPoolItem& rItem, ContentNode* pNode, USHORT nStart, USHORT nEnd ); - void InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem ); - void InsertAttribInSelection( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem ); - BOOL RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, USHORT nWhich = 0 ); - BOOL RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, USHORT nWhich = 0 ); - void FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos, SfxItemSet& rCurSet ); + void InsertAttrib( const SfxPoolItem& rItem, ContentNode* pNode, USHORT nStart, USHORT nEnd ); + void InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem ); + void InsertAttribInSelection( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem ); + BOOL RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, USHORT nWhich = 0 ); + BOOL RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, USHORT nWhich = 0 ); + void FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos, SfxItemSet& rCurSet ); - USHORT GetPos( ContentNode* pNode ) const { return ContentList::GetPos(pNode); } - ContentNode* SaveGetObject( USHORT nPos ) const { return ( nPos < Count() ) ? GetObject( nPos ) : 0; } + USHORT GetPos( ContentNode* pNode ) const { return ContentList::GetPos(pNode); } + ContentNode* SaveGetObject( USHORT nPos ) const { return ( nPos < Count() ) ? GetObject( nPos ) : 0; } - static XubString GetSepStr( LineEnd eEnd ); + static XubString GetSepStr( LineEnd eEnd ); }; inline EditPaM EditDoc::GetStartPaM() const @@ -795,7 +795,7 @@ protected: virtual ~EditEngineItemPool(); public: - virtual SvStream& Store( SvStream& rStream ) const; + virtual SvStream& Store( SvStream& rStream ) const; }; #endif // _EDITDOC_HXX diff --git a/editeng/source/editeng/editdoc2.cxx b/editeng/source/editeng/editdoc2.cxx index a3b210e8d559..71077d07cea8 100644 --- a/editeng/source/editeng/editdoc2.cxx +++ b/editeng/source/editeng/editdoc2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ #include <editeng/wrlmitem.hxx> #include <editeng/charscaleitem.hxx> -#include <vcl/svapp.hxx> // Fuer AppWindow... +#include <vcl/svapp.hxx> // Fuer AppWindow... DBG_NAME( EE_ParaPortion ) @@ -190,16 +190,16 @@ ParaPortion::ParaPortion( ContentNode* pN ) { DBG_CTOR( EE_ParaPortion, 0 ); - pNode = pN; - bInvalid = TRUE; - bVisible = TRUE; - bSimple = FALSE; - bForceRepaint = FALSE; - nInvalidPosStart = 0; - nInvalidDiff = 0; - nHeight = 0; - nFirstLineOffset = 0; - nBulletX = 0; + pNode = pN; + bInvalid = TRUE; + bVisible = TRUE; + bSimple = FALSE; + bForceRepaint = FALSE; + nInvalidPosStart = 0; + nInvalidDiff = 0; + nHeight = 0; + nFirstLineOffset = 0; + nBulletX = 0; } ParaPortion::~ParaPortion() @@ -211,7 +211,7 @@ void ParaPortion::MarkInvalid( USHORT nStart, short nDiff ) { if ( bInvalid == FALSE ) { -// nInvalidPosEnd = nStart; // ??? => CreateLines +// nInvalidPosEnd = nStart; // ??? => CreateLines nInvalidPosStart = ( nDiff >= 0 ) ? nStart : ( nStart + nDiff ); nInvalidDiff = nDiff; } @@ -231,7 +231,7 @@ void ParaPortion::MarkInvalid( USHORT nStart, short nDiff ) } else { -// nInvalidPosEnd = pNode->Len(); +// nInvalidPosEnd = pNode->Len(); DBG_ASSERT( ( nDiff >= 0 ) || ( (nStart+nDiff) >= 0 ), "MarkInvalid: Diff out of Range" ); nInvalidPosStart = Min( nInvalidPosStart, (USHORT) ( nDiff < 0 ? nStart+nDiff : nDiff ) ); nInvalidDiff = 0; @@ -241,7 +241,7 @@ void ParaPortion::MarkInvalid( USHORT nStart, short nDiff ) bInvalid = TRUE; aScriptInfos.Remove( 0, aScriptInfos.Count() ); aWritingDirectionInfos.Remove( 0, aWritingDirectionInfos.Count() ); -// aExtraCharInfos.Remove( 0, aExtraCharInfos.Count() ); +// aExtraCharInfos.Remove( 0, aExtraCharInfos.Count() ); } void ParaPortion::MarkSelectionInvalid( USHORT nStart, USHORT /* nEnd */ ) @@ -249,19 +249,19 @@ void ParaPortion::MarkSelectionInvalid( USHORT nStart, USHORT /* nEnd */ ) if ( bInvalid == FALSE ) { nInvalidPosStart = nStart; -// nInvalidPosEnd = nEnd; +// nInvalidPosEnd = nEnd; } else { nInvalidPosStart = Min( nInvalidPosStart, nStart ); -// nInvalidPosEnd = pNode->Len(); +// nInvalidPosEnd = pNode->Len(); } nInvalidDiff = 0; bInvalid = TRUE; bSimple = FALSE; aScriptInfos.Remove( 0, aScriptInfos.Count() ); aWritingDirectionInfos.Remove( 0, aWritingDirectionInfos.Count() ); -// aExtraCharInfos.Remove( 0, aExtraCharInfos.Count() ); +// aExtraCharInfos.Remove( 0, aExtraCharInfos.Count() ); } USHORT ParaPortion::GetLineNumber( USHORT nIndex ) @@ -295,7 +295,7 @@ void ParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLin const EditLine* pUnformatted = aLineList[ nLastFormattedLine+1 ]; short nPortionDiff = pUnformatted->GetStartPortion() - pLastFormatted->GetEndPortion(); short nTextDiff = pUnformatted->GetStart() - pLastFormatted->GetEnd(); - nTextDiff++; // LastFormatted->GetEnd() war incl. => 1 zuviel abgezogen! + nTextDiff++; // LastFormatted->GetEnd() war incl. => 1 zuviel abgezogen! // Die erste unformatierte muss genau eine Portion hinter der letzten der // formatierten beginnen: @@ -414,7 +414,7 @@ USHORT ParaPortionList::FindParagraph( long nYOffset ) if ( nY > nYOffset ) return nPortion; } - return 0xFFFF; // solte mal ueber EE_PARA_NOT_FOUND erreicht werden! + return 0xFFFF; // solte mal ueber EE_PARA_NOT_FOUND erreicht werden! } void ParaPortionList::DbgCheck( EditDoc& @@ -453,7 +453,7 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit SvxLRSpaceItem& rItem = (SvxLRSpaceItem&)rPoolItem; rItem.SetTxtFirstLineOfst( sal::static_int_cast< short >( OutputDevice::LogicToLogic( rItem.GetTxtFirstLineOfst(), eSourceUnit, eDestUnit ) ) ); rItem.SetTxtLeft( OutputDevice::LogicToLogic( rItem.GetTxtLeft(), eSourceUnit, eDestUnit ) ); -// rItem.SetLeft( OutputDevice::LogicToLogic( rItem.GetLeft(), eSourceUnit, eDestUnit ) ); // #96298# SetLeft manipulates nTxtLeft! +// rItem.SetLeft( OutputDevice::LogicToLogic( rItem.GetLeft(), eSourceUnit, eDestUnit ) ); // #96298# SetLeft manipulates nTxtLeft! rItem.SetRight( OutputDevice::LogicToLogic( rItem.GetRight(), eSourceUnit, eDestUnit ) ); } break; @@ -525,7 +525,7 @@ void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const Map if ( eSourceUnit != eDestUnit ) { SfxPoolItem* pItem = rSource.Get( nSourceWhich ).Clone(); -// pItem->SetWhich( nWhich ); +// pItem->SetWhich( nWhich ); ConvertItem( *pItem, eSourceUnit, eDestUnit ); rDest.Put( *pItem, nWhich ); delete pItem; @@ -538,7 +538,7 @@ void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const Map else { // MT 3.3.99: Waere so eigentlich richtig, aber schon seit Jahren nicht so... -// rDest.ClearItem( nWhich ); +// rDest.ClearItem( nWhich ); } } } diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 734b8d75ee8e..c6a446362f69 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -492,13 +492,13 @@ void EditEngine::SetPaperSize( const Size& rNewSize ) // Aendern der Breite hat bei AutoPageSize keine Wirkung, da durch // Textbreite bestimmt. // Optimierung erst nach Vobis-Auslieferung aktivieren... -// if ( !bAutoPageSize ) +// if ( !bAutoPageSize ) pImpEditEngine->FormatFullDoc(); -// else -// { -// pImpEditEngine->FormatDoc(); // PageSize, falls Aenderung -// pImpEditEngine->CheckAutoPageSize(); // Falls nichts formatiert wurde -// } +// else +// { +// pImpEditEngine->FormatDoc(); // PageSize, falls Aenderung +// pImpEditEngine->CheckAutoPageSize(); // Falls nichts formatiert wurde +// } pImpEditEngine->UpdateViews( pImpEditEngine->GetActiveView() ); @@ -710,14 +710,14 @@ sal_uInt16 EditEngine::GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) con pImpEditEngine->FormatDoc(); return pImpEditEngine->GetLineLen( nParagraph, nLine ); } - + void EditEngine::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const { DBG_CHKTHIS( EditEngine, 0 ); if ( !pImpEditEngine->IsFormatted() ) pImpEditEngine->FormatDoc(); return pImpEditEngine->GetLineBoundaries( rStart, rEnd, nParagraph, nLine ); -} +} USHORT EditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const { @@ -725,7 +725,7 @@ USHORT EditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const if ( !pImpEditEngine->IsFormatted() ) pImpEditEngine->FormatDoc(); return pImpEditEngine->GetLineNumberAtIndex( nPara, nIndex ); -} +} sal_uInt32 EditEngine::GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine ) { @@ -830,10 +830,10 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie sal_Bool bDone = sal_True; - sal_Bool bModified = sal_False; - sal_Bool bMoved = sal_False; + sal_Bool bModified = sal_False; + sal_Bool bMoved = sal_False; sal_Bool bAllowIdle = sal_True; - sal_Bool bReadOnly = pEditView->IsReadOnly(); + sal_Bool bReadOnly = pEditView->IsReadOnly(); USHORT nNewCursorFlags = 0; BOOL bSetCursorFlags = TRUE; @@ -866,7 +866,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie } // break; - default: // wird dann evtl. unten bearbeitet. + default: // wird dann evtl. unten bearbeitet. eFunc = KEYFUNC_DONTKNOW; } } @@ -1026,7 +1026,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie // length may have changed as well ) pImpEditEngine->FormatAndUpdate( pImpEditEngine->GetActiveView() ); - if (bBulletIsVisible) // bullet just turned invisible... + if (bBulletIsVisible) // bullet just turned invisible... break; } @@ -1154,7 +1154,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie xub_Unicode nCharCode = rKeyEvent.GetCharCode(); pEditView->pImpEditView->DrawSelection(); // Autokorrektur ? - SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); + SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); if ( ( pImpEditEngine->GetStatus().DoAutoCorrect() ) && ( SvxAutoCorrect::IsAutoCorrectChar( nCharCode ) || pAutoCorrect->HasRunNext() ) ) @@ -1363,13 +1363,13 @@ ULONG EditEngine::Write( SvStream& rOutput, EETextFormat eFormat ) return rOutput.GetError(); } -EditTextObject* EditEngine::CreateTextObject() +EditTextObject* EditEngine::CreateTextObject() { DBG_CHKTHIS( EditEngine, 0 ); return pImpEditEngine->CreateTextObject(); } -EditTextObject* EditEngine::CreateTextObject( const ESelection& rESelection ) +EditTextObject* EditEngine::CreateTextObject( const ESelection& rESelection ) { DBG_CHKTHIS( EditEngine, 0 ); EditSelection aSel( pImpEditEngine->CreateSel( rESelection ) ); @@ -1458,7 +1458,7 @@ void EditEngine::SetEndPasteOrDropHdl( const Link& rLink ) pImpEditEngine->aEndPasteOrDropHdl = rLink; } -EditTextObject* EditEngine::CreateTextObject( sal_uInt16 nPara, sal_uInt16 nParas ) +EditTextObject* EditEngine::CreateTextObject( sal_uInt16 nPara, sal_uInt16 nParas ) { DBG_CHKTHIS( EditEngine, 0 ); DBG_ASSERT( nPara < pImpEditEngine->GetEditDoc().Count(), "CreateTextObject: Startpara out of Range" ); @@ -1805,7 +1805,7 @@ void EditEngine::SetControlWord( sal_uInt32 nWord ) ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( n ); ParaPortion* pPortion = pImpEditEngine->GetParaPortions().GetObject( n ); sal_Bool bWrongs = ( bSpellingChanged || ( nWord & EE_CNTRL_ONLINESPELLING ) ) ? pNode->GetWrongList()->HasWrongs() : sal_False; - if ( bSpellingChanged ) // Also aus + if ( bSpellingChanged ) // Also aus pNode->DestroyWrongList(); // => vorm Paint weghaun. if ( bWrongs ) { @@ -1877,7 +1877,7 @@ Point EditEngine::GetDocPosTopLeft( sal_uInt16 nParagraph ) else { const SvxLRSpaceItem& rLRItem = pImpEditEngine->GetLRSpaceItem( pPPortion->GetNode() ); -// TL_NF_LR aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst()) ); +// TL_NF_LR aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst()) ); sal_Int32 nSpaceBefore = 0; pImpEditEngine->GetSpaceBeforeAndMinLabelWidth( pPPortion->GetNode(), &nSpaceBefore ); short nX = (short)(rLRItem.GetTxtLeft() @@ -2748,9 +2748,9 @@ sal_Bool EditEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent ) case KEYFUNC_UNDO: case KEYFUNC_REDO: case KEYFUNC_CUT: - case KEYFUNC_PASTE: bDoesChange = sal_True; + case KEYFUNC_PASTE: bDoesChange = sal_True; break; - default: // wird dann evtl. unten bearbeitet. + default: // wird dann evtl. unten bearbeitet. eFunc = KEYFUNC_DONTKNOW; } } @@ -2759,7 +2759,7 @@ sal_Bool EditEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent ) switch ( rKeyEvent.GetKeyCode().GetCode() ) { case KEY_DELETE: - case KEY_BACKSPACE: bDoesChange = sal_True; + case KEY_BACKSPACE: bDoesChange = sal_True; break; case KEY_RETURN: case KEY_TAB: @@ -2809,14 +2809,14 @@ void EditEngine::ImportBulletItem( SvxNumBulletItem& /*rNumBullet*/, sal_uInt16 SvxExtNumType eNumType; switch( pOldBullet->GetStyle() ) { - case BS_BMP: eNumType = SVX_NUM_BITMAP; break; - case BS_BULLET: eNumType = SVX_NUM_CHAR_SPECIAL; break; - case BS_ROMAN_BIG: eNumType = SVX_NUM_ROMAN_UPPER; break; - case BS_ROMAN_SMALL: eNumType = SVX_NUM_ROMAN_LOWER; break; - case BS_ABC_BIG: eNumType = SVX_NUM_CHARS_UPPER_LETTER; break; - case BS_ABC_SMALL: eNumType = SVX_NUM_CHARS_LOWER_LETTER; break; - case BS_123: eNumType = SVX_NUM_ARABIC; break; - default: eNumType = SVX_NUM_NUMBER_NONE; break; + case BS_BMP: eNumType = SVX_NUM_BITMAP; break; + case BS_BULLET: eNumType = SVX_NUM_CHAR_SPECIAL; break; + case BS_ROMAN_BIG: eNumType = SVX_NUM_ROMAN_UPPER; break; + case BS_ROMAN_SMALL: eNumType = SVX_NUM_ROMAN_LOWER; break; + case BS_ABC_BIG: eNumType = SVX_NUM_CHARS_UPPER_LETTER; break; + case BS_ABC_SMALL: eNumType = SVX_NUM_CHARS_LOWER_LETTER; break; + case BS_123: eNumType = SVX_NUM_ARABIC; break; + default: eNumType = SVX_NUM_NUMBER_NONE; break; } pNumberFormat->SetNumberingType( sal::static_int_cast< sal_Int16 >( eNumType ) ); @@ -2825,9 +2825,9 @@ void EditEngine::ImportBulletItem( SvxNumBulletItem& /*rNumBullet*/, sal_uInt16 SvxAdjust eAdjust; switch( pOldBullet->GetJustification() & (BJ_HRIGHT|BJ_HCENTER|BJ_HLEFT) ) { - case BJ_HRIGHT: eAdjust = SVX_ADJUST_RIGHT; break; - case BJ_HCENTER: eAdjust = SVX_ADJUST_CENTER; break; - default: eAdjust = SVX_ADJUST_LEFT; break; + case BJ_HRIGHT: eAdjust = SVX_ADJUST_RIGHT; break; + case BJ_HCENTER: eAdjust = SVX_ADJUST_CENTER; break; + default: eAdjust = SVX_ADJUST_LEFT; break; } pNumberFormat->SetNumAdjust(eAdjust); diff --git a/editeng/source/editeng/editeng.src b/editeng/source/editeng/editeng.src index b65f20c36583..7543185f24ef 100644 --- a/editeng/source/editeng/editeng.src +++ b/editeng/source/editeng/editeng.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index b5fe642df53e..5f5ced939e5c 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -169,7 +169,7 @@ XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, USHORT nS, USHORT nE ) XEditAttribute::~XEditAttribute() { DBG_DTOR( XEditAttribute, 0 ); - pItem = 0; // Gehoert dem Pool. + pItem = 0; // Gehoert dem Pool. } XEditAttribute* XEditAttributeList::FindAttrib( USHORT _nWhich, USHORT nChar ) const @@ -242,14 +242,14 @@ ContentInfo::~ContentInfo() /* cl removed because not needed anymore since binfilter void ContentInfo::CreateLoadStoreTempInfos() { - delete pTempLoadStoreInfos; + delete pTempLoadStoreInfos; pTempLoadStoreInfos = new LoadStoreTempInfos; } void ContentInfo::DestroyLoadStoreTempInfos() { - delete pTempLoadStoreInfos; - pTempLoadStoreInfos = NULL; + delete pTempLoadStoreInfos; + pTempLoadStoreInfos = NULL; } */ @@ -267,7 +267,7 @@ bool ContentInfo::isWrongListEqual(const ContentInfo& rCompare) const bool ContentInfo::operator==( const ContentInfo& rCompare ) const { - if( (aText == rCompare.aText) && + if( (aText == rCompare.aText) && (aStyle == rCompare.aStyle ) && (aAttribs.Count() == rCompare.aAttribs.Count() ) && (eFamily == rCompare.eFamily ) && @@ -505,7 +505,7 @@ BOOL EditTextObject::Store( SvStream& rOStream ) const return rOStream.GetError() ? FALSE : TRUE; } -EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool ) +EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool ) { ULONG nStartPos = rIStream.Tell(); @@ -524,10 +524,10 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobal EditTextObject* pTxtObj = NULL; switch ( nWhich ) { - case 0x22 /*BIN300*/: pTxtObj = new BinTextObject( 0 ); + case 0x22 /*BIN300*/: pTxtObj = new BinTextObject( 0 ); ((BinTextObject*)pTxtObj)->CreateData300( rIStream ); break; - case EE_FORMAT_BIN: pTxtObj = new BinTextObject( pGlobalTextObjectPool ); + case EE_FORMAT_BIN: pTxtObj = new BinTextObject( pGlobalTextObjectPool ); pTxtObj->CreateData( rIStream ); break; default: @@ -610,7 +610,7 @@ void BinTextObject::ObjectInDestruction(const SfxItemPool& rSfxItemPool) aContents.Replace(pNew, n); delete pOrg; } - + // set local variables pPool = pNewPool; bOwnerOfPool = TRUE; @@ -643,23 +643,23 @@ BinTextObject::BinTextObject( SfxItemPool* pP ) : nUserType = 0; nObjSettings = 0; pPortionInfo = 0; - + // #i101239# ensure target is a EditEngineItemPool, else // fallback to pool ownership. This is needed to ensure that at // pool destruction time of an alien pool, the pool is still alive. // When registering would happen at an alien pool which just uses an // EditEngineItemPool as some sub-pool, that pool could already // be decoupled and deleted whcih would lead to crashes. - pPool = getEditEngineItemPool(pP); - + pPool = getEditEngineItemPool(pP); + if ( pPool ) { bOwnerOfPool = FALSE; } else { - pPool = EditEngine::CreatePool(); - bOwnerOfPool = TRUE; + pPool = EditEngine::CreatePool(); + bOwnerOfPool = TRUE; } if(!bOwnerOfPool && pPool) @@ -683,7 +683,7 @@ BinTextObject::BinTextObject( const BinTextObject& r ) : nObjSettings = r.nObjSettings; bVertical = r.bVertical; nScriptType = r.nScriptType; - pPortionInfo = NULL; // PortionInfo nicht kopieren + pPortionInfo = NULL; // PortionInfo nicht kopieren bStoreUnicodeStrings = FALSE; if ( !r.bOwnerOfPool ) @@ -691,13 +691,13 @@ BinTextObject::BinTextObject( const BinTextObject& r ) : // reuse alien pool; this must be a EditEngineItemPool // since there is no other way to construct a BinTextObject // than it's regular constructor where that is ensured - pPool = r.pPool; + pPool = r.pPool; bOwnerOfPool = FALSE; } else { - pPool = EditEngine::CreatePool(); - bOwnerOfPool = TRUE; + pPool = EditEngine::CreatePool(); + bOwnerOfPool = TRUE; } @@ -732,7 +732,7 @@ __EXPORT BinTextObject::~BinTextObject() { // Nicht mehr, wegen 1xDefItems. // siehe auch ~EditDoc(). -// pPool->ReleaseDefaults( TRUE /* bDelete */ ); +// pPool->ReleaseDefaults( TRUE /* bDelete */ ); SfxItemPool::Free(pPool); } } @@ -793,7 +793,7 @@ void BinTextObject::DeleteContents() aContents.Remove( 0, aContents.Count() ); } -EditTextObject* __EXPORT BinTextObject::Clone() const +EditTextObject* __EXPORT BinTextObject::Clone() const { return new BinTextObject( *this ); } @@ -1363,7 +1363,7 @@ void __EXPORT BinTextObject::CreateData( SvStream& rIStream ) { // Es soll ein globaler Pool verwendet werden, aber dieses // Textobject hat einen eigenen. - pPool = EditEngine::CreatePool(); + pPool = EditEngine::CreatePool(); } if ( bOwnerOfPool ) @@ -1659,7 +1659,7 @@ bool BinTextObject::isWrongListEqual(const BinTextObject& rCompare) const return true; } -#define CHARSETMARKER 0x9999 +#define CHARSETMARKER 0x9999 void __EXPORT BinTextObject::CreateData300( SvStream& rIStream ) { diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index 96e08ee6c629..74fa0b4c4e99 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,17 +35,17 @@ #include <unotools/fontcvt.hxx> -class SfxStyleSheetPool; +class SfxStyleSheetPool; class XEditAttribute { - friend class ContentInfo; // fuer DTOR - friend class BinTextObject; // fuer DTOR + friend class ContentInfo; // fuer DTOR + friend class BinTextObject; // fuer DTOR private: - const SfxPoolItem* pItem; - USHORT nStart; - USHORT nEnd; + const SfxPoolItem* pItem; + USHORT nStart; + USHORT nEnd; XEditAttribute(); XEditAttribute( const XEditAttribute& rCopyFrom ); @@ -56,24 +56,24 @@ public: XEditAttribute( const SfxPoolItem& rAttr ); XEditAttribute( const SfxPoolItem& rAttr, USHORT nStart, USHORT nEnd ); - const SfxPoolItem* GetItem() const { return pItem; } + const SfxPoolItem* GetItem() const { return pItem; } - USHORT& GetStart() { return nStart; } - USHORT& GetEnd() { return nEnd; } + USHORT& GetStart() { return nStart; } + USHORT& GetEnd() { return nEnd; } - USHORT GetStart() const { return nStart; } - USHORT GetEnd() const { return nEnd; } + USHORT GetStart() const { return nStart; } + USHORT GetEnd() const { return nEnd; } - USHORT GetLen() const { return nEnd-nStart; } + USHORT GetLen() const { return nEnd-nStart; } - inline BOOL IsFeature(); + inline BOOL IsFeature(); - inline bool operator==( const XEditAttribute& rCompare ); + inline bool operator==( const XEditAttribute& rCompare ); }; inline bool XEditAttribute::operator==( const XEditAttribute& rCompare ) { - return (nStart == rCompare.nStart) && + return (nStart == rCompare.nStart) && (nEnd == rCompare.nEnd) && ( (pItem == rCompare.pItem) || ( pItem->Which() != rCompare.pItem->Which()) || @@ -83,7 +83,7 @@ inline bool XEditAttribute::operator==( const XEditAttribute& rCompare ) inline BOOL XEditAttribute::IsFeature() { USHORT nWhich = pItem->Which(); - return ( ( nWhich >= EE_FEATURE_START ) && + return ( ( nWhich >= EE_FEATURE_START ) && ( nWhich <= EE_FEATURE_END ) ); } @@ -98,11 +98,11 @@ public: struct XParaPortion { - long nHeight; - USHORT nFirstLineOffset; + long nHeight; + USHORT nFirstLineOffset; - EditLineList aLines; - TextPortionList aTextPortions; + EditLineList aLines; + TextPortionList aTextPortions; }; typedef XParaPortion* XParaPortionPtr; @@ -110,12 +110,12 @@ SV_DECL_PTRARR( XBaseParaPortionList, XParaPortionPtr, 0, 4 ) class XParaPortionList : public XBaseParaPortionList { - ULONG nRefDevPtr; - OutDevType eRefDevType; - MapMode aRefMapMode; - sal_uInt16 nStretchX; - sal_uInt16 nStretchY; - ULONG nPaperWidth; + ULONG nRefDevPtr; + OutDevType eRefDevType; + MapMode aRefMapMode; + sal_uInt16 nStretchX; + sal_uInt16 nStretchY; + ULONG nPaperWidth; public: @@ -128,12 +128,12 @@ public: eRefDevType = pRefDev->GetOutDevType(); } - ULONG GetRefDevPtr() const { return nRefDevPtr; } - ULONG GetPaperWidth() const { return nPaperWidth; } - OutDevType GetRefDevType() const { return eRefDevType; } - const MapMode& GetRefMapMode() const { return aRefMapMode; } - sal_uInt16 GetStretchX() const { return nStretchX; } - sal_uInt16 GetStretchY() const { return nStretchY; } + ULONG GetRefDevPtr() const { return nRefDevPtr; } + ULONG GetPaperWidth() const { return nPaperWidth; } + OutDevType GetRefDevType() const { return eRefDevType; } + const MapMode& GetRefMapMode() const { return aRefMapMode; } + sal_uInt16 GetStretchX() const { return nStretchX; } + sal_uInt16 GetStretchY() const { return nStretchY; } }; /* cl removed because not needed anymore since binfilter @@ -154,12 +154,12 @@ class ContentInfo friend class BinTextObject; private: - String aText; - String aStyle; - XEditAttributeList aAttribs; - SfxStyleFamily eFamily; - SfxItemSet aParaAttribs; - WrongList* pWrongs; + String aText; + String aStyle; + XEditAttributeList aAttribs; + SfxStyleFamily eFamily; + SfxItemSet aParaAttribs; + WrongList* pWrongs; /* cl removed because not needed anymore since binfilter LoadStoreTempInfos* pTempLoadStoreInfos; @@ -171,21 +171,21 @@ private: public: ~ContentInfo(); - const String& GetText() const { return aText; } - const String& GetStyle() const { return aStyle; } - const XEditAttributeList& GetAttribs() const { return aAttribs; } - const SfxItemSet& GetParaAttribs() const { return aParaAttribs; } - SfxStyleFamily GetFamily() const { return eFamily; } + const String& GetText() const { return aText; } + const String& GetStyle() const { return aStyle; } + const XEditAttributeList& GetAttribs() const { return aAttribs; } + const SfxItemSet& GetParaAttribs() const { return aParaAttribs; } + SfxStyleFamily GetFamily() const { return eFamily; } - String& GetText() { return aText; } - String& GetStyle() { return aStyle; } - XEditAttributeList& GetAttribs() { return aAttribs; } - SfxItemSet& GetParaAttribs() { return aParaAttribs; } - SfxStyleFamily& GetFamily() { return eFamily; } + String& GetText() { return aText; } + String& GetStyle() { return aStyle; } + XEditAttributeList& GetAttribs() { return aAttribs; } + SfxItemSet& GetParaAttribs() { return aParaAttribs; } + SfxStyleFamily& GetFamily() { return eFamily; } - WrongList* GetWrongList() const { return pWrongs; } - void SetWrongList( WrongList* p ) { pWrongs = p; } - bool operator==( const ContentInfo& rCompare ) const; + WrongList* GetWrongList() const { return pWrongs; } + void SetWrongList( WrongList* p ) { pWrongs = p; } + bool operator==( const ContentInfo& rCompare ) const; // #i102062# bool isWrongListEqual(const ContentInfo& rCompare) const; @@ -202,108 +202,108 @@ class BinTextObject : public EditTextObject, public SfxItemPoolUser using EditTextObject::isWrongListEqual; private: - ContentInfoList aContents; - SfxItemPool* pPool; - BOOL bOwnerOfPool; - XParaPortionList* pPortionInfo; - - sal_uInt32 nObjSettings; - USHORT nMetric; - USHORT nVersion; - USHORT nUserType; - USHORT nScriptType; - - BOOL bVertical; - BOOL bStoreUnicodeStrings; + ContentInfoList aContents; + SfxItemPool* pPool; + BOOL bOwnerOfPool; + XParaPortionList* pPortionInfo; + + sal_uInt32 nObjSettings; + USHORT nMetric; + USHORT nVersion; + USHORT nUserType; + USHORT nScriptType; + + BOOL bVertical; + BOOL bStoreUnicodeStrings; protected: - void DeleteContents(); - virtual void StoreData( SvStream& rOStream ) const; - virtual void CreateData( SvStream& rIStream ); - BOOL ImpChangeStyleSheets( const String& rOldName, SfxStyleFamily eOldFamily, + void DeleteContents(); + virtual void StoreData( SvStream& rOStream ) const; + virtual void CreateData( SvStream& rIStream ); + BOOL ImpChangeStyleSheets( const String& rOldName, SfxStyleFamily eOldFamily, const String& rNewName, SfxStyleFamily eNewFamily ); public: BinTextObject( SfxItemPool* pPool ); BinTextObject( const BinTextObject& ); - virtual ~BinTextObject(); + virtual ~BinTextObject(); - virtual EditTextObject* Clone() const; + virtual EditTextObject* Clone() const; - USHORT GetUserType() const; - void SetUserType( USHORT n ); + USHORT GetUserType() const; + void SetUserType( USHORT n ); - ULONG GetObjectSettings() const; - void SetObjectSettings( ULONG n ); + ULONG GetObjectSettings() const; + void SetObjectSettings( ULONG n ); - BOOL IsVertical() const; - void SetVertical( BOOL b ); + BOOL IsVertical() const; + void SetVertical( BOOL b ); - USHORT GetScriptType() const; - void SetScriptType( USHORT nType ); + USHORT GetScriptType() const; + void SetScriptType( USHORT nType ); - USHORT GetVersion() const; // Solange der Outliner keine Recordlaenge speichert + USHORT GetVersion() const; // Solange der Outliner keine Recordlaenge speichert - ContentInfo* CreateAndInsertContent(); - XEditAttribute* CreateAttrib( const SfxPoolItem& rItem, USHORT nStart, USHORT nEnd ); - void DestroyAttrib( XEditAttribute* pAttr ); + ContentInfo* CreateAndInsertContent(); + XEditAttribute* CreateAttrib( const SfxPoolItem& rItem, USHORT nStart, USHORT nEnd ); + void DestroyAttrib( XEditAttribute* pAttr ); - ContentInfoList& GetContents() { return aContents; } - const ContentInfoList& GetContents() const { return aContents; } - SfxItemPool* GetPool() const { return pPool; } - XParaPortionList* GetPortionInfo() const { return pPortionInfo; } - void SetPortionInfo( XParaPortionList* pP ) + ContentInfoList& GetContents() { return aContents; } + const ContentInfoList& GetContents() const { return aContents; } + SfxItemPool* GetPool() const { return pPool; } + XParaPortionList* GetPortionInfo() const { return pPortionInfo; } + void SetPortionInfo( XParaPortionList* pP ) { pPortionInfo = pP; } - virtual USHORT GetParagraphCount() const; - virtual String GetText( USHORT nParagraph ) const; - virtual void Insert( const EditTextObject& rObj, USHORT nPara ); - virtual EditTextObject* CreateTextObject( USHORT nPara, USHORT nParas = 1 ) const; - virtual void RemoveParagraph( USHORT nPara ); - - virtual BOOL HasPortionInfo() const; - virtual void ClearPortionInfo(); + virtual USHORT GetParagraphCount() const; + virtual String GetText( USHORT nParagraph ) const; + virtual void Insert( const EditTextObject& rObj, USHORT nPara ); + virtual EditTextObject* CreateTextObject( USHORT nPara, USHORT nParas = 1 ) const; + virtual void RemoveParagraph( USHORT nPara ); - virtual BOOL HasOnlineSpellErrors() const; + virtual BOOL HasPortionInfo() const; + virtual void ClearPortionInfo(); - virtual BOOL HasCharAttribs( USHORT nWhich = 0 ) const; - virtual void GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const; + virtual BOOL HasOnlineSpellErrors() const; - virtual BOOL RemoveCharAttribs( USHORT nWhich = 0 ); - virtual BOOL RemoveParaAttribs( USHORT nWhich = 0 ); + virtual BOOL HasCharAttribs( USHORT nWhich = 0 ) const; + virtual void GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const; - virtual void MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart, USHORT nEnd ); + virtual BOOL RemoveCharAttribs( USHORT nWhich = 0 ); + virtual BOOL RemoveParaAttribs( USHORT nWhich = 0 ); + + virtual void MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart, USHORT nEnd ); - virtual BOOL IsFieldObject() const; - virtual const SvxFieldItem* GetField() const; - virtual BOOL HasField( TypeId Type = NULL ) const; + virtual BOOL IsFieldObject() const; + virtual const SvxFieldItem* GetField() const; + virtual BOOL HasField( TypeId Type = NULL ) const; - SfxItemSet GetParaAttribs( USHORT nPara ) const; - void SetParaAttribs( USHORT nPara, const SfxItemSet& rAttribs ); + SfxItemSet GetParaAttribs( USHORT nPara ) const; + void SetParaAttribs( USHORT nPara, const SfxItemSet& rAttribs ); - virtual BOOL HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const; - virtual void GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& eFamily ) const; - virtual void SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& eFamily ); - virtual BOOL ChangeStyleSheets( const XubString& rOldName, SfxStyleFamily eOldFamily, + virtual BOOL HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const; + virtual void GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& eFamily ) const; + virtual void SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& eFamily ); + virtual BOOL ChangeStyleSheets( const XubString& rOldName, SfxStyleFamily eOldFamily, const String& rNewName, SfxStyleFamily eNewFamily ); - virtual void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName ); + virtual void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName ); - void CreateData300( SvStream& rIStream ); + void CreateData300( SvStream& rIStream ); - BOOL HasMetric() const { return nMetric != 0xFFFF; } - USHORT GetMetric() const { return nMetric; } - void SetMetric( USHORT n ) { nMetric = n; } + BOOL HasMetric() const { return nMetric != 0xFFFF; } + USHORT GetMetric() const { return nMetric; } + void SetMetric( USHORT n ) { nMetric = n; } - BOOL IsOwnerOfPool() const { return bOwnerOfPool; } - void StoreUnicodeStrings( BOOL b ) { bStoreUnicodeStrings = b; } + BOOL IsOwnerOfPool() const { return bOwnerOfPool; } + void StoreUnicodeStrings( BOOL b ) { bStoreUnicodeStrings = b; } /* cl removed because not needed anymore since binfilter - void PrepareStore( SfxStyleSheetPool* pStyleSheetPool ); - void FinishStore(); - void FinishLoad( SfxStyleSheetPool* pStyleSheetPool ); + void PrepareStore( SfxStyleSheetPool* pStyleSheetPool ); + void FinishStore(); + void FinishLoad( SfxStyleSheetPool* pStyleSheetPool ); */ - bool operator==( const BinTextObject& rCompare ) const; + bool operator==( const BinTextObject& rCompare ) const; // #i102062# bool isWrongListEqual(const BinTextObject& rCompare) const; @@ -312,6 +312,6 @@ public: virtual void ObjectInDestruction(const SfxItemPool& rSfxItemPool); }; -#endif // _EDITOBJ2_HXX +#endif // _EDITOBJ2_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx index 03aa2187251d..4c26189582bb 100644 --- a/editeng/source/editeng/editsel.cxx +++ b/editeng/source/editeng/editsel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,9 +35,9 @@ #include <impedit.hxx> #include <editeng/editview.hxx> -// ---------------------------------------------------------------------- -// class EditSelFunctionSet -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// class EditSelFunctionSet +// ---------------------------------------------------------------------- EditSelFunctionSet::EditSelFunctionSet() { pCurView = NULL; @@ -89,9 +89,9 @@ void __EXPORT EditSelFunctionSet::DeselectAll() pCurView->pImpEditView->DeselectAll(); } -// ---------------------------------------------------------------------- -// class EditSelectionEngine -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// class EditSelectionEngine +// ---------------------------------------------------------------------- EditSelectionEngine::EditSelectionEngine() : SelectionEngine( (Window*)0 ) { // Wegen Bug OV: (1994) diff --git a/editeng/source/editeng/editsel.hxx b/editeng/source/editeng/editsel.hxx index d5a4c6f56949..78e7a118b4b3 100644 --- a/editeng/source/editeng/editsel.hxx +++ b/editeng/source/editeng/editsel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,35 +33,35 @@ class EditView; -// ---------------------------------------------------------------------- -// class EditSelFunctionSet -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// class EditSelFunctionSet +// ---------------------------------------------------------------------- class EditSelFunctionSet: public FunctionSet { private: - EditView* pCurView; + EditView* pCurView; public: EditSelFunctionSet(); - virtual void BeginDrag(); + virtual void BeginDrag(); - virtual void CreateAnchor(); - virtual void DestroyAnchor(); + virtual void CreateAnchor(); + virtual void DestroyAnchor(); - virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); + virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); - virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); - virtual void DeselectAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(); + virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); + virtual void DeselectAtPoint( const Point& rPointPixel ); + virtual void DeselectAll(); - void SetCurView( EditView* pView ) { pCurView = pView; } - EditView* GetCurView() { return pCurView; } + void SetCurView( EditView* pView ) { pCurView = pView; } + EditView* GetCurView() { return pCurView; } }; - // ---------------------------------------------------------------------- -// class EditSelectionEngine -// ---------------------------------------------------------------------- + // ---------------------------------------------------------------------- +// class EditSelectionEngine +// ---------------------------------------------------------------------- class EditSelectionEngine : public SelectionEngine { private: @@ -69,8 +69,8 @@ private: public: EditSelectionEngine(); - void SetCurView( EditView* pNewView ); - EditView* GetCurView(); + void SetCurView( EditView* pNewView ); + EditView* GetCurView(); }; #endif // _EDITSEL_HXX diff --git a/editeng/source/editeng/editstt2.hxx b/editeng/source/editeng/editstt2.hxx index 123c175e6a47..3bab4db1b819 100644 --- a/editeng/source/editeng/editstt2.hxx +++ b/editeng/source/editeng/editstt2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,93 +37,93 @@ class InternalEditStatus : public EditStatus public: InternalEditStatus() { ; } - void TurnOnFlags( ULONG nFlags ) + void TurnOnFlags( ULONG nFlags ) { nControlBits |= nFlags; } - void TurnOffFlags( ULONG nFlags ) + void TurnOffFlags( ULONG nFlags ) { nControlBits &= ~nFlags; } - void TurnOnStatusBits( ULONG nBits ) + void TurnOnStatusBits( ULONG nBits ) { nStatusBits |= nBits; } - void TurnOffStatusBits( ULONG nBits ) + void TurnOffStatusBits( ULONG nBits ) { nStatusBits &= ~nBits; } - BOOL UseCharAttribs() const + BOOL UseCharAttribs() const { return ( ( nControlBits & EE_CNTRL_USECHARATTRIBS ) != 0 ); } - BOOL NotifyCursorMovements() const + BOOL NotifyCursorMovements() const { return ( ( nControlBits & EE_CNTRL_CRSRLEFTPARA ) != 0 ); } - BOOL UseIdleFormatter() const + BOOL UseIdleFormatter() const { return ( ( nControlBits & EE_CNTRL_DOIDLEFORMAT) != 0 ); } - BOOL AllowPasteSpecial() const + BOOL AllowPasteSpecial() const { return ( ( nControlBits & EE_CNTRL_PASTESPECIAL ) != 0 ); } - BOOL DoAutoIndenting() const + BOOL DoAutoIndenting() const { return ( ( nControlBits & EE_CNTRL_AUTOINDENTING ) != 0 ); } - BOOL DoUndoAttribs() const + BOOL DoUndoAttribs() const { return ( ( nControlBits & EE_CNTRL_UNDOATTRIBS ) != 0 ); } - BOOL OneCharPerLine() const + BOOL OneCharPerLine() const { return ( ( nControlBits & EE_CNTRL_ONECHARPERLINE ) != 0 ); } - BOOL IsOutliner() const + BOOL IsOutliner() const { return ( ( nControlBits & EE_CNTRL_OUTLINER ) != 0 ); } - BOOL IsOutliner2() const + BOOL IsOutliner2() const { return ( ( nControlBits & EE_CNTRL_OUTLINER2 ) != 0 ); } - BOOL IsAnyOutliner() const + BOOL IsAnyOutliner() const { return IsOutliner() || IsOutliner2(); } - BOOL DoNotUseColors() const + BOOL DoNotUseColors() const { return ( ( nControlBits & EE_CNTRL_NOCOLORS ) != 0 ); } - BOOL AllowBigObjects() const + BOOL AllowBigObjects() const { return ( ( nControlBits & EE_CNTRL_ALLOWBIGOBJS ) != 0 ); } - BOOL DoOnlineSpelling() const + BOOL DoOnlineSpelling() const { return ( ( nControlBits & EE_CNTRL_ONLINESPELLING ) != 0 ); } - BOOL DoStretch() const + BOOL DoStretch() const { return ( ( nControlBits & EE_CNTRL_STRETCHING ) != 0 ); } - BOOL AutoPageSize() const + BOOL AutoPageSize() const { return ( ( nControlBits & EE_CNTRL_AUTOPAGESIZE ) != 0 ); } - BOOL AutoPageWidth() const + BOOL AutoPageWidth() const { return ( ( nControlBits & EE_CNTRL_AUTOPAGESIZEX ) != 0 ); } - BOOL AutoPageHeight() const + BOOL AutoPageHeight() const { return ( ( nControlBits & EE_CNTRL_AUTOPAGESIZEY ) != 0 ); } - BOOL MarkFields() const + BOOL MarkFields() const { return ( ( nControlBits & EE_CNTRL_MARKFIELDS ) != 0 ); } - BOOL DoRestoreFont() const + BOOL DoRestoreFont() const { return ( ( nControlBits & EE_CNTRL_RESTOREFONT ) != 0 ); } - BOOL DoImportRTFStyleSheets() const + BOOL DoImportRTFStyleSheets() const { return ( ( nControlBits & EE_CNTRL_RTFSTYLESHEETS ) != 0 ); } - BOOL DoAutoCorrect() const + BOOL DoAutoCorrect() const { return ( ( nControlBits & EE_CNTRL_AUTOCORRECT ) != 0 ); } - BOOL DoAutoComplete() const + BOOL DoAutoComplete() const { return ( ( nControlBits & EE_CNTRL_AUTOCOMPLETE ) != 0 ); } - BOOL DoTabIndenting() const + BOOL DoTabIndenting() const { return ( ( nControlBits & EE_CNTRL_TABINDENTING ) != 0 ); } - BOOL DoFormat100() const + BOOL DoFormat100() const { return ( ( nControlBits & EE_CNTRL_FORMAT100 ) != 0 ); } - - BOOL ULSpaceSummation() const + + BOOL ULSpaceSummation() const { return ( ( nControlBits & EE_CNTRL_ULSPACESUMMATION ) != 0 ); } - - BOOL ULSpaceFirstParagraph() const + + BOOL ULSpaceFirstParagraph() const { return ( ( nControlBits & EE_CNTRL_ULSPACEFIRSTPARA ) != 0 ); } }; diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 19ca7dcaf68f..79e1a6cf4fe0 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,11 +38,11 @@ DBG_NAME( EditUndo ) -#define MAX_UNDOS 100 // ab dieser Menge darf geloescht werden.... -#define MIN_UNDOS 50 // soviel muss stehen bleiben... +#define MAX_UNDOS 100 // ab dieser Menge darf geloescht werden.... +#define MIN_UNDOS 50 // soviel muss stehen bleiben... -#define NO_UNDO 0xFFFF -#define GROUP_NOTFOUND 0xFFFF +#define NO_UNDO 0xFFFF +#define GROUP_NOTFOUND 0xFFFF TYPEINIT1( EditUndo, SfxUndoAction ); TYPEINIT1( EditUndoDelContent, EditUndo ); @@ -93,7 +93,7 @@ BOOL __EXPORT EditUndoManager::Undo( USHORT nCount ) } } - pImpEE->GetActiveView()->GetImpEditView()->DrawSelection(); // alte Selektion entfernen + pImpEE->GetActiveView()->GetImpEditView()->DrawSelection(); // alte Selektion entfernen pImpEE->SetUndoMode( TRUE ); BOOL bDone = SfxUndoManager::Undo( nCount ); @@ -128,7 +128,7 @@ BOOL __EXPORT EditUndoManager::Redo( USHORT nCount ) } } - pImpEE->GetActiveView()->GetImpEditView()->DrawSelection(); // alte Selektion entfernen + pImpEE->GetActiveView()->GetImpEditView()->DrawSelection(); // alte Selektion entfernen pImpEE->SetUndoMode( TRUE ); BOOL bDone = SfxUndoManager::Redo( nCount ); @@ -203,7 +203,7 @@ void __EXPORT EditUndoDelContent::Undo() { DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); GetImpEditEngine()->InsertContent( pContentNode, nNode ); - bDelObject = FALSE; // gehoert wieder der Engine + bDelObject = FALSE; // gehoert wieder der Engine EditSelection aSel( EditPaM( pContentNode, 0 ), EditPaM( pContentNode, pContentNode->Len() ) ); GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aSel ); } @@ -237,7 +237,7 @@ void __EXPORT EditUndoDelContent::Redo() DBG_ASSERT( pN && ( pN != pContentNode ), "?! RemoveContent !? " ); EditPaM aPaM( pN, pN->Len() ); - bDelObject = TRUE; // gehoert wieder dem Undo + bDelObject = TRUE; // gehoert wieder dem Undo _pImpEE->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aPaM ) ); } @@ -248,12 +248,12 @@ void __EXPORT EditUndoDelContent::Redo() EditUndoConnectParas::EditUndoConnectParas( ImpEditEngine* _pImpEE, USHORT nN, USHORT nSP, const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs, const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, BOOL bBkwrd ) - : EditUndo( EDITUNDO_CONNECTPARAS, _pImpEE ), + : EditUndo( EDITUNDO_CONNECTPARAS, _pImpEE ), aLeftParaAttribs( rLeftParaAttribs ), aRightParaAttribs( rRightParaAttribs ) { - nNode = nN; - nSepPos = nSP; + nNode = nN; + nSepPos = nSP; if ( pLeftStyle ) { @@ -292,7 +292,7 @@ void __EXPORT EditUndoConnectParas::Undo() if ( GetImpEditEngine()->IsCallParaInsertedOrDeleted() ) GetImpEditEngine()->GetEditEnginePtr()->ParagraphInserted( nNode+1 ); - if ( GetImpEditEngine()->GetStyleSheetPool() ) + if ( GetImpEditEngine()->GetStyleSheetPool() ) { if ( aLeftStyleName.Len() ) GetImpEditEngine()->SetStyleSheet( (USHORT)nNode, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aLeftStyleName, eLeftStyleFamily ) ); @@ -317,8 +317,8 @@ void __EXPORT EditUndoConnectParas::Redo() EditUndoSplitPara::EditUndoSplitPara( ImpEditEngine* _pImpEE, USHORT nN, USHORT nSP ) : EditUndo( EDITUNDO_SPLITPARA, _pImpEE ) { - nNode = nN; - nSepPos = nSP; + nNode = nN; + nSepPos = nSP; } EditUndoSplitPara::~EditUndoSplitPara() @@ -438,7 +438,7 @@ void __EXPORT EditUndoInsertFeature::Undo() // Attribute werden dort implizit vom Dokument korrigiert... aSel.Max().GetIndex()++; EditPaM aNewPaM = GetImpEditEngine()->ImpDeleteSelection( aSel ); - aSel.Max().GetIndex()--; // Fuer Selektion + aSel.Max().GetIndex()--; // Fuer Selektion GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aSel ); } @@ -459,7 +459,7 @@ void __EXPORT EditUndoInsertFeature::Redo() // ------------------------------------------------------------------------ EditUndoMoveParagraphs::EditUndoMoveParagraphs ( ImpEditEngine* _pImpEE, const Range& rParas, USHORT n ) - : EditUndo( EDITUNDO_MOVEPARAGRAPHS, _pImpEE ), + : EditUndo( EDITUNDO_MOVEPARAGRAPHS, _pImpEE ), nParagraphs( rParas ) { nDest = n; @@ -537,7 +537,7 @@ void __EXPORT EditUndoSetStyleSheet::Redo() // EditUndoSetParaAttribs // ------------------------------------------------------------------------ EditUndoSetParaAttribs::EditUndoSetParaAttribs( ImpEditEngine* _pImpEE, USHORT nP, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems ) - : EditUndo( EDITUNDO_PARAATTRIBS, _pImpEE ), + : EditUndo( EDITUNDO_PARAATTRIBS, _pImpEE ), aPrevItems( rPrevItems ), aNewItems(rNewItems ) { @@ -566,7 +566,7 @@ void __EXPORT EditUndoSetParaAttribs::Redo() // EditUndoSetAttribs // ------------------------------------------------------------------------ EditUndoSetAttribs::EditUndoSetAttribs( ImpEditEngine* _pImpEE, const ESelection& rESel, const SfxItemSet& rNewItems ) - : EditUndo( EDITUNDO_ATTRIBS, _pImpEE ), + : EditUndo( EDITUNDO_ATTRIBS, _pImpEE ), aESel( rESel ), aNewAttribs( rNewItems ) { @@ -735,7 +735,7 @@ EditUndoMarkSelection::~EditUndoMarkSelection() void __EXPORT EditUndoMarkSelection::Undo() { DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); - if ( GetImpEditEngine()->GetActiveView() ) + if ( GetImpEditEngine()->GetActiveView() ) { if ( GetImpEditEngine()->IsFormatted() ) GetImpEditEngine()->GetActiveView()->SetSelection( aSelection ); diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx index dfea0a08d9c9..7c230eb38adf 100644 --- a/editeng/source/editeng/editundo.hxx +++ b/editeng/source/editeng/editundo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,11 +33,11 @@ #include <editeng/editund2.hxx> #include <editeng/editdata.hxx> -#define UNDO_NOACTION 0 -#define UNDO_NEWUNDO 1 -#define UNDO_UNDOSDELETED 2 -#define UNDO_EMPTYGROUPDELETED 3 -#define UNDO_INVALIDEND 4 +#define UNDO_NOACTION 0 +#define UNDO_NEWUNDO 1 +#define UNDO_UNDOSDELETED 2 +#define UNDO_EMPTYGROUPDELETED 3 +#define UNDO_INVALIDEND 4 class ImpEditEngine; class EditView; @@ -48,9 +48,9 @@ class EditView; class EditUndoDelContent : public EditUndo { private: - BOOL bDelObject; - USHORT nNode; - ContentNode* pContentNode; // Zeigt auf das gueltige, + BOOL bDelObject; + USHORT nNode; + ContentNode* pContentNode; // Zeigt auf das gueltige, // nicht zerstoerte Objekt! public: @@ -58,8 +58,8 @@ public: EditUndoDelContent( ImpEditEngine* pImpEE, ContentNode* pNode, USHORT nPortio ); ~EditUndoDelContent(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ----------------------------------------------------------------------- @@ -68,18 +68,18 @@ public: class EditUndoConnectParas : public EditUndo { private: - USHORT nNode; - USHORT nSepPos; - SfxItemSet aLeftParaAttribs; - SfxItemSet aRightParaAttribs; + USHORT nNode; + USHORT nSepPos; + SfxItemSet aLeftParaAttribs; + SfxItemSet aRightParaAttribs; // 2 Pointer waeren schoener, aber dann muesste es ein SfxListener sein. - String aLeftStyleName; - String aRightStyleName; - SfxStyleFamily eLeftStyleFamily; - SfxStyleFamily eRightStyleFamily; + String aLeftStyleName; + String aRightStyleName; + SfxStyleFamily eLeftStyleFamily; + SfxStyleFamily eRightStyleFamily; - BOOL bBackward; + BOOL bBackward; public: TYPEINFO(); @@ -88,8 +88,8 @@ public: const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, BOOL bBackward ); ~EditUndoConnectParas(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ----------------------------------------------------------------------- @@ -98,16 +98,16 @@ public: class EditUndoSplitPara : public EditUndo { private: - USHORT nNode; - USHORT nSepPos; + USHORT nNode; + USHORT nSepPos; public: TYPEINFO(); EditUndoSplitPara( ImpEditEngine* pImpEE, USHORT nNode, USHORT nSepPos ); ~EditUndoSplitPara(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ----------------------------------------------------------------------- @@ -116,20 +116,20 @@ public: class EditUndoInsertChars : public EditUndo { private: - EPaM aEPaM; - String aText; + EPaM aEPaM; + String aText; public: TYPEINFO(); EditUndoInsertChars( ImpEditEngine* pImpEE, const EPaM& rEPaM, const String& rStr ); - const EPaM& GetEPaM() { return aEPaM; } - String& GetStr() { return aText; } + const EPaM& GetEPaM() { return aEPaM; } + String& GetStr() { return aText; } - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual BOOL Merge( SfxUndoAction *pNextAction ); }; // ----------------------------------------------------------------------- @@ -138,18 +138,18 @@ public: class EditUndoRemoveChars : public EditUndo { private: - EPaM aEPaM; - String aText; + EPaM aEPaM; + String aText; public: TYPEINFO(); EditUndoRemoveChars( ImpEditEngine* pImpEE, const EPaM& rEPaM, const String& rStr ); - const EPaM& GetEPaM() { return aEPaM; } - String& GetStr() { return aText; } + const EPaM& GetEPaM() { return aEPaM; } + String& GetStr() { return aText; } - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ----------------------------------------------------------------------- @@ -158,8 +158,8 @@ public: class EditUndoInsertFeature : public EditUndo { private: - EPaM aEPaM; - SfxPoolItem* pFeature; + EPaM aEPaM; + SfxPoolItem* pFeature; public: TYPEINFO(); @@ -167,8 +167,8 @@ public: const SfxPoolItem& rFeature); ~EditUndoInsertFeature(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ----------------------------------------------------------------------- @@ -177,16 +177,16 @@ public: class EditUndoMoveParagraphs: public EditUndo { private: - Range nParagraphs; - USHORT nDest; + Range nParagraphs; + USHORT nDest; public: TYPEINFO(); EditUndoMoveParagraphs( ImpEditEngine* pImpEE, const Range& rParas, USHORT nDest ); ~EditUndoMoveParagraphs(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ----------------------------------------------------------------------- @@ -195,24 +195,24 @@ public: class EditUndoSetStyleSheet: public EditUndo { private: - USHORT nPara; - XubString aPrevName; - XubString aNewName; - SfxStyleFamily ePrevFamily; - SfxStyleFamily eNewFamily; - SfxItemSet aPrevParaAttribs; + USHORT nPara; + XubString aPrevName; + XubString aNewName; + SfxStyleFamily ePrevFamily; + SfxStyleFamily eNewFamily; + SfxItemSet aPrevParaAttribs; public: TYPEINFO(); - + EditUndoSetStyleSheet( ImpEditEngine* pImpEE, USHORT nPara, const XubString& rPrevName, SfxStyleFamily ePrevFamily, const XubString& rNewName, SfxStyleFamily eNewFamily, const SfxItemSet& rPrevParaAttribs ); ~EditUndoSetStyleSheet(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ----------------------------------------------------------------------- @@ -221,17 +221,17 @@ public: class EditUndoSetParaAttribs: public EditUndo { private: - USHORT nPara; - SfxItemSet aPrevItems; - SfxItemSet aNewItems; + USHORT nPara; + SfxItemSet aPrevItems; + SfxItemSet aNewItems; public: TYPEINFO(); EditUndoSetParaAttribs( ImpEditEngine* pImpEE, USHORT nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems ); ~EditUndoSetParaAttribs(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ----------------------------------------------------------------------- @@ -240,16 +240,16 @@ public: class EditUndoSetAttribs: public EditUndo { private: - ESelection aESel; - SfxItemSet aNewAttribs; - ContentInfoArray aPrevAttribs; + ESelection aESel; + SfxItemSet aNewAttribs; + ContentInfoArray aPrevAttribs; - BYTE nSpecial; - BOOL bSetIsRemove; - BOOL bRemoveParaAttribs; - USHORT nRemoveWhich; + BYTE nSpecial; + BOOL bSetIsRemove; + BOOL bRemoveParaAttribs; + USHORT nRemoveWhich; - void ImpSetSelection( EditView* pView ); + void ImpSetSelection( EditView* pView ); public: @@ -257,16 +257,16 @@ public: EditUndoSetAttribs( ImpEditEngine* pImpEE, const ESelection& rESel, const SfxItemSet& rNewItems ); ~EditUndoSetAttribs(); - ContentInfoArray& GetContentInfos() { return aPrevAttribs; } - SfxItemSet& GetNewAttribs() { return aNewAttribs; } + ContentInfoArray& GetContentInfos() { return aPrevAttribs; } + SfxItemSet& GetNewAttribs() { return aNewAttribs; } - void SetSpecial( BYTE n ) { nSpecial = n; } - void SetRemoveAttribs( BOOL b ) { bSetIsRemove = b; } - void SetRemoveParaAttribs( BOOL b ) { bRemoveParaAttribs = b; } - void SetRemoveWhich( USHORT n ) { nRemoveWhich = n; } + void SetSpecial( BYTE n ) { nSpecial = n; } + void SetRemoveAttribs( BOOL b ) { bSetIsRemove = b; } + void SetRemoveParaAttribs( BOOL b ) { bRemoveParaAttribs = b; } + void SetRemoveWhich( USHORT n ) { nRemoveWhich = n; } - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ----------------------------------------------------------------------- @@ -275,24 +275,24 @@ public: class EditUndoTransliteration: public EditUndo { private: - ESelection aOldESel; - ESelection aNewESel; + ESelection aOldESel; + ESelection aNewESel; - sal_Int32 nMode; - EditTextObject* pTxtObj; - String aText; + sal_Int32 nMode; + EditTextObject* pTxtObj; + String aText; public: TYPEINFO(); EditUndoTransliteration( ImpEditEngine* pImpEE, const ESelection& rESel, sal_Int32 nMode ); ~EditUndoTransliteration(); - void SetText( const String& rText ) { aText = rText; } - void SetText( EditTextObject* pObj ) { pTxtObj = pObj; } - void SetNewSelection( const ESelection& rSel ) { aNewESel = rSel; } + void SetText( const String& rText ) { aText = rText; } + void SetText( EditTextObject* pObj ) { pTxtObj = pObj; } + void SetNewSelection( const ESelection& rSel ) { aNewESel = rSel; } - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; // ----------------------------------------------------------------------- @@ -301,15 +301,15 @@ public: class EditUndoMarkSelection: public EditUndo { private: - ESelection aSelection; + ESelection aSelection; public: TYPEINFO(); EditUndoMarkSelection( ImpEditEngine* pImpEE, const ESelection& rSel ); ~EditUndoMarkSelection(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 6d30e0205c06..f67de56ed73b 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -261,7 +261,7 @@ void EditView::SetSelection( const ESelection& rESel ) aNewSelection.Max() = EditPaM( pNode, pNode->Len() ); } - pImpEditView->DrawSelection(); // alte Selektion 'weg-zeichnen' + pImpEditView->DrawSelection(); // alte Selektion 'weg-zeichnen' pImpEditView->SetEditSelection( aNewSelection ); pImpEditView->DrawSelection(); sal_Bool bGotoCursor = pImpEditView->DoAutoScroll(); @@ -328,7 +328,7 @@ void EditView::SetWindow( Window* pWin ) PIMPEE->GetSelEngine().Reset(); } -Window* EditView::GetWindow() const +Window* EditView::GetWindow() const { DBG_CHKTHIS( EditView, 0 ); return pImpEditView->pOutWin; @@ -464,8 +464,8 @@ void EditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor ) DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); // Draw vertraegt die Assertion nicht, spaeter mal aktivieren -// DBG_ASSERT( pImpEditView->pEditEngine->HasView( this ), "ShowCursor - View nicht angemeldet!" ); -// DBG_ASSERT( !GetWindow()->IsInPaint(), "ShowCursor - Why in Paint ?!" ); +// DBG_ASSERT( pImpEditView->pEditEngine->HasView( this ), "ShowCursor - View nicht angemeldet!" ); +// DBG_ASSERT( !GetWindow()->IsInPaint(), "ShowCursor - Why in Paint ?!" ); if ( pImpEditView->pEditEngine->HasView( this ) ) { @@ -701,7 +701,7 @@ void EditView::UnindentBlock() PIMPEE->IndentBlock( this, sal_False ); } -EESelectionMode EditView::GetSelectionMode() const +EESelectionMode EditView::GetSelectionMode() const { DBG_CHKTHIS( EditView, 0 ); return pImpEditView->GetSelectionMode(); @@ -770,7 +770,7 @@ sal_uInt32 EditView::GetControlWord() const return pImpEditView->nControl; } -EditTextObject* EditView::CreateTextObject() +EditTextObject* EditView::CreateTextObject() { DBG_CHKTHIS( EditView, 0 ); DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); @@ -787,7 +787,7 @@ void EditView::InsertText( const EditTextObject& rTextObject ) EditSelection aTextSel( PIMPEE->InsertText( rTextObject, pImpEditView->GetEditSelection() ) ); PIMPEE->UndoActionEnd( EDITUNDO_INSERT ); - aTextSel.Min() = aTextSel.Max(); // Selektion nicht behalten. + aTextSel.Min() = aTextSel.Max(); // Selektion nicht behalten. pImpEditView->SetEditSelection( aTextSel ); PIMPEE->FormatAndUpdate( this ); } @@ -802,7 +802,7 @@ void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::d EditSelection aTextSel( PIMPEE->InsertText( xDataObj, rBaseURL, pImpEditView->GetEditSelection().Max(), bUseSpecial ) ); PIMPEE->UndoActionEnd( EDITUNDO_INSERT ); - aTextSel.Min() = aTextSel.Max(); // Selektion nicht behalten. + aTextSel.Min() = aTextSel.Max(); // Selektion nicht behalten. pImpEditView->SetEditSelection( aTextSel ); PIMPEE->FormatAndUpdate( this ); } @@ -864,7 +864,7 @@ SfxStyleSheet* EditView::GetStyleSheet() const { SfxStyleSheet* pTmpStyle = PIMPEE->GetStyleSheet( n ); if ( ( n != nStartPara ) && ( pStyle != pTmpStyle ) ) - return NULL; // Nicht eindeutig. + return NULL; // Nicht eindeutig. pStyle = pTmpStyle; } return pStyle; @@ -901,7 +901,7 @@ void EditView::TransliterateText( sal_Int32 nTransliterationMode ) EditSelection aNewSel = PIMPEE->TransliterateText( pImpEditView->GetEditSelection(), nTransliterationMode ); if ( aNewSel != aOldSel ) { - pImpEditView->DrawSelection(); // alte Selektion 'weg-zeichnen' + pImpEditView->DrawSelection(); // alte Selektion 'weg-zeichnen' pImpEditView->SetEditSelection( aNewSel ); pImpEditView->DrawSelection(); } @@ -1142,7 +1142,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) aPopupMenu.InsertSeparator( nWords ); } else - aPopupMenu.RemoveItem( MN_AUTOCORR ); // Loeschen? + aPopupMenu.RemoveItem( MN_AUTOCORR ); // Loeschen? SvtLinguConfig aCfg; const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -1158,7 +1158,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) uno::Reference< linguistic2::XDictionary > xDic( SvxGetOrCreatePosDic( xDicList ) ); if (xDic.is()) xDic->setActive( sal_True ); - + aDics = xDicList->getDictionaries(); pDic = aDics.getConstArray(); sal_uInt16 nCheckedLanguage = PIMPEE->GetLanguage( aPaM2 ); @@ -1252,7 +1252,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) { // Cursor vor das Wort setzen... EditPaM aCursor = pImpEditView->GetEditSelection().Min(); - pImpEditView->DrawSelection(); // alte Selektion 'weg-zeichnen' + pImpEditView->DrawSelection(); // alte Selektion 'weg-zeichnen' pImpEditView->SetEditSelection( EditSelection( aCursor, aCursor ) ); pImpEditView->DrawSelection(); // Stuerzt ab, wenn keine SfxApp @@ -1294,12 +1294,12 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) { DBG_ASSERT(nId - MN_AUTOSTART < aAlt.getLength(), "index out of range"); String aWord = pAlt[nId - MN_AUTOSTART]; - SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); + SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); if ( pAutoCorrect ) pAutoCorrect->PutText( aSelected, aWord, PIMPEE->GetLanguage( aPaM2 ) ); InsertText( aWord ); } - else if ( nId >= MN_ALTSTART ) // Replace + else if ( nId >= MN_ALTSTART ) // Replace { DBG_ASSERT(nId - MN_ALTSTART < aAlt.getLength(), "index out of range"); String aWord = pAlt[nId - MN_ALTSTART]; diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 71dcb38efa4b..0a04b042fdcf 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ void __EXPORT EditSpellWrapper::SpellStart( SvxSpellArea eArea ) } else if ( eArea == SVX_SPELL_BODY ) { - ; // Wird ueber SpellNextDocument von App gehandelt + ; // Wird ueber SpellNextDocument von App gehandelt // pSpellInfo->bSpellToEnd = sal_True; // pSpellInfo->aSpellTo = pImpEE->CreateEPaM( pImpEE->GetEditDoc().GetEndPaM() ); @@ -279,7 +279,7 @@ void WrongList::TextInserted( sal_uInt16 nPos, sal_uInt16 nNew, sal_Bool bPosIsS WrongRange aNewWrong( rWrong.nStart, nPos ); rWrong.nStart = nPos+1; Insert( aNewWrong, n ); - bRefIsValid = sal_False; // Referenz nach Insert nicht mehr gueltig, der andere wurde davor an dessen Position eingefuegt + bRefIsValid = sal_False; // Referenz nach Insert nicht mehr gueltig, der andere wurde davor an dessen Position eingefuegt n++; // Diesen nicht nochmal... } } @@ -340,7 +340,7 @@ void WrongList::TextDeleted( sal_uInt16 nPos, sal_uInt16 nDeleted ) // 2. Wrong beginnt davor, endet drinnen oder dahinter... else if ( ( rWrong.nStart <= nPos ) && ( rWrong.nEnd > nPos ) ) { - if ( rWrong.nEnd <= nEndChanges ) // endet drinnen + if ( rWrong.nEnd <= nEndChanges ) // endet drinnen rWrong.nEnd = nPos; else rWrong.nEnd = rWrong.nEnd - nDeleted; // endet dahinter @@ -418,7 +418,7 @@ void WrongList::ClearWrongs( sal_uInt16 nStart, sal_uInt16 nEnd, WrongRange& rWrong = GetObject( n ); if ( ( rWrong.nEnd > nStart ) && ( rWrong.nStart < nEnd ) ) { - if ( rWrong.nEnd > nEnd ) // // Laeuft raus + if ( rWrong.nEnd > nEnd ) // // Laeuft raus { rWrong.nStart = nEnd; // Blanks? @@ -476,7 +476,7 @@ void WrongList::MarkWrongsInvalid() MarkInvalid( GetObject( 0 ).nStart, GetObject( Count()-1 ).nEnd ); } -WrongList* WrongList::Clone() const +WrongList* WrongList::Clone() const { WrongList* pNew = new WrongList; for ( sal_uInt16 n = 0; n < Count(); n++ ) @@ -492,7 +492,7 @@ WrongList* WrongList::Clone() const bool WrongList::operator==(const WrongList& rCompare) const { // cleck direct members - if(GetInvalidStart() != rCompare.GetInvalidStart() + if(GetInvalidStart() != rCompare.GetInvalidStart() || GetInvalidEnd() != rCompare.GetInvalidEnd() || Count() != rCompare.Count()) { @@ -623,7 +623,7 @@ sal_Bool EdtAutoCorrDoc::SetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, aSet.Put( rItem ); EditSelection aSel( EditPaM( pCurNode, nStt ), EditPaM( pCurNode, nEnd ) ); - aSel.Max().SetIndex( nEnd ); // ??? + aSel.Max().SetIndex( nEnd ); // ??? pImpEE->SetAttribs( aSel, aSet, ATTRSPECIAL_EDGE ); bAllowUndoAction = sal_False; } @@ -677,7 +677,7 @@ const String* EdtAutoCorrDoc::GetPrevPara( sal_Bool ) // Vorherigen Absatz zurueck geben, damit ermittel werden kann, // ob es sich beim aktuellen Wort um einen Satzanfang handelt. - bAllowUndoAction = sal_False; // Jetzt nicht mehr... + bAllowUndoAction = sal_False; // Jetzt nicht mehr... ContentList& rNodes = pImpEE->GetEditDoc(); sal_uInt16 nPos = rNodes.GetPos( pCurNode ); @@ -709,14 +709,14 @@ const String* EdtAutoCorrDoc::GetPrevPara( sal_Bool ) } sal_Bool EdtAutoCorrDoc::ChgAutoCorrWord( sal_uInt16& rSttPos, - sal_uInt16 nEndPos, SvxAutoCorrect& rACorrect, + sal_uInt16 nEndPos, SvxAutoCorrect& rACorrect, const String** ppPara ) { // Absatz-Anfang oder ein Blank gefunden, suche nach dem Wort // Kuerzel im Auto - - bAllowUndoAction = sal_False; // Jetzt nicht mehr... - + + bAllowUndoAction = sal_False; // Jetzt nicht mehr... + String aShort( pCurNode->Copy( rSttPos, nEndPos - rSttPos ) ); sal_Bool bRet = sal_False; @@ -728,7 +728,7 @@ sal_Bool EdtAutoCorrDoc::ChgAutoCorrWord( sal_uInt16& rSttPos, if( pFnd && pFnd->IsTextOnly() ) { // dann mal ersetzen - EditSelection aSel( EditPaM( pCurNode, rSttPos ), + EditSelection aSel( EditPaM( pCurNode, rSttPos ), EditPaM( pCurNode, nEndPos ) ); aSel = pImpEE->ImpDeleteSelection( aSel ); DBG_ASSERT( nCursor >= nEndPos, "Cursor mitten im Geschehen ?!" ); diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index 2acd7347f150..992a94f39d97 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,17 +48,17 @@ class ContentNode; class EditSpellWrapper : public SvxSpellWrapper { private: - EditView* pEditView; - void CheckSpellTo(); + EditView* pEditView; + void CheckSpellTo(); protected: - virtual void SpellStart( SvxSpellArea eArea ); - virtual BOOL SpellContinue(); // Bereich pruefen - virtual void ReplaceAll( const String &rNewText, INT16 nLanguage ); - virtual void SpellEnd(); - virtual BOOL SpellMore(); - virtual BOOL HasOtherCnt(); - virtual void ScrollArea(); + virtual void SpellStart( SvxSpellArea eArea ); + virtual BOOL SpellContinue(); // Bereich pruefen + virtual void ReplaceAll( const String &rNewText, INT16 nLanguage ); + virtual void SpellEnd(); + virtual BOOL SpellMore(); + virtual BOOL HasOtherCnt(); + virtual void ScrollArea(); virtual void ChangeWord( const String& rNewWord, const USHORT nLang ); virtual void ChangeThesWord( const String& rNewWord ); virtual void AutoCorrect( const String& rOldWord, const String& rNewWord ); @@ -82,49 +82,49 @@ struct WrongRange }; SV_DECL_VARARR( WrongRanges, WrongRange, 4, 4 ) -#define NOT_INVALID 0xFFFF +#define NOT_INVALID 0xFFFF class WrongList : private WrongRanges { private: - USHORT nInvalidStart; - USHORT nInvalidEnd; + USHORT nInvalidStart; + USHORT nInvalidEnd; - BOOL DbgIsBuggy() const; + BOOL DbgIsBuggy() const; public: WrongList(); ~WrongList(); - BOOL IsInvalid() const { return nInvalidStart != NOT_INVALID; } - void SetValid() { nInvalidStart = NOT_INVALID; nInvalidEnd = 0; } - void MarkInvalid( USHORT nS, USHORT nE ); + BOOL IsInvalid() const { return nInvalidStart != NOT_INVALID; } + void SetValid() { nInvalidStart = NOT_INVALID; nInvalidEnd = 0; } + void MarkInvalid( USHORT nS, USHORT nE ); - USHORT Count() const { return WrongRanges::Count(); } + USHORT Count() const { return WrongRanges::Count(); } // Wenn man weiss was man tut: - WrongRange& GetObject( USHORT n ) const { return WrongRanges::GetObject( n ); } - void InsertWrong( const WrongRange& rWrong, USHORT nPos ); + WrongRange& GetObject( USHORT n ) const { return WrongRanges::GetObject( n ); } + void InsertWrong( const WrongRange& rWrong, USHORT nPos ); - USHORT GetInvalidStart() const { return nInvalidStart; } - USHORT& GetInvalidStart() { return nInvalidStart; } + USHORT GetInvalidStart() const { return nInvalidStart; } + USHORT& GetInvalidStart() { return nInvalidStart; } - USHORT GetInvalidEnd() const { return nInvalidEnd; } - USHORT& GetInvalidEnd() { return nInvalidEnd; } + USHORT GetInvalidEnd() const { return nInvalidEnd; } + USHORT& GetInvalidEnd() { return nInvalidEnd; } - void TextInserted( USHORT nPos, USHORT nChars, BOOL bPosIsSep ); - void TextDeleted( USHORT nPos, USHORT nChars ); + void TextInserted( USHORT nPos, USHORT nChars, BOOL bPosIsSep ); + void TextDeleted( USHORT nPos, USHORT nChars ); - void ResetRanges() { Remove( 0, Count() ); } - BOOL HasWrongs() const { return Count() != 0; } - void InsertWrong( USHORT nStart, USHORT nEnd, BOOL bClearRange ); - BOOL NextWrong( USHORT& rnStart, USHORT& rnEnd ) const; - BOOL HasWrong( USHORT nStart, USHORT nEnd ) const; - BOOL HasAnyWrong( USHORT nStart, USHORT nEnd ) const; - void ClearWrongs( USHORT nStart, USHORT nEnd, const ContentNode* pNode ); - void MarkWrongsInvalid(); + void ResetRanges() { Remove( 0, Count() ); } + BOOL HasWrongs() const { return Count() != 0; } + void InsertWrong( USHORT nStart, USHORT nEnd, BOOL bClearRange ); + BOOL NextWrong( USHORT& rnStart, USHORT& rnEnd ) const; + BOOL HasWrong( USHORT nStart, USHORT nEnd ) const; + BOOL HasAnyWrong( USHORT nStart, USHORT nEnd ) const; + void ClearWrongs( USHORT nStart, USHORT nEnd, const ContentNode* pNode ); + void MarkWrongsInvalid(); - WrongList* Clone() const; + WrongList* Clone() const; // #i102062# bool operator==(const WrongList& rCompare) const; @@ -142,40 +142,40 @@ inline void WrongList::InsertWrong( const WrongRange& rWrong, USHORT nPos ) class EdtAutoCorrDoc : public SvxAutoCorrDoc { - ImpEditEngine* pImpEE; - ContentNode* pCurNode; - USHORT nCursor; + ImpEditEngine* pImpEE; + ContentNode* pCurNode; + USHORT nCursor; - BOOL bAllowUndoAction; - BOOL bUndoAction; + BOOL bAllowUndoAction; + BOOL bUndoAction; protected: - void ImplStartUndoAction(); + void ImplStartUndoAction(); public: EdtAutoCorrDoc( ImpEditEngine* pImpEE, ContentNode* pCurNode, USHORT nCrsr, xub_Unicode cIns ); ~EdtAutoCorrDoc(); - virtual BOOL Delete( USHORT nStt, USHORT nEnd ); - virtual BOOL Insert( USHORT nPos, const String& rTxt ); - virtual BOOL Replace( USHORT nPos, const String& rTxt ); + virtual BOOL Delete( USHORT nStt, USHORT nEnd ); + virtual BOOL Insert( USHORT nPos, const String& rTxt ); + virtual BOOL Replace( USHORT nPos, const String& rTxt ); - virtual BOOL SetAttr( USHORT nStt, USHORT nEnd, USHORT nSlotId, SfxPoolItem& ); - virtual BOOL SetINetAttr( USHORT nStt, USHORT nEnd, const String& rURL ); + virtual BOOL SetAttr( USHORT nStt, USHORT nEnd, USHORT nSlotId, SfxPoolItem& ); + virtual BOOL SetINetAttr( USHORT nStt, USHORT nEnd, const String& rURL ); - virtual BOOL HasSymbolChars( USHORT nStt, USHORT nEnd ); + virtual BOOL HasSymbolChars( USHORT nStt, USHORT nEnd ); virtual const String* GetPrevPara( BOOL bAtNormalPos ); - virtual BOOL ChgAutoCorrWord( USHORT& rSttPos, USHORT nEndPos, + virtual BOOL ChgAutoCorrWord( USHORT& rSttPos, USHORT nEndPos, SvxAutoCorrect& rACorrect, const String** ppPara ); virtual LanguageType GetLanguage( USHORT nPos, BOOL bPrevPara = FALSE ) const; - USHORT GetCursor() const { return nCursor; } + USHORT GetCursor() const { return nCursor; } }; -#endif // EDTSPELL +#endif // EDTSPELL /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 8f3bffffbd59..50a776a5a9f6 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,10 +46,10 @@ #include <svtools/htmlkywd.hxx> #include <tools/tenccvt.hxx> -#define ACTION_INSERTTEXT 1 -#define ACTION_INSERTPARABRK 2 +#define ACTION_INSERTTEXT 1 +#define ACTION_INSERTPARABRK 2 -#define STYLE_PRE 101 +#define STYLE_PRE 101 EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs ) : HTMLParser( rIn, true ) @@ -228,7 +228,7 @@ void EditHTMLParser::NextToken( int nToken ) break; case HTML_CENTER_ON: - case HTML_CENTER_OFF: // if ( bInPara ) + case HTML_CENTER_OFF: // if ( bInPara ) { USHORT nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() ); SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() ); @@ -239,9 +239,9 @@ void EditHTMLParser::NextToken( int nToken ) } break; - case HTML_ANCHOR_ON: AnchorStart(); + case HTML_ANCHOR_ON: AnchorStart(); break; - case HTML_ANCHOR_OFF: AnchorEnd(); + case HTML_ANCHOR_OFF: AnchorEnd(); break; case HTML_PARABREAK_ON: @@ -299,9 +299,9 @@ void EditHTMLParser::NextToken( int nToken ) } break; - case HTML_TABLE_ON: nInTable++; + case HTML_TABLE_ON: nInTable++; break; - case HTML_TABLE_OFF: DBG_ASSERT( nInTable, "Nicht in Table, aber TABLE_OFF?" ); + case HTML_TABLE_OFF: DBG_ASSERT( nInTable, "Nicht in Table, aber TABLE_OFF?" ); nInTable--; break; @@ -339,19 +339,19 @@ void EditHTMLParser::NextToken( int nToken ) case HTML_DD_OFF: case HTML_DT_OFF: case HTML_ORDERLIST_OFF: - case HTML_UNORDERLIST_OFF: EndPara( FALSE ); + case HTML_UNORDERLIST_OFF: EndPara( FALSE ); break; case HTML_TABLEROW_ON: - case HTML_TABLEROW_OFF: // Nur nach einem CELL ein RETURN, fuer Calc + case HTML_TABLEROW_OFF: // Nur nach einem CELL ein RETURN, fuer Calc case HTML_COL_ON: case HTML_COLGROUP_ON: case HTML_COLGROUP_OFF: break; - case HTML_FONT_ON: // ... + case HTML_FONT_ON: // ... break; - case HTML_FONT_OFF: // ... + case HTML_FONT_OFF: // ... break; @@ -383,16 +383,16 @@ void EditHTMLParser::NextToken( int nToken ) case HTML_BANNER_OFF: case HTML_DIVISION_ON: case HTML_DIVISION_OFF: -// case HTML_LISTHEADER_ON: //! special handling -// case HTML_LISTHEADER_OFF: +// case HTML_LISTHEADER_ON: //! special handling +// case HTML_LISTHEADER_OFF: case HTML_NOTE_ON: case HTML_NOTE_OFF: // inline elements, logical markup // HTML 2.0 case HTML_ADDRESS_ON: case HTML_ADDRESS_OFF: -// case HTML_BLOCKQUOTE_ON: //! extra Behandlung -// case HTML_BLOCKQUOTE_OFF: +// case HTML_BLOCKQUOTE_ON: //! extra Behandlung +// case HTML_BLOCKQUOTE_OFF: case HTML_CITIATION_ON: case HTML_CITIATION_OFF: case HTML_CODE_ON: @@ -418,8 +418,8 @@ void EditHTMLParser::NextToken( int nToken ) case HTML_ACRONYM_OFF: case HTML_AUTHOR_ON: case HTML_AUTHOR_OFF: -// case HTML_BLOCKQUOTE30_ON: //! extra Behandlung -// case HTML_BLOCKQUOTE30_OFF: +// case HTML_BLOCKQUOTE30_ON: //! extra Behandlung +// case HTML_BLOCKQUOTE30_OFF: case HTML_DELETEDTEXT_ON: case HTML_DELETEDTEXT_OFF: case HTML_INSERTEDTEXT_ON: @@ -461,21 +461,21 @@ void EditHTMLParser::NextToken( int nToken ) // misc case HTML_DIRLIST_ON: case HTML_DIRLIST_OFF: - case HTML_FOOTNOTE_ON: //! landen so im Text + case HTML_FOOTNOTE_ON: //! landen so im Text case HTML_FOOTNOTE_OFF: case HTML_MENULIST_ON: case HTML_MENULIST_OFF: -// case HTML_PLAINTEXT_ON: //! extra Behandlung -// case HTML_PLAINTEXT_OFF: -// case HTML_PREFORMTXT_ON: //! extra Behandlung -// case HTML_PREFORMTXT_OFF: +// case HTML_PLAINTEXT_ON: //! extra Behandlung +// case HTML_PLAINTEXT_OFF: +// case HTML_PREFORMTXT_ON: //! extra Behandlung +// case HTML_PREFORMTXT_OFF: case HTML_SPAN_ON: case HTML_SPAN_OFF: // obsolete -// case HTML_XMP_ON: //! extra Behandlung -// case HTML_XMP_OFF: -// case HTML_LISTING_ON: //! extra Behandlung -// case HTML_LISTING_OFF: +// case HTML_XMP_ON: //! extra Behandlung +// case HTML_XMP_OFF: +// case HTML_LISTING_ON: //! extra Behandlung +// case HTML_LISTING_OFF: // Netscape case HTML_BLINK_ON: case HTML_BLINK_OFF: @@ -488,8 +488,8 @@ void EditHTMLParser::NextToken( int nToken ) // Internet Explorer case HTML_MARQUEE_ON: case HTML_MARQUEE_OFF: -// case HTML_PLAINTEXT2_ON: //! extra Behandlung -// case HTML_PLAINTEXT2_OFF: +// case HTML_PLAINTEXT2_ON: //! extra Behandlung +// case HTML_PLAINTEXT2_OFF: break; default: @@ -507,7 +507,7 @@ void EditHTMLParser::NextToken( int nToken ) } } } - } // SWITCH + } // SWITCH if ( pImpEditEngine->aImportHdl.IsSet() ) { @@ -610,19 +610,19 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSe void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel ) { /* - nHLevel: 0: Ausschalten - 1-6: Heading - STYLE_PRE: Preformatted + nHLevel: 0: Ausschalten + 1-6: Heading + STYLE_PRE: Preformatted */ -// if ( pImpEditEngine->GetStatus().DoImportRTFStyleSheets() ) -// { -// SvxRTFStyleType* pS = GetStyleTbl().Get( rSet.StyleNo() ); -// DBG_ASSERT( pS, "Vorlage in RTF nicht definiert!" ); -// if ( pS ) -// pImpEditEngine->SetStyleSheet( EditSelection( aStartPaM, aEndPaM ), pS->sName, SFX_STYLE_FAMILY_ALL ); -// } -// else +// if ( pImpEditEngine->GetStatus().DoImportRTFStyleSheets() ) +// { +// SvxRTFStyleType* pS = GetStyleTbl().Get( rSet.StyleNo() ); +// DBG_ASSERT( pS, "Vorlage in RTF nicht definiert!" ); +// if ( pS ) +// pImpEditEngine->SetStyleSheet( EditSelection( aStartPaM, aEndPaM ), pS->sName, SFX_STYLE_FAMILY_ALL ); +// } +// else { // Harte Attribute erzeugen... // Reicht fuer Calc, bei StyleSheets muesste noch geklaert werden, @@ -630,7 +630,7 @@ void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel ) // fuettern in eine andere Engine auch noch da sind... USHORT nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() ); -// SfxItemSet aItems( pImpEditEngine->GetEmptyItemSet() ); +// SfxItemSet aItems( pImpEditEngine->GetEmptyItemSet() ); SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() ); aItems.ClearItem( EE_PARA_ULSPACE ); @@ -793,8 +793,8 @@ void EditHTMLParser::EndPara( BOOL ) if ( bHasText ) ImpInsertParaBreak(); // Nur, wenn ohne Absatzabstaende gearbeitet wird... -// if ( !nInTable && bReal && (nNumberingLevel<=1) && (nBulletLevel<=1) ) -// ImpInsertParaBreak(); +// if ( !nInTable && bReal && (nNumberingLevel<=1) && (nBulletLevel<=1) ) +// ImpInsertParaBreak(); } bInPara = FALSE; } diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx index 344321998674..75dcfdae53d1 100644 --- a/editeng/source/editeng/eehtml.hxx +++ b/editeng/source/editeng/eehtml.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,62 +36,62 @@ class ImpEditEngine; -#define MAX_NUMBERLEVEL 10 +#define MAX_NUMBERLEVEL 10 struct AnchorInfo { - String aHRef; - String aText; + String aHRef; + String aText; }; class EditHTMLParser : public HTMLParser { using HTMLParser::CallParser; private: - EditSelection aCurSel; + EditSelection aCurSel; String aBaseURL; - ImpEditEngine* pImpEditEngine; - AnchorInfo* pCurAnchor; - - BOOL bInPara; - BOOL bWasInPara; // bInPara vor HeadingStart merken, weil sonst hinterher weg - BOOL bFieldsInserted; - BYTE nInTable; - BYTE nInCell; + ImpEditEngine* pImpEditEngine; + AnchorInfo* pCurAnchor; + + BOOL bInPara; + BOOL bWasInPara; // bInPara vor HeadingStart merken, weil sonst hinterher weg + BOOL bFieldsInserted; + BYTE nInTable; + BYTE nInCell; BOOL bInTitle; - BYTE nDefListLevel; - BYTE nBulletLevel; - BYTE nNumberingLevel; + BYTE nDefListLevel; + BYTE nBulletLevel; + BYTE nNumberingLevel; - BYTE nLastAction; + BYTE nLastAction; - void StartPara( BOOL bReal ); - void EndPara( BOOL bReal ); - void AnchorStart(); - void AnchorEnd(); - void HeadingStart( int nToken ); - void HeadingEnd( int nToken ); - void SkipGroup( int nEndToken ); - BOOL ThrowAwayBlank(); - BOOL HasTextInCurrentPara(); - void ProcessUnknownControl( BOOL bOn ); + void StartPara( BOOL bReal ); + void EndPara( BOOL bReal ); + void AnchorStart(); + void AnchorEnd(); + void HeadingStart( int nToken ); + void HeadingEnd( int nToken ); + void SkipGroup( int nEndToken ); + BOOL ThrowAwayBlank(); + BOOL HasTextInCurrentPara(); + void ProcessUnknownControl( BOOL bOn ); - void ImpInsertParaBreak(); - void ImpInsertText( const String& rText ); - void ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSel = 0 ); - void ImpSetStyleSheet( USHORT nHeadingLevel ); + void ImpInsertParaBreak(); + void ImpInsertText( const String& rText ); + void ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSel = 0 ); + void ImpSetStyleSheet( USHORT nHeadingLevel ); protected: - virtual void NextToken( int nToken ); + virtual void NextToken( int nToken ); public: EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs ); ~EditHTMLParser(); - virtual SvParserState CallParser( ImpEditEngine* pImpEE, const EditPaM& rPaM ); + virtual SvParserState CallParser( ImpEditEngine* pImpEE, const EditPaM& rPaM ); - const EditSelection& GetCurSelection() const { return aCurSel; } + const EditSelection& GetCurSelection() const { return aCurSel; } }; SV_DECL_REF( EditHTMLParser ) diff --git a/editeng/source/editeng/eeng_pch.cxx b/editeng/source/editeng/eeng_pch.cxx index 45216b37b7b9..31a3b5e37636 100644 --- a/editeng/source/editeng/eeng_pch.cxx +++ b/editeng/source/editeng/eeng_pch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/editeng/eeng_pch.hxx b/editeng/source/editeng/eeng_pch.hxx index 7f80ed57005f..1ae7d8beed6a 100644 --- a/editeng/source/editeng/eeng_pch.hxx +++ b/editeng/source/editeng/eeng_pch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx index 5228d80dccaa..34d595970904 100644 --- a/editeng/source/editeng/eeobj.cxx +++ b/editeng/source/editeng/eeobj.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ EditDataObject::EditDataObject() EditDataObject::~EditDataObject() { } - + // uno::XInterface uno::Any EditDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) { diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx index 56b95e0d23df..f6fa28f4b14c 100644 --- a/editeng/source/editeng/eeobj.hxx +++ b/editeng/source/editeng/eeobj.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,34 +34,34 @@ #include <tools/stream.hxx> -class EditDataObject : public ::com::sun::star::datatransfer::XTransferable, +class EditDataObject : public ::com::sun::star::datatransfer::XTransferable, public ::cppu::OWeakObject { private: - SvMemoryStream maBinData; - SvMemoryStream maRTFData; - String maText; + SvMemoryStream maBinData; + SvMemoryStream maRTFData; + String maText; - String maOfficeBookmark; + String maOfficeBookmark; -// String maNetscapeBookmark; -// SvMemoryStream maRTFData; +// String maNetscapeBookmark; +// SvMemoryStream maRTFData; -public: +public: EditDataObject(); ~EditDataObject(); - - SvMemoryStream& GetStream() { return maBinData; } - SvMemoryStream& GetRTFStream() { return maRTFData; } - String& GetString() { return maText; } - String& GetURL() { return maOfficeBookmark; } - - + + SvMemoryStream& GetStream() { return maBinData; } + SvMemoryStream& GetRTFStream() { return maRTFData; } + String& GetString() { return maText; } + String& GetURL() { return maOfficeBookmark; } + + // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::datatransfer::XTransferable ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -69,6 +69,6 @@ public: sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException); }; -#endif // _DATAOBJ_HXX +#endif // _DATAOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index c4f518982991..c1491b764389 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/editeng/eerdll2.hxx b/editeng/source/editeng/eerdll2.hxx index baf2a1d8c5bf..43bf536982b5 100644 --- a/editeng/source/editeng/eerdll2.hxx +++ b/editeng/source/editeng/eerdll2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,20 +40,20 @@ class GlobalEditData private: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > xLanguageGuesser; - SfxPoolItem** ppDefItems; - OutputDevice* pStdRefDevice; + SfxPoolItem** ppDefItems; + OutputDevice* pStdRefDevice; - rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable; + rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable; public: GlobalEditData(); ~GlobalEditData(); - SfxPoolItem** GetDefItems(); - OutputDevice* GetStdRefDevice(); + SfxPoolItem** GetDefItems(); + OutputDevice* GetStdRefDevice(); - rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable(); - void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { xForbiddenCharsTable = xForbiddenChars; } + rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable(); + void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { xForbiddenCharsTable = xForbiddenChars; } ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > GetLanguageGuesser(); }; diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index 49967ac72df8..d92da4962c32 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,14 +46,14 @@ // alle Werte auf default; wird nach einlesen der Bitmap aufgerufen ! void SvxRTFPictureType::ResetValues() -{ // setze alle Werte RTF-Defaults +{ // setze alle Werte RTF-Defaults eStyle = RTF_BITMAP; nMode = HEX_MODE; nType = nGoalWidth = nGoalHeight = 0; nWidth = nHeight = nWidthBytes = 0; uPicLen = 0; nBitsPerPixel = nPlanes = 1; - nScalX = nScalY = 100; // Skalierung in Prozent + nScalX = nScalY = 100; // Skalierung in Prozent nCropT = nCropB = nCropL = nCropR = 0; aPropertyPairs.clear(); } @@ -61,12 +61,12 @@ void SvxRTFPictureType::ResetValues() ImportInfo::ImportInfo( ImportState eSt, SvParser* pPrsrs, const ESelection& rSel ) : aSelection( rSel ) { - pParser = pPrsrs, - eState = eSt; + pParser = pPrsrs, + eState = eSt; - nToken = 0; - nTokenValue = 0; - pAttrs = NULL; + nToken = 0; + nTokenValue = 0; + pAttrs = NULL; } ImportInfo::~ImportInfo() @@ -77,20 +77,20 @@ EditRTFParser::EditRTFParser( SvStream& rIn, EditSelection aSel, SfxItemPool& rA : SvxRTFParser( rAttrPool, rIn, 0 ), aRTFMapMode( MAP_TWIP ) { - pImpEditEngine = pImpEE; - aCurSel = aSel; - eDestCharSet = RTL_TEXTENCODING_DONTKNOW; - nDefFont = 0; - nDefTab = 0; - nLastAction = 0; - nDefFontHeight = 0; + pImpEditEngine = pImpEE; + aCurSel = aSel; + eDestCharSet = RTL_TEXTENCODING_DONTKNOW; + nDefFont = 0; + nDefTab = 0; + nLastAction = 0; + nDefFontHeight = 0; SetInsPos( EditPosition( pImpEditEngine, &aCurSel ) ); // Umwandeln der Twips-Werte... SetCalcValue( TRUE ); SetChkStyleAttr( pImpEE->GetStatus().DoImportRTFStyleSheets() ); - SetNewDoc( FALSE ); // damit die Pool-Defaults nicht + SetNewDoc( FALSE ); // damit die Pool-Defaults nicht // ueberschrieben werden... aEditMapMode = MapMode( pImpEE->GetRefDevice()->GetMapMode().GetMapUnit() ); } @@ -323,8 +323,8 @@ void __EXPORT EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) const SfxPoolItem* pItem; // #i66167# adapt font heights to destination MapUnit if necessary - const MapUnit eDestUnit = ( MapUnit )( pImpEditEngine->GetEditDoc().GetItemPool().GetMetric(0) ); - const MapUnit eSrcUnit = aRTFMapMode.GetMapUnit(); + const MapUnit eDestUnit = ( MapUnit )( pImpEditEngine->GetEditDoc().GetItemPool().GetMetric(0) ); + const MapUnit eSrcUnit = aRTFMapMode.GetMapUnit(); if (eDestUnit != eSrcUnit) { USHORT aFntHeightIems[3] = { EE_CHAR_FONTHEIGHT, EE_CHAR_FONTHEIGHT_CJK, EE_CHAR_FONTHEIGHT_CTL }; @@ -332,7 +332,7 @@ void __EXPORT EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) { if (SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( aFntHeightIems[i], FALSE, &pItem )) { - UINT32 nHeight = ((SvxFontHeightItem*)pItem)->GetHeight(); + UINT32 nHeight = ((SvxFontHeightItem*)pItem)->GetHeight(); long nNewHeight; nNewHeight = pImpEditEngine->GetRefDevice()->LogicToLogic( (long)nHeight, eSrcUnit, eDestUnit ); @@ -349,7 +349,7 @@ void __EXPORT EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) if( ( DFLT_ESC_AUTO_SUPER != nEsc ) && ( DFLT_ESC_AUTO_SUB != nEsc ) ) { - nEsc *= 10; //HalPoints => Twips wurde in RTFITEM.CXX unterschlagen! + nEsc *= 10; //HalPoints => Twips wurde in RTFITEM.CXX unterschlagen! SvxFont aFont; pImpEditEngine->SeekCursor( aStartPaM.GetNode(), aStartPaM.GetIndex()+1, aFont ); nEsc = nEsc * 100 / aFont.GetSize().Height(); @@ -427,7 +427,7 @@ void __EXPORT EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) // OutlLevel... if ( nOutlLevel != 0xff ) { - for ( USHORT n = nStartNode; n <= nEndNode; n++ ) + for ( USHORT n = nStartNode; n <= nEndNode; n++ ) { ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( n ); pNode->GetContentAttribs().GetItems().Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nOutlLevel ) ); @@ -451,7 +451,7 @@ SfxStyleSheet* EditRTFParser::CreateStyleSheet( SvxRTFStyleType* pRTFStyle ) SfxStyleSheet* pStyle = (SfxStyleSheet*)pImpEditEngine->GetStyleSheetPool()->Find( pRTFStyle->sName, SFX_STYLE_FAMILY_ALL ); if ( pStyle ) return pStyle; - + String aName( pRTFStyle->sName ); String aParent; if ( pRTFStyle->nBasedOn ) @@ -487,7 +487,7 @@ SfxStyleSheet* EditRTFParser::CreateStyleSheet( SvxRTFStyleType* pRTFStyle ) void EditRTFParser::CreateStyleSheets() { // der SvxRTFParser hat jetzt die Vorlagen erzeugt... - if ( pImpEditEngine->GetStyleSheetPool() && pImpEditEngine->GetStatus().DoImportRTFStyleSheets() ) + if ( pImpEditEngine->GetStyleSheetPool() && pImpEditEngine->GetStatus().DoImportRTFStyleSheets() ) { SvxRTFStyleType* pRTFStyle = GetStyleTbl().First(); while ( pRTFStyle ) @@ -510,7 +510,7 @@ void __EXPORT EditRTFParser::CalcValue() void EditRTFParser::ReadField() { // Aus SwRTFParser::ReadField() - int _nOpenBrakets = 1; // die erste wurde schon vorher erkannt + int _nOpenBrakets = 1; // die erste wurde schon vorher erkannt BOOL bFldInst = FALSE; BOOL bFldRslt = FALSE; String aFldInst; @@ -531,16 +531,16 @@ void EditRTFParser::ReadField() } break; - case '{': _nOpenBrakets++; + case '{': _nOpenBrakets++; break; - case RTF_FIELD: SkipGroup(); + case RTF_FIELD: SkipGroup(); break; - case RTF_FLDINST: bFldInst = TRUE; + case RTF_FLDINST: bFldInst = TRUE; break; - case RTF_FLDRSLT: bFldRslt = TRUE; + case RTF_FLDRSLT: bFldRslt = TRUE; break; case RTF_TEXTTOKEN: @@ -561,8 +561,8 @@ void EditRTFParser::ReadField() aFldInst.Erase( 0, aHyperLinkMarker.Len() ); aFldInst.EraseLeadingChars(); aFldInst.EraseTrailingChars(); - aFldInst.Erase( 0, 1 ); // " - aFldInst.Erase( aFldInst.Len()-1, 1 ); // " + aFldInst.Erase( 0, 1 ); // " + aFldInst.Erase( aFldInst.Len()-1, 1 ); // " if ( !aFldRslt.Len() ) aFldRslt = aFldInst; @@ -574,12 +574,12 @@ void EditRTFParser::ReadField() } } - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet } void EditRTFParser::SkipGroup() { - int _nOpenBrakets = 1; // die erste wurde schon vorher erkannt + int _nOpenBrakets = 1; // die erste wurde schon vorher erkannt while( _nOpenBrakets && IsParserWorking() ) { @@ -591,7 +591,7 @@ void EditRTFParser::SkipGroup() } break; - case '{': + case '{': { _nOpenBrakets++; } @@ -599,7 +599,7 @@ void EditRTFParser::SkipGroup() } } - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet } ULONG __EXPORT EditNodeIdx::GetIdx() const diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx index 63bb1a9d03f0..9656c9e8708a 100644 --- a/editeng/source/editeng/eertfpar.hxx +++ b/editeng/source/editeng/eertfpar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,29 +38,29 @@ class EditNodeIdx : public SvxNodeIdx { private: - ContentNode* pNode; - ImpEditEngine* pImpEditEngine; + ContentNode* pNode; + ImpEditEngine* pImpEditEngine; public: EditNodeIdx( ImpEditEngine* pIEE, ContentNode* pNd = 0) { pImpEditEngine = pIEE; pNode = pNd; } - virtual ULONG GetIdx() const; + virtual ULONG GetIdx() const; virtual SvxNodeIdx* Clone() const; - ContentNode* GetNode() { return pNode; } + ContentNode* GetNode() { return pNode; } }; class EditPosition : public SvxPosition { private: - EditSelection* pCurSel; - ImpEditEngine* pImpEditEngine; + EditSelection* pCurSel; + ImpEditEngine* pImpEditEngine; public: EditPosition( ImpEditEngine* pIEE, EditSelection* pSel ) { pImpEditEngine = pIEE; pCurSel = pSel; } - virtual ULONG GetNodeIdx() const; - virtual USHORT GetCntIdx() const; + virtual ULONG GetNodeIdx() const; + virtual USHORT GetCntIdx() const; // erzeuge von sich selbst eine Kopie virtual SvxPosition* Clone() const; @@ -69,56 +69,56 @@ public: virtual SvxNodeIdx* MakeNodeIdx() const; }; -#define ACTION_INSERTTEXT 1 -#define ACTION_INSERTPARABRK 2 +#define ACTION_INSERTTEXT 1 +#define ACTION_INSERTPARABRK 2 class EditRTFParser : public SvxRTFParser { private: - EditSelection aCurSel; - ImpEditEngine* pImpEditEngine; - CharSet eDestCharSet; - MapMode aRTFMapMode; - MapMode aEditMapMode; + EditSelection aCurSel; + ImpEditEngine* pImpEditEngine; + CharSet eDestCharSet; + MapMode aRTFMapMode; + MapMode aEditMapMode; - USHORT nDefFont; - USHORT nDefTab; - USHORT nDefFontHeight; - BYTE nLastAction; + USHORT nDefFont; + USHORT nDefTab; + USHORT nDefFontHeight; + BYTE nLastAction; protected: - virtual void InsertPara(); - virtual void InsertText(); - virtual void MovePos( int bForward = TRUE ); - virtual void SetEndPrevPara( SvxNodeIdx*& rpNodePos, + virtual void InsertPara(); + virtual void InsertText(); + virtual void MovePos( int bForward = TRUE ); + virtual void SetEndPrevPara( SvxNodeIdx*& rpNodePos, USHORT& rCntPos ); - virtual void UnknownAttrToken( int nToken, SfxItemSet* pSet ); - virtual void NextToken( int nToken ); - virtual void SetAttrInDoc( SvxRTFItemStackType &rSet ); - virtual int IsEndPara( SvxNodeIdx* pNd, USHORT nCnt ) const; - virtual void CalcValue(); - void CreateStyleSheets(); - SfxStyleSheet* CreateStyleSheet( SvxRTFStyleType* pRTFStyle ); - SvxRTFStyleType* FindStyleSheet( const String& rName ); - void AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& rEnd ); - void ReadField(); - void SkipGroup(); + virtual void UnknownAttrToken( int nToken, SfxItemSet* pSet ); + virtual void NextToken( int nToken ); + virtual void SetAttrInDoc( SvxRTFItemStackType &rSet ); + virtual int IsEndPara( SvxNodeIdx* pNd, USHORT nCnt ) const; + virtual void CalcValue(); + void CreateStyleSheets(); + SfxStyleSheet* CreateStyleSheet( SvxRTFStyleType* pRTFStyle ); + SvxRTFStyleType* FindStyleSheet( const String& rName ); + void AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& rEnd ); + void ReadField(); + void SkipGroup(); public: EditRTFParser( SvStream& rIn, EditSelection aCurSel, SfxItemPool& rAttrPool, ImpEditEngine* pImpEditEngine ); ~EditRTFParser(); - virtual SvParserState CallParser(); + virtual SvParserState CallParser(); - void SetDestCharSet( CharSet eCharSet ) { eDestCharSet = eCharSet; } - CharSet GetDestCharSet() const { return eDestCharSet; } + void SetDestCharSet( CharSet eCharSet ) { eDestCharSet = eCharSet; } + CharSet GetDestCharSet() const { return eDestCharSet; } - USHORT GetDefTab() const { return nDefTab; } - Font GetDefFont() { return GetFont( nDefFont ); } + USHORT GetDefTab() const { return nDefTab; } + Font GetDefFont() { return GetFont( nDefFont ); } - EditPaM GetCurPaM() const { return aCurSel.Max(); } + EditPaM GetCurPaM() const { return aCurSel.Max(); } }; SV_DECL_REF( EditRTFParser ) @@ -126,6 +126,6 @@ SV_IMPL_REF( EditRTFParser ); #endif // !SVX_LIGH -#endif //_EERTFPAR_HXX +#endif //_EERTFPAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index e3d624fceced..bfb199d7ce3b 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; -#define SCRLRANGE 20 // 1/20 der Breite/Hoehe scrollen, wenn im QueryDrop +#define SCRLRANGE 20 // 1/20 der Breite/Hoehe scrollen, wenn im QueryDrop inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, short nDiffX, short nDiffY ) { @@ -73,29 +73,29 @@ inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, short nDiff rPoint = pOutDev->PixelToLogic( rPoint ); } -// ---------------------------------------------------------------------- -// class ImpEditView -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// class ImpEditView +// ---------------------------------------------------------------------- ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) : aOutArea( Point(), pEng->GetPaperSize() ) { pEditView = pView; - pEditEngine = pEng; - pOutWin = pWindow; - pPointer = NULL; - pBackgroundColor = NULL; - nScrollDiffX = 0; + pEditEngine = pEng; + pOutWin = pWindow; + pPointer = NULL; + pBackgroundColor = NULL; + nScrollDiffX = 0; nExtraCursorFlags = 0; nCursorBidiLevel = CURSOR_BIDILEVEL_DONTKNOW; - pCursor = NULL; - pDragAndDropInfo = NULL; - bReadOnly = sal_False; + pCursor = NULL; + pDragAndDropInfo = NULL; + bReadOnly = sal_False; bClickedInSelection = sal_False; - eSelectionMode = EE_SELMODE_TXTONLY; - eAnchorMode = ANCHOR_TOP_LEFT; - nInvMore = 1; - nTravelXPos = TRAVEL_X_DONTKNOW; - nControl = EV_CNTRL_AUTOSCROLL | EV_CNTRL_ENABLEPASTE; + eSelectionMode = EE_SELMODE_TXTONLY; + eAnchorMode = ANCHOR_TOP_LEFT; + nInvMore = 1; + nTravelXPos = TRAVEL_X_DONTKNOW; + nControl = EV_CNTRL_AUTOSCROLL | EV_CNTRL_ENABLEPASTE; bActiveDragAndDropListener = FALSE; aEditSelection.Min() = pEng->pImpEditEngine->GetEditDoc().GetStartPaM(); @@ -408,13 +408,13 @@ Region* ImpEditView::CalcSelectedRegion() return pRegion; } -void ImpEditView::SetSelectionMode( EESelectionMode eNewMode ) +void ImpEditView::SetSelectionMode( EESelectionMode eNewMode ) { if ( eSelectionMode != eNewMode ) { - DrawSelection(); // 'Wegmalen' ... + DrawSelection(); // 'Wegmalen' ... eSelectionMode = eNewMode; - DrawSelection(); // und neu zeichnen. + DrawSelection(); // und neu zeichnen. } } @@ -724,7 +724,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US nDocDiffY = aEditCursor.Bottom() - aTmpVisArea.Bottom(); } else if ( aEditCursor.Top() < aTmpVisArea.Top() ) - { // runterscrollen, negativ + { // runterscrollen, negativ nDocDiffY = aEditCursor.Top() - aTmpVisArea.Top(); } @@ -744,7 +744,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US } } else if ( aEditCursor.Left() < aTmpVisArea.Left() ) - { // rechtsscrollen + { // rechtsscrollen // negativ: nDocDiffX = aEditCursor.Left() - aTmpVisArea.Left(); // Darfs ein bischen mehr sein? @@ -753,7 +753,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US else nDocDiffX -= aEditCursor.Left(); } - if ( aPaM.GetIndex() == 0 ) // braucht Olli fuer den Outliner + if ( aPaM.GetIndex() == 0 ) // braucht Olli fuer den Outliner { // Aber sicherstellen, dass dadurch der Cursor nicht den // sichtbaren bereich verlaesst! @@ -916,7 +916,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, BYTE nRangeCheck ) { // GetTextHeight noch optimieren! long nDiff = pEditEngine->pImpEditEngine->GetTextHeight() - aNewVisArea.Bottom(); // negativ - aNewVisArea.Move( 0, nDiff ); // koennte im neg. Bereich landen... + aNewVisArea.Move( 0, nDiff ); // koennte im neg. Bereich landen... } if ( ( aNewVisArea.Top() < 0 ) && ( nRangeCheck != RGCHK_NONE ) ) aNewVisArea.Move( 0, -aNewVisArea.Top() ); @@ -934,8 +934,8 @@ Pair ImpEditView::Scroll( long ndX, long ndY, BYTE nRangeCheck ) } if ( ( nRangeCheck == RGCHK_PAPERSZ1 ) && ( aNewVisArea.Right() > (long)pEditEngine->pImpEditEngine->CalcTextWidth( FALSE ) ) ) { - long nDiff = pEditEngine->pImpEditEngine->CalcTextWidth( FALSE ) - aNewVisArea.Right(); // negativ - aNewVisArea.Move( nDiff, 0 ); // koennte im neg. Bereich landen... + long nDiff = pEditEngine->pImpEditEngine->CalcTextWidth( FALSE ) - aNewVisArea.Right(); // negativ + aNewVisArea.Move( nDiff, 0 ); // koennte im neg. Bereich landen... } if ( ( aNewVisArea.Left() < 0 ) && ( nRangeCheck != RGCHK_NONE ) ) aNewVisArea.Move( -aNewVisArea.Left(), 0 ); @@ -1071,7 +1071,7 @@ sal_Bool ImpEditView::MouseButtonUp( const MouseEvent& rMouseEvent ) sal_Bool ImpEditView::MouseButtonDown( const MouseEvent& rMouseEvent ) { - pEditEngine->pImpEditEngine->CheckIdleFormatter(); // Falls schnelles Tippen und MouseButtonDown + pEditEngine->pImpEditEngine->CheckIdleFormatter(); // Falls schnelles Tippen und MouseButtonDown if ( pEditEngine->pImpEditEngine->aStatus.NotifyCursorMovements() ) pEditEngine->pImpEditEngine->aStatus.GetPrevParagraph() = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( GetEditSelection().Max().GetNode() ); nTravelXPos = TRAVEL_X_DONTKNOW; @@ -1088,7 +1088,7 @@ sal_Bool ImpEditView::MouseMove( const MouseEvent& rMouseEvent ) void ImpEditView::Command( const CommandEvent& rCEvt ) { - pEditEngine->pImpEditEngine->CheckIdleFormatter(); // Falls schnelles Tippen und MouseButtonDown + pEditEngine->pImpEditEngine->CheckIdleFormatter(); // Falls schnelles Tippen und MouseButtonDown pEditEngine->pImpEditEngine->Command( rCEvt, GetEditViewPtr() ); } @@ -1112,7 +1112,7 @@ sal_Bool ImpEditView::IsWrongSpelledWord( const EditPaM& rPaM, sal_Bool bMarkIfW bIsWrong = rPaM.GetNode()->GetWrongList()->HasWrong( aSel.Min().GetIndex(), aSel.Max().GetIndex() ); if ( bIsWrong && bMarkIfWrong ) { - DrawSelection(); // alte Selektion 'weg-zeichnen' + DrawSelection(); // alte Selektion 'weg-zeichnen' SetEditSelection( aSel ); DrawSelection(); } @@ -1137,7 +1137,7 @@ String ImpEditView::SpellIgnoreOrAddWord( sal_Bool bAdd ) { aWord = pEditEngine->pImpEditEngine->GetSelected( GetEditSelection() ); // Und deselektieren - DrawSelection(); // alte Selektion 'weg-zeichnen' + DrawSelection(); // alte Selektion 'weg-zeichnen' SetEditSelection( EditSelection( aPaM, aPaM ) ); DrawSelection(); } @@ -1491,7 +1491,7 @@ void ImpEditView::ShowDDCursor( const Rectangle& rRect ) pOutWin->GetCursor()->Hide(); Color aOldFillColor = GetWindow()->GetFillColor(); - GetWindow()->SetFillColor( Color(4210752) ); // GRAY BRUSH_50, OLDSV, change to DDCursor! + GetWindow()->SetFillColor( Color(4210752) ); // GRAY BRUSH_50, OLDSV, change to DDCursor! // Hintergrund sichern... Rectangle aSaveRec( GetWindow()->LogicToPixel( rRect ) ); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index af282a6f094d..a08ebe80a95d 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,23 +60,23 @@ DBG_NAMEEX( EditView ) DBG_NAMEEX( EditEngine ) -#define PIMPEE pImpEditView->pEditEngine->pImpEditEngine +#define PIMPEE pImpEditView->pEditEngine->pImpEditEngine -#define DEL_LEFT 1 -#define DEL_RIGHT 2 -#define TRAVEL_X_DONTKNOW 0xFFFFFFFF -#define CURSOR_BIDILEVEL_DONTKNOW 0xFFFF -#define MAXCHARSINPARA 0x3FFF-CHARPOSGROW // Max 16K, because WYSIWYG array +#define DEL_LEFT 1 +#define DEL_RIGHT 2 +#define TRAVEL_X_DONTKNOW 0xFFFFFFFF +#define CURSOR_BIDILEVEL_DONTKNOW 0xFFFF +#define MAXCHARSINPARA 0x3FFF-CHARPOSGROW // Max 16K, because WYSIWYG array -#define ATTRSPECIAL_WHOLEWORD 1 -#define ATTRSPECIAL_EDGE 2 +#define ATTRSPECIAL_WHOLEWORD 1 +#define ATTRSPECIAL_EDGE 2 -#define GETCRSR_TXTONLY 0x0001 -#define GETCRSR_STARTOFLINE 0x0002 -#define GETCRSR_ENDOFLINE 0x0004 +#define GETCRSR_TXTONLY 0x0001 +#define GETCRSR_STARTOFLINE 0x0002 +#define GETCRSR_ENDOFLINE 0x0004 #define GETCRSR_PREFERPORTIONSTART 0x0008 -#define LINE_SEP 0x0A +#define LINE_SEP 0x0A typedef EENotify* EENotifyPtr; SV_DECL_PTRARR_DEL( NotifyList, EENotifyPtr, 1, 1 ) // IMPL is in outliner.cxx, move to EE later and share declaration, or use BlockNotifications from EE directly @@ -117,19 +117,19 @@ namespace svtools { struct DragAndDropInfo { - Rectangle aCurCursor; - Rectangle aCurSavedCursor; - sal_uInt16 nSensibleRange; - sal_uInt16 nCursorWidth; + Rectangle aCurCursor; + Rectangle aCurSavedCursor; + sal_uInt16 nSensibleRange; + sal_uInt16 nCursorWidth; ESelection aBeginDragSel; - EditPaM aDropDest; + EditPaM aDropDest; USHORT nOutlinerDropDest; - ESelection aDropSel; - VirtualDevice* pBackground; - const SvxFieldItem* pField; - sal_Bool bVisCursor : 1; - sal_Bool bDroppedInMe : 1; - sal_Bool bStarterOfDD : 1; + ESelection aDropSel; + VirtualDevice* pBackground; + const SvxFieldItem* pField; + sal_Bool bVisCursor : 1; + sal_Bool bDroppedInMe : 1; + sal_Bool bStarterOfDD : 1; sal_Bool bHasValidData : 1; sal_Bool bUndoAction : 1; sal_Bool bOutlinerMode : 1; @@ -147,16 +147,16 @@ struct ImplIMEInfos { String aOldTextAfterStartPos; sal_uInt16* pAttribs; - EditPaM aPos; - sal_uInt16 nLen; - sal_Bool bCursor; - sal_Bool bWasCursorOverwrite; + EditPaM aPos; + sal_uInt16 nLen; + sal_Bool bCursor; + sal_Bool bWasCursorOverwrite; ImplIMEInfos( const EditPaM& rPos, const String& rOldTextAfterStartPos ); ~ImplIMEInfos(); - void CopyAttribs( const sal_uInt16* pA, sal_uInt16 nL ); - void DestroyAttribs(); + void CopyAttribs( const sal_uInt16* pA, sal_uInt16 nL ); + void DestroyAttribs(); }; // #i18881# to be able to identify the postions of changed words @@ -165,12 +165,12 @@ typedef std::vector<EditSelection> SpellContentSelections; struct SpellInfo { - EESpellState eState; - EPaM aSpellStart; - EPaM aSpellTo; - EditPaM aCurSentenceStart; - sal_Bool bSpellToEnd; - sal_Bool bMultipleDoc; + EESpellState eState; + EPaM aSpellStart; + EPaM aSpellTo; + EditPaM aCurSentenceStart; + sal_Bool bSpellToEnd; + sal_Bool bMultipleDoc; ::svx::SpellPortions aLastSpellPortions; SpellContentSelections aLastSpellContentSelections; SpellInfo() @@ -194,29 +194,29 @@ struct FormatterFontMetric sal_uInt16 nMaxAscent; sal_uInt16 nMaxDescent; - FormatterFontMetric() { nMaxAscent = 0; nMaxDescent = 0; /* nMinLeading = 0xFFFF; */ } + FormatterFontMetric() { nMaxAscent = 0; nMaxDescent = 0; /* nMinLeading = 0xFFFF; */ } sal_uInt16 GetHeight() const { return nMaxAscent+nMaxDescent; } }; class IdleFormattter : public Timer { private: - EditView* pView; - int nRestarts; + EditView* pView; + int nRestarts; public: IdleFormattter(); ~IdleFormattter(); - void DoIdleFormat( EditView* pV ); - void ForceTimeout(); - void ResetRestarts() { nRestarts = 0; } - EditView* GetView() { return pView; } + void DoIdleFormat( EditView* pV ); + void ForceTimeout(); + void ResetRestarts() { nRestarts = 0; } + EditView* GetView() { return pView; } }; - // ---------------------------------------------------------------------- -// class ImpEditView -// ---------------------------------------------------------------------- + // ---------------------------------------------------------------------- +// class ImpEditView +// ---------------------------------------------------------------------- class ImpEditView : public vcl::unohelper::DragAndDropClient { friend class EditView; @@ -228,32 +228,32 @@ class ImpEditView : public vcl::unohelper::DragAndDropClient private: EditView* pEditView; - Cursor* pCursor; - Color* pBackgroundColor; - EditEngine* pEditEngine; - Window* pOutWin; - Pointer* pPointer; - DragAndDropInfo* pDragAndDropInfo; + Cursor* pCursor; + Color* pBackgroundColor; + EditEngine* pEditEngine; + Window* pOutWin; + Pointer* pPointer; + DragAndDropInfo* pDragAndDropInfo; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener > mxDnDListener; - long nInvMore; - ULONG nControl; - sal_uInt32 nTravelXPos; + long nInvMore; + ULONG nControl; + sal_uInt32 nTravelXPos; sal_uInt16 nExtraCursorFlags; sal_uInt16 nCursorBidiLevel; - sal_uInt16 nScrollDiffX; - sal_Bool bReadOnly; + sal_uInt16 nScrollDiffX; + sal_Bool bReadOnly; sal_Bool bClickedInSelection; sal_Bool bActiveDragAndDropListener; - Point aAnchorPoint; - Rectangle aOutArea; - Point aVisDocStartPos; - EESelectionMode eSelectionMode; - EditSelection aEditSelection; - EVAnchorMode eAnchorMode; + Point aAnchorPoint; + Rectangle aOutArea; + Point aVisDocStartPos; + EESelectionMode eSelectionMode; + EditSelection aEditSelection; + EVAnchorMode eAnchorMode; protected: @@ -276,114 +276,114 @@ public: EditView* GetEditViewPtr() { return pEditView; } - sal_uInt16 GetScrollDiffX() const { return nScrollDiffX; } - void SetScrollDiffX( sal_uInt16 n ) { nScrollDiffX = n; } + sal_uInt16 GetScrollDiffX() const { return nScrollDiffX; } + void SetScrollDiffX( sal_uInt16 n ) { nScrollDiffX = n; } sal_uInt16 GetCursorBidiLevel() const { return nCursorBidiLevel; } void SetCursorBidiLevel( sal_uInt16 n ) { nCursorBidiLevel = n; } - Point GetDocPos( const Point& rWindowPos ) const; - Point GetWindowPos( const Point& rDocPos ) const; - Rectangle GetWindowPos( const Rectangle& rDocPos ) const; + Point GetDocPos( const Point& rWindowPos ) const; + Point GetWindowPos( const Point& rDocPos ) const; + Rectangle GetWindowPos( const Rectangle& rDocPos ) const; - void SetOutputArea( const Rectangle& rRec ); - void ResetOutputArea( const Rectangle& rRec ); - const Rectangle& GetOutputArea() const { return aOutArea; } + void SetOutputArea( const Rectangle& rRec ); + void ResetOutputArea( const Rectangle& rRec ); + const Rectangle& GetOutputArea() const { return aOutArea; } - BOOL IsVertical() const; + BOOL IsVertical() const; - BOOL PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL ); + BOOL PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL ); - BOOL MouseButtonUp( const MouseEvent& rMouseEvent ); - BOOL MouseButtonDown( const MouseEvent& rMouseEvent ); - BOOL MouseMove( const MouseEvent& rMouseEvent ); - void Command( const CommandEvent& rCEvt ); + BOOL MouseButtonUp( const MouseEvent& rMouseEvent ); + BOOL MouseButtonDown( const MouseEvent& rMouseEvent ); + BOOL MouseMove( const MouseEvent& rMouseEvent ); + void Command( const CommandEvent& rCEvt ); void CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, sal_Bool bCut ); void Paste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, sal_Bool bUseSpecial = sal_False ); - void SetVisDocStartPos( const Point& rPos ) { aVisDocStartPos = rPos; } - const Point& GetVisDocStartPos() const { return aVisDocStartPos; } + void SetVisDocStartPos( const Point& rPos ) { aVisDocStartPos = rPos; } + const Point& GetVisDocStartPos() const { return aVisDocStartPos; } - long GetVisDocLeft() const { return aVisDocStartPos.X(); } - long GetVisDocTop() const { return aVisDocStartPos.Y(); } - long GetVisDocRight() const { return aVisDocStartPos.X() + ( !IsVertical() ? aOutArea.GetWidth() : aOutArea.GetHeight() ); } - long GetVisDocBottom() const { return aVisDocStartPos.Y() + ( !IsVertical() ? aOutArea.GetHeight() : aOutArea.GetWidth() ); } - Rectangle GetVisDocArea() const; + long GetVisDocLeft() const { return aVisDocStartPos.X(); } + long GetVisDocTop() const { return aVisDocStartPos.Y(); } + long GetVisDocRight() const { return aVisDocStartPos.X() + ( !IsVertical() ? aOutArea.GetWidth() : aOutArea.GetHeight() ); } + long GetVisDocBottom() const { return aVisDocStartPos.Y() + ( !IsVertical() ? aOutArea.GetHeight() : aOutArea.GetWidth() ); } + Rectangle GetVisDocArea() const; - EditSelection& GetEditSelection() { return aEditSelection; } - void SetEditSelection( const EditSelection& rEditSelection ); - sal_Bool HasSelection() const { return aEditSelection.HasRange(); } + EditSelection& GetEditSelection() { return aEditSelection; } + void SetEditSelection( const EditSelection& rEditSelection ); + sal_Bool HasSelection() const { return aEditSelection.HasRange(); } - void DrawSelection() { DrawSelection( aEditSelection ); } - void DrawSelection( EditSelection, Region* pRegion = NULL ); - Region* CalcSelectedRegion(); + void DrawSelection() { DrawSelection( aEditSelection ); } + void DrawSelection( EditSelection, Region* pRegion = NULL ); + Region* CalcSelectedRegion(); - Window* GetWindow() const { return pOutWin; } + Window* GetWindow() const { return pOutWin; } - EESelectionMode GetSelectionMode() const { return eSelectionMode; } - void SetSelectionMode( EESelectionMode eMode ); + EESelectionMode GetSelectionMode() const { return eSelectionMode; } + void SetSelectionMode( EESelectionMode eMode ); - inline void SetPointer( const Pointer& rPointer ); - inline const Pointer& GetPointer(); + inline void SetPointer( const Pointer& rPointer ); + inline const Pointer& GetPointer(); - inline void SetCursor( const Cursor& rCursor ); - inline Cursor* GetCursor(); + inline void SetCursor( const Cursor& rCursor ); + inline Cursor* GetCursor(); void AddDragAndDropListeners(); void RemoveDragAndDropListeners(); BOOL IsBulletArea( const Point& rPos, sal_uInt16* pPara ); -// Fuer die SelectionEngine... - void CreateAnchor(); - void DeselectAll(); - sal_Bool SetCursorAtPoint( const Point& rPointPixel ); - sal_Bool IsSelectionAtPoint( const Point& rPosPixel ); - sal_Bool IsInSelection( const EditPaM& rPaM ); +// Fuer die SelectionEngine... + void CreateAnchor(); + void DeselectAll(); + sal_Bool SetCursorAtPoint( const Point& rPointPixel ); + sal_Bool IsSelectionAtPoint( const Point& rPosPixel ); + sal_Bool IsInSelection( const EditPaM& rPaM ); - void SetAnchorMode( EVAnchorMode eMode ); - EVAnchorMode GetAnchorMode() const { return eAnchorMode; } - void CalcAnchorPoint(); - void RecalcOutputArea(); + void SetAnchorMode( EVAnchorMode eMode ); + EVAnchorMode GetAnchorMode() const { return eAnchorMode; } + void CalcAnchorPoint(); + void RecalcOutputArea(); - void ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, BOOL test ); - void ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, USHORT nShowCursorFlags = 0 ); - Pair Scroll( long ndX, long ndY, BYTE nRangeCheck = RGCHK_NEG ); + void ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, BOOL test ); + void ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, USHORT nShowCursorFlags = 0 ); + Pair Scroll( long ndX, long ndY, BYTE nRangeCheck = RGCHK_NEG ); - void SetInsertMode( sal_Bool bInsert ); - sal_Bool IsInsertMode() const { return ( ( nControl & EV_CNTRL_OVERWRITE ) == 0 ); } + void SetInsertMode( sal_Bool bInsert ); + sal_Bool IsInsertMode() const { return ( ( nControl & EV_CNTRL_OVERWRITE ) == 0 ); } - void EnablePaste( sal_Bool bEnable ) { SetFlags( nControl, EV_CNTRL_ENABLEPASTE, bEnable ); } - sal_Bool IsPasteEnabled() const { return ( ( nControl & EV_CNTRL_ENABLEPASTE ) != 0 ); } + void EnablePaste( sal_Bool bEnable ) { SetFlags( nControl, EV_CNTRL_ENABLEPASTE, bEnable ); } + sal_Bool IsPasteEnabled() const { return ( ( nControl & EV_CNTRL_ENABLEPASTE ) != 0 ); } - sal_Bool DoSingleLinePaste() const { return ( ( nControl & EV_CNTRL_SINGLELINEPASTE ) != 0 ); } - sal_Bool DoAutoScroll() const { return ( ( nControl & EV_CNTRL_AUTOSCROLL ) != 0 ); } - sal_Bool DoBigScroll() const { return ( ( nControl & EV_CNTRL_BIGSCROLL ) != 0 ); } - sal_Bool DoAutoSize() const { return ( ( nControl & EV_CNTRL_AUTOSIZE ) != 0 ); } - sal_Bool DoAutoWidth() const { return ( ( nControl & EV_CNTRL_AUTOSIZEX) != 0 ); } - sal_Bool DoAutoHeight() const { return ( ( nControl & EV_CNTRL_AUTOSIZEY) != 0 ); } - sal_Bool DoInvalidateMore() const { return ( ( nControl & EV_CNTRL_INVONEMORE ) != 0 ); } + sal_Bool DoSingleLinePaste() const { return ( ( nControl & EV_CNTRL_SINGLELINEPASTE ) != 0 ); } + sal_Bool DoAutoScroll() const { return ( ( nControl & EV_CNTRL_AUTOSCROLL ) != 0 ); } + sal_Bool DoBigScroll() const { return ( ( nControl & EV_CNTRL_BIGSCROLL ) != 0 ); } + sal_Bool DoAutoSize() const { return ( ( nControl & EV_CNTRL_AUTOSIZE ) != 0 ); } + sal_Bool DoAutoWidth() const { return ( ( nControl & EV_CNTRL_AUTOSIZEX) != 0 ); } + sal_Bool DoAutoHeight() const { return ( ( nControl & EV_CNTRL_AUTOSIZEY) != 0 ); } + sal_Bool DoInvalidateMore() const { return ( ( nControl & EV_CNTRL_INVONEMORE ) != 0 ); } - void SetBackgroundColor( const Color& rColor ); - const Color& GetBackgroundColor() const { + void SetBackgroundColor( const Color& rColor ); + const Color& GetBackgroundColor() const { return ( pBackgroundColor ? *pBackgroundColor : pOutWin->GetBackground().GetColor() ); } - sal_Bool IsWrongSpelledWord( const EditPaM& rPaM, sal_Bool bMarkIfWrong ); - String SpellIgnoreOrAddWord( sal_Bool bAdd ); + sal_Bool IsWrongSpelledWord( const EditPaM& rPaM, sal_Bool bMarkIfWrong ); + String SpellIgnoreOrAddWord( sal_Bool bAdd ); const SvxFieldItem* GetField( const Point& rPos, sal_uInt16* pPara, sal_uInt16* pPos ) const; void DeleteSelected(); // Ggf. mehr als OutputArea invalidieren, fuer den DrawingEngine-Textrahmen... - void SetInvalidateMore( sal_uInt16 nPixel ) { nInvMore = nPixel; } - sal_uInt16 GetInvalidateMore() const { return (sal_uInt16)nInvMore; } + void SetInvalidateMore( sal_uInt16 nPixel ) { nInvMore = nPixel; } + sal_uInt16 GetInvalidateMore() const { return (sal_uInt16)nInvMore; } }; -// ---------------------------------------------------------------------- -// ImpEditEngine -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// ImpEditEngine +// ---------------------------------------------------------------------- typedef EditView* EditViewPtr; SV_DECL_PTRARR( EditViews, EditViewPtr, 0, 1 ) @@ -402,11 +402,11 @@ class ImpEditEngine : public SfxListener friend class EditView; friend class ImpEditView; - friend class EditEngine; // Fuer Zugriff auf Imp-Methoden - friend class EditRTFParser; // Fuer Zugriff auf Imp-Methoden - friend class EditHTMLParser; // Fuer Zugriff auf Imp-Methoden - friend class EdtAutoCorrDoc; // Fuer Zugriff auf Imp-Methoden - friend class EditDbg; // DebugRoutinen + friend class EditEngine; // Fuer Zugriff auf Imp-Methoden + friend class EditRTFParser; // Fuer Zugriff auf Imp-Methoden + friend class EditHTMLParser; // Fuer Zugriff auf Imp-Methoden + friend class EdtAutoCorrDoc; // Fuer Zugriff auf Imp-Methoden + friend class EditDbg; // DebugRoutinen private: @@ -415,217 +415,217 @@ private: // ================================================================ // Dokument-Spezifische Daten... - ParaPortionList aParaPortionList; // Formatierung - Size aPaperSize; // Layout - Size aMinAutoPaperSize; // Layout ? - Size aMaxAutoPaperSize; // Layout ? - EditDoc aEditDoc; // Dokumenteninhalt + ParaPortionList aParaPortionList; // Formatierung + Size aPaperSize; // Layout + Size aMinAutoPaperSize; // Layout ? + Size aMaxAutoPaperSize; // Layout ? + EditDoc aEditDoc; // Dokumenteninhalt // Engine-Spezifische Daten.... - EditEngine* pEditEngine; - EditViews aEditViews; - EditView* pActiveView; - TextRanger* pTextRanger; + EditEngine* pEditEngine; + EditViews aEditViews; + EditView* pActiveView; + TextRanger* pTextRanger; - SfxStyleSheetPool* pStylePool; - SfxItemPool* pTextObjectPool; + SfxStyleSheetPool* pStylePool; + SfxItemPool* pTextObjectPool; - VirtualDevice* pVirtDev; - OutputDevice* pRefDev; + VirtualDevice* pVirtDev; + OutputDevice* pRefDev; svtools::ColorConfig* pColorConfig; mutable SvtCTLOptions* pCTLOptions; - SfxItemSet* pEmptyItemSet; - EditUndoManager* pUndoManager; - ESelection* pUndoMarkSelection; + SfxItemSet* pEmptyItemSet; + EditUndoManager* pUndoManager; + ESelection* pUndoMarkSelection; - ImplIMEInfos* mpIMEInfos; + ImplIMEInfos* mpIMEInfos; NotifyList aNotifyCache; - XubString aWordDelimiters; - XubString aGroupChars; + XubString aWordDelimiters; + XubString aGroupChars; - EditSelFunctionSet aSelFuncSet; - EditSelectionEngine aSelEngine; + EditSelFunctionSet aSelFuncSet; + EditSelectionEngine aSelEngine; - Color maBackgroundColor; + Color maBackgroundColor; sal_uInt32 nBlockNotifications; - sal_uInt16 nStretchX; - sal_uInt16 nStretchY; + sal_uInt16 nStretchX; + sal_uInt16 nStretchY; USHORT nAsianCompressionMode; - BOOL bKernAsianPunctuation; + BOOL bKernAsianPunctuation; BOOL bAddExtLeading; EEHorizontalTextDirection eDefaultHorizontalTextDirection; - sal_uInt16 nBigTextObjectStart; + sal_uInt16 nBigTextObjectStart; ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpeller; + ::com::sun::star::linguistic2::XSpellChecker1 > xSpeller; ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > xHyphenator; - SpellInfo* pSpellInfo; + ::com::sun::star::linguistic2::XHyphenator > xHyphenator; + SpellInfo* pSpellInfo; mutable ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > xBI; mutable ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > xISC; ConvInfo * pConvInfo; - XubString aAutoCompleteText; + XubString aAutoCompleteText; - InternalEditStatus aStatus; + InternalEditStatus aStatus; - LanguageType eDefLanguage; + LanguageType eDefLanguage; OnDemandLocaleDataWrapper xLocaleDataWrapper; OnDemandTransliterationWrapper xTransliterationWrapper; - sal_Bool bIsFormatting; - sal_Bool bFormatted; - sal_Bool bInSelection; - sal_Bool bIsInUndo; - sal_Bool bUpdate; - sal_Bool bUndoEnabled; - sal_Bool bOwnerOfRefDev; - sal_Bool bDowning; + sal_Bool bIsFormatting; + sal_Bool bFormatted; + sal_Bool bInSelection; + sal_Bool bIsInUndo; + sal_Bool bUpdate; + sal_Bool bUndoEnabled; + sal_Bool bOwnerOfRefDev; + sal_Bool bDowning; sal_Bool bUseAutoColor; sal_Bool bForceAutoColor; - sal_Bool bCallParaInsertedOrDeleted; + sal_Bool bCallParaInsertedOrDeleted; sal_Bool bImpConvertFirstCall; // specifies if ImpConvert is called the very first time after Convert was called sal_Bool bFirstWordCapitalization; // specifies if auto-correction should capitalize the first word or not // Fuer Formatierung / Update.... - DeletedNodesList aDeletedNodes; - Rectangle aInvalidRec; - sal_uInt32 nCurTextHeight; - sal_uInt16 nOnePixelInRef; + DeletedNodesList aDeletedNodes; + Rectangle aInvalidRec; + sal_uInt32 nCurTextHeight; + sal_uInt16 nOnePixelInRef; - IdleFormattter aIdleFormatter; + IdleFormattter aIdleFormatter; - Timer aOnlineSpellTimer; + Timer aOnlineSpellTimer; // Wenn an einer Stelle erkannt wird, dass der StatusHdl gerufen werden // muss, dies aber nicht sofort geschehen darf (kritischer Abschnitt): - Timer aStatusTimer; - Link aStatusHdlLink; - Link aNotifyHdl; - Link aImportHdl; + Timer aStatusTimer; + Link aStatusHdlLink; + Link aNotifyHdl; + Link aImportHdl; Link aBeginMovingParagraphsHdl; Link aEndMovingParagraphsHdl; Link aBeginPasteOrDropHdl; Link aEndPasteOrDropHdl; Link aModifyHdl; - Link maBeginDropHdl; - Link maEndDropHdl; + Link maBeginDropHdl; + Link maEndDropHdl; - rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable; + rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable; // ================================================================ // Methoden... // ================================================================ - void CursorMoved( ContentNode* pPrevNode ); - void ParaAttribsChanged( ContentNode* pNode ); - void TextModified(); - void CalcHeight( ParaPortion* pPortion ); + void CursorMoved( ContentNode* pPrevNode ); + void ParaAttribsChanged( ContentNode* pNode ); + void TextModified(); + void CalcHeight( ParaPortion* pPortion ); // ggf. lieber inline, aber so einiges... - void InsertUndo( EditUndo* pUndo, sal_Bool bTryMerge = sal_False ); - void ResetUndoManager(); - sal_Bool HasUndoManager() const { return pUndoManager ? sal_True : sal_False; } + void InsertUndo( EditUndo* pUndo, sal_Bool bTryMerge = sal_False ); + void ResetUndoManager(); + sal_Bool HasUndoManager() const { return pUndoManager ? sal_True : sal_False; } EditUndoSetAttribs* CreateAttribUndo( EditSelection aSel, const SfxItemSet& rSet ); - EditPaM GetPaM( Point aDocPos, sal_Bool bSmart = sal_True ); - EditPaM GetPaM( ParaPortion* pPortion, Point aPos, sal_Bool bSmart = sal_True ); - long GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT nIndex, BOOL bPreferPortionStart = FALSE ); + EditPaM GetPaM( Point aDocPos, sal_Bool bSmart = sal_True ); + EditPaM GetPaM( ParaPortion* pPortion, Point aPos, sal_Bool bSmart = sal_True ); + long GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT nIndex, BOOL bPreferPortionStart = FALSE ); long GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLine, USHORT nTextPortion ); - USHORT GetChar( ParaPortion* pParaPortion, EditLine* pLine, long nX, BOOL bSmart = TRUE ); - Range GetInvalidYOffsets( ParaPortion* pPortion ); + USHORT GetChar( ParaPortion* pParaPortion, EditLine* pLine, long nX, BOOL bSmart = TRUE ); + Range GetInvalidYOffsets( ParaPortion* pPortion ); Range GetLineXPosStartEnd( ParaPortion* pParaPortion, EditLine* pLine ); - void SetParaAttrib( BYTE nFunc, EditSelection aSel, sal_uInt16 nValue ); - sal_uInt16 GetParaAttrib( BYTE nFunc, EditSelection aSel ); - void SetCharAttrib( EditSelection aSel, const SfxPoolItem& rItem ); - void ParaAttribsToCharAttribs( ContentNode* pNode ); - void GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const; + void SetParaAttrib( BYTE nFunc, EditSelection aSel, sal_uInt16 nValue ); + sal_uInt16 GetParaAttrib( BYTE nFunc, EditSelection aSel ); + void SetCharAttrib( EditSelection aSel, const SfxPoolItem& rItem ); + void ParaAttribsToCharAttribs( ContentNode* pNode ); + void GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const; - EditTextObject* CreateBinTextObject( EditSelection aSelection, SfxItemPool*, sal_Bool bAllowBigObjects = sal_False, sal_uInt16 nBigObjStart = 0 ) const; - void StoreBinTextObject( SvStream& rOStream, BinTextObject& rTextObject ); - EditSelection InsertBinTextObject( BinTextObject&, EditPaM aPaM ); + EditTextObject* CreateBinTextObject( EditSelection aSelection, SfxItemPool*, sal_Bool bAllowBigObjects = sal_False, sal_uInt16 nBigObjStart = 0 ) const; + void StoreBinTextObject( SvStream& rOStream, BinTextObject& rTextObject ); + EditSelection InsertBinTextObject( BinTextObject&, EditPaM aPaM ); EditSelection InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, BOOL bUseSpecial ); - EditPaM Clear(); - EditPaM RemoveText(); - EditPaM RemoveText( EditSelection aEditSelection ); - sal_Bool CreateLines( USHORT nPara, sal_uInt32 nStartPosY ); - void CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 nStartPosY ); - sal_Bool FinishCreateLines( ParaPortion* pParaPortion ); - void CalcCharPositions( ParaPortion* pParaPortion ); - void CreateTextPortions( ParaPortion* pParaPortion, sal_uInt16& rStartPos /*, sal_Bool bCreateBlockPortions */ ); - void RecalcTextPortion( ParaPortion* pParaPortion, sal_uInt16 nStartPos, short nNewChars ); - sal_uInt16 SplitTextPortion( ParaPortion* pParaPortion, sal_uInt16 nPos, EditLine* pCurLine = 0 ); - void SeekCursor( ContentNode* pNode, sal_uInt16 nPos, SvxFont& rFont, OutputDevice* pOut = NULL, sal_uInt16 nIgnoreWhich = 0 ); - void RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics, SvxFont& rFont ); - void CheckAutoPageSize(); - - void ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, TextPortion* pPortion, sal_uInt16 nPortionStart, long nRemainingWidth, sal_Bool bCanHyphenate ); - void ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine, long nRemainingSpace ); - EditPaM ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pRight, sal_Bool bBackward = sal_False ); - EditPaM ImpDeleteSelection( EditSelection aEditSelection); - EditPaM ImpInsertParaBreak( const EditPaM& rPaM, sal_Bool bKeepEndingAttribs = sal_True ); - EditPaM ImpInsertParaBreak( const EditSelection& rEditSelection, sal_Bool bKeepEndingAttribs = sal_True ); - EditPaM ImpInsertText( EditSelection aCurEditSelection, const String& rStr ); - EditPaM ImpInsertFeature( EditSelection aEditSelection, const SfxPoolItem& rItem ); - void ImpRemoveChars( const EditPaM& rPaM, sal_uInt16 nChars, EditUndoRemoveChars* pCurUndo = 0 ); - void ImpRemoveParagraph( sal_uInt16 nPara ); - EditSelection ImpMoveParagraphs( Range aParagraphs, sal_uInt16 nNewPos ); - - EditPaM ImpFastInsertText( EditPaM aPaM, const String& rStr ); - EditPaM ImpFastInsertParagraph( sal_uInt16 nPara ); - - sal_Bool ImpCheckRefMapMode(); + EditPaM Clear(); + EditPaM RemoveText(); + EditPaM RemoveText( EditSelection aEditSelection ); + sal_Bool CreateLines( USHORT nPara, sal_uInt32 nStartPosY ); + void CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 nStartPosY ); + sal_Bool FinishCreateLines( ParaPortion* pParaPortion ); + void CalcCharPositions( ParaPortion* pParaPortion ); + void CreateTextPortions( ParaPortion* pParaPortion, sal_uInt16& rStartPos /*, sal_Bool bCreateBlockPortions */ ); + void RecalcTextPortion( ParaPortion* pParaPortion, sal_uInt16 nStartPos, short nNewChars ); + sal_uInt16 SplitTextPortion( ParaPortion* pParaPortion, sal_uInt16 nPos, EditLine* pCurLine = 0 ); + void SeekCursor( ContentNode* pNode, sal_uInt16 nPos, SvxFont& rFont, OutputDevice* pOut = NULL, sal_uInt16 nIgnoreWhich = 0 ); + void RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics, SvxFont& rFont ); + void CheckAutoPageSize(); + + void ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, TextPortion* pPortion, sal_uInt16 nPortionStart, long nRemainingWidth, sal_Bool bCanHyphenate ); + void ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine, long nRemainingSpace ); + EditPaM ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pRight, sal_Bool bBackward = sal_False ); + EditPaM ImpDeleteSelection( EditSelection aEditSelection); + EditPaM ImpInsertParaBreak( const EditPaM& rPaM, sal_Bool bKeepEndingAttribs = sal_True ); + EditPaM ImpInsertParaBreak( const EditSelection& rEditSelection, sal_Bool bKeepEndingAttribs = sal_True ); + EditPaM ImpInsertText( EditSelection aCurEditSelection, const String& rStr ); + EditPaM ImpInsertFeature( EditSelection aEditSelection, const SfxPoolItem& rItem ); + void ImpRemoveChars( const EditPaM& rPaM, sal_uInt16 nChars, EditUndoRemoveChars* pCurUndo = 0 ); + void ImpRemoveParagraph( sal_uInt16 nPara ); + EditSelection ImpMoveParagraphs( Range aParagraphs, sal_uInt16 nNewPos ); + + EditPaM ImpFastInsertText( EditPaM aPaM, const String& rStr ); + EditPaM ImpFastInsertParagraph( sal_uInt16 nPara ); + + sal_Bool ImpCheckRefMapMode(); BOOL ImplHasText() const; void ImpFindKashidas( ContentNode* pNode, USHORT nStart, USHORT nEnd, SvUShorts& rArray ); - void InsertContent( ContentNode* pNode, sal_uInt16 nPos ); - EditPaM SplitContent( sal_uInt16 nNode, sal_uInt16 nSepPos ); - EditPaM ConnectContents( sal_uInt16 nLeftNode, sal_Bool bBackward ); - - void ShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow ); - sal_Bool IsParagraphVisible( sal_uInt16 nParagraph ); - - EditPaM PageUp( const EditPaM& rPaM, EditView* pView); - EditPaM PageDown( const EditPaM& rPaM, EditView* pView); - EditPaM CursorUp( const EditPaM& rPaM, EditView* pEditView ); - EditPaM CursorDown( const EditPaM& rPaM, EditView* pEditView ); - EditPaM CursorLeft( const EditPaM& rPaM, USHORT nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL ); - EditPaM CursorRight( const EditPaM& rPaM, USHORT nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL ); - EditPaM CursorStartOfLine( const EditPaM& rPaM ); - EditPaM CursorEndOfLine( const EditPaM& rPaM ); - EditPaM CursorStartOfParagraph( const EditPaM& rPaM ); - EditPaM CursorEndOfParagraph( const EditPaM& rPaM ); - EditPaM CursorStartOfDoc(); - EditPaM CursorEndOfDoc(); - EditPaM WordLeft( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); - EditPaM WordRight( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); - EditPaM StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); - EditPaM EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); - EditSelection SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, BOOL bAcceptStartOfWord = TRUE ); + void InsertContent( ContentNode* pNode, sal_uInt16 nPos ); + EditPaM SplitContent( sal_uInt16 nNode, sal_uInt16 nSepPos ); + EditPaM ConnectContents( sal_uInt16 nLeftNode, sal_Bool bBackward ); + + void ShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow ); + sal_Bool IsParagraphVisible( sal_uInt16 nParagraph ); + + EditPaM PageUp( const EditPaM& rPaM, EditView* pView); + EditPaM PageDown( const EditPaM& rPaM, EditView* pView); + EditPaM CursorUp( const EditPaM& rPaM, EditView* pEditView ); + EditPaM CursorDown( const EditPaM& rPaM, EditView* pEditView ); + EditPaM CursorLeft( const EditPaM& rPaM, USHORT nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL ); + EditPaM CursorRight( const EditPaM& rPaM, USHORT nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL ); + EditPaM CursorStartOfLine( const EditPaM& rPaM ); + EditPaM CursorEndOfLine( const EditPaM& rPaM ); + EditPaM CursorStartOfParagraph( const EditPaM& rPaM ); + EditPaM CursorEndOfParagraph( const EditPaM& rPaM ); + EditPaM CursorStartOfDoc(); + EditPaM CursorEndOfDoc(); + EditPaM WordLeft( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); + EditPaM WordRight( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); + EditPaM StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); + EditPaM EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); + EditSelection SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, BOOL bAcceptStartOfWord = TRUE ); EditSelection SelectSentence( const EditSelection& rCurSel ); EditPaM CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, USHORT nCharacterIteratorMode, BOOL bToLeft ); EditPaM CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, BOOL bStart ); - void InitScriptTypes( USHORT nPara ); - USHORT GetScriptType( const EditPaM& rPaM, USHORT* pEndPos = NULL ) const; - USHORT GetScriptType( const EditSelection& rSel ) const; - BOOL IsScriptChange( const EditPaM& rPaM ) const; + void InitScriptTypes( USHORT nPara ); + USHORT GetScriptType( const EditPaM& rPaM, USHORT* pEndPos = NULL ) const; + USHORT GetScriptType( const EditSelection& rSel ) const; + BOOL IsScriptChange( const EditPaM& rPaM ) const; BOOL HasScriptType( USHORT nPara, USHORT nType ) const; BOOL ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, USHORT nStartPos, sal_Int32* pDXArray, USHORT n100thPercentFromMax, BOOL bManipulateDXArray ); @@ -634,62 +634,62 @@ private: void ImplInitLayoutMode( OutputDevice* pOutDev, USHORT nPara, USHORT nIndex ); void ImplInitDigitMode( OutputDevice* pOutDev, String* pString, xub_StrLen nStt, xub_StrLen nLen, LanguageType eLang ); - EditPaM ReadText( SvStream& rInput, EditSelection aSel ); - EditPaM ReadRTF( SvStream& rInput, EditSelection aSel ); - EditPaM ReadXML( SvStream& rInput, EditSelection aSel ); + EditPaM ReadText( SvStream& rInput, EditSelection aSel ); + EditPaM ReadRTF( SvStream& rInput, EditSelection aSel ); + EditPaM ReadXML( SvStream& rInput, EditSelection aSel ); EditPaM ReadHTML( SvStream& rInput, const String& rBaseURL, EditSelection aSel, SvKeyValueIterator* pHTTPHeaderAttrs ); - EditPaM ReadBin( SvStream& rInput, EditSelection aSel ); - sal_uInt32 WriteText( SvStream& rOutput, EditSelection aSel ); - sal_uInt32 WriteRTF( SvStream& rOutput, EditSelection aSel ); - sal_uInt32 WriteXML( SvStream& rOutput, EditSelection aSel ); - sal_uInt32 WriteHTML( SvStream& rOutput, EditSelection aSel ); - sal_uInt32 WriteBin( SvStream& rOutput, EditSelection aSel, BOOL bStoreUnicode = FALSE ) const; - - void WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_uInt16 nPara, sal_uInt16 nPos, + EditPaM ReadBin( SvStream& rInput, EditSelection aSel ); + sal_uInt32 WriteText( SvStream& rOutput, EditSelection aSel ); + sal_uInt32 WriteRTF( SvStream& rOutput, EditSelection aSel ); + sal_uInt32 WriteXML( SvStream& rOutput, EditSelection aSel ); + sal_uInt32 WriteHTML( SvStream& rOutput, EditSelection aSel ); + sal_uInt32 WriteBin( SvStream& rOutput, EditSelection aSel, BOOL bStoreUnicode = FALSE ) const; + + void WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_uInt16 nPara, sal_uInt16 nPos, SvxFontTable& rFontTable, SvxColorList& rColorList ); - sal_Bool WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, sal_uInt16 nPara, sal_uInt16 nPos, + sal_Bool WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, sal_uInt16 nPara, sal_uInt16 nPos, SvxFontTable& rFontTable, SvxColorList& rColorList ); - long LogicToTwips( long n ); + long LogicToTwips( long n ); - inline short GetXValue( short nXValue ) const; - inline sal_uInt16 GetXValue( sal_uInt16 nXValue ) const; - inline long GetXValue( long nXValue ) const; + inline short GetXValue( short nXValue ) const; + inline sal_uInt16 GetXValue( sal_uInt16 nXValue ) const; + inline long GetXValue( long nXValue ) const; - inline short GetYValue( short nYValue ) const; - inline sal_uInt16 GetYValue( sal_uInt16 nYValue ) const; + inline short GetYValue( short nYValue ) const; + inline sal_uInt16 GetYValue( sal_uInt16 nYValue ) const; - ContentNode* GetPrevVisNode( ContentNode* pCurNode ); - ContentNode* GetNextVisNode( ContentNode* pCurNode ); + ContentNode* GetPrevVisNode( ContentNode* pCurNode ); + ContentNode* GetNextVisNode( ContentNode* pCurNode ); - ParaPortion* GetPrevVisPortion( ParaPortion* pCurPortion ); - ParaPortion* GetNextVisPortion( ParaPortion* pCurPortion ); + ParaPortion* GetPrevVisPortion( ParaPortion* pCurPortion ); + ParaPortion* GetNextVisPortion( ParaPortion* pCurPortion ); - void SetBackgroundColor( const Color& rColor ) { maBackgroundColor = rColor; } - Color GetBackgroundColor() const { return maBackgroundColor; } + void SetBackgroundColor( const Color& rColor ) { maBackgroundColor = rColor; } + Color GetBackgroundColor() const { return maBackgroundColor; } long CalcVertLineSpacing(Point& rStartPos) const; - Color GetAutoColor() const; + Color GetAutoColor() const; void EnableAutoColor( BOOL b ) { bUseAutoColor = b; } BOOL IsAutoColorEnabled() const { return bUseAutoColor; } void ForceAutoColor( BOOL b ) { bForceAutoColor = b; } BOOL IsForceAutoColor() const { return bForceAutoColor; } - inline VirtualDevice* GetVirtualDevice( const MapMode& rMapMode, ULONG nDrawMode ); - inline void EraseVirtualDevice(); + inline VirtualDevice* GetVirtualDevice( const MapMode& rMapMode, ULONG nDrawMode ); + inline void EraseVirtualDevice(); DECL_LINK( StatusTimerHdl, Timer * ); DECL_LINK( IdleFormatHdl, Timer * ); DECL_LINK( OnlineSpellHdl, Timer * ); DECL_LINK( DocModified, void* ); - void CheckIdleFormatter(); + void CheckIdleFormatter(); - inline ParaPortion* FindParaPortion( ContentNode* pNode ) const; + inline ParaPortion* FindParaPortion( ContentNode* pNode ) const; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CreateTransferable( const EditSelection& rSelection ) const; - void SetValidPaperSize( const Size& rSz ); + void SetValidPaperSize( const Size& rSz ); ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > ImplGetBreakIterator() const; ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker() const; @@ -707,233 +707,233 @@ private: SpellInfo * CreateSpellInfo( const EditSelection &rSel, bool bMultipleDocs ); protected: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); public: ImpEditEngine( EditEngine* pEditEngine, SfxItemPool* pPool ); ~ImpEditEngine(); - void InitDoc( BOOL bKeepParaAttribs ); - EditDoc& GetEditDoc() { return aEditDoc; } - const EditDoc& GetEditDoc() const { return aEditDoc; } + void InitDoc( BOOL bKeepParaAttribs ); + EditDoc& GetEditDoc() { return aEditDoc; } + const EditDoc& GetEditDoc() const { return aEditDoc; } - inline EditUndoManager& GetUndoManager(); + inline EditUndoManager& GetUndoManager(); - void SetUpdateMode( sal_Bool bUp, EditView* pCurView = 0, sal_Bool bForceUpdate = sal_False ); - sal_Bool GetUpdateMode() const { return bUpdate; } + void SetUpdateMode( sal_Bool bUp, EditView* pCurView = 0, sal_Bool bForceUpdate = sal_False ); + sal_Bool GetUpdateMode() const { return bUpdate; } - const ParaPortionList& GetParaPortions() const { return aParaPortionList; } - ParaPortionList& GetParaPortions() { return aParaPortionList; } - EditViews& GetEditViews() { return aEditViews; } + const ParaPortionList& GetParaPortions() const { return aParaPortionList; } + ParaPortionList& GetParaPortions() { return aParaPortionList; } + EditViews& GetEditViews() { return aEditViews; } - const Size& GetPaperSize() const { return aPaperSize; } - void SetPaperSize( const Size& rSz ) { aPaperSize = rSz; } + const Size& GetPaperSize() const { return aPaperSize; } + void SetPaperSize( const Size& rSz ) { aPaperSize = rSz; } - void SetVertical( BOOL bVertical ); - BOOL IsVertical() const { return GetEditDoc().IsVertical(); } + void SetVertical( BOOL bVertical ); + BOOL IsVertical() const { return GetEditDoc().IsVertical(); } - void SetFixedCellHeight( BOOL bUseFixedCellHeight ); - BOOL IsFixedCellHeight() const { return GetEditDoc().IsFixedCellHeight(); } + void SetFixedCellHeight( BOOL bUseFixedCellHeight ); + BOOL IsFixedCellHeight() const { return GetEditDoc().IsFixedCellHeight(); } void SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir ) { eDefaultHorizontalTextDirection = eHTextDir; } EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const { return eDefaultHorizontalTextDirection; } - void InitWritingDirections( USHORT nPara ); + void InitWritingDirections( USHORT nPara ); BOOL IsRightToLeft( USHORT nPara ) const; BYTE GetRightToLeft( USHORT nPara, USHORT nChar, USHORT* pStart = NULL, USHORT* pEnd = NULL ); BOOL HasDifferentRTLLevels( const ContentNode* pNode ); - void SetTextRanger( TextRanger* pRanger ); - TextRanger* GetTextRanger() const { return pTextRanger; } + void SetTextRanger( TextRanger* pRanger ); + TextRanger* GetTextRanger() const { return pTextRanger; } - const Size& GetMinAutoPaperSize() const { return aMinAutoPaperSize; } - void SetMinAutoPaperSize( const Size& rSz ) { aMinAutoPaperSize = rSz; } + const Size& GetMinAutoPaperSize() const { return aMinAutoPaperSize; } + void SetMinAutoPaperSize( const Size& rSz ) { aMinAutoPaperSize = rSz; } - const Size& GetMaxAutoPaperSize() const { return aMaxAutoPaperSize; } - void SetMaxAutoPaperSize( const Size& rSz ) { aMaxAutoPaperSize = rSz; } + const Size& GetMaxAutoPaperSize() const { return aMaxAutoPaperSize; } + void SetMaxAutoPaperSize( const Size& rSz ) { aMaxAutoPaperSize = rSz; } - void FormatDoc(); - void FormatFullDoc(); - void UpdateViews( EditView* pCurView = 0 ); - void Paint( ImpEditView* pView, const Rectangle& rRect, sal_Bool bUseVirtDev = sal_False ); - void Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aStartPos, sal_Bool bStripOnly = sal_False, short nOrientation = 0 ); + void FormatDoc(); + void FormatFullDoc(); + void UpdateViews( EditView* pCurView = 0 ); + void Paint( ImpEditView* pView, const Rectangle& rRect, sal_Bool bUseVirtDev = sal_False ); + void Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aStartPos, sal_Bool bStripOnly = sal_False, short nOrientation = 0 ); - sal_Bool MouseButtonUp( const MouseEvent& rMouseEvent, EditView* pView ); - sal_Bool MouseButtonDown( const MouseEvent& rMouseEvent, EditView* pView ); - sal_Bool MouseMove( const MouseEvent& rMouseEvent, EditView* pView ); - void Command( const CommandEvent& rCEvt, EditView* pView ); + sal_Bool MouseButtonUp( const MouseEvent& rMouseEvent, EditView* pView ); + sal_Bool MouseButtonDown( const MouseEvent& rMouseEvent, EditView* pView ); + sal_Bool MouseMove( const MouseEvent& rMouseEvent, EditView* pView ); + void Command( const CommandEvent& rCEvt, EditView* pView ); - EditSelectionEngine& GetSelEngine() { return aSelEngine; } - XubString GetSelected( const EditSelection& rSel, const LineEnd eParaSep = LINEEND_LF ) const; + EditSelectionEngine& GetSelEngine() { return aSelEngine; } + XubString GetSelected( const EditSelection& rSel, const LineEnd eParaSep = LINEEND_LF ) const; - const SfxItemSet& GetEmptyItemSet(); + const SfxItemSet& GetEmptyItemSet(); - void UpdateSelections(); + void UpdateSelections(); - void EnableUndo( sal_Bool bEnable ); - sal_Bool IsUndoEnabled() { return bUndoEnabled; } - void SetUndoMode( sal_Bool b ) { bIsInUndo = b; } - sal_Bool IsInUndo() { return bIsInUndo; } + void EnableUndo( sal_Bool bEnable ); + sal_Bool IsUndoEnabled() { return bUndoEnabled; } + void SetUndoMode( sal_Bool b ) { bIsInUndo = b; } + sal_Bool IsInUndo() { return bIsInUndo; } - void SetCallParaInsertedOrDeleted( sal_Bool b ) { bCallParaInsertedOrDeleted = b; } - sal_Bool IsCallParaInsertedOrDeleted() const { return bCallParaInsertedOrDeleted; } + void SetCallParaInsertedOrDeleted( sal_Bool b ) { bCallParaInsertedOrDeleted = b; } + sal_Bool IsCallParaInsertedOrDeleted() const { return bCallParaInsertedOrDeleted; } - sal_Bool IsFormatted() const { return bFormatted; } - sal_Bool IsFormatting() const { return bIsFormatting; } + sal_Bool IsFormatted() const { return bFormatted; } + sal_Bool IsFormatting() const { return bIsFormatting; } - void SetText( const String& rText ); - EditPaM DeleteSelected( EditSelection aEditSelection); + void SetText( const String& rText ); + EditPaM DeleteSelected( EditSelection aEditSelection); EditPaM InsertText( const EditSelection& rCurEditSelection, sal_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput = sal_False ); - EditPaM InsertText( EditSelection aCurEditSelection, const String& rStr ); - EditPaM AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, Window* pFrameWin = NULL ); - EditPaM DeleteLeftOrRight( const EditSelection& rEditSelection, BYTE nMode, BYTE nDelMode = DELMODE_SIMPLE ); - EditPaM InsertParaBreak( EditSelection aEditSelection ); - EditPaM InsertLineBreak( EditSelection aEditSelection ); - EditPaM InsertTab( EditSelection aEditSelection ); - EditPaM InsertField( EditSelection aEditSelection, const SvxFieldItem& rFld ); - sal_Bool UpdateFields(); + EditPaM InsertText( EditSelection aCurEditSelection, const String& rStr ); + EditPaM AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, Window* pFrameWin = NULL ); + EditPaM DeleteLeftOrRight( const EditSelection& rEditSelection, BYTE nMode, BYTE nDelMode = DELMODE_SIMPLE ); + EditPaM InsertParaBreak( EditSelection aEditSelection ); + EditPaM InsertLineBreak( EditSelection aEditSelection ); + EditPaM InsertTab( EditSelection aEditSelection ); + EditPaM InsertField( EditSelection aEditSelection, const SvxFieldItem& rFld ); + sal_Bool UpdateFields(); EditPaM Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, EditSelection aSel, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); - void Write( SvStream& rOutput, EETextFormat eFormat, EditSelection aSel ); + void Write( SvStream& rOutput, EETextFormat eFormat, EditSelection aSel ); - EditTextObject* CreateTextObject(); - EditTextObject* CreateTextObject( EditSelection aSel ); - void SetText( const EditTextObject& rTextObject ); - EditSelection InsertText( const EditTextObject& rTextObject, EditSelection aSel ); + EditTextObject* CreateTextObject(); + EditTextObject* CreateTextObject( EditSelection aSel ); + void SetText( const EditTextObject& rTextObject ); + EditSelection InsertText( const EditTextObject& rTextObject, EditSelection aSel ); - EditSelection MoveCursor( const KeyEvent& rKeyEvent, EditView* pEditView ); + EditSelection MoveCursor( const KeyEvent& rKeyEvent, EditView* pEditView ); - EditSelection MoveParagraphs( Range aParagraphs, sal_uInt16 nNewPos, EditView* pCurView ); + EditSelection MoveParagraphs( Range aParagraphs, sal_uInt16 nNewPos, EditView* pCurView ); - sal_uInt32 CalcTextHeight(); - sal_uInt32 GetTextHeight() const; - sal_uInt32 CalcTextWidth( BOOL bIgnoreExtraSpace ); - sal_uInt32 CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace ); - sal_uInt16 GetLineCount( sal_uInt16 nParagraph ) const; + sal_uInt32 CalcTextHeight(); + sal_uInt32 GetTextHeight() const; + sal_uInt32 CalcTextWidth( BOOL bIgnoreExtraSpace ); + sal_uInt32 CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace ); + sal_uInt16 GetLineCount( sal_uInt16 nParagraph ) const; sal_uInt16 GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const; void GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const; USHORT GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const; - sal_uInt16 GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine ); - sal_uInt32 GetParaHeight( sal_uInt16 nParagraph ); + sal_uInt16 GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine ); + sal_uInt32 GetParaHeight( sal_uInt16 nParagraph ); SfxItemSet GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd, sal_uInt8 nFlags = 0xFF ) const; - SfxItemSet GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib = FALSE ); - void SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE nSpecial = 0 ); - void RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich = 0 ); - void RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0, sal_Bool bRemoveFeatures = sal_False ); - void SetFlatMode( sal_Bool bFlat ); + SfxItemSet GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib = FALSE ); + void SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE nSpecial = 0 ); + void RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich = 0 ); + void RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0, sal_Bool bRemoveFeatures = sal_False ); + void SetFlatMode( sal_Bool bFlat ); - void SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet ); - const SfxItemSet& GetParaAttribs( sal_uInt16 nPara ) const; + void SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet ); + const SfxItemSet& GetParaAttribs( sal_uInt16 nPara ) const; - sal_Bool HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const; - const SfxPoolItem& GetParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const; + sal_Bool HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const; + const SfxPoolItem& GetParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const; - Rectangle PaMtoEditCursor( EditPaM aPaM, sal_uInt16 nFlags = 0 ); - Rectangle GetEditCursor( ParaPortion* pPortion, sal_uInt16 nIndex, sal_uInt16 nFlags = 0 ); + Rectangle PaMtoEditCursor( EditPaM aPaM, sal_uInt16 nFlags = 0 ); + Rectangle GetEditCursor( ParaPortion* pPortion, sal_uInt16 nIndex, sal_uInt16 nFlags = 0 ); - sal_Bool IsModified() const { return aEditDoc.IsModified(); } - void SetModifyFlag( sal_Bool b ) { aEditDoc.SetModified( b ); } + sal_Bool IsModified() const { return aEditDoc.IsModified(); } + void SetModifyFlag( sal_Bool b ) { aEditDoc.SetModified( b ); } void SetModifyHdl( const Link& rLink ) { aModifyHdl = rLink; } Link GetModifyHdl() const { return aModifyHdl; } - sal_Bool IsInSelectionMode() { return bInSelection; } - void StopSelectionMode(); + sal_Bool IsInSelectionMode() { return bInSelection; } + void StopSelectionMode(); - void IndentBlock( EditView* pView, sal_Bool bRight ); + void IndentBlock( EditView* pView, sal_Bool bRight ); -// Fuer Undo/Redo - sal_Bool Undo( EditView* pView ); - sal_Bool Redo( EditView* pView ); - sal_Bool Repeat( EditView* pView ); +// Fuer Undo/Redo + sal_Bool Undo( EditView* pView ); + sal_Bool Redo( EditView* pView ); + sal_Bool Repeat( EditView* pView ); -// OV-Special - void InvalidateFromParagraph( sal_uInt16 nFirstInvPara ); - EditPaM InsertParagraph( sal_uInt16 nPara ); - EditSelection* SelectParagraph( sal_uInt16 nPara ); +// OV-Special + void InvalidateFromParagraph( sal_uInt16 nFirstInvPara ); + EditPaM InsertParagraph( sal_uInt16 nPara ); + EditSelection* SelectParagraph( sal_uInt16 nPara ); - void SetStatusEventHdl( const Link& rLink ) { aStatusHdlLink = rLink; } - Link GetStatusEventHdl() const { return aStatusHdlLink; } + void SetStatusEventHdl( const Link& rLink ) { aStatusHdlLink = rLink; } + Link GetStatusEventHdl() const { return aStatusHdlLink; } - void SetNotifyHdl( const Link& rLink ) { aNotifyHdl = rLink; } - Link GetNotifyHdl() const { return aNotifyHdl; } + void SetNotifyHdl( const Link& rLink ) { aNotifyHdl = rLink; } + Link GetNotifyHdl() const { return aNotifyHdl; } - void FormatAndUpdate( EditView* pCurView = 0 ); - inline void IdleFormatAndUpdate( EditView* pCurView = 0 ); + void FormatAndUpdate( EditView* pCurView = 0 ); + inline void IdleFormatAndUpdate( EditView* pCurView = 0 ); svtools::ColorConfig& GetColorConfig(); BOOL IsVisualCursorTravelingEnabled(); BOOL DoVisualCursorTraveling( const ContentNode* pNode ); - EditSelection ConvertSelection( sal_uInt16 nStartPara, sal_uInt16 nStartPos, sal_uInt16 nEndPara, sal_uInt16 nEndPos ) const; - inline EPaM CreateEPaM( const EditPaM& rPaM ); - inline EditPaM CreateEditPaM( const EPaM& rEPaM ); - inline ESelection CreateESel( const EditSelection& rSel ); - inline EditSelection CreateSel( const ESelection& rSel ); + EditSelection ConvertSelection( sal_uInt16 nStartPara, sal_uInt16 nStartPos, sal_uInt16 nEndPara, sal_uInt16 nEndPos ) const; + inline EPaM CreateEPaM( const EditPaM& rPaM ); + inline EditPaM CreateEditPaM( const EPaM& rEPaM ); + inline ESelection CreateESel( const EditSelection& rSel ); + inline EditSelection CreateSel( const ESelection& rSel ); - void SetStyleSheetPool( SfxStyleSheetPool* pSPool ); - SfxStyleSheetPool* GetStyleSheetPool() const { return pStylePool; } + void SetStyleSheetPool( SfxStyleSheetPool* pSPool ); + SfxStyleSheetPool* GetStyleSheetPool() const { return pStylePool; } - void SetStyleSheet( EditSelection aSel, SfxStyleSheet* pStyle ); - void SetStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pStyle ); - SfxStyleSheet* GetStyleSheet( sal_uInt16 nPara ) const; + void SetStyleSheet( EditSelection aSel, SfxStyleSheet* pStyle ); + void SetStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pStyle ); + SfxStyleSheet* GetStyleSheet( sal_uInt16 nPara ) const; - void UpdateParagraphsWithStyleSheet( SfxStyleSheet* pStyle ); - void RemoveStyleFromParagraphs( SfxStyleSheet* pStyle ); + void UpdateParagraphsWithStyleSheet( SfxStyleSheet* pStyle ); + void RemoveStyleFromParagraphs( SfxStyleSheet* pStyle ); - OutputDevice* GetRefDevice() const { return pRefDev; } - void SetRefDevice( OutputDevice* pRefDef ); + OutputDevice* GetRefDevice() const { return pRefDev; } + void SetRefDevice( OutputDevice* pRefDef ); - const MapMode& GetRefMapMode() { return pRefDev->GetMapMode(); } - void SetRefMapMode( const MapMode& rMapMode ); + const MapMode& GetRefMapMode() { return pRefDev->GetMapMode(); } + void SetRefMapMode( const MapMode& rMapMode ); - InternalEditStatus& GetStatus() { return aStatus; } - void CallStatusHdl(); - void DelayedCallStatusHdl() { aStatusTimer.Start(); } + InternalEditStatus& GetStatus() { return aStatus; } + void CallStatusHdl(); + void DelayedCallStatusHdl() { aStatusTimer.Start(); } void CallNotify( EENotify& rNotify ); void EnterBlockNotifications(); void LeaveBlockNotifications(); - EditSelection MatchGroup( const EditSelection& rSel ); + EditSelection MatchGroup( const EditSelection& rSel ); - void UndoActionStart( sal_uInt16 nId ); - void UndoActionStart( sal_uInt16 nId, const ESelection& rSel ); - void UndoActionEnd( sal_uInt16 nId ); + void UndoActionStart( sal_uInt16 nId ); + void UndoActionStart( sal_uInt16 nId, const ESelection& rSel ); + void UndoActionEnd( sal_uInt16 nId ); - EditView* GetActiveView() const { return pActiveView; } - void SetActiveView( EditView* pView ); + EditView* GetActiveView() const { return pActiveView; } + void SetActiveView( EditView* pView ); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > GetSpeller(); - void SetSpeller( ::com::sun::star::uno::Reference< + void SetSpeller( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) { xSpeller = xSpl; } ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > GetHyphenator() const { return xHyphenator; } - void SetHyphenator( ::com::sun::star::uno::Reference< + void SetHyphenator( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyph ) { xHyphenator = xHyph; } - SpellInfo* GetSpellInfo() const { return pSpellInfo; } + SpellInfo* GetSpellInfo() const { return pSpellInfo; } - void SetDefaultLanguage( LanguageType eLang ) { eDefLanguage = eLang; } - LanguageType GetDefaultLanguage() const { return eDefLanguage; } + void SetDefaultLanguage( LanguageType eLang ) { eDefLanguage = eLang; } + LanguageType GetDefaultLanguage() const { return eDefLanguage; } LanguageType GetLanguage( const EditSelection rSelection ) const; - LanguageType GetLanguage( const EditPaM& rPaM, USHORT* pEndPos = NULL ) const; + LanguageType GetLanguage( const EditPaM& rPaM, USHORT* pEndPos = NULL ) const; ::com::sun::star::lang::Locale GetLocale( const EditPaM& rPaM ) const; - void DoOnlineSpelling( ContentNode* pThisNodeOnly = 0, sal_Bool bSpellAtCursorPos = sal_False, sal_Bool bInteruptable = sal_True ); - EESpellState Spell( EditView* pEditView, sal_Bool bMultipleDoc ); - EESpellState HasSpellErrors(); - EESpellState StartThesaurus( EditView* pEditView ); + void DoOnlineSpelling( ContentNode* pThisNodeOnly = 0, sal_Bool bSpellAtCursorPos = sal_False, sal_Bool bInteruptable = sal_True ); + EESpellState Spell( EditView* pEditView, sal_Bool bMultipleDoc ); + EESpellState HasSpellErrors(); + EESpellState StartThesaurus( EditView* pEditView ); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > ImpSpell( EditView* pEditView ); @@ -979,37 +979,37 @@ public: bool bIsField ); sal_Bool Search( const SvxSearchItem& rSearchItem, EditView* pView ); - sal_Bool ImpSearch( const SvxSearchItem& rSearchItem, const EditSelection& rSearchSelection, const EditPaM& rStartPos, EditSelection& rFoundSel ); - sal_uInt16 StartSearchAndReplace( EditView* pEditView, const SvxSearchItem& rSearchItem ); - sal_Bool HasText( const SvxSearchItem& rSearchItem ); + sal_Bool ImpSearch( const SvxSearchItem& rSearchItem, const EditSelection& rSearchSelection, const EditPaM& rStartPos, EditSelection& rFoundSel ); + sal_uInt16 StartSearchAndReplace( EditView* pEditView, const SvxSearchItem& rSearchItem ); + sal_Bool HasText( const SvxSearchItem& rSearchItem ); - void SetEditTextObjectPool( SfxItemPool* pP ) { pTextObjectPool = pP; } - SfxItemPool* GetEditTextObjectPool() const { return pTextObjectPool; } + void SetEditTextObjectPool( SfxItemPool* pP ) { pTextObjectPool = pP; } + SfxItemPool* GetEditTextObjectPool() const { return pTextObjectPool; } const SvxNumberFormat * GetNumberFormat( const ContentNode* pNode ) const; sal_Int32 GetSpaceBeforeAndMinLabelWidth( const ContentNode *pNode, sal_Int32 *pnSpaceBefore = 0, sal_Int32 *pnMinLabelWidth = 0 ) const; - const SvxLRSpaceItem& GetLRSpaceItem( ContentNode* pNode ); + const SvxLRSpaceItem& GetLRSpaceItem( ContentNode* pNode ); SvxAdjust GetJustification( USHORT nPara ) const; SvxCellJustifyMethod GetJustifyMethod( USHORT nPara ) const; SvxCellVerJustify GetVerJustification( USHORT nPara ) const; - void SetCharStretching( sal_uInt16 nX, sal_uInt16 nY ); - inline void GetCharStretching( sal_uInt16& rX, sal_uInt16& rY ); - void DoStretchChars( sal_uInt16 nX, sal_uInt16 nY ); + void SetCharStretching( sal_uInt16 nX, sal_uInt16 nY ); + inline void GetCharStretching( sal_uInt16& rX, sal_uInt16& rY ); + void DoStretchChars( sal_uInt16 nX, sal_uInt16 nY ); - void SetBigTextObjectStart( sal_uInt16 nStartAtPortionCount ) { nBigTextObjectStart = nStartAtPortionCount; } - sal_uInt16 GetBigTextObjectStart() const { return nBigTextObjectStart; } + void SetBigTextObjectStart( sal_uInt16 nStartAtPortionCount ) { nBigTextObjectStart = nStartAtPortionCount; } + sal_uInt16 GetBigTextObjectStart() const { return nBigTextObjectStart; } - inline EditEngine* GetEditEnginePtr() const { return pEditEngine; } + inline EditEngine* GetEditEnginePtr() const { return pEditEngine; } - void StartOnlineSpellTimer() { aOnlineSpellTimer.Start(); } - void StopOnlineSpellTimer() { aOnlineSpellTimer.Stop(); } + void StartOnlineSpellTimer() { aOnlineSpellTimer.Start(); } + void StopOnlineSpellTimer() { aOnlineSpellTimer.Stop(); } - const XubString& GetAutoCompleteText() const { return aAutoCompleteText; } - void SetAutoCompleteText( const String& rStr, sal_Bool bUpdateTipWindow ); + const XubString& GetAutoCompleteText() const { return aAutoCompleteText; } + void SetAutoCompleteText( const String& rStr, sal_Bool bUpdateTipWindow ); - EditSelection TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode ); + EditSelection TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode ); short ReplaceTextOnly( ContentNode* pNode, USHORT nCurrentStart, xub_StrLen nLen, const String& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rOffsets ); @@ -1017,23 +1017,23 @@ public: USHORT GetAsianCompressionMode() const { return nAsianCompressionMode; } void SetKernAsianPunctuation( BOOL b ); - BOOL IsKernAsianPunctuation() const { return bKernAsianPunctuation; } + BOOL IsKernAsianPunctuation() const { return bKernAsianPunctuation; } void SetAddExtLeading( BOOL b ); BOOL IsAddExtLeading() const { return bAddExtLeading; } - rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable( BOOL bGetInternal = TRUE ) const; - void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); + rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable( BOOL bGetInternal = TRUE ) const; + void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); - BOOL mbLastTryMerge; + BOOL mbLastTryMerge; /** sets a link that is called at the beginning of a drag operation at an edit view */ - void SetBeginDropHdl( const Link& rLink ) { maBeginDropHdl = rLink; } - Link GetBeginDropHdl() const { return maBeginDropHdl; } + void SetBeginDropHdl( const Link& rLink ) { maBeginDropHdl = rLink; } + Link GetBeginDropHdl() const { return maBeginDropHdl; } /** sets a link that is called at the end of a drag operation at an edit view */ - void SetEndDropHdl( const Link& rLink ) { maEndDropHdl = rLink; } - Link GetEndDropHdl() const { return maEndDropHdl; } + void SetEndDropHdl( const Link& rLink ) { maEndDropHdl = rLink; } + Link GetEndDropHdl() const { return maEndDropHdl; } /// specifies if auto-correction should capitalize the first word or not (default is on) void SetFirstWordCapitalization( BOOL bCapitalize ) { bFirstWordCapitalization = bCapitalize; } @@ -1109,7 +1109,7 @@ inline void ImpEditEngine::IdleFormatAndUpdate( EditView* pCurView ) } #ifndef SVX_LIGHT -inline EditUndoManager& ImpEditEngine::GetUndoManager() +inline EditUndoManager& ImpEditEngine::GetUndoManager() { if ( !pUndoManager ) pUndoManager = new EditUndoManager( this ); @@ -1117,14 +1117,14 @@ inline EditUndoManager& ImpEditEngine::GetUndoManager() } #endif -inline ParaPortion* ImpEditEngine::FindParaPortion( ContentNode* pNode ) const +inline ParaPortion* ImpEditEngine::FindParaPortion( ContentNode* pNode ) const { sal_uInt16 nPos = aEditDoc.GetPos( pNode ); DBG_ASSERT( nPos < GetParaPortions().Count(), "Portionloser Node?" ); return GetParaPortions()[ nPos ]; } -inline void ImpEditEngine::GetCharStretching( sal_uInt16& rX, sal_uInt16& rY ) +inline void ImpEditEngine::GetCharStretching( sal_uInt16& rX, sal_uInt16& rY ) { rX = nStretchX; rY = nStretchY; diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 57d087766371..d610c68dcb54 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ USHORT lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem ) ULONG nH = pPortion->GetLines().GetObject( 0 )->GetHeight(); long n = nH * rLSItem.GetPropLineSpace(); n /= 100; - n -= nH; // nur den Abstand + n -= nH; // nur den Abstand if ( n > 0 ) nExtra = (USHORT)n; } @@ -101,8 +101,8 @@ USHORT lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem ) } // ---------------------------------------------------------------------- -// class ImpEditEngine -// ---------------------------------------------------------------------- +// class ImpEditEngine +// ---------------------------------------------------------------------- ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) : aPaperSize( 0x7FFFFFFF, 0x7FFFFFFF ), @@ -112,46 +112,46 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) : aWordDelimiters( RTL_CONSTASCII_USTRINGPARAM( " .,;:-'`'?!_=\"{}()[]\0xFF" ) ), aGroupChars( RTL_CONSTASCII_USTRINGPARAM( "{}()[]" ) ) { - pEditEngine = pEE; - pRefDev = NULL; - pVirtDev = NULL; - pEmptyItemSet = NULL; - pActiveView = NULL; - pSpellInfo = NULL; + pEditEngine = pEE; + pRefDev = NULL; + pVirtDev = NULL; + pEmptyItemSet = NULL; + pActiveView = NULL; + pSpellInfo = NULL; pConvInfo = NULL; - pTextObjectPool = NULL; - mpIMEInfos = NULL; - pStylePool = NULL; - pUndoManager = NULL; - pUndoMarkSelection = NULL; - pTextRanger = NULL; + pTextObjectPool = NULL; + mpIMEInfos = NULL; + pStylePool = NULL; + pUndoManager = NULL; + pUndoMarkSelection = NULL; + pTextRanger = NULL; pColorConfig = NULL; pCTLOptions = NULL; - nCurTextHeight = 0; + nCurTextHeight = 0; nBlockNotifications = 0; - nBigTextObjectStart = 20; - - nStretchX = 100; - nStretchY = 100; - - bInSelection = FALSE; - bOwnerOfRefDev = FALSE; - bDowning = FALSE; - bIsInUndo = FALSE; - bIsFormatting = FALSE; - bFormatted = FALSE; - bUpdate = TRUE; + nBigTextObjectStart = 20; + + nStretchX = 100; + nStretchY = 100; + + bInSelection = FALSE; + bOwnerOfRefDev = FALSE; + bDowning = FALSE; + bIsInUndo = FALSE; + bIsFormatting = FALSE; + bFormatted = FALSE; + bUpdate = TRUE; bUseAutoColor = TRUE; bForceAutoColor = FALSE; bAddExtLeading = FALSE; - bUndoEnabled = TRUE; + bUndoEnabled = TRUE; bCallParaInsertedOrDeleted = FALSE; bImpConvertFirstCall= FALSE; bFirstWordCapitalization = TRUE; - eDefLanguage = LANGUAGE_DONTKNOW; - maBackgroundColor = COL_AUTO; + eDefLanguage = LANGUAGE_DONTKNOW; + maBackgroundColor = COL_AUTO; nAsianCompressionMode = text::CharacterCompressionType::NONE; bKernAsianPunctuation = FALSE; @@ -159,7 +159,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) : eDefaultHorizontalTextDirection = EE_HTEXTDIR_DEFAULT; - aStatus.GetControlWord() = EE_CNTRL_USECHARATTRIBS | EE_CNTRL_DOIDLEFORMAT | + aStatus.GetControlWord() = EE_CNTRL_USECHARATTRIBS | EE_CNTRL_DOIDLEFORMAT | EE_CNTRL_PASTESPECIAL | EE_CNTRL_UNDOATTRIBS | EE_CNTRL_ALLOWBIGOBJS | EE_CNTRL_RTFSTYLESHEETS | EE_CNTRL_FORMAT100; @@ -175,7 +175,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) : aOnlineSpellTimer.SetTimeout( 100 ); aOnlineSpellTimer.SetTimeoutHdl( LINK( this, ImpEditEngine, OnlineSpellHdl ) ); - pRefDev = EE_DLL()->GetGlobalData()->GetStdRefDevice(); + pRefDev = EE_DLL()->GetGlobalData()->GetStdRefDevice(); // Ab hier wird schon auf Daten zugegriffen! SetRefDevice( pRefDev ); @@ -312,7 +312,7 @@ XubString ImpEditEngine::GetSelected( const EditSelection& rSel, const LineEnd e DBG_ASSERT( nStartNode <= nEndNode, "Selektion nicht sortiert ?" ); // ueber die Absaetze iterieren... - for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ ) + for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ ) { DBG_ASSERT( aEditDoc.SaveGetObject( nNode ), "Node nicht gefunden: GetSelected" ); ContentNode* pNode = aEditDoc.GetObject( nNode ); @@ -700,8 +700,8 @@ BOOL ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, EditView* pView ) BOOL ImpEditEngine::MouseMove( const MouseEvent& rMEvt, EditView* pView ) { // MouseMove wird sofort nach ShowQuickHelp() gerufen! -// if ( GetAutoCompleteText().Len() ) -// SetAutoCompleteText( String(), TRUE ); +// if ( GetAutoCompleteText().Len() ) +// SetAutoCompleteText( String(), TRUE ); GetSelEngine().SetCurView( pView ); GetSelEngine().SelMouseMove( rMEvt ); return TRUE; @@ -779,7 +779,7 @@ void ImpEditEngine::SetText( const XubString& rText ) pView->GetWindow()->Invalidate( aTmpRec ); } } - if( !rText.Len() ) // sonst muss spaeter noch invalidiert werden, !bFormatted reicht. + if( !rText.Len() ) // sonst muss spaeter noch invalidiert werden, !bFormatted reicht. nCurTextHeight = 0; EnableUndo( bUndoCurrentlyEnabled ); #ifndef SVX_LIGHT @@ -801,9 +801,9 @@ const SfxItemSet& ImpEditEngine::GetEmptyItemSet() return *pEmptyItemSet; } -// ---------------------------------------------------------------------- -// MISC -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// MISC +// ---------------------------------------------------------------------- void ImpEditEngine::CursorMoved( ContentNode* pPrevNode ) { // Leere Attribute loeschen, aber nur, wenn Absatz nicht leer! @@ -844,9 +844,9 @@ void ImpEditEngine::ParaAttribsChanged( ContentNode* pNode ) CalcHeight( pNextPortion ); } -// ---------------------------------------------------------------------- -// Cursorbewegungen -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// Cursorbewegungen +// ---------------------------------------------------------------------- EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pEditView ) { @@ -888,21 +888,21 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE bool bKeyModifySelection = aTranslatedKeyEvent.GetKeyCode().IsShift(); switch ( nCode ) { - case KEY_UP: aPaM = CursorUp( aPaM, pEditView ); + case KEY_UP: aPaM = CursorUp( aPaM, pEditView ); break; - case KEY_DOWN: aPaM = CursorDown( aPaM, pEditView ); + case KEY_DOWN: aPaM = CursorDown( aPaM, pEditView ); break; - case KEY_LEFT: aPaM = bCtrl ? WordLeft( aPaM ) : CursorLeft( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? i18n::CharacterIteratorMode::SKIPCHARACTER : i18n::CharacterIteratorMode::SKIPCELL ); + case KEY_LEFT: aPaM = bCtrl ? WordLeft( aPaM ) : CursorLeft( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? i18n::CharacterIteratorMode::SKIPCHARACTER : i18n::CharacterIteratorMode::SKIPCELL ); break; - case KEY_RIGHT: aPaM = bCtrl ? WordRight( aPaM ) : CursorRight( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? i18n::CharacterIteratorMode::SKIPCHARACTER : i18n::CharacterIteratorMode::SKIPCELL ); + case KEY_RIGHT: aPaM = bCtrl ? WordRight( aPaM ) : CursorRight( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? i18n::CharacterIteratorMode::SKIPCHARACTER : i18n::CharacterIteratorMode::SKIPCELL ); break; - case KEY_HOME: aPaM = bCtrl ? CursorStartOfDoc() : CursorStartOfLine( aPaM ); + case KEY_HOME: aPaM = bCtrl ? CursorStartOfDoc() : CursorStartOfLine( aPaM ); break; - case KEY_END: aPaM = bCtrl ? CursorEndOfDoc() : CursorEndOfLine( aPaM ); + case KEY_END: aPaM = bCtrl ? CursorEndOfDoc() : CursorEndOfLine( aPaM ); break; - case KEY_PAGEUP: aPaM = bCtrl ? CursorStartOfDoc() : PageUp( aPaM, pEditView ); + case KEY_PAGEUP: aPaM = bCtrl ? CursorStartOfDoc() : PageUp( aPaM, pEditView ); break; - case KEY_PAGEDOWN: aPaM = bCtrl ? CursorEndOfDoc() : PageDown( aPaM, pEditView ); + case KEY_PAGEDOWN: aPaM = bCtrl ? CursorEndOfDoc() : PageDown( aPaM, pEditView ); break; case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: aPaM = CursorStartOfLine( aPaM ); @@ -1051,7 +1051,7 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM& UBiDi* pBidi = ubidi_openSized( aLine.Len(), 0, &nError ); const UBiDiLevel nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 /*LTR*/; - ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.Len(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW + ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.Len(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW USHORT nVisPos = bStart ? 0 : aLine.Len()-1; USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError ); @@ -1173,7 +1173,7 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM UBiDi* pBidi = ubidi_openSized( aLine.Len(), 0, &nError ); const UBiDiLevel nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 /*LTR*/; - ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.Len(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW + ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.Len(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW if ( !pEditView->IsInsertMode() ) { @@ -1349,7 +1349,7 @@ EditPaM ImpEditEngine::CursorUp( const EditPaM& rPaM, EditView* pView ) nX = pView->pImpEditView->nTravelXPos; EditPaM aNewPaM( rPaM ); - if ( nLine ) // gleicher Absatz + if ( nLine ) // gleicher Absatz { EditLine* pPrevLine = pPPortion->GetLines().GetObject(nLine-1); aNewPaM.SetIndex( GetChar( pPPortion, pPrevLine, nX ) ); @@ -1359,7 +1359,7 @@ EditPaM ImpEditEngine::CursorUp( const EditPaM& rPaM, EditView* pView ) if ( aNewPaM.GetIndex() && ( aNewPaM.GetIndex() == pLine->GetStart() ) ) aNewPaM = CursorLeft( aNewPaM ); } - else // vorheriger Absatz + else // vorheriger Absatz { ParaPortion* pPrevPortion = GetPrevVisPortion( pPPortion ); if ( pPrevPortion ) @@ -1401,7 +1401,7 @@ EditPaM ImpEditEngine::CursorDown( const EditPaM& rPaM, EditView* pView ) if ( ( aNewPaM.GetIndex() == pNextLine->GetEnd() ) && ( aNewPaM.GetIndex() > pNextLine->GetStart() ) && ( aNewPaM.GetIndex() < pPPortion->GetNode()->Len() ) ) aNewPaM = CursorLeft( aNewPaM ); } - else // naechster Absatz + else // naechster Absatz { ParaPortion* pNextPortion = GetNextVisPortion( pPPortion ); if ( pNextPortion ) @@ -1445,7 +1445,7 @@ EditPaM ImpEditEngine::CursorEndOfLine( const EditPaM& rPaM ) aNewPaM.SetIndex( pLine->GetEnd() ); if ( pLine->GetEnd() > pLine->GetStart() ) { -// xub_Unicode cLastChar = aNewPaM.GetNode()->GetChar( aNewPaM.GetIndex()-1 ); +// xub_Unicode cLastChar = aNewPaM.GetNode()->GetChar( aNewPaM.GetIndex()-1 ); if ( aNewPaM.GetNode()->IsFeature( aNewPaM.GetIndex() - 1 ) ) { // Bei einem weichen Umbruch muss ich davor stehen! @@ -1723,7 +1723,7 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara ) ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos; rTypes.Remove( 0, rTypes.Count() ); -// pParaPortion->aExtraCharInfos.Remove( 0, pParaPortion->aExtraCharInfos.Count() ); +// pParaPortion->aExtraCharInfos.Remove( 0, pParaPortion->aExtraCharInfos.Count() ); ContentNode* pNode = pParaPortion->GetNode(); if ( pNode->Len() ) @@ -2013,7 +2013,7 @@ void ImpEditEngine::InitWritingDirections( USHORT nPara ) UBiDi* pBidi = ubidi_openSized( aText.Len(), 0, &nError ); nError = U_ZERO_ERROR; - ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.GetBuffer()), aText.Len(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW + ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.GetBuffer()), aText.Len(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW nError = U_ZERO_ERROR; long nCount = ubidi_countRuns( pBidi, &nError ); @@ -2153,9 +2153,9 @@ SvxCellVerJustify ImpEditEngine::GetVerJustification( USHORT nPara ) const } -// ---------------------------------------------------------------------- -// Textaenderung -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// Textaenderung +// ---------------------------------------------------------------------- void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, USHORT nChars, EditUndoRemoveChars* pCurUndo ) { @@ -2167,7 +2167,7 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, USHORT nChars, EditUndo USHORT nStart = rPaM.GetIndex(); USHORT nEnd = nStart + nChars; CharAttribArray& rAttribs = rPaM.GetNode()->GetCharAttribs().GetAttribs(); -// USHORT nAttrs = rAttribs.Count(); +// USHORT nAttrs = rAttribs.Count(); for ( USHORT nAttr = 0; nAttr < rAttribs.Count(); nAttr++ ) { EditCharAttrib* pAttr = rAttribs[nAttr]; @@ -2179,7 +2179,7 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, USHORT nChars, EditUndo EditUndoSetAttribs* pAttrUndo = CreateAttribUndo( aSel, GetEmptyItemSet() ); InsertUndo( pAttrUndo ); #endif - break; // for + break; // for } } if ( pCurUndo && ( CreateEditPaM( pCurUndo->GetEPaM() ) == rPaM ) ) @@ -2220,7 +2220,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew ParaPortion* pRecalc3 = NULL; ParaPortion* pRecalc4 = NULL; - if ( nNewPos == 0 ) // Move to Start + if ( nNewPos == 0 ) // Move to Start { pRecalc1 = GetParaPortions().GetObject( 0 ); pRecalc2 = GetParaPortions().GetObject( (USHORT)aOldPositions.Min() ); @@ -2232,7 +2232,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew pRecalc2 = GetParaPortions().GetObject( (USHORT)aOldPositions.Max() ); } - if ( aOldPositions.Min() == 0 ) // Move from Start + if ( aOldPositions.Min() == 0 ) // Move from Start { pRecalc3 = GetParaPortions().GetObject( 0 ); pRecalc4 = GetParaPortions().GetObject( @@ -2305,7 +2305,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew if ( pRecalc4 ) CalcHeight( pRecalc4 ); - aTmpPortionList.Remove( 0, aTmpPortionList.Count() ); // wichtig ! + aTmpPortionList.Remove( 0, aTmpPortionList.Count() ); // wichtig ! #ifdef EDITDEBUG GetParaPortions().DbgCheck(aEditDoc); @@ -2357,14 +2357,14 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR { xub_StrLen nEnd = pLeft->Len(); xub_StrLen nInv = nEnd ? nEnd-1 : nEnd; - pLeft->GetWrongList()->ClearWrongs( nInv, 0xFFFF, pLeft ); // Evtl. einen wegnehmen + pLeft->GetWrongList()->ClearWrongs( nInv, 0xFFFF, pLeft ); // Evtl. einen wegnehmen pLeft->GetWrongList()->MarkInvalid( nInv, nEnd+1 ); // Falschgeschriebene Woerter ruebernehmen: USHORT nRWrongs = pRight->GetWrongList()->Count(); for ( USHORT nW = 0; nW < nRWrongs; nW++ ) { WrongRange aWrong = pRight->GetWrongList()->GetObject( nW ); - if ( aWrong.nStart != 0 ) // Nicht ein anschliessender + if ( aWrong.nStart != 0 ) // Nicht ein anschliessender { aWrong.nStart = aWrong.nStart + nEnd; aWrong.nEnd = aWrong.nEnd + nEnd; @@ -2407,7 +2407,7 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, BYTE nMode, { DBG_ASSERT( !EditSelection( rSel ).DbgIsBuggy( aEditDoc ), "Index im Wald in DeleteLeftOrRight" ); - if ( rSel.HasRange() ) // dann nur Sel. loeschen + if ( rSel.HasRange() ) // dann nur Sel. loeschen return ImpDeleteSelection( rSel ); const EditPaM aCurPos( rSel.Max() ); @@ -2425,7 +2425,7 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, BYTE nMode, if ( aDelStart.GetIndex() == aCurPos.GetIndex() ) aDelStart = WordLeft( aCurPos ); } - else // DELMODE_RESTOFCONTENT + else // DELMODE_RESTOFCONTENT { aDelStart.SetIndex( 0 ); if ( aDelStart == aCurPos ) @@ -2461,7 +2461,7 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, BYTE nMode, } } } - else // DELMODE_RESTOFCONTENT + else // DELMODE_RESTOFCONTENT { aDelEnd.SetIndex( aCurPos.GetNode()->Len() ); if ( aDelEnd == aCurPos ) @@ -2498,7 +2498,7 @@ EditPaM ImpEditEngine::ImpDeleteSelection( EditSelection aSel ) EditPaM aEndPaM( aSel.Max() ); CursorMoved( aStartPaM.GetNode() ); // nur damit neu eingestellte Attribute verschwinden... - CursorMoved( aEndPaM.GetNode() ); // nur damit neu eingestellte Attribute verschwinden... + CursorMoved( aEndPaM.GetNode() ); // nur damit neu eingestellte Attribute verschwinden... DBG_ASSERT( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index im Wald in ImpDeleteSelection" ); DBG_ASSERT( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index im Wald in ImpDeleteSelection" ); @@ -2597,7 +2597,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, { EditSelection aSel( rCurSel ); #ifndef SVX_LIGHT - SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); + SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); if ( pAutoCorrect ) { if ( aSel.HasRange() ) @@ -2612,7 +2612,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, ESelection aESel( CreateESel(aSel) ); EditSelection aFirstWordSel; EditSelection aSecondWordSel; - if (aESel.nEndPara == 0) // is this the first para? + if (aESel.nEndPara == 0) // is this the first para? { // select first word... // start by checking if para starts with word. @@ -2770,10 +2770,10 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS else aPaM = aCurSel.Max(); - EditPaM aCurPaM( aPaM ); // fuers Invalidieren + EditPaM aCurPaM( aPaM ); // fuers Invalidieren // get word boundaries in order to clear possible WrongList entries - // and invalidate all the necessary text (everything after and including the + // and invalidate all the necessary text (everything after and including the // start of the word) EditSelection aCurWord( SelectWord( aCurPaM, i18n::WordType::DICTIONARY_WORD ) ); @@ -2790,7 +2790,7 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS { USHORT nEnd = aText.Search( LINE_SEP, nStart ); if ( nEnd == STRING_NOTFOUND ) - nEnd = aText.Len(); // nicht dereferenzieren! + nEnd = aText.Len(); // nicht dereferenzieren! // Start == End => Leerzeile if ( nEnd > nStart ) @@ -2800,7 +2800,7 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS if ( nChars > MAXCHARSINPARA ) { USHORT nMaxNewChars = MAXCHARSINPARA-aPaM.GetNode()->Len(); - nEnd -= ( aLine.Len() - nMaxNewChars ); // Dann landen die Zeichen im naechsten Absatz. + nEnd -= ( aLine.Len() - nMaxNewChars ); // Dann landen die Zeichen im naechsten Absatz. aLine.Erase( nMaxNewChars ); // Del Rest... } #ifndef SVX_LIGHT @@ -2817,7 +2817,7 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS { USHORT nEnd2 = aLine.Search( '\t', nStart2 ); if ( nEnd2 == STRING_NOTFOUND ) - nEnd2 = aLine.Len(); // nicht dereferenzieren! + nEnd2 = aLine.Len(); // nicht dereferenzieren! if ( nEnd2 > nStart2 ) aPaM = aEditDoc.InsertText( aPaM, XubString( aLine, nStart2, nEnd2-nStart2 ) ); @@ -2956,7 +2956,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding else pLWrongs->SetValid(); pRWrongs->SetValid(); // sonst 0 - 0xFFFF - pRWrongs->MarkInvalid( 0, 1 ); // Nur das erste Wort testen + pRWrongs->MarkInvalid( 0, 1 ); // Nur das erste Wort testen } #endif // !SVX_LIGHT @@ -2974,7 +2974,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding if ( IsCallParaInsertedOrDeleted() ) GetEditEnginePtr()->ParagraphInserted( nPos+1 ); - CursorMoved( rPaM.GetNode() ); // falls leeres Attribut entstanden. + CursorMoved( rPaM.GetNode() ); // falls leeres Attribut entstanden. TextModified(); return aPaM; } @@ -3058,7 +3058,7 @@ BOOL ImpEditEngine::UpdateFields() ContentNode* pNode = GetEditDoc().GetObject( nPara ); DBG_ASSERT( pNode, "NULL-Pointer im Doc" ); CharAttribArray& rAttribs = pNode->GetCharAttribs().GetAttribs(); -// USHORT nAttrs = rAttribs.Count(); +// USHORT nAttrs = rAttribs.Count(); for ( USHORT nAttr = 0; nAttr < rAttribs.Count(); nAttr++ ) { EditCharAttrib* pAttr = rAttribs[nAttr]; @@ -3101,9 +3101,9 @@ EditPaM ImpEditEngine::InsertLineBreak( EditSelection aCurSel ) return aPaM; } -// ---------------------------------------------------------------------- -// Hilfsfunktionen -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- +// Hilfsfunktionen +// ---------------------------------------------------------------------- Rectangle ImpEditEngine::PaMtoEditCursor( EditPaM aPaM, USHORT nFlags ) { DBG_ASSERT( GetUpdateMode(), "Darf bei Update=FALSE nicht erreicht werden: PaMtoEditCursor" ); @@ -3142,7 +3142,7 @@ EditPaM ImpEditEngine::GetPaM( Point aDocPos, BOOL bSmart ) for ( nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ ) { ParaPortion* pPortion = GetParaPortions().GetObject(nPortion); - nTmpHeight = pPortion->GetHeight(); // sollte auch bei !bVisible richtig sein! + nTmpHeight = pPortion->GetHeight(); // sollte auch bei !bVisible richtig sein! nY += nTmpHeight; if ( nY > aDocPos.Y() ) { @@ -3194,8 +3194,8 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace ) // Ueber alle Absaetze... // -------------------------------------------------- USHORT nParas = GetParaPortions().Count(); -// USHORT nBiggestPara = 0; -// USHORT nBiggestLine = 0; +// USHORT nBiggestPara = 0; +// USHORT nBiggestLine = 0; for ( USHORT nPara = 0; nPara < nParas; nPara++ ) { ParaPortion* pPortion = GetParaPortions().GetObject( nPara ); @@ -3224,7 +3224,7 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace ) nCurWidth -= nFI; if ( pPortion->GetBulletX() > nCurWidth ) { - nCurWidth += nFI; // LI? + nCurWidth += nFI; // LI? if ( pPortion->GetBulletX() > nCurWidth ) nCurWidth = pPortion->GetBulletX(); } @@ -3345,7 +3345,7 @@ void ImpEditEngine::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEn rStart = pLine->GetStart(); rEnd = pLine->GetEnd(); } -} +} USHORT ImpEditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const { @@ -3369,11 +3369,11 @@ USHORT ImpEditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const if (nStart <= nIndex && nIndex < nEnd) nLineNo = i; } - } + } } return nLineNo; } - + USHORT ImpEditEngine::GetLineHeight( USHORT nParagraph, USHORT nLine ) { DBG_ASSERT( nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" ); @@ -3447,7 +3447,7 @@ void ImpEditEngine::UpdateSelections() EditSelection aTmpSelection( EditPaM( pParaPortion->GetNode(), 0 ) ); pView->pImpEditView->SetEditSelection( aTmpSelection ); bChanged=TRUE; - break; // for-Schleife + break; // for-Schleife } } if ( !bChanged ) @@ -3516,7 +3516,7 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel ) EditSelection aMatchSel; EditSelection aTmpSel( rSel ); aTmpSel.Adjust( GetEditDoc() ); - if ( ( aTmpSel.Min().GetNode() != aTmpSel.Max().GetNode() ) || + if ( ( aTmpSel.Min().GetNode() != aTmpSel.Max().GetNode() ) || ( ( aTmpSel.Max().GetIndex() - aTmpSel.Min().GetIndex() ) > 1 ) ) { return aMatchSel; @@ -3551,7 +3551,7 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel ) { nLevel--; if ( !nLevel ) - break; // while nCur... + break; // while nCur... } nCur++; } @@ -3563,7 +3563,7 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel ) nCur = 0; } } - if ( nLevel == 0 ) // gefunden + if ( nLevel == 0 ) // gefunden { aMatchSel.Min() = aTmpSel.Min(); aMatchSel.Max() = EditPaM( pNode, nCur+1 ); @@ -3588,7 +3588,7 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel ) { nLevel--; if ( !nLevel ) - break; // while nCur... + break; // while nCur... } else if ( rStr.GetChar( nCur ) == nEC ) nLevel++; @@ -3601,14 +3601,14 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel ) { pNode = nNode ? aEditDoc.GetObject( --nNode ) : 0; if ( pNode ) - nCur = pNode->Len()-1; // egal ob negativ, weil if Len() + nCur = pNode->Len()-1; // egal ob negativ, weil if Len() } } - if ( nLevel == 0 ) // gefunden + if ( nLevel == 0 ) // gefunden { aMatchSel.Min() = aTmpSel.Min(); - aMatchSel.Min().GetIndex()++; // hinter das Zeichen + aMatchSel.Min().GetIndex()++; // hinter das Zeichen aMatchSel.Max() = EditPaM( pNode, nCur ); } } @@ -3620,7 +3620,7 @@ void ImpEditEngine::StopSelectionMode() { if ( ( IsInSelectionMode() || aSelEngine.IsInSelection() ) && pActiveView ) { - pActiveView->pImpEditView->DrawSelection(); // Wegzeichnen... + pActiveView->pImpEditView->DrawSelection(); // Wegzeichnen... EditSelection aSel( pActiveView->pImpEditView->GetEditSelection() ); aSel.Min() = aSel.Max(); pActiveView->pImpEditView->SetEditSelection( aSel ); @@ -3639,20 +3639,20 @@ void ImpEditEngine::SetActiveView( EditView* pView ) return; if ( pActiveView && pActiveView->HasSelection() ) - pActiveView->pImpEditView->DrawSelection(); // Wegzeichnen... + pActiveView->pImpEditView->DrawSelection(); // Wegzeichnen... pActiveView = pView; if ( pActiveView && pActiveView->HasSelection() ) - pActiveView->pImpEditView->DrawSelection(); // Wegzeichnen... + pActiveView->pImpEditView->DrawSelection(); // Wegzeichnen... - // NN: Quick fix for #78668#: - // When editing of a cell in Calc is ended, the edit engine is not deleted, - // only the edit views are removed. If mpIMEInfos is still set in that case, - // mpIMEInfos->aPos points to an invalid selection. - // -> reset mpIMEInfos now - // (probably something like this is necessary whenever the content is modified - // from the outside) + // NN: Quick fix for #78668#: + // When editing of a cell in Calc is ended, the edit engine is not deleted, + // only the edit views are removed. If mpIMEInfos is still set in that case, + // mpIMEInfos->aPos points to an invalid selection. + // -> reset mpIMEInfos now + // (probably something like this is necessary whenever the content is modified + // from the outside) if ( !pView && mpIMEInfos ) { @@ -3672,7 +3672,7 @@ uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable( xDataObj = pDataObj; XubString aText( GetSelected( aSelection ) ); - aText.ConvertLineEnd(); // Systemspezifisch + aText.ConvertLineEnd(); // Systemspezifisch pDataObj->GetString() = aText; SvxFontItem::EnableStoreUnicodeNames( TRUE ); @@ -3692,7 +3692,7 @@ uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable( ( pAttr->GetStart() == aSelection.Min().GetIndex() ) && ( pAttr->Which() == EE_FEATURE_FIELD ) ) { - const SvxFieldItem* pField = (const SvxFieldItem*)pAttr->GetItem(); + const SvxFieldItem* pField = (const SvxFieldItem*)pAttr->GetItem(); const SvxFieldData* pFld = pField->GetField(); if ( pFld && pFld->ISA( SvxURLField ) ) { @@ -3833,7 +3833,7 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion ) nFirstInvalid = nLine; break; } - if ( nLine && !aStatus.IsOutliner() ) // nicht die erste Zeile + if ( nLine && !aStatus.IsOutliner() ) // nicht die erste Zeile aRange.Min() += nSBL; aRange.Min() += pL->GetHeight(); } @@ -3843,7 +3843,7 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion ) // Abgleichen und weiter... aRange.Max() = aRange.Min(); aRange.Max() += pPortion->GetFirstLineOffset(); - if ( nFirstInvalid != 0 ) // Nur wenn nicht die erste Zeile ungueltig + if ( nFirstInvalid != 0 ) // Nur wenn nicht die erste Zeile ungueltig aRange.Min() = aRange.Max(); USHORT nLastInvalid = pPortion->GetLines().Count()-1; @@ -3902,10 +3902,10 @@ EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, BOOL bSmart nY += pTmpLine->GetHeight(); if ( !aStatus.IsOutliner() ) nY += nSBL; - if ( nY > aDocPos.Y() ) // das war 'se + if ( nY > aDocPos.Y() ) // das war 'se { pLine = pTmpLine; - break; // richtige Y-Position intressiert nicht + break; // richtige Y-Position intressiert nicht } nCurIndex = nCurIndex + pTmpLine->GetLen(); @@ -4077,7 +4077,7 @@ long ImpEditEngine::GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLin case PORTIONKIND_TEXT: case PORTIONKIND_HYPHENATOR: case PORTIONKIND_TAB: -// case PORTIONKIND_EXTRASPACE: +// case PORTIONKIND_EXTRASPACE: { nX += pPortion->GetSize().Width(); } @@ -4321,7 +4321,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion ) if ( ( nPortion != (GetParaPortions().Count()-1) ) ) { - pPortion->nHeight += GetYValue( rULItem.GetLower() ); // nicht in letzter + pPortion->nHeight += GetYValue( rULItem.GetLower() ); // nicht in letzter } @@ -4393,7 +4393,7 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, USHORT nIndex, US /* GETCRSR_ENDOFLINE: Wenn hinter dem letzten Zeichen einer umgebrochenen Zeile, am Ende der Zeile bleiben, nicht am Anfang der naechsten. - Zweck: - END => wirklich hinter das letzte Zeichen + Zweck: - END => wirklich hinter das letzte Zeichen - Selektion.... */ @@ -4503,7 +4503,7 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, BOOL bRight ) if ( aESel.nEndPos == 0 ) { - aESel.nEndPara--; // dann diesen Absatz nicht... + aESel.nEndPara--; // dann diesen Absatz nicht... aNewSel.nEndPos = 0; } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 8894a2949d9e..0bfb819c4a50 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,23 +92,23 @@ using namespace ::com::sun::star::linguistic2; SV_DECL_VARARR_SORT( SortedPositions, sal_uInt32, 16, 8 ) SV_IMPL_VARARR_SORT( SortedPositions, sal_uInt32 ); -#define CH_HYPH '-' +#define CH_HYPH '-' -#define RESDIFF 10 +#define RESDIFF 10 -#define WRONG_SHOW_MIN 5 -#define WRONG_SHOW_SMALL 11 -#define WRONG_SHOW_MEDIUM 15 +#define WRONG_SHOW_MIN 5 +#define WRONG_SHOW_SMALL 11 +#define WRONG_SHOW_MEDIUM 15 struct TabInfo { - BOOL bValid; + BOOL bValid; - SvxTabStop aTabStop; - xub_StrLen nCharPos; - USHORT nTabPortion; - long nStartPosX; - long nTabPos; + SvxTabStop aTabStop; + xub_StrLen nCharPos; + USHORT nTabPortion; + long nStartPosX; + long nTabPos; TabInfo() { bValid = FALSE; } }; @@ -159,16 +159,16 @@ BYTE GetCharTypeForCompression( xub_Unicode cChar ) } } -void lcl_DrawRedLines( - OutputDevice* pOutDev, - long nFontHeight, - const Point& rPnt, - sal_uInt16 nIndex, - sal_uInt16 nMaxEnd, - const sal_Int32* pDXArray, - WrongList* pWrongs, - short nOrientation, - const Point& rOrigin, +void lcl_DrawRedLines( + OutputDevice* pOutDev, + long nFontHeight, + const Point& rPnt, + sal_uInt16 nIndex, + sal_uInt16 nMaxEnd, + const sal_Int32* pDXArray, + WrongList* pWrongs, + short nOrientation, + const Point& rOrigin, BOOL bVertical, BOOL bIsRightToLeft ) { @@ -192,7 +192,7 @@ void lcl_DrawRedLines( if ( nStart >= nMaxEnd ) break; - if ( nStart < nIndex ) // Wurde korrigiert + if ( nStart < nIndex ) // Wurde korrigiert nStart = nIndex; if ( nEnd > nMaxEnd ) nEnd = nMaxEnd; @@ -286,8 +286,8 @@ sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh ) // For Kashi // ---------------------------------------------------------------------- -// class ImpEditEngine -// ---------------------------------------------------------------------- +// class ImpEditEngine +// ---------------------------------------------------------------------- void ImpEditEngine::UpdateViews( EditView* pCurView ) { if ( !GetUpdateMode() || IsFormatting() || aInvalidRec.IsEmpty() ) @@ -344,7 +344,7 @@ IMPL_LINK_INLINE_START( ImpEditEngine, IdleFormatHdl, Timer *, EMPTYARG ) // #i97146# check if that view is still available // else probably the idle format timer fired while we're already // downing - EditView* pView = aIdleFormatter.GetView(); + EditView* pView = aIdleFormatter.GetView(); for( sal_uInt16 nView = 0; nView < aEditViews.Count(); nView++ ) { if( aEditViews[nView] == pView ) @@ -393,7 +393,7 @@ void ImpEditEngine::FormatDoc() // Hier schon, damit nicht jedesmal in CreateLines... sal_Bool bMapChanged = ImpCheckRefMapMode(); - aInvalidRec = Rectangle(); // leermachen + aInvalidRec = Rectangle(); // leermachen for ( sal_uInt16 nPara = 0; nPara < GetParaPortions().Count(); nPara++ ) { ParaPortion* pParaPortion = GetParaPortions().GetObject( nPara ); @@ -411,7 +411,7 @@ void ImpEditEngine::FormatDoc() // bei MustRepaint() sollte keine Formatierung noetig sein! // 23.1.95: Evtl. ist sie durch eine andere Aktion aber doch // ungueltig geworden! -// if ( pParaPortion->MustRepaint() || CreateLines( nPara ) ) +// if ( pParaPortion->MustRepaint() || CreateLines( nPara ) ) if ( ( pParaPortion->MustRepaint() && !pParaPortion->IsInvalid() ) || CreateLines( nPara, nY ) ) { @@ -455,7 +455,7 @@ void ImpEditEngine::FormatDoc() // Man kann auch durch UpdateMode An=>AUS=>AN in die Formatierung gelangen... // Optimierung erst nach Vobis-Auslieferung aktivieren... -// if ( !aInvalidRec.IsEmpty() ) +// if ( !aInvalidRec.IsEmpty() ) { sal_uInt32 nNewHeight = CalcTextHeight(); long nDiff = nNewHeight - nCurTextHeight; @@ -505,7 +505,7 @@ void ImpEditEngine::FormatDoc() if ( bMapChanged ) GetRefDevice()->Pop(); - CallStatusHdl(); // Falls Modified... + CallStatusHdl(); // Falls Modified... LeaveBlockNotifications(); } @@ -543,7 +543,7 @@ void ImpEditEngine::CheckAutoPageSize() if ( GetStatus().AutoPageHeight() ) aPaperSize.Height() = (long) !IsVertical() ? GetTextHeight() : CalcTextWidth( TRUE ); - SetValidPaperSize( aPaperSize ); //Min, Max beruecksichtigen + SetValidPaperSize( aPaperSize ); //Min, Max beruecksichtigen if ( aPaperSize != aPrevPaperSize ) { @@ -563,7 +563,7 @@ void ImpEditEngine::CheckAutoPageSize() if ( eJustification != SVX_ADJUST_LEFT ) { pParaPortion->MarkSelectionInvalid( 0, pNode->Len() ); - CreateLines( nPara, 0 ); // 0: Bei AutoPageSize kein TextRange! + CreateLines( nPara, 0 ); // 0: Bei AutoPageSize kein TextRange! } } } @@ -593,7 +593,7 @@ void ImpEditEngine::CheckAutoPageSize() static sal_Int32 ImplCalculateFontIndependentLineSpacing( const sal_Int32 nFontHeight ) { - return ( nFontHeight * 12 ) / 10; // + 20% + return ( nFontHeight * 12 ) / 10; // + 20% } sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) @@ -651,9 +651,9 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&) pNode->GetContentAttribs().GetItem( EE_PARA_SBL ); const BOOL bScriptSpace = ((const SvxScriptSpaceItem&) pNode->GetContentAttribs().GetItem( EE_PARA_ASIANCJKSPACING )).GetValue(); -// const sal_uInt16 nInvalidEnd = ( pParaPortion->GetInvalidDiff() > 0 ) -// ? pParaPortion->GetInvalidPosStart() + pParaPortion->GetInvalidDiff() -// : pNode->Len(); +// const sal_uInt16 nInvalidEnd = ( pParaPortion->GetInvalidDiff() > 0 ) +// ? pParaPortion->GetInvalidPosStart() + pParaPortion->GetInvalidDiff() +// : pNode->Len(); const short nInvalidDiff = pParaPortion->GetInvalidDiff(); const sal_uInt16 nInvalidStart = pParaPortion->GetInvalidPosStart(); const sal_uInt16 nInvalidEnd = nInvalidStart + Abs( nInvalidDiff ); @@ -669,7 +669,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) else if ( ( pParaPortion->IsSimpleInvalid() ) && ( nInvalidDiff < 0 ) ) { // pruefen, ob loeschen ueber Portiongrenzen erfolgte... - sal_uInt16 nStart = nInvalidStart; // DOPPELT !!!!!!!!!!!!!!! + sal_uInt16 nStart = nInvalidStart; // DOPPELT !!!!!!!!!!!!!!! sal_uInt16 nEnd = nStart - nInvalidDiff; // neg. bQuickFormat = sal_True; sal_uInt16 nPos = 0; @@ -710,7 +710,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) // schnellere Methode: RecalcTextPortion( pParaPortion, nInvalidStart, nInvalidDiff ); } - else // nRealInvalidStart kann vor InvalidStart liegen, weil Portions geloescht.... + else // nRealInvalidStart kann vor InvalidStart liegen, weil Portions geloescht.... { CreateTextPortions( pParaPortion, nRealInvalidStart ); } @@ -725,7 +725,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) for ( sal_uInt16 nL = 0; nL <= nLine; nL++ ) { EditLine* pLine = pParaPortion->GetLines().GetObject( nL ); - if ( pLine->GetEnd() > nRealInvalidStart ) // nicht nInvalidStart! + if ( pLine->GetEnd() > nRealInvalidStart ) // nicht nInvalidStart! { nLine = nL; break; @@ -763,7 +763,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) sal_Bool bCalcCharPositions = sal_True; sal_Int32* pBuf = new sal_Int32[ pNode->Len() ]; - sal_Bool bSameLineAgain = sal_False; // Fuer TextRanger, wenn sich die Hoehe aendert. + sal_Bool bSameLineAgain = sal_False; // Fuer TextRanger, wenn sich die Hoehe aendert. TabInfo aCurrentTab; BOOL bForceOneRun = bEmptyNodeWithPolygon; @@ -786,8 +786,8 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) if ( !nLine && ( pParaPortion->GetBulletX() > nStartX ) ) { -// TL_NFLR nStartX += nFI; // Vielleicht reicht der LI? -// TL_NFLR if ( pParaPortion->GetBulletX() > nStartX ) +// TL_NFLR nStartX += nFI; // Vielleicht reicht der LI? +// TL_NFLR if ( pParaPortion->GetBulletX() > nStartX ) nStartX = pParaPortion->GetBulletX(); } } @@ -823,7 +823,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) sal_uInt16 nTmpPortion = pLine->GetStartPortion(); long nTmpWidth = 0; long nXWidth = nMaxLineWidth; - if ( nXWidth <= nTmpWidth ) // while muss 1x durchlaufen werden + if ( nXWidth <= nTmpWidth ) // while muss 1x durchlaufen werden nXWidth = nTmpWidth+1; SvLongsPtr pTextRanges = 0; @@ -872,7 +872,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) // Den breitesten Bereich verwenden... // Der breiteste Bereich koennte etwas verwirren, also // generell den ersten. Am besten mal richtig mit Luecken. -// for ( sal_uInt16 n = 0; n < pTextRanges->Count(); ) +// for ( sal_uInt16 n = 0; n < pTextRanges->Count(); ) if ( pTextRanges->Count() ) { sal_uInt16 n = 0; @@ -897,7 +897,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) if ( ( nTextY + nTextExtraYOffset ) > GetTextRanger()->GetBoundRect().Bottom() ) { nXWidth = !IsVertical() ? GetPaperSize().Width() : GetPaperSize().Height(); - if ( !nXWidth ) // AutoPaperSize + if ( !nXWidth ) // AutoPaperSize nXWidth = 0x7FFFFFFF; } } @@ -945,7 +945,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) // Tab-Pos suchen... long nCurPos = nTmpWidth+nStartX; -// nCurPos -= rLRItem.GetTxtLeft(); // Tabs relativ zu LI +// nCurPos -= rLRItem.GetTxtLeft(); // Tabs relativ zu LI // Skalierung rausrechnen if ( aStatus.DoStretch() && ( nStretchX != 100 ) ) nCurPos = nCurPos*100/nStretchX; @@ -1016,9 +1016,9 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) break; case EE_FEATURE_FIELD: { -// long nCurWidth = nTmpWidth; +// long nCurWidth = nTmpWidth; SeekCursor( pNode, nTmpPos+1, aTmpFont ); - sal_Unicode cChar = 0; // later: NBS? + sal_Unicode cChar = 0; // later: NBS? aTmpFont.SetPhysFont( GetRefDevice() ); ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() ); @@ -1047,7 +1047,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) bCompressedChars = FALSE; } break; - default: DBG_ERROR( "Was fuer ein Feature ?" ); + default: DBG_ERROR( "Was fuer ein Feature ?" ); } pNextFeature = pNode->GetCharAttribs().FindFeature( pNextFeature->GetStart() + 1 ); } @@ -1113,10 +1113,10 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) TextPortion* pTP = pParaPortion->GetTextPortions().GetObject( n ); nWidthAfterTab += pTP->GetSize().Width(); } - long nW = nWidthAfterTab; // Length before tab position + long nW = nWidthAfterTab; // Length before tab position if ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_RIGHT ) { -// nW = nWidthAfterTab; +// nW = nWidthAfterTab; } else if ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_CENTER ) { @@ -1124,7 +1124,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) } else if ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_DECIMAL ) { -// nW = nWidthAfterTab; +// nW = nWidthAfterTab; String aText = GetSelected( EditSelection( EditPaM( pParaPortion->GetNode(), nTmpPos ), EditPaM( pParaPortion->GetNode(), nTmpPos + pPortion->GetLen() ) ) ); USHORT nDecPos = aText.Search( aCurrentTab.aTabStop.GetDecimal() ); @@ -1353,17 +1353,17 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) // #80582# - Bullet should not influence line height -// if ( !nLine ) -// { -// long nBulletHeight = aBulletArea.GetHeight(); -// if ( nBulletHeight > (long)pLine->GetHeight() ) -// { -// long nDiff = nBulletHeight - (long)pLine->GetHeight(); -// // nDiff auf oben und unten verteilen. -// pLine->SetMaxAscent( (sal_uInt16)(pLine->GetMaxAscent() + nDiff/2) ); -// pLine->SetHeight( (sal_uInt16)nBulletHeight ); -// } -// } +// if ( !nLine ) +// { +// long nBulletHeight = aBulletArea.GetHeight(); +// if ( nBulletHeight > (long)pLine->GetHeight() ) +// { +// long nDiff = nBulletHeight - (long)pLine->GetHeight(); +// // nDiff auf oben und unten verteilen. +// pLine->SetMaxAscent( (sal_uInt16)(pLine->GetMaxAscent() + nDiff/2) ); +// pLine->SetHeight( (sal_uInt16)nBulletHeight ); +// } +// } if ( ( !IsVertical() && aStatus.AutoPageWidth() ) || ( IsVertical() && aStatus.AutoPageHeight() ) ) @@ -1523,7 +1523,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) if ( !bSameLineAgain ) { - nIndex = pLine->GetEnd(); // naechste Zeile Start = letzte Zeile Ende + nIndex = pLine->GetEnd(); // naechste Zeile Start = letzte Zeile Ende // weil nEnd hinter das letzte Zeichen zeigt! sal_uInt16 nEndPortion = pLine->GetEndPortion(); @@ -1565,7 +1565,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY ) pLine->SetEndPortion( nEndPortion+1 ); } } - } // while ( Index < Len ) + } // while ( Index < Len ) if ( nDelFromLine != 0xFFFF ) pParaPortion->GetLines().DeleteFromLine( nDelFromLine ); @@ -1716,8 +1716,8 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn DBG_ASSERT( pLastLine, "Weicher Umbruch, keine Zeile ?!" ); DBG_ASSERT( pLastLine->GetEnd() == pParaPortion->GetNode()->Len(), "Doch anders?" ); #endif -// pTmpLine->SetStart( pLastLine->GetEnd() ); -// pTmpLine->SetEnd( pLastLine->GetEnd() ); +// pTmpLine->SetStart( pLastLine->GetEnd() ); +// pTmpLine->SetEnd( pLastLine->GetEnd() ); sal_uInt16 nPos = (sal_uInt16) pParaPortion->GetTextPortions().Count() - 1 ; pTmpLine->SetStartPortion( nPos ); pTmpLine->SetEndPortion( nPos ); @@ -1726,12 +1726,12 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn sal_Bool ImpEditEngine::FinishCreateLines( ParaPortion* pParaPortion ) { -// CalcCharPositions( pParaPortion ); +// CalcCharPositions( pParaPortion ); pParaPortion->SetValid(); long nOldHeight = pParaPortion->GetHeight(); -// sal_uInt16 nPos = GetParaPortions().GetPos( pParaPortion ); -// DBG_ASSERT( nPos != USHRT_MAX, "FinishCreateLines: Portion nicht in Liste!" ); -// ParaPortion* pPrev = nPos ? GetParaPortions().GetObject( nPos-1 ) : 0; +// sal_uInt16 nPos = GetParaPortions().GetPos( pParaPortion ); +// DBG_ASSERT( nPos != USHRT_MAX, "FinishCreateLines: Portion nicht in Liste!" ); +// ParaPortion* pPrev = nPos ? GetParaPortions().GetObject( nPos-1 ) : 0; CalcHeight( pParaPortion ); DBG_ASSERT( pParaPortion->GetTextPortions().Count(), "FinishCreateLines: Keine Text-Portion?" ); @@ -1813,7 +1813,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te nBreakPos = nMaxBreakPos; // BUG in I18N - the japanese dot is in the next line! - // !!! Testen!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + // !!! Testen!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! if ( (nBreakPos + ( aUserOptions.allowPunctuationOutsideMargin ? 0 : 1 ) ) <= nMaxBreakPos ) { sal_Unicode cFirstInNextLine = ( (nBreakPos+1) < pNode->Len() ) ? pNode->GetChar( nBreakPos ) : 0; @@ -1834,8 +1834,8 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te if ( !bHangingPunctuation && bCanHyphenate && GetHyphenator().is() ) { i18n::Boundary aBoundary = _xBI->getWordBoundary( *pNode, nBreakPos, GetLocale( EditPaM( pNode, nBreakPos ) ), ::com::sun::star::i18n::WordType::DICTIONARY_WORD, sal_True ); -// sal_uInt16 nWordStart = nBreakPos; -// sal_uInt16 nBreakPos_OLD = nBreakPos; +// sal_uInt16 nWordStart = nBreakPos; +// sal_uInt16 nBreakPos_OLD = nBreakPos; sal_uInt16 nWordStart = nBreakPos; sal_uInt16 nWordEnd = (USHORT) aBoundary.endPos; DBG_ASSERT( nWordEnd > nWordStart, "ImpBreakLine: Start >= End?" ); @@ -1846,7 +1846,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te // #104415# May happen, because getLineBreak may differ from getWordBoudary with DICTIONARY_WORD // DBG_ASSERT( nWordEnd >= nMaxBreakPos, "Hyph: Break?" ); String aWord( *pNode, nWordStart, nWordLen ); - sal_uInt16 nMinTrail = nWordEnd-nMaxBreakPos+1; //+1: Vor dem angeknacksten Buchstaben + sal_uInt16 nMinTrail = nWordEnd-nMaxBreakPos+1; //+1: Vor dem angeknacksten Buchstaben Reference< XHyphenatedWord > xHyphWord; if (xHyphenator.is()) xHyphWord = xHyphenator->hyphenate( aWord, aLocale, aWord.Len() - nMinTrail, Sequence< PropertyValue >() ); @@ -1928,7 +1928,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te nBreakPos = nMaxBreakPos; // MT: I18N nextCharacters !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! if ( nBreakPos <= pLine->GetStart() ) - nBreakPos = pLine->GetStart() + 1; // Sonst Endlosschleife! + nBreakPos = pLine->GetStart() + 1; // Sonst Endlosschleife! } } @@ -1999,7 +1999,7 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine, return ; const USHORT nFirstChar = pLine->GetStart(); - const USHORT nLastChar = pLine->GetEnd() -1; // Last zeigt dahinter + const USHORT nLastChar = pLine->GetEnd() -1; // Last zeigt dahinter ContentNode* pNode = pParaPortion->GetNode(); DBG_ASSERT( nLastChar < pNode->Len(), "AdjustBlocks: Out of range!" ); @@ -2249,11 +2249,11 @@ sal_uInt16 ImpEditEngine::SplitTextPortion( ParaPortion* pPortion, sal_uInt16 nP nTmpPos = nTmpPos + pTP->GetLen(); if ( nTmpPos >= nPos ) { - if ( nTmpPos == nPos ) // dann braucht nichts geteilt werden + if ( nTmpPos == nPos ) // dann braucht nichts geteilt werden { // Skip Portions with ExtraSpace -// while ( ( (nSplitPortion+1) < nPortions ) && (pPortion->GetTextPortions().GetObject(nSplitPortion+1)->GetKind() == PORTIONKIND_EXTRASPACE ) ) -// nSplitPortion++; +// while ( ( (nSplitPortion+1) < nPortions ) && (pPortion->GetTextPortions().GetObject(nSplitPortion+1)->GetKind() == PORTIONKIND_EXTRASPACE ) ) +// nSplitPortion++; return nSplitPortion; } @@ -2698,12 +2698,12 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_uInt16 nPos, SvxFont& rF => Nicht das Kerning verdoppelt, also die Buchstaben weiter zusammenziehen --------------------------- - Kern StretchX =>Kern + Kern StretchX =>Kern --------------------------- - >0 <100 < (Proportional) - <0 <100 < (Proportional) - >0 >100 > (Proportional) - <0 >100 < (Der Betrag, also Antiprop) + >0 <100 < (Proportional) + <0 <100 < (Proportional) + >0 >100 > (Proportional) + <0 >100 < (Der Betrag, also Antiprop) */ if ( ( nKerning < 0 ) && ( nStretchX > 100 ) ) { @@ -2803,7 +2803,7 @@ void ImpEditEngine::RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics if ( IsFixedCellHeight() ) { -/* creating correct proportional ascent and descent values lead to problems if different fonts are used +/* creating correct proportional ascent and descent values lead to problems if different fonts are used in the same portion, it results in a bigger linespacing. sal_Int32 f = nAscent + nDescent; if ( f ) @@ -2833,11 +2833,11 @@ void ImpEditEngine::RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics // 4/96: Kommt bei HP Laserjet 4V auch nicht hin // => Werte komplett vom Bildschirm holen. - // sal_uInt16 nTmpLeading = (sal_uInt16)aMetric.GetLeading(); - // nAscent += nTmpLeading; + // sal_uInt16 nTmpLeading = (sal_uInt16)aMetric.GetLeading(); + // nAscent += nTmpLeading; nAscent = (sal_uInt16)aMetric.GetAscent(); nDescent = (sal_uInt16)aMetric.GetDescent(); - // nLeading = (sal_uInt16)aMetric.GetLeading(); + // nLeading = (sal_uInt16)aMetric.GetLeading(); } } if ( nAscent > rCurMetrics.nMaxAscent ) @@ -2856,7 +2856,7 @@ void ImpEditEngine::RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics if ( nAscent > rCurMetrics.nMaxAscent ) rCurMetrics.nMaxAscent = nAscent; } - else // muss < 0 sein + else // muss < 0 sein { nDescent = (sal_uInt16) (((long)nDescent)*nPropr/100 - nDiff); if ( nDescent > rCurMetrics.nMaxDescent ) @@ -2903,9 +2903,9 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta const bool bMetafileValid( pMtf != NULL ); // Fuer OnlineSpelling: -// EditPaM aCursorPos; -// if( GetStatus().DoOnlineSpelling() && pActiveView ) -// aCurPos = pActiveView->pImpEditView->GetEditSelections().Max(); +// EditPaM aCursorPos; +// if( GetStatus().DoOnlineSpelling() && pActiveView ) +// aCurPos = pActiveView->pImpEditView->GetEditSelections().Max(); long nVertLineSpacing = CalcVertLineSpacing(aStartPos); @@ -2997,23 +2997,23 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta { aTmpPos.X() = aStartPos.X() + nPortionXOffset; if ( aTmpPos.X() > aClipRec.Right() ) - break; // Keine weitere Ausgabe in Zeile noetig + break; // Keine weitere Ausgabe in Zeile noetig } else { aTmpPos.Y() = aStartPos.Y() + nPortionXOffset; if ( aTmpPos.Y() > aClipRec.Bottom() ) - break; // Keine weitere Ausgabe in Zeile noetig + break; // Keine weitere Ausgabe in Zeile noetig } // R2L replaces with obove... // New position after processing R2L text... // R2L if ( nR2LWidth && !pTextPortion->GetRightToLeft() ) // R2L { -// R2L if ( !IsVertical() ) -// R2L aTmpPos.X() += nR2LWidth; -// R2L else -// R2L aTmpPos.Y() += nR2LWidth; +// R2L if ( !IsVertical() ) +// R2L aTmpPos.X() += nR2LWidth; +// R2L else +// R2L aTmpPos.Y() += nR2LWidth; // R2L // R2L nR2LWidth = 0; // R2L } @@ -3228,12 +3228,12 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta //L2R sal_uInt16 nNextPortion = y+1; //L2R while ( nNextPortion <= pLine->GetEndPortion() ) //L2R { -//L2R TextPortion* pNextTextPortion = pPortion->GetTextPortions().GetObject( nNextPortion ); +//L2R TextPortion* pNextTextPortion = pPortion->GetTextPortions().GetObject( nNextPortion ); //L2R if ( pNextTextPortion->GetRightToLeft() ) //L2R { -//L2R if ( !IsVertical() ) +//L2R if ( !IsVertical() ) //L2R aOutPos.X() += pNextTextPortion->GetSize().Width(); -//L2R else +//L2R else //L2R aOutPos.Y() += pNextTextPortion->GetSize().Width(); //L2R } //L2R else @@ -3452,8 +3452,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta { Point aTopLeft( aTmpPos ); aTopLeft.Y() -= pLine->GetMaxAscent(); -// if ( nOrientation ) -// aTopLeft = lcl_ImplCalcRotatedPos( aTopLeft, aOrigin, nSin, nCos ); +// if ( nOrientation ) +// aTopLeft = lcl_ImplCalcRotatedPos( aTopLeft, aOrigin, nSin, nCos ); Rectangle aRect( aTopLeft, pTextPortion->GetSize() ); vcl::PDFExtOutDevBookmarkEntry aBookmark; @@ -3502,10 +3502,10 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta // R2L if ( !pTextPortion->GetRightToLeft() ) // R2L { -// R2L if ( !IsVertical() ) -// R2L aTmpPos.X() += nTxtWidth; -// R2L else -// R2L aTmpPos.Y() += nTxtWidth; +// R2L if ( !IsVertical() ) +// R2L aTmpPos.X() += nTxtWidth; +// R2L else +// R2L aTmpPos.Y() += nTxtWidth; // R2L } // R2L else // R2L { @@ -3535,7 +3535,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta } break; -// case PORTIONKIND_EXTRASPACE: +// case PORTIONKIND_EXTRASPACE: case PORTIONKIND_TAB: { if ( pTextPortion->GetExtraValue() && ( pTextPortion->GetExtraValue() != ' ' ) ) @@ -3549,9 +3549,9 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta if( nCharWidth ) nChars = pTextPortion->GetSize().Width() / nCharWidth; if ( nChars < 2 ) - nChars = 2; // wird durch DrawStretchText gestaucht. + nChars = 2; // wird durch DrawStretchText gestaucht. else if ( nChars == 2 ) - nChars = 3; // sieht besser aus + nChars = 3; // sieht besser aus String aText; aText.Fill( (USHORT)nChars, pTextPortion->GetExtraValue() ); @@ -3693,8 +3693,8 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, sal_Bool b sal_Bool bVDevValid = sal_True; Size aOutSz( pVDev->GetOutputSizePixel() ); - if ( ( aOutSz.Width() < aClipRecPixel.GetWidth() ) || - ( aOutSz.Height() < aClipRecPixel.GetHeight() ) ) + if ( ( aOutSz.Width() < aClipRecPixel.GetWidth() ) || + ( aOutSz.Height() < aClipRecPixel.GetHeight() ) ) { bVDevValid = pVDev->SetOutputSizePixel( aClipRecPixel.GetSize() ); } @@ -3748,7 +3748,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, sal_Bool b if ( GetTextRanger() ) { // Some problems here with push/pop, why?! -// pOutWin->Push( PUSH_CLIPREGION|PUSH_MAPMODE ); +// pOutWin->Push( PUSH_CLIPREGION|PUSH_MAPMODE ); bClipRegion = pOutWin->IsClipRegion(); aOldRegion = pOutWin->GetClipRegion(); // Wie bekomme ich das Polygon an die richtige Stelle???? @@ -3770,7 +3770,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, sal_Bool b if ( GetTextRanger() ) { -// pOutWin->Pop(); +// pOutWin->Pop(); if ( bClipRegion ) pOutWin->SetClipRegion( aOldRegion ); else @@ -3864,14 +3864,14 @@ void ImpEditEngine::SetUpdateMode( sal_Bool bUp, EditView* pCurView, sal_Bool bF // => Wegmalen // Umgekehrt waren alle unsichtbar => malen -// DrawAllSelections(); sieht im Outliner schlecht aus ! -// EditView* pView = aEditViewList.First(); -// while ( pView ) -// { -// DBG_CHKOBJ( pView, EditView, 0 ); -// pView->pImpEditView->DrawSelection(); -// pView = aEditViewList.Next(); -// } +// DrawAllSelections(); sieht im Outliner schlecht aus ! +// EditView* pView = aEditViewList.First(); +// while ( pView ) +// { +// DBG_CHKOBJ( pView, EditView, 0 ); +// pView->pImpEditView->DrawSelection(); +// pView = aEditViewList.Next(); +// } // Wenn !bFormatted, also z.B. nach SetText, braucht bei UpdateMode sal_True // nicht sofort formatiert werden, weil warscheinlich noch Text kommt. @@ -3900,7 +3900,7 @@ void ImpEditEngine::ShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow ) // Dann kriege ich den unteren Bereich nicht invalidiert, // wenn UpdateMode = sal_False! // Wenn doch, dann vor SetVisible auf sal_False merken! -// nCurTextHeight -= pPPortion->GetHeight(); +// nCurTextHeight -= pPPortion->GetHeight(); } if ( bShow && ( pPPortion->IsInvalid() || !pPPortion->nHeight ) ) @@ -3910,7 +3910,7 @@ void ImpEditEngine::ShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow ) if ( pPPortion->IsInvalid() ) { Font aOldFont( GetRefDevice()->GetFont() ); - CreateLines( nParagraph, 0 ); // 0: Kein TextRanger + CreateLines( nParagraph, 0 ); // 0: Kein TextRanger if ( aStatus.DoRestoreFont() ) GetRefDevice()->SetFont( aOldFont ); } @@ -3929,7 +3929,7 @@ void ImpEditEngine::ShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow ) pPPortion->SetMustRepaint( sal_True ); if ( GetUpdateMode() && !IsInUndo() && !GetTextRanger() ) { - aInvalidRec = Rectangle( Point( 0, GetParaPortions().GetYOffset( pPPortion ) ), + aInvalidRec = Rectangle( Point( 0, GetParaPortions().GetYOffset( pPPortion ) ), Point( GetPaperSize().Width(), nCurTextHeight ) ); UpdateViews( GetActiveView() ); } @@ -3970,7 +3970,7 @@ EditSelection ImpEditEngine::MoveParagraphs( Range aOldPositions, sal_uInt16 nNe ParaPortion* pUpperPortion = GetParaPortions().SaveGetObject( nFirstPortion ); ParaPortion* pLowerPortion = GetParaPortions().SaveGetObject( nLastPortion ); - aInvalidRec = Rectangle(); // leermachen + aInvalidRec = Rectangle(); // leermachen aInvalidRec.Left() = 0; aInvalidRec.Right() = aPaperSize.Width(); aInvalidRec.Top() = GetParaPortions().GetYOffset( pUpperPortion ); @@ -4022,7 +4022,7 @@ void ImpEditEngine::CallStatusHdl() EditStatus aTmpStatus( aStatus ); aStatus.Clear(); aStatusHdlLink.Call( &aTmpStatus ); - aStatusTimer.Stop(); // Falls von Hand gerufen... + aStatusTimer.Stop(); // Falls von Hand gerufen... } } @@ -4217,7 +4217,7 @@ void ImpEditEngine::DoStretchChars( sal_uInt16 nX, sal_uInt16 nY ) { // Fontbreite SvxCharScaleWidthItem* pNewWidth = (SvxCharScaleWidthItem*) pNode->GetContentAttribs().GetItem( EE_CHAR_FONTWIDTH ).Clone(); - sal_uInt32 nProp = pNewWidth->GetValue(); // sal_uInt32, kann temporaer gross werden + sal_uInt32 nProp = pNewWidth->GetValue(); // sal_uInt32, kann temporaer gross werden nProp *= nX; nProp /= 100; pNewWidth->SetValue( (sal_uInt16)nProp ); @@ -4291,7 +4291,7 @@ void ImpEditEngine::DoStretchChars( sal_uInt16 nX, sal_uInt16 nY ) SetParaAttribs( nPara, aTmpSet ); // harte Attribute: - sal_uInt16 nLastEnd = 0; // damit nach entfernen und neu nicht nochmal + sal_uInt16 nLastEnd = 0; // damit nach entfernen und neu nicht nochmal CharAttribArray& rAttribs = pNode->GetCharAttribs().GetAttribs(); sal_uInt16 nAttribs = rAttribs.Count(); for ( sal_uInt16 nAttr = 0; nAttr < nAttribs; nAttr++ ) @@ -4446,7 +4446,7 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice* pOutDev, String* pString, x break; case LANGUAGE_URDU & LANGUAGE_MASK_PRIMARY: case LANGUAGE_PUNJABI & LANGUAGE_MASK_PRIMARY: //??? - case LANGUAGE_SINDHI & LANGUAGE_MASK_PRIMARY: + case LANGUAGE_SINDHI & LANGUAGE_MASK_PRIMARY: nOffset = 0x06F0 - '0'; // eastern arabic-indic digits break; } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index d4ba71348c4b..c56809c3801e 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,7 +121,7 @@ EditPaM ImpEditEngine::Read( SvStream& rInput, const String& rBaseURL, EETextFor DBG_ERROR( "Read: Unbekanntes Format" ); } - FormatFullDoc(); // reicht vielleicht auch ein einfaches Format? + FormatFullDoc(); // reicht vielleicht auch ein einfaches Format? SetUpdateMode( _bUpdate ); return aPaM; @@ -174,8 +174,8 @@ EditPaM ImpEditEngine::ReadRTF( SvStream& rInput, EditSelection aSel ) if ( aSel.HasRange() ) aSel = ImpDeleteSelection( aSel ); -// sal_Bool bCharsBeforeInsertPos = ( aSel.Min().GetIndex() ) ? sal_True : sal_False; -// sal_Bool bCharsBehindInsertPos = ( aSel.Min().GetIndex() < aSel.Min().GetNode()->Len() ) ? sal_True : sal_False; +// sal_Bool bCharsBeforeInsertPos = ( aSel.Min().GetIndex() ) ? sal_True : sal_False; +// sal_Bool bCharsBehindInsertPos = ( aSel.Min().GetIndex() < aSel.Min().GetNode()->Len() ) ? sal_True : sal_False; // Der SvRTF-Parser erwartet, dass das Which-Mapping am uebergebenen Pool, // nicht an einem Secondary haengt. @@ -207,8 +207,8 @@ EditPaM ImpEditEngine::ReadHTML( SvStream& rInput, const String& rBaseURL, EditS if ( aSel.HasRange() ) aSel = ImpDeleteSelection( aSel ); -// sal_Bool bCharsBeforeInsertPos = ( aSel.Min().GetIndex() ) ? sal_True : sal_False; -// sal_Bool bCharsBehindInsertPos = ( aSel.Min().GetIndex() < aSel.Min().GetNode()->Len() ) ? sal_True : sal_False; +// sal_Bool bCharsBeforeInsertPos = ( aSel.Min().GetIndex() ) ? sal_True : sal_False; +// sal_Bool bCharsBehindInsertPos = ( aSel.Min().GetIndex() < aSel.Min().GetNode()->Len() ) ? sal_True : sal_False; EditHTMLParserRef xPrsr = new EditHTMLParser( rInput, rBaseURL, pHTTPHeaderAttrs ); SvParserState eState = xPrsr->CallParser( this, aSel.Max() ); @@ -426,17 +426,17 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) rOutput.WriteNumber( j ); switch ( pFontItem->GetFamily() ) { - case FAMILY_DONTKNOW: rOutput << OOO_STRING_SVTOOLS_RTF_FNIL; + case FAMILY_DONTKNOW: rOutput << OOO_STRING_SVTOOLS_RTF_FNIL; break; - case FAMILY_DECORATIVE: rOutput << OOO_STRING_SVTOOLS_RTF_FDECOR; + case FAMILY_DECORATIVE: rOutput << OOO_STRING_SVTOOLS_RTF_FDECOR; break; - case FAMILY_MODERN: rOutput << OOO_STRING_SVTOOLS_RTF_FMODERN; + case FAMILY_MODERN: rOutput << OOO_STRING_SVTOOLS_RTF_FMODERN; break; - case FAMILY_ROMAN: rOutput << OOO_STRING_SVTOOLS_RTF_FROMAN; + case FAMILY_ROMAN: rOutput << OOO_STRING_SVTOOLS_RTF_FROMAN; break; - case FAMILY_SCRIPT: rOutput << OOO_STRING_SVTOOLS_RTF_FSCRIPT; + case FAMILY_SCRIPT: rOutput << OOO_STRING_SVTOOLS_RTF_FSCRIPT; break; - case FAMILY_SWISS: rOutput << OOO_STRING_SVTOOLS_RTF_FSWISS; + case FAMILY_SWISS: rOutput << OOO_STRING_SVTOOLS_RTF_FSWISS; break; default: break; @@ -445,8 +445,8 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) sal_uInt16 nVal = 0; switch( pFontItem->GetPitch() ) { - case PITCH_FIXED: nVal = 1; break; - case PITCH_VARIABLE: nVal = 2; break; + case PITCH_FIXED: nVal = 1; break; + case PITCH_VARIABLE: nVal = 2; break; default: break; } @@ -612,7 +612,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) for ( sal_uInt16 nParAttr = EE_PARA_START; nParAttr <= EE_CHAR_END; nParAttr++ ) { -// const SfxPoolItem& rItem = pNode->GetContentAttribs().GetItem( nParAttr ); +// const SfxPoolItem& rItem = pNode->GetContentAttribs().GetItem( nParAttr ); // Jetzt, wo StyleSheet-Verarbeitung, nur noch harte Absatzattribute! if ( pNode->GetContentAttribs().GetItems().GetItemState( nParAttr ) == SFX_ITEM_ON ) { @@ -622,7 +622,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) } } if ( bAttr ) - rOutput << ' '; // Separator + rOutput << ' '; // Separator ItemList aAttribItems; ParaPortion* pParaPortion = FindParaPortion( pNode ); @@ -722,7 +722,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) rOutput << endl; } // RTF-Nachspann... - rOutput << "}}"; // 1xKlammerung Absaetze, 1x Klammerung RTF-Dokument + rOutput << "}}"; // 1xKlammerung Absaetze, 1x Klammerung RTF-Dokument rOutput.Flush(); #if defined (EDITDEBUG) && !defined( UNX ) @@ -821,11 +821,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, SvxAdjust eJustification = ((const SvxAdjustItem&)rItem).GetAdjust(); switch ( eJustification ) { - case SVX_ADJUST_CENTER: rOutput << OOO_STRING_SVTOOLS_RTF_QC; + case SVX_ADJUST_CENTER: rOutput << OOO_STRING_SVTOOLS_RTF_QC; break; - case SVX_ADJUST_RIGHT: rOutput << OOO_STRING_SVTOOLS_RTF_QR; + case SVX_ADJUST_RIGHT: rOutput << OOO_STRING_SVTOOLS_RTF_QR; break; - default: rOutput << OOO_STRING_SVTOOLS_RTF_QL; + default: rOutput << OOO_STRING_SVTOOLS_RTF_QL; break; } } @@ -876,8 +876,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, FontWeight e = ((const SvxWeightItem&)rItem).GetWeight(); switch ( e ) { - case WEIGHT_BOLD: rOutput << OOO_STRING_SVTOOLS_RTF_B; break; - default: rOutput << OOO_STRING_SVTOOLS_RTF_B << '0'; break; + case WEIGHT_BOLD: rOutput << OOO_STRING_SVTOOLS_RTF_B; break; + default: rOutput << OOO_STRING_SVTOOLS_RTF_B << '0'; break; } } break; @@ -888,10 +888,10 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, FontUnderline e = ((const SvxUnderlineItem&)rItem).GetLineStyle(); switch ( e ) { - case UNDERLINE_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_ULNONE; break; - case UNDERLINE_SINGLE: rOutput << OOO_STRING_SVTOOLS_RTF_UL; break; - case UNDERLINE_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_ULDB; break; - case UNDERLINE_DOTTED: rOutput << OOO_STRING_SVTOOLS_RTF_ULD; break; + case UNDERLINE_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_ULNONE; break; + case UNDERLINE_SINGLE: rOutput << OOO_STRING_SVTOOLS_RTF_UL; break; + case UNDERLINE_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_ULDB; break; + case UNDERLINE_DOTTED: rOutput << OOO_STRING_SVTOOLS_RTF_ULD; break; default: break; } @@ -902,10 +902,10 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, FontUnderline e = ((const SvxOverlineItem&)rItem).GetLineStyle(); switch ( e ) { - case UNDERLINE_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_OLNONE; break; - case UNDERLINE_SINGLE: rOutput << OOO_STRING_SVTOOLS_RTF_OL; break; - case UNDERLINE_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_OLDB; break; - case UNDERLINE_DOTTED: rOutput << OOO_STRING_SVTOOLS_RTF_OLD; break; + case UNDERLINE_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_OLNONE; break; + case UNDERLINE_SINGLE: rOutput << OOO_STRING_SVTOOLS_RTF_OL; break; + case UNDERLINE_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_OLDB; break; + case UNDERLINE_DOTTED: rOutput << OOO_STRING_SVTOOLS_RTF_OLD; break; default: break; } @@ -917,8 +917,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, switch ( e ) { case STRIKEOUT_SINGLE: - case STRIKEOUT_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_STRIKE; break; - case STRIKEOUT_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_STRIKE << '0'; break; + case STRIKEOUT_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_STRIKE; break; + case STRIKEOUT_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_STRIKE << '0'; break; default: break; } @@ -932,8 +932,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, switch ( e ) { case ITALIC_OBLIQUE: - case ITALIC_NORMAL: rOutput << OOO_STRING_SVTOOLS_RTF_I; break; - case ITALIC_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_I << '0'; break; + case ITALIC_NORMAL: rOutput << OOO_STRING_SVTOOLS_RTF_I; break; + case ITALIC_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_I << '0'; break; default: break; } @@ -1004,14 +1004,14 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, MapMode aPntMode( MAP_POINT ); long nFontHeight = GetRefDevice()->LogicToLogic( aFont.GetSize(), &GetRefMapMode(), &aPntMode ).Height(); - nFontHeight *=2; // HalfPoints + nFontHeight *=2; // HalfPoints sal_uInt16 nProp = ((const SvxEscapementItem&)rItem).GetProp(); - sal_uInt16 nProp100 = nProp*100; // Fuer SWG-Token Prop in 100tel Prozent. + sal_uInt16 nProp100 = nProp*100; // Fuer SWG-Token Prop in 100tel Prozent. short nEsc = ((const SvxEscapementItem&)rItem).GetEsc(); if ( nEsc == DFLT_ESC_AUTO_SUPER ) { nEsc = 100 - nProp; - nProp100++; // Eine 1 hinten bedeutet 'automatisch'. + nProp100++; // Eine 1 hinten bedeutet 'automatisch'. } else if ( nEsc == DFLT_ESC_AUTO_SUB ) { @@ -1038,7 +1038,7 @@ sal_uInt32 ImpEditEngine::WriteHTML( SvStream&, EditSelection ) } -EditTextObject* ImpEditEngine::CreateTextObject() +EditTextObject* ImpEditEngine::CreateTextObject() { EditSelection aCompleteSelection; aCompleteSelection.Min() = aEditDoc.GetStartPaM(); @@ -1047,12 +1047,12 @@ EditTextObject* ImpEditEngine::CreateTextObject() return CreateTextObject( aCompleteSelection ); } -EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel ) +EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel ) { return CreateBinTextObject( aSel, GetEditTextObjectPool(), aStatus.AllowBigObjects(), nBigTextObjectStart ); } -EditTextObject* ImpEditEngine::CreateBinTextObject( EditSelection aSel, SfxItemPool* pPool, sal_Bool bAllowBigObjects, sal_uInt16 nBigObjectStart ) const +EditTextObject* ImpEditEngine::CreateBinTextObject( EditSelection aSel, SfxItemPool* pPool, sal_Bool bAllowBigObjects, sal_uInt16 nBigObjectStart ) const { BinTextObject* pTxtObj = new BinTextObject( pPool ); pTxtObj->SetVertical( IsVertical() ); @@ -1247,7 +1247,7 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed DBG_ASSERT( !aSel.DbgIsBuggy( aEditDoc ), "InsertBibTextObject: Selektion kaput!(1)" ); sal_Bool bUsePortionInfo = sal_False; -// sal_Bool bFields = sal_False; +// sal_Bool bFields = sal_False; XParaPortionList* pPortionInfo = rTextObject.GetPortionInfo(); if ( pPortionInfo && ( (long)pPortionInfo->GetPaperWidth() == aPaperSize.Width() ) @@ -1371,7 +1371,7 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed pParaPortion->nHeight = pXP->nHeight; pParaPortion->nFirstLineOffset = pXP->nFirstLineOffset; pParaPortion->bForceRepaint = sal_True; - pParaPortion->SetValid(); // Nicht formatieren + pParaPortion->SetValid(); // Nicht formatieren // Die TextPortions pParaPortion->GetTextPortions().Reset(); @@ -1390,7 +1390,7 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed { EditLine* pLine = pXP->aLines[m]; EditLine* pNew = pLine->Clone(); - pNew->SetInvalid(); // neu Painten! + pNew->SetInvalid(); // neu Painten! pParaPortion->GetLines().Insert( pNew, m ); } #ifdef DBG_UTIL @@ -1414,7 +1414,7 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed #ifndef SVX_LIGHT if ( bNewContent && GetStatus().DoOnlineSpelling() && pC->GetWrongList() ) { - aPaM.GetNode()->DestroyWrongList(); // otherwise MLK, if list exists... + aPaM.GetNode()->DestroyWrongList(); // otherwise MLK, if list exists... aPaM.GetNode()->SetWrongList( pC->GetWrongList()->Clone() ); } #endif // !SVX_LIGHT @@ -1436,10 +1436,10 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed LanguageType ImpEditEngine::GetLanguage( const EditPaM& rPaM, USHORT* pEndPos ) const { - short nScriptType = GetScriptType( rPaM, pEndPos ); // pEndPos will be valid now, pointing to ScriptChange or NodeLen + short nScriptType = GetScriptType( rPaM, pEndPos ); // pEndPos will be valid now, pointing to ScriptChange or NodeLen USHORT nLangId = GetScriptItemId( EE_CHAR_LANGUAGE, nScriptType ); const SvxLanguageItem* pLangItem = &(const SvxLanguageItem&)rPaM.GetNode()->GetContentAttribs().GetItem( nLangId ); - EditCharAttrib* pAttr = rPaM.GetNode()->GetCharAttribs().FindAttrib( nLangId, rPaM.GetIndex() ); + EditCharAttrib* pAttr = rPaM.GetNode()->GetCharAttribs().FindAttrib( nLangId, rPaM.GetIndex() ); if ( pAttr ) pLangItem = (const SvxLanguageItem*)pAttr->GetItem(); @@ -1476,7 +1476,7 @@ SpellInfo * ImpEditEngine::CreateSpellInfo( const EditSelection &rSel, bool bMul // pSpellInfo->aSpellStart = CreateEPaM( aSentenceSel.Min() ); // pSpellInfo->aSpellTo = CreateEPaM( rSel.HasRange()? aSentenceSel.Max() : aSentenceSel.Min() ); // always spell draw objects completely, startting at the top. - // (spelling in only a selection or not starting with the top requires + // (spelling in only a selection or not starting with the top requires // further changes elsewehe to work properly) pSpellInfo->aSpellStart = EPaM(); pSpellInfo->aSpellTo = EPaM( EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND ); @@ -1508,7 +1508,7 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, sal_Bool bMultipleDoc ) sal_Bool bIsStart = sal_False; if ( bMultipleDoc ) - bIsStart = sal_True; // Immer von Vorne bzw. von hinten... + bIsStart = sal_True; // Immer von Vorne bzw. von hinten... else if ( ( CreateEPaM( aEditDoc.GetStartPaM() ) == pSpellInfo->aSpellStart ) ) bIsStart = sal_True; @@ -1555,7 +1555,7 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang ) // if the paragraph is not empty we need to increase the index // by one since the attribute of the character left to the // specified position is evaluated. - if (nEnd > nStart) // empty para? + if (nEnd > nStart) // empty para? ++nStart; LanguageType nLangFound = pEditEngine->GetLanguage( k, nStart ); #ifdef DEBUG @@ -1604,7 +1604,7 @@ void ImpEditEngine::Convert( EditView* pEditView, // the start of the word we use that though. if (!aCurSel.HasRange() && ImplGetBreakIterator().is()) { - EditPaM aWordStartPaM( SelectWord( aCurSel, i18n::WordType::DICTIONARY_WORD ).Min() ); + EditPaM aWordStartPaM( SelectWord( aCurSel, i18n::WordType::DICTIONARY_WORD ).Min() ); // since #118246 / #117803 still occurs if the cursor is placed // between the two chinese characters to be converted (because both @@ -1644,7 +1644,7 @@ void ImpEditEngine::Convert( EditView* pEditView, // disallow formatting, updating the view, ... while // non-interactively converting the document. (saves time) //if (!bIsInteractive) - // SetUpdateMode( FALSE ); + // SetUpdateMode( FALSE ); aWrp.Convert(); @@ -1755,15 +1755,15 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL } */ - USHORT nAttribStart = USHRT_MAX; - USHORT nAttribEnd = USHRT_MAX; - USHORT nCurPos = USHRT_MAX; + USHORT nAttribStart = USHRT_MAX; + USHORT nAttribEnd = USHRT_MAX; + USHORT nCurPos = USHRT_MAX; EPaM aCurStart = CreateEPaM( aCurSel.Min() ); SvUShorts aPortions; pEditEngine->GetPortions( (USHORT)aCurStart.nPara, aPortions ); for ( USHORT nPos = 0; nPos < aPortions.Count(); ++nPos ) { - USHORT nEnd = aPortions.GetObject( nPos ); + USHORT nEnd = aPortions.GetObject( nPos ); USHORT nStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0; // the language attribute is obtained from the left character @@ -2027,8 +2027,8 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& r /*-- 13.10.2003 16:43:27--------------------------------------------------- -----------------------------------------------------------------------*/ -bool ImpEditEngine::SpellSentence(EditView& rEditView, - ::svx::SpellPortions& rToFill, +bool ImpEditEngine::SpellSentence(EditView& rEditView, + ::svx::SpellPortions& rToFill, bool /*bIsGrammarChecking*/ ) { #ifdef SVX_LIGHT @@ -2196,8 +2196,8 @@ void ImpEditEngine::AddPortionIterated( /*-- 13.10.2003 16:43:33--------------------------------------------------- -----------------------------------------------------------------------*/ -void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, - const ::svx::SpellPortions& rNewPortions, +void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, + const ::svx::SpellPortions& rNewPortions, bool bRecheck ) { #ifdef SVX_LIGHT @@ -2320,7 +2320,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, aNext = EditPaM( aOldSel.Max().GetNode(), nEndOfSentence ); } rEditView.pImpEditView->SetEditSelection( aNext ); - + FormatAndUpdate(); aEditDoc.SetModified(TRUE); } @@ -2337,7 +2337,7 @@ void ImpEditEngine::PutSpellingToSentenceStart( EditView& rEditView ) { rEditView.pImpEditView->SetEditSelection( pSpellInfo->aLastSpellContentSelections.begin()->Min() ); } - + #endif } @@ -2352,7 +2352,7 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpel Es werden alle Woerter im invalidierten Bereich geprueft. Ist ein Wort falsch, aber noch nicht in der WrongList, oder umgekehrt, wird der Bereich des Wortes invalidiert - ( kein Invalidate, sondern wenn nur Uebergaenge von richtig=>falsch, + ( kein Invalidate, sondern wenn nur Uebergaenge von richtig=>falsch, einfaches Paint, bei Uebergaengen von falsch=>richtig mit VDev ueberplaetten ) */ @@ -2384,8 +2384,8 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpel sal_uInt16 nInvStart = pWrongList->GetInvalidStart(); sal_uInt16 nInvEnd = pWrongList->GetInvalidEnd(); - sal_uInt16 nWrongs = 0; // Auch im Absatz mal die Kontrolle abgeben... -// sal_Bool bStop = sal_False; + sal_uInt16 nWrongs = 0; // Auch im Absatz mal die Kontrolle abgeben... +// sal_Bool bStop = sal_False; sal_uInt16 nPaintFrom = 0xFFFF, nPaintTo = 0; sal_Bool bSimpleRepaint = sal_True; @@ -2398,7 +2398,7 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpel { if ( ( aSel.Min().GetIndex() > nInvEnd ) || ( ( aSel.Max().GetNode() == pLastNode ) && ( aSel.Max().GetIndex() >= pLastNode->Len() ) ) ) - break; // Dokument- oder Ungueltigkeitsbereich-Ende + break; // Dokument- oder Ungueltigkeitsbereich-Ende aSel = SelectWord( aSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ); String aWord( GetSelected( aSel ) ); @@ -2427,11 +2427,11 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpel // Pruefen, ob schon richtig markiert... nWrongs++; // Nur bei SimpleRepaint stoppen, sonst zu oft VDev - // if ( ( nWrongs > 8 ) && bSimpleRepaint ) - // { - // bStop = sal_True; - // pWrongList->MarkInvalid( aSel.Max().GetIndex(), nInvEnd ); - // } + // if ( ( nWrongs > 8 ) && bSimpleRepaint ) + // { + // bStop = sal_True; + // pWrongList->MarkInvalid( aSel.Max().GetIndex(), nInvEnd ); + // } sal_uInt16 nXEnd = bDottAdded ? nWEnd -1 : nWEnd; if ( !pWrongList->HasWrong( nWStart, nXEnd ) ) { @@ -2698,7 +2698,7 @@ BOOL ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEditVie EditSelection aFoundSel; BOOL bFound = ImpSearch( rSearchItem, aSel, aStartPaM, aFoundSel ); - if ( bFound && ( aFoundSel == aSel ) ) // Bei Rueckwaetssuche + if ( bFound && ( aFoundSel == aSel ) ) // Bei Rueckwaetssuche { aStartPaM = aSel.Min(); bFound = ImpSearch( rSearchItem, aSel, aStartPaM, aFoundSel ); @@ -2854,7 +2854,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, utl::TransliterationWrapper aTranslitarationWrapper( ::comphelper::getProcessServiceFactory(), nTransliterationMode ); BOOL bConsiderLanguage = aTranslitarationWrapper.needLanguageForTheMode(); - for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ ) + for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ ) { ContentNode* pNode = aEditDoc.GetObject( nNode ); xub_StrLen nStartPos = 0; @@ -2869,17 +2869,17 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, sal_uInt16 nLanguage = LANGUAGE_SYSTEM; // since we don't use Hiragana/Katakana or half-width/full-width transliterations here - // it is fine to use ANYWORD_IGNOREWHITESPACES. (ANY_WORD btw is broken and will + // it is fine to use ANYWORD_IGNOREWHITESPACES. (ANY_WORD btw is broken and will // occasionaly miss words in consecutive sentences). Also with ANYWORD_IGNOREWHITESPACES // text like 'just-in-time' will be converted to 'Just-In-Time' which seems to be the // proper thing to do. const sal_Int16 nWordType = i18n::WordType::ANYWORD_IGNOREWHITESPACES; //! In order to have less trouble with changing text size, e.g. because - //! of ligatures or � (German small sz) being resolved, we need to process - //! the text replacements from end to start. - //! This way the offsets for the yet to be changed words will be - //! left unchanged by the already replaced text. + //! of ligatures or � (German small sz) being resolved, we need to process + //! the text replacements from end to start. + //! This way the offsets for the yet to be changed words will be + //! left unchanged by the already replaced text. //! For this we temporarily save the changes to be done in this vector std::vector< TransliterationChgData > aChanges; TransliterationChgData aChgData; @@ -2892,11 +2892,11 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, i18n::Boundary aEndBndry; aSttBndry = _xBI->getWordBoundary( *pNode, nStartPos, - SvxCreateLocale( GetLanguage( EditPaM( pNode, nStartPos + 1 ) ) ), + SvxCreateLocale( GetLanguage( EditPaM( pNode, nStartPos + 1 ) ) ), nWordType, TRUE /*prefer forward direction*/); aEndBndry = _xBI->getWordBoundary( *pNode, nEndPos, - SvxCreateLocale( GetLanguage( EditPaM( pNode, nEndPos + 1 ) ) ), + SvxCreateLocale( GetLanguage( EditPaM( pNode, nEndPos + 1 ) ) ), nWordType, FALSE /*prefer backward direction*/); // prevent backtracking to the previous word if selection is at word boundary @@ -2928,8 +2928,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, #endif Sequence< sal_Int32 > aOffsets; - String aNewText( aTranslitarationWrapper.transliterate( *pNode, - GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ), + String aNewText( aTranslitarationWrapper.transliterate( *pNode, + GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ), nCurrentStart, nLen, &aOffsets )); if (!pNode->Equals( aNewText, nCurrentStart, nLen )) @@ -2946,8 +2946,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, (void) aSelTxt; #endif - aCurWordBndry = _xBI->nextWord( *pNode, nCurrentEnd, - SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentEnd + 1 ) ) ), + aCurWordBndry = _xBI->nextWord( *pNode, nCurrentEnd, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentEnd + 1 ) ) ), nWordType); } DBG_ASSERT( nCurrentEnd >= aEndBndry.endPos, "failed to reach end of transliteration" ); @@ -2956,19 +2956,19 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, { // for 'sentence case' we need to iterate sentence by sentence - sal_Int32 nLastStart = _xBI->beginOfSentence( - *pNode, nEndPos, + sal_Int32 nLastStart = _xBI->beginOfSentence( + *pNode, nEndPos, SvxCreateLocale( GetLanguage( EditPaM( pNode, nEndPos + 1 ) ) ) ); - sal_Int32 nLastEnd = _xBI->endOfSentence( - *pNode, nLastStart, + sal_Int32 nLastEnd = _xBI->endOfSentence( + *pNode, nLastStart, SvxCreateLocale( GetLanguage( EditPaM( pNode, nLastStart + 1 ) ) ) ); - + // extend nCurrentStart, nCurrentEnd to the current sentence boundaries - nCurrentStart = _xBI->beginOfSentence( - *pNode, nStartPos, + nCurrentStart = _xBI->beginOfSentence( + *pNode, nStartPos, SvxCreateLocale( GetLanguage( EditPaM( pNode, nStartPos + 1 ) ) ) ); - nCurrentEnd = _xBI->endOfSentence( - *pNode, nCurrentStart, + nCurrentEnd = _xBI->endOfSentence( + *pNode, nCurrentStart, SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ) ) ); // prevent backtracking to the previous sentence if selection starts at end of a sentence @@ -2976,18 +2976,18 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, { // now nCurrentStart is probably located on a non-letter word. (unless we // are in Asian text with no spaces...) - // Thus to get the real sentence start we should locate the next real word, + // Thus to get the real sentence start we should locate the next real word, // that is one found by DICTIONARY_WORD - i18n::Boundary aBndry = _xBI->nextWord( *pNode, nCurrentEnd, - SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentEnd + 1 ) ) ), + i18n::Boundary aBndry = _xBI->nextWord( *pNode, nCurrentEnd, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentEnd + 1 ) ) ), i18n::WordType::DICTIONARY_WORD); // now get new current sentence boundaries - nCurrentStart = _xBI->beginOfSentence( - *pNode, aBndry.startPos, + nCurrentStart = _xBI->beginOfSentence( + *pNode, aBndry.startPos, SvxCreateLocale( GetLanguage( EditPaM( pNode, aBndry.startPos + 1 ) ) ) ); - nCurrentEnd = _xBI->endOfSentence( - *pNode, nCurrentStart, + nCurrentEnd = _xBI->endOfSentence( + *pNode, nCurrentStart, SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ) ) ); } // prevent advancing to the next sentence if selection ends at start of a sentence @@ -2995,13 +2995,13 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, { // now nCurrentStart is probably located on a non-letter word. (unless we // are in Asian text with no spaces...) - // Thus to get the real sentence start we should locate the previous real word, + // Thus to get the real sentence start we should locate the previous real word, // that is one found by DICTIONARY_WORD - i18n::Boundary aBndry = _xBI->previousWord( *pNode, nLastStart, - SvxCreateLocale( GetLanguage( EditPaM( pNode, nLastStart + 1 ) ) ), + i18n::Boundary aBndry = _xBI->previousWord( *pNode, nLastStart, + SvxCreateLocale( GetLanguage( EditPaM( pNode, nLastStart + 1 ) ) ), i18n::WordType::DICTIONARY_WORD); - nLastEnd = _xBI->endOfSentence( - *pNode, aBndry.startPos, + nLastEnd = _xBI->endOfSentence( + *pNode, aBndry.startPos, SvxCreateLocale( GetLanguage( EditPaM( pNode, aBndry.startPos + 1 ) ) ) ); if (nCurrentEnd > nLastEnd) nCurrentEnd = nLastEnd; @@ -3016,8 +3016,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, #endif Sequence< sal_Int32 > aOffsets; - String aNewText( aTranslitarationWrapper.transliterate( *pNode, - GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ), + String aNewText( aTranslitarationWrapper.transliterate( *pNode, + GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ), nCurrentStart, nLen, &aOffsets )); if (!pNode->Equals( aNewText, nCurrentStart, nLen )) @@ -3036,8 +3036,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentEnd + 1 ) ) ), nWordType); nCurrentStart = aFirstWordBndry.startPos; - nCurrentEnd = _xBI->endOfSentence( - *pNode, nCurrentStart, + nCurrentEnd = _xBI->endOfSentence( + *pNode, nCurrentStart, SvxCreateLocale( GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ) ) ); } DBG_ASSERT( nCurrentEnd >= nLastEnd, "failed to reach end of transliteration" ); @@ -3123,8 +3123,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, USHORT nSelNode = aEditDoc.GetPos( rData.aSelection.Min().GetNode() ); ParaPortion* pParaPortion = GetParaPortions()[nSelNode]; - pParaPortion->MarkSelectionInvalid( rData.nStart, - std::max< USHORT >( rData.nStart + rData.nLen, + pParaPortion->MarkSelectionInvalid( rData.nStart, + std::max< USHORT >( rData.nStart + rData.nLen, rData.nStart + rData.aNewText.Len() ) ); } } // if (aChanges.size() > 0) @@ -3152,7 +3152,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, } -short ImpEditEngine::ReplaceTextOnly( +short ImpEditEngine::ReplaceTextOnly( ContentNode* pNode, USHORT nCurrentStart, xub_StrLen nLen, const String& rNewText, diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index 08451cfe6b2c..8709b197c188 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,13 +44,13 @@ void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool ) { if ( pStylePool != pSPool ) { -// if ( pStylePool ) -// EndListening( *pStylePool, TRUE ); +// if ( pStylePool ) +// EndListening( *pStylePool, TRUE ); pStylePool = pSPool; -// if ( pStylePool ) -// StartListening( *pStylePool, TRUE ); +// if ( pStylePool ) +// StartListening( *pStylePool, TRUE ); } } @@ -191,10 +191,10 @@ void ImpEditEngine::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) // ULONG nStyles = pMyStylePool->GetStyles().Count(); // for ( ULONG nStyle = 0; nStyle < nStyles; nStyle++ ) // { - // EditStyleSheet* pES = (EditStyleSheet*)pMyStylePool->GetStyles().GetObject( nStyle ); - // DBG_ASSERT( pES, "NULL-Pointer im StyleSheetPool!" ); - // if ( pES->IsUsed() && pES->HasStyleAsAnyParent( *pStyle ) ) - // UpdateParagraphsWithStyleSheet( pES ); + // EditStyleSheet* pES = (EditStyleSheet*)pMyStylePool->GetStyles().GetObject( nStyle ); + // DBG_ASSERT( pES, "NULL-Pointer im StyleSheetPool!" ); + // if ( pES->IsUsed() && pES->HasStyleAsAnyParent( *pStyle ) ) + // UpdateParagraphsWithStyleSheet( pES ); // } } } @@ -356,7 +356,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib ) USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() ); // ueber die Absaetze iterieren... - for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ ) + for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ ) { ContentNode* pNode = aEditDoc.GetObject( nNode ); DBG_ASSERT( aEditDoc.SaveGetObject( nNode ), "Node nicht gefunden: GetAttrib" ); @@ -415,7 +415,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib ) // => Lieber nicht invalidieren, UMSTELLEN! // Besser waere, Absatzweise ein ItemSet zu fuellen // und dieses mit dem gesmten vergleichen. - // aCurSet.InvalidateItem( nWhich ); + // aCurSet.InvalidateItem( nWhich ); if ( nWhich <= EE_PARA_END ) aCurSet.InvalidateItem( nWhich ); } @@ -558,7 +558,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE } // ueber die Absaetze iterieren... - for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ ) + for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ ) { BOOL bParaAttribFound = FALSE; BOOL bCharAttribFound = FALSE; @@ -578,13 +578,13 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE // ueber die Items iterieren... #ifdef EDITDEBUG -// FILE* fp = fopen( "d:\\debug.log", "a" ); -// if ( fp ) -// { -// fprintf( fp, "\n \n=> Zeichen-Attribute: Absatz %i, %i-%i\n", nNode, nStartPos, nEndPos ); -// DbgOutItemSet( fp, rSet, TRUE, FALSE ); -// fclose( fp ); -// } +// FILE* fp = fopen( "d:\\debug.log", "a" ); +// if ( fp ) +// { +// fprintf( fp, "\n \n=> Zeichen-Attribute: Absatz %i, %i-%i\n", nNode, nStartPos, nEndPos ); +// DbgOutItemSet( fp, rSet, TRUE, FALSE ); +// fclose( fp ); +// } #endif for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++) @@ -659,7 +659,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri } // ueber die Absaetze iterieren... - for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ ) + for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ ) { ContentNode* pNode = aEditDoc.GetObject( nNode ); ParaPortion* pPortion = GetParaPortions().GetObject( nNode ); @@ -678,7 +678,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri BOOL bChanged = aEditDoc.RemoveAttribs( pNode, nStartPos, nEndPos, nWhich ); if ( bRemoveParaAttribs ) { - SetParaAttribs( nNode, *_pEmptyItemSet ); // Invalidiert + SetParaAttribs( nNode, *_pEmptyItemSet ); // Invalidiert } else { @@ -744,13 +744,13 @@ void ImpEditEngine::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ) return; #ifdef EDITDEBUG -// FILE* fp = fopen( "d:\\debug.log", "a" ); -// if ( fp ) -// { -// fprintf( fp, "\n \n=> Absatz-Attribute: Absatz %i\n", nPara ); -// DbgOutItemSet( fp, rSet, TRUE, FALSE ); -// fclose( fp ); -// } +// FILE* fp = fopen( "d:\\debug.log", "a" ); +// if ( fp ) +// { +// fprintf( fp, "\n \n=> Absatz-Attribute: Absatz %i\n", nPara ); +// DbgOutItemSet( fp, rSet, TRUE, FALSE ); +// fclose( fp ); +// } #endif if ( !( pNode->GetContentAttribs().GetItems() == rSet ) ) diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 4202c30dba13..b37e767a6fac 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -241,9 +241,9 @@ void TextConvWrapper::ConvStart_impl( SvxSpellArea eArea ) if (aConvSel.HasRange()) { // user selection: convert to end of selection - pConvInfo->aConvTo.nPara = aConvSel.nEndPara; - pConvInfo->aConvTo.nIndex = aConvSel.nEndPos; - pConvInfo->bConvToEnd = sal_False; + pConvInfo->aConvTo.nPara = aConvSel.nEndPara; + pConvInfo->aConvTo.nIndex = aConvSel.nEndPos; + pConvInfo->bConvToEnd = sal_False; } else { @@ -267,7 +267,7 @@ void TextConvWrapper::ConvStart_impl( SvxSpellArea eArea ) } -void TextConvWrapper::ConvEnd_impl() +void TextConvWrapper::ConvEnd_impl() { } @@ -318,15 +318,15 @@ void TextConvWrapper::SetLanguageAndFont( const ESelection &rESel, } -void TextConvWrapper::SelectNewUnit_impl( - const sal_Int32 nUnitStart, +void TextConvWrapper::SelectNewUnit_impl( + const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd ) { BOOL bOK = 0 <= nUnitStart && 0 <= nUnitEnd && nUnitStart <= nUnitEnd; DBG_ASSERT( bOK, "invalid arguments" ); if (!bOK) return; - + ESelection aSelection = pEditView->GetSelection(); DBG_ASSERT( aSelection.nStartPara == aSelection.nEndPara, "paragraph mismatch in selection" ); @@ -336,13 +336,13 @@ void TextConvWrapper::SelectNewUnit_impl( } -void TextConvWrapper::GetNextPortion( +void TextConvWrapper::GetNextPortion( ::rtl::OUString& /* [out] */ rNextPortion, LanguageType& /* [out] */ rLangOfPortion, sal_Bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ) { bAllowChange = _bAllowImplicitChangesForNotConvertibleText; - + FindConvText_impl(); rNextPortion = aConvText; rLangOfPortion = nConvTextLang; @@ -357,8 +357,8 @@ void TextConvWrapper::GetNextPortion( } -void TextConvWrapper::HandleNewUnit( - const sal_Int32 nUnitStart, +void TextConvWrapper::HandleNewUnit( + const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd ) { SelectNewUnit_impl( nUnitStart, nUnitEnd ); @@ -368,7 +368,7 @@ void TextConvWrapper::HandleNewUnit( void TextConvWrapper::ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, const ::rtl::OUString& rOrigText, - const ::rtl::OUString& rReplaceWith, + const ::rtl::OUString& rReplaceWith, const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, ReplacementAction eAction, LanguageType *pNewUnitLanguage ) @@ -408,14 +408,14 @@ void TextConvWrapper::ReplaceUnit( } nUnitOffset = sal::static_int_cast< USHORT >( nUnitOffset + nUnitStart + aNewTxt.getLength()); - + // remember current original language for kater use ImpEditEngine *pImpEditEng = pEditView->GetImpEditEngine(); - ESelection _aOldSel = pEditView->GetSelection(); + ESelection _aOldSel = pEditView->GetSelection(); //EditSelection aOldEditSel = pEditView->GetImpEditView()->GetEditSelection(); - + #ifdef DBG_UTIL - LanguageType nOldLang = pImpEditEng->GetLanguage( pImpEditEng->CreateSel( _aOldSel ).Min() ); + LanguageType nOldLang = pImpEditEng->GetLanguage( pImpEditEng->CreateSel( _aOldSel ).Min() ); #endif pImpEditEng->UndoActionStart( EDITUNDO_INSERT ); @@ -432,18 +432,18 @@ void TextConvWrapper::ReplaceUnit( // change language and font if necessary if (bIsChineseConversion) { - DBG_ASSERT( GetTargetLanguage() == LANGUAGE_CHINESE_SIMPLIFIED || GetTargetLanguage() == LANGUAGE_CHINESE_TRADITIONAL, + DBG_ASSERT( GetTargetLanguage() == LANGUAGE_CHINESE_SIMPLIFIED || GetTargetLanguage() == LANGUAGE_CHINESE_TRADITIONAL, "TextConvWrapper::ReplaceUnit : unexpected target language" ); - + ESelection aOldSel = pEditView->GetSelection(); ESelection aNewSel( aOldSel ); aNewSel.nStartPos = sal::static_int_cast< xub_StrLen >( aNewSel.nStartPos - aNewTxt.getLength()); -// DBG_ASSERT( aOldSel.nEndPos >= 0, "error while building selection" ); +// DBG_ASSERT( aOldSel.nEndPos >= 0, "error while building selection" ); if (pNewUnitLanguage) { - DBG_ASSERT(!IsSimilarChinese( *pNewUnitLanguage, nOldLang ), + DBG_ASSERT(!IsSimilarChinese( *pNewUnitLanguage, nOldLang ), "similar language should not be changed!"); SetLanguageAndFont( aNewSel, *pNewUnitLanguage, EE_CHAR_LANGUAGE_CJK, GetTargetFont(), EE_CHAR_FONTINFO_CJK ); @@ -472,7 +472,7 @@ void TextConvWrapper::ReplaceUnit( } -void TextConvWrapper::ChangeText( const String &rNewText, +void TextConvWrapper::ChangeText( const String &rNewText, const OUString& rOrigText, const uno::Sequence< sal_Int32 > *pOffsets, ESelection *pESelection ) @@ -486,7 +486,7 @@ void TextConvWrapper::ChangeText( const String &rNewText, if (pOffsets && pESelection) // try to keep as much attributation as possible ? { pESelection->Adjust(); - + // remember cursor start position for later setting of the cursor const xub_StrLen nStartIndex = pESelection->nStartPos; @@ -498,15 +498,15 @@ void TextConvWrapper::ChangeText( const String &rNewText, xub_StrLen nChgLen = 0; xub_StrLen nConvChgPos = STRING_NOTFOUND; xub_StrLen nConvChgLen = 0; - - // offset to calculate the position in the text taking into + + // offset to calculate the position in the text taking into // account that text may have been replaced with new text of // different length. Negative values allowed! long nCorrectionOffset = 0; - - DBG_ASSERT(nIndices == 0 || nIndices == nConvTextLen, + + DBG_ASSERT(nIndices == 0 || nIndices == nConvTextLen, "mismatch between string length and sequence length!" ); - + // find all substrings that need to be replaced (and only those) while (sal_True) { @@ -542,8 +542,8 @@ void TextConvWrapper::ChangeText( const String &rNewText, #ifdef DEBUG String aSelTxt1( pEditView->GetSelected() ); #endif - - // replace selected sub string with the corresponding + + // replace selected sub string with the corresponding // sub string from the new text while keeping as // much from the attributes as possible ChangeText_impl( aInNew, sal_True ); @@ -569,7 +569,7 @@ void TextConvWrapper::ChangeText( const String &rNewText, } // set cursor to the end of the inserted text - // (as it would happen after ChangeText_impl (Delete and Insert) + // (as it would happen after ChangeText_impl (Delete and Insert) // of the whole text in the 'else' branch below) pESelection->nStartPos = pESelection->nEndPos = nStartIndex + nConvTextLen; } @@ -585,8 +585,8 @@ void TextConvWrapper::ChangeText_impl( const String &rNewText, sal_Bool bKeepAtt if (bKeepAttributes) { // save attributes to be restored - SfxItemSet aSet( pEditView->GetAttribs() ); - + SfxItemSet aSet( pEditView->GetAttribs() ); + #ifdef DEBUG String aSelTxt1( pEditView->GetSelected() ); #endif @@ -598,8 +598,8 @@ void TextConvWrapper::ChangeText_impl( const String &rNewText, sal_Bool bKeepAtt // since 'SetAttribs' below function like merging with the attributes // from the itemset with any existing ones we have to get rid of all - // all attributes now. (Those attributes that may take effect left - // to the position where the new text gets inserted after the old text + // all attributes now. (Those attributes that may take effect left + // to the position where the new text gets inserted after the old text // was deleted) pEditView->RemoveAttribs(); // apply saved attributes to new inserted text diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx index 770fcd92ba64..e8d17075d7d6 100644 --- a/editeng/source/editeng/textconv.hxx +++ b/editeng/source/editeng/textconv.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ class EditView; class ImpEditEngine; class ContentNode; -class TextConvWrapper : public editeng::HangulHanjaConversion +class TextConvWrapper : public editeng::HangulHanjaConversion { rtl::OUString aConvText; // convertible text part found last time LanguageType nConvTextLang; // language of aConvText @@ -70,10 +70,10 @@ class TextConvWrapper : public editeng::HangulHanjaConversion void ConvEnd_impl(); // former SpellEnd sal_Bool ConvContinue_impl(); // former SpellContinue - void SelectNewUnit_impl( const sal_Int32 nUnitStart, + void SelectNewUnit_impl( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd ); - void ChangeText( const String &rNewText, + void ChangeText( const String &rNewText, const ::rtl::OUString& rOrigText, const ::com::sun::star::uno::Sequence< sal_Int32 > *pOffsets, ESelection *pESelection ); @@ -84,19 +84,19 @@ class TextConvWrapper : public editeng::HangulHanjaConversion TextConvWrapper & operator= (const TextConvWrapper &); protected: - virtual void GetNextPortion( ::rtl::OUString& /* [out] */ rNextPortion, - LanguageType& /* [out] */ rLangOfPortion, + virtual void GetNextPortion( ::rtl::OUString& /* [out] */ rNextPortion, + LanguageType& /* [out] */ rLangOfPortion, sal_Bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ); - virtual void HandleNewUnit( const sal_Int32 nUnitStart, + virtual void HandleNewUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd ); virtual void ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, const ::rtl::OUString& rOrigText, - const ::rtl::OUString& rReplaceWith, + const ::rtl::OUString& rReplaceWith, const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, - ReplacementAction eAction, + ReplacementAction eAction, LanguageType *pNewUnitLanguage ); - + virtual sal_Bool HasRubySupport() const; void SetLanguageAndFont( const ESelection &rESel, diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index b03e0f601ad5..f14d985ec4b8 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ // #90477# #include <tools/tenccvt.hxx> -#define BULITEM_VERSION ((USHORT)2) +#define BULITEM_VERSION ((USHORT)2) // ----------------------------------------------------------------------- @@ -86,10 +86,10 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, USHORT nVer ) rStream >> nTemp; aFont.SetFamily((FontFamily)nTemp); // #90477# - rStream >> nTemp; + rStream >> nTemp; nTemp = (sal_uInt16)GetSOLoadTextEncoding((rtl_TextEncoding)nTemp, (sal_uInt16)rStream.GetVersion()); aFont.SetCharSet((rtl_TextEncoding)nTemp); - + rStream >> nTemp; aFont.SetPitch((FontPitch)nTemp); rStream >> nTemp; aFont.SetAlign((FontAlign)nTemp); rStream >> nTemp; aFont.SetWeight((FontWeight)nTemp); @@ -141,9 +141,9 @@ SvxBulletItem::SvxBulletItem( BYTE nNewStyle, const Font& rFont, USHORT /*nStart SvxBulletItem::SvxBulletItem( const Font& rFont, xub_Unicode cSymb, USHORT _nWhich ) : SfxPoolItem( _nWhich ) { SetDefaults_Impl(); - aFont = rFont; + aFont = rFont; cSymbol = cSymb; - nStyle = BS_BULLET; + nStyle = BS_BULLET; nValidMask = 0xFFFF; } @@ -154,7 +154,7 @@ SvxBulletItem::SvxBulletItem( const Bitmap& rBmp, USHORT _nWhich ) : SfxPoolItem SetDefaults_Impl(); if( !rBmp.IsEmpty() ) - { + { pGraphicObject = new GraphicObject( rBmp ); nStyle = BS_BMP; } @@ -173,14 +173,14 @@ SvxBulletItem::SvxBulletItem( const GraphicObject& rGraphicObject, USHORT _nWhic pGraphicObject = new GraphicObject( rGraphicObject ); nStyle = BS_BMP; } - + nValidMask = 0xFFFF; } // ----------------------------------------------------------------------- -SvxBulletItem::SvxBulletItem( SvStream& rStrm, USHORT _nWhich ) : - SfxPoolItem( _nWhich ), +SvxBulletItem::SvxBulletItem( SvStream& rStrm, USHORT _nWhich ) : + SfxPoolItem( _nWhich ), pGraphicObject( NULL ) { rStrm >> nStyle; @@ -190,8 +190,8 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, USHORT _nWhich ) : else { // Sicheres Laden mit Test auf leere Bitmap - Bitmap aBmp; - const UINT32 nOldPos = rStrm.Tell(); + Bitmap aBmp; + const UINT32 nOldPos = rStrm.Tell(); // #69345# Errorcode beim Bitmap lesen ignorieren, // siehe Kommentar #67581# in SvxBulletItem::Store() BOOL bOldError = rStrm.GetError() ? TRUE : FALSE; @@ -211,7 +211,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, USHORT _nWhich ) : else pGraphicObject = new GraphicObject( aBmp ); } - + rStrm >> nWidth; rStrm >> nStart; rStrm >> nJustify; @@ -235,17 +235,17 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, USHORT _nWhich ) : SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : SfxPoolItem( rItem ) { - aFont = rItem.aFont; - pGraphicObject = ( rItem.pGraphicObject ? new GraphicObject( *rItem.pGraphicObject ) : NULL ); - aPrevText = rItem.aPrevText; - aFollowText = rItem.aFollowText; - nStart = rItem.nStart; - nStyle = rItem.nStyle; - nWidth = rItem.nWidth; - nScale = rItem.nScale; - cSymbol = rItem.cSymbol; - nJustify = rItem.nJustify; - nValidMask = rItem.nValidMask; + aFont = rItem.aFont; + pGraphicObject = ( rItem.pGraphicObject ? new GraphicObject( *rItem.pGraphicObject ) : NULL ); + aPrevText = rItem.aPrevText; + aFollowText = rItem.aFollowText; + nStart = rItem.nStart; + nStyle = rItem.nStyle; + nWidth = rItem.nWidth; + nScale = rItem.nScale; + cSymbol = rItem.cSymbol; + nJustify = rItem.nJustify; + nValidMask = rItem.nValidMask; } // ----------------------------------------------------------------------- @@ -284,12 +284,12 @@ void SvxBulletItem::SetDefaultFont_Impl() void SvxBulletItem::SetDefaults_Impl() { pGraphicObject = NULL; - nWidth = 1200; // 1.2cm - nStart = 1; - nStyle = BS_123; - nJustify = BJ_HLEFT | BJ_VCENTER; - cSymbol = sal_Unicode(' '); - nScale = 75; + nWidth = 1200; // 1.2cm + nStart = 1; + nStyle = BS_123; + nJustify = BJ_HLEFT | BJ_VCENTER; + cSymbol = sal_Unicode(' '); + nScale = 75; } // ----------------------------------------------------------------------- @@ -340,25 +340,25 @@ int SvxBulletItem::operator==( const SfxPoolItem& rItem ) const const SvxBulletItem& rBullet = (const SvxBulletItem&)rItem; // ValidMask mitvergleichen, da sonst kein Putten in ein AttrSet moeglich, // wenn sich das Item nur in der ValidMask von einem existierenden unterscheidet. - if( nValidMask != rBullet.nValidMask || - nStyle != rBullet.nStyle || - nScale != rBullet.nScale || - nJustify != rBullet.nJustify || - nWidth != rBullet.nWidth || - nStart != rBullet.nStart || - cSymbol != rBullet.cSymbol || - aPrevText != rBullet.aPrevText || + if( nValidMask != rBullet.nValidMask || + nStyle != rBullet.nStyle || + nScale != rBullet.nScale || + nJustify != rBullet.nJustify || + nWidth != rBullet.nWidth || + nStart != rBullet.nStart || + cSymbol != rBullet.cSymbol || + aPrevText != rBullet.aPrevText || aFollowText != rBullet.aFollowText ) return 0; if( ( nStyle != BS_BMP ) && ( aFont != rBullet.aFont ) ) return 0; - + if( nStyle == BS_BMP ) - { + { if( ( pGraphicObject && !rBullet.pGraphicObject ) || ( !pGraphicObject && rBullet.pGraphicObject ) ) return 0; - + if( ( pGraphicObject && rBullet.pGraphicObject ) && ( ( *pGraphicObject != *rBullet.pGraphicObject ) || ( pGraphicObject->GetPrefSize() != rBullet.pGraphicObject->GetPrefSize() ) ) ) @@ -375,7 +375,7 @@ int SvxBulletItem::operator==( const SfxPoolItem& rItem ) const SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const { // Korrektur bei leerer Bitmap - if( ( nStyle == BS_BMP ) && + if( ( nStyle == BS_BMP ) && ( !pGraphicObject || ( GRAPHIC_NONE == pGraphicObject->GetType() ) || ( GRAPHIC_DEFAULT == pGraphicObject->GetType() ) ) ) { if( pGraphicObject ) @@ -383,7 +383,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const delete( const_cast< SvxBulletItem* >( this )->pGraphicObject ); const_cast< SvxBulletItem* >( this )->pGraphicObject = NULL; } - + const_cast< SvxBulletItem* >( this )->nStyle = BS_NONE; } @@ -449,7 +449,7 @@ SfxItemPresentation SvxBulletItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * -) const +) const { SfxItemPresentation eRet = SFX_ITEM_PRESENTATION_NONE; switch ( ePres ) @@ -472,7 +472,7 @@ SfxItemPresentation SvxBulletItem::GetPresentation //------------------------------------------------------------------------ Bitmap SvxBulletItem::GetBitmap() const -{ +{ if( pGraphicObject ) return pGraphicObject->GetGraphic().GetBitmap(); else @@ -518,7 +518,7 @@ const GraphicObject& SvxBulletItem::GetGraphicObject() const //------------------------------------------------------------------------ void SvxBulletItem::SetGraphicObject( const GraphicObject& rGraphicObject ) -{ +{ if( ( GRAPHIC_NONE == rGraphicObject.GetType() ) || ( GRAPHIC_DEFAULT == rGraphicObject.GetType() ) ) { if( pGraphicObject ) diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx index bc910b75c283..e504eaabad01 100644 --- a/editeng/source/items/charhiddenitem.cxx +++ b/editeng/source/items/charhiddenitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index b11534a22dd6..ce4ce58f3f11 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ // #90477# #include <tools/tenccvt.hxx> -#define FRAME_MARKER (sal_uInt32)0x21981357 -#define CHARSET_MARKER (FRAME_MARKER+1) +#define FRAME_MARKER (sal_uInt32)0x21981357 +#define CHARSET_MARKER (FRAME_MARKER+1) // ----------------------------------------------------------------------- @@ -76,7 +76,7 @@ int SvxFieldData::operator==( const SvxFieldData& rFld ) const { DBG_ASSERT( Type() == rFld.Type(), "==: Verschiedene Typen" ); (void)rFld; - return TRUE; // Basicklasse immer gleich. + return TRUE; // Basicklasse immer gleich. } // ----------------------------------------------------------------------- @@ -107,7 +107,7 @@ MetaAction* SvxFieldData::createEndComment() const SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const USHORT nId ) : SfxPoolItem( nId ) { - pField = pFld; // gehoert direkt dem Item + pField = pFld; // gehoert direkt dem Item } // ----------------------------------------------------------------------- @@ -121,7 +121,7 @@ SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const USHORT nId ) : // ----------------------------------------------------------------------- SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) : - SfxPoolItem ( rItem ) + SfxPoolItem ( rItem ) { pField = rItem.GetField() ? rItem.GetField()->Clone() : 0; } @@ -152,7 +152,7 @@ SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, USHORT ) const aPStrm.SetError( SVSTREAM_GENERALERROR ); if ( aPStrm.GetError() == ERRCODE_IO_NOFACTORY ) - aPStrm.ResetError(); // Eigentlich einen Code, dass nicht alle Attr gelesen wurden... + aPStrm.ResetError(); // Eigentlich einen Code, dass nicht alle Attr gelesen wurden... return new SvxFieldItem( pData, Which() ); } @@ -461,7 +461,7 @@ MetaAction* SvxURLField::createBeginComment() const { // #i46618# Adding target URL to metafile comment return new MetaCommentAction( "FIELD_SEQ_BEGIN", - 0, + 0, reinterpret_cast<const BYTE*>(aURL.GetBuffer()), 2*aURL.Len() ); } @@ -474,7 +474,7 @@ SV_IMPL_PERSIST1( SvxPageField, SvxFieldData ); SvxFieldData* __EXPORT SvxPageField::Clone() const { - return new SvxPageField; // leer + return new SvxPageField; // leer } int __EXPORT SvxPageField::operator==( const SvxFieldData& rCmp ) const @@ -500,7 +500,7 @@ SV_IMPL_PERSIST1( SvxPagesField, SvxFieldData ); SvxFieldData* __EXPORT SvxPagesField::Clone() const { - return new SvxPagesField; // leer + return new SvxPagesField; // leer } int __EXPORT SvxPagesField::operator==( const SvxFieldData& rCmp ) const @@ -520,7 +520,7 @@ SV_IMPL_PERSIST1( SvxTimeField, SvxFieldData ); SvxFieldData* __EXPORT SvxTimeField::Clone() const { - return new SvxTimeField; // leer + return new SvxTimeField; // leer } int __EXPORT SvxTimeField::operator==( const SvxFieldData& rCmp ) const @@ -545,7 +545,7 @@ SV_IMPL_PERSIST1( SvxFileField, SvxFieldData ); SvxFieldData* __EXPORT SvxFileField::Clone() const { - return new SvxFileField; // leer + return new SvxFileField; // leer } int __EXPORT SvxFileField::operator==( const SvxFieldData& rCmp ) const @@ -565,7 +565,7 @@ SV_IMPL_PERSIST1( SvxTableField, SvxFieldData ); SvxFieldData* __EXPORT SvxTableField::Clone() const { - return new SvxTableField; // leer + return new SvxTableField; // leer } int __EXPORT SvxTableField::operator==( const SvxFieldData& rCmp ) const @@ -582,7 +582,7 @@ void __EXPORT SvxTableField::Save( SvPersistStream & /*rStm*/ ) } //---------------------------------------------------------------------------- -// SvxExtTimeField +// SvxExtTimeField //---------------------------------------------------------------------------- SV_IMPL_PERSIST1( SvxExtTimeField, SvxFieldData ); @@ -722,7 +722,7 @@ MetaAction* SvxExtTimeField::createBeginComment() const } //---------------------------------------------------------------------------- -// SvxExtFileField +// SvxExtFileField //---------------------------------------------------------------------------- SV_IMPL_PERSIST1( SvxExtFileField, SvxFieldData ); @@ -869,7 +869,7 @@ XubString SvxExtFileField::GetFormatted() const } //---------------------------------------------------------------------------- -// SvxAuthorField +// SvxAuthorField //---------------------------------------------------------------------------- SV_IMPL_PERSIST1( SvxAuthorField, SvxFieldData ); @@ -884,7 +884,7 @@ SvxAuthorField::SvxAuthorField() //---------------------------------------------------------------------------- -SvxAuthorField::SvxAuthorField( const XubString& rFirstName, +SvxAuthorField::SvxAuthorField( const XubString& rFirstName, const XubString& rLastName, const XubString& rShortName, SvxAuthorType eT, SvxAuthorFormat eF ) @@ -989,7 +989,7 @@ XubString SvxAuthorField::GetFormatted() const static SvClassManager* pClassMgr=0; -SvClassManager& SvxFieldItem::GetClassManager() +SvClassManager& SvxFieldItem::GetClassManager() { if ( !pClassMgr ) { @@ -1013,7 +1013,7 @@ SV_IMPL_PERSIST1( SvxHeaderField, SvxFieldData ); SvxFieldData* __EXPORT SvxHeaderField::Clone() const { - return new SvxHeaderField; // leer + return new SvxHeaderField; // leer } int __EXPORT SvxHeaderField::operator==( const SvxFieldData& rCmp ) const @@ -1035,7 +1035,7 @@ SV_IMPL_PERSIST1( SvxFooterField, SvxFieldData ); SvxFieldData* __EXPORT SvxFooterField::Clone() const { - return new SvxFooterField; // leer + return new SvxFooterField; // leer } int __EXPORT SvxFooterField::operator==( const SvxFieldData& rCmp ) const @@ -1057,7 +1057,7 @@ SV_IMPL_PERSIST1( SvxDateTimeField, SvxFieldData ); SvxFieldData* __EXPORT SvxDateTimeField::Clone() const { - return new SvxDateTimeField; // leer + return new SvxDateTimeField; // leer } int __EXPORT SvxDateTimeField::operator==( const SvxFieldData& rCmp ) const diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index bc8c1a2b8930..ce0f053e9652 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,8 +98,8 @@ using namespace ::com::sun::star; // Konvertierung fuer UNO -#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) -#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) +#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) +#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) #define TWIP_TO_MM100_UNSIGNED(TWIP) ((((TWIP)*127L+36L)/72L)) #define MM100_TO_TWIP_UNSIGNED(MM100) ((((MM100)*72L+63L)/127L)) @@ -175,7 +175,7 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * -) const +) const { switch ( ePres ) { @@ -233,7 +233,7 @@ bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const switch( nMemberId ) { - case MID_SIZE_SIZE: rVal <<= aTmp; break; + case MID_SIZE_SIZE: rVal <<= aTmp; break; case MID_SIZE_WIDTH: rVal <<= aTmp.Width; break; case MID_SIZE_HEIGHT: rVal <<= aTmp.Height; break; default: DBG_ERROR("Wrong MemberId!"); return false; @@ -320,10 +320,10 @@ SfxPoolItem* SvxSizeItem::Clone( SfxItemPool* ) const SfxItemPresentation SvxSizeItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, XubString& rText, const IntlWrapper *pIntl -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -420,7 +420,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight, SfxPoolItem( nId ), nFirstLineOfst ( nOfset ), - nTxtLeft ( nTLeft ), + nTxtLeft ( nTLeft ), nLeftMargin ( nLeft ), nRightMargin ( nRight ), nPropFirstLineOfst( 100 ), @@ -438,7 +438,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const nMemberId &= ~CONVERT_TWIPS; switch( nMemberId ) { - // jetzt alles signed + // jetzt alles signed case MID_L_MARGIN: rVal <<= (sal_Int32)(bConvert ? TWIP_TO_MM100(nLeftMargin) : nLeftMargin); break; @@ -497,7 +497,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) break; case MID_R_MARGIN: - SetRight((sal_Int32) bConvert ? MM100_TO_TWIP(nVal) : nVal); + SetRight((sal_Int32) bConvert ? MM100_TO_TWIP(nVal) : nVal); break; case MID_L_REL_MARGIN: case MID_R_REL_MARGIN: @@ -514,12 +514,12 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) return false; } break; - case MID_FIRST_LINE_INDENT : + case MID_FIRST_LINE_INDENT : SetTxtFirstLineOfst((short)(bConvert ? MM100_TO_TWIP(nVal) : nVal)); break; case MID_FIRST_LINE_REL_INDENT: - SetPropTxtFirstLineOfst ( (USHORT)nVal ); + SetPropTxtFirstLineOfst ( (USHORT)nVal ); break; case MID_FIRST_AUTO: @@ -573,10 +573,10 @@ SfxPoolItem* SvxLRSpaceItem::Clone( SfxItemPool* ) const SfxItemPresentation SvxLRSpaceItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, XubString& rText, const IntlWrapper* pIntl -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -653,12 +653,12 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation // MT: BulletFI: Vor 501 wurde im Outliner das Bullet nicht auf der Position des // FI positioniert, deshalb muss in aelteren Dokumenten der FI auf 0 stehen. -#define BULLETLR_MARKER 0x599401FE +#define BULLETLR_MARKER 0x599401FE SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { short nSaveFI = nFirstLineOfst; - ((SvxLRSpaceItem*)this)->SetTxtFirstLineOfst( 0 ); // nLeftMargin wird mitmanipuliert, siehe Create() + ((SvxLRSpaceItem*)this)->SetTxtFirstLineOfst( 0 ); // nLeftMargin wird mitmanipuliert, siehe Create() sal_uInt16 nMargin = 0; if( nLeftMargin > 0 ) @@ -723,7 +723,7 @@ SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons { rStrm >> firstline; if ( firstline < 0 ) - left = left + static_cast<sal_uInt16>(firstline); // s.u.: txtleft = ... + left = left + static_cast<sal_uInt16>(firstline); // s.u.: txtleft = ... } else rStrm.Seek( nPos ); @@ -831,7 +831,7 @@ bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const nMemberId &= ~CONVERT_TWIPS; switch( nMemberId ) { - // jetzt alles signed + // jetzt alles signed case 0: { ::com::sun::star::frame::status::UpperLowerMarginScale aUpperLowerMarginScale; @@ -931,10 +931,10 @@ SfxPoolItem* SvxULSpaceItem::Clone( SfxItemPool* ) const SfxItemPresentation SvxULSpaceItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, XubString& rText, const IntlWrapper *pIntl -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -1073,7 +1073,7 @@ SfxItemPresentation SvxPrintItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -1130,7 +1130,7 @@ SfxItemPresentation SvxOpaqueItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -1175,7 +1175,7 @@ bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const sal_Bool bValue; switch(nMemberId) { - case MID_PROTECT_CONTENT : bValue = bCntnt; break; + case MID_PROTECT_CONTENT : bValue = bCntnt; break; case MID_PROTECT_SIZE : bValue = bSize; break; case MID_PROTECT_POSITION: bValue = bPos; break; default: @@ -1189,16 +1189,16 @@ bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const /*-----------------16.03.98 12:42------------------- --------------------------------------------------*/ -bool SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; sal_Bool bVal( Any2Bool(rVal) ); switch(nMemberId) { - case MID_PROTECT_CONTENT : bCntnt = bVal; break; - case MID_PROTECT_SIZE : bSize = bVal; break; - case MID_PROTECT_POSITION: bPos = bVal; break; + case MID_PROTECT_CONTENT : bCntnt = bVal; break; + case MID_PROTECT_SIZE : bSize = bVal; break; + case MID_PROTECT_POSITION: bPos = bVal; break; default: DBG_ERROR("falsche MemberId"); return false; @@ -1290,8 +1290,8 @@ SvxShadowItem::SvxShadowItem( const USHORT nId, const SvxShadowLocation eLoc ) : SfxEnumItemInterface( nId ), aShadowColor(COL_GRAY), - nWidth ( nW ), - eLocation ( eLoc ) + nWidth ( nW ), + eLocation ( eLoc ) { if ( pColor ) aShadowColor = *pColor; @@ -1443,10 +1443,10 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( sal_uInt16 nShadow ) const SfxItemPresentation SvxShadowItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, XubString& rText, const IntlWrapper *pIntl -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -1541,7 +1541,7 @@ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const sal_uInt16 SvxShadowItem::GetValueCount() const { - return SVX_SHADOW_END; // SVX_SHADOW_BOTTOMRIGHT + 1 + return SVX_SHADOW_END; // SVX_SHADOW_BOTTOMRIGHT + 1 } // ----------------------------------------------------------------------- @@ -1611,7 +1611,7 @@ void SvxBorderLine::ScaleMetrics( long nMult, long nDiv ) sal_Bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const { - return ( ( aColor == rCmp.GetColor() ) && + return ( ( aColor == rCmp.GetColor() ) && ( nInWidth == rCmp.GetInWidth() ) && ( nOutWidth == rCmp.GetOutWidth() ) && ( nDistance == rCmp.GetDistance() ) && @@ -1744,17 +1744,17 @@ bool SvxBorderLine::HasPriority( const SvxBorderLine& rOtherLine ) const SvxBoxItem::SvxBoxItem( const SvxBoxItem& rCpy ) : - SfxPoolItem ( rCpy ), - nTopDist ( rCpy.nTopDist ), - nBottomDist ( rCpy.nBottomDist ), - nLeftDist ( rCpy.nLeftDist ), - nRightDist ( rCpy.nRightDist ) + SfxPoolItem ( rCpy ), + nTopDist ( rCpy.nTopDist ), + nBottomDist ( rCpy.nBottomDist ), + nLeftDist ( rCpy.nLeftDist ), + nRightDist ( rCpy.nRightDist ) { - pTop = rCpy.GetTop() ? new SvxBorderLine( *rCpy.GetTop() ) : 0; - pBottom = rCpy.GetBottom() ? new SvxBorderLine( *rCpy.GetBottom() ) : 0; - pLeft = rCpy.GetLeft() ? new SvxBorderLine( *rCpy.GetLeft() ) : 0; - pRight = rCpy.GetRight() ? new SvxBorderLine( *rCpy.GetRight() ) : 0; + pTop = rCpy.GetTop() ? new SvxBorderLine( *rCpy.GetTop() ) : 0; + pBottom = rCpy.GetBottom() ? new SvxBorderLine( *rCpy.GetBottom() ) : 0; + pLeft = rCpy.GetLeft() ? new SvxBorderLine( *rCpy.GetLeft() ) : 0; + pRight = rCpy.GetRight() ? new SvxBorderLine( *rCpy.GetRight() ) : 0; } // ----------------------------------------------------------------------- @@ -1762,14 +1762,14 @@ SvxBoxItem::SvxBoxItem( const SvxBoxItem& rCpy ) : SvxBoxItem::SvxBoxItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), - pTop ( 0 ), - pBottom ( 0 ), - pLeft ( 0 ), - pRight ( 0 ), - nTopDist ( 0 ), - nBottomDist ( 0 ), - nLeftDist ( 0 ), - nRightDist ( 0 ) + pTop ( 0 ), + pBottom ( 0 ), + pLeft ( 0 ), + pRight ( 0 ), + nTopDist ( 0 ), + nBottomDist ( 0 ), + nLeftDist ( 0 ), + nRightDist ( 0 ) { } @@ -1821,13 +1821,13 @@ int SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); return ( - ( nTopDist == ( (SvxBoxItem&)rAttr ).nTopDist ) && - ( nBottomDist == ( (SvxBoxItem&)rAttr ).nBottomDist ) && - ( nLeftDist == ( (SvxBoxItem&)rAttr ).nLeftDist ) && - ( nRightDist == ( (SvxBoxItem&)rAttr ).nRightDist ) && - CmpBrdLn( pTop, ( (SvxBoxItem&)rAttr ).GetTop() ) && - CmpBrdLn( pBottom, ( (SvxBoxItem&)rAttr ).GetBottom() ) && - CmpBrdLn( pLeft, ( (SvxBoxItem&)rAttr ).GetLeft() ) && + ( nTopDist == ( (SvxBoxItem&)rAttr ).nTopDist ) && + ( nBottomDist == ( (SvxBoxItem&)rAttr ).nBottomDist ) && + ( nLeftDist == ( (SvxBoxItem&)rAttr ).nLeftDist ) && + ( nRightDist == ( (SvxBoxItem&)rAttr ).nRightDist ) && + CmpBrdLn( pTop, ( (SvxBoxItem&)rAttr ).GetTop() ) && + CmpBrdLn( pBottom, ( (SvxBoxItem&)rAttr ).GetBottom() ) && + CmpBrdLn( pLeft, ( (SvxBoxItem&)rAttr ).GetLeft() ) && CmpBrdLn( pRight, ( (SvxBoxItem&)rAttr ).GetRight() ) ); } @@ -1837,14 +1837,14 @@ table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Boo table::BorderLine2 aLine; if(pLine) { - aLine.Color = pLine->GetColor().GetColor() ; + aLine.Color = pLine->GetColor().GetColor() ; aLine.InnerLineWidth = sal_uInt16( bConvert ? TWIP_TO_MM100_UNSIGNED(pLine->GetInWidth() ): pLine->GetInWidth() ); aLine.OuterLineWidth = sal_uInt16( bConvert ? TWIP_TO_MM100_UNSIGNED(pLine->GetOutWidth()): pLine->GetOutWidth() ); aLine.LineDistance = sal_uInt16( bConvert ? TWIP_TO_MM100_UNSIGNED(pLine->GetDistance()): pLine->GetDistance() ); aLine.LineStyle = pLine->GetStyle( ); } else - aLine.Color = aLine.InnerLineWidth = aLine.OuterLineWidth = aLine.LineDistance = 0; + aLine.Color = aLine.InnerLineWidth = aLine.OuterLineWidth = aLine.LineDistance = 0; return aLine; } // ----------------------------------------------------------------------- @@ -1947,7 +1947,7 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_B rSvxLine.SetColor( Color(rLine.Color)); rSvxLine.SetInWidth( sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.InnerLineWidth) : rLine.InnerLineWidth )); rSvxLine.SetOutWidth( sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.OuterLineWidth) : rLine.OuterLineWidth )); - rSvxLine.SetDistance( sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.LineDistance ) : rLine.LineDistance )); + rSvxLine.SetDistance( sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.LineDistance ) : rLine.LineDistance )); sal_Bool bRet = rLine.InnerLineWidth > 0 || rLine.OuterLineWidth > 0; return bRet; @@ -2172,10 +2172,10 @@ SfxPoolItem* SvxBoxItem::Clone( SfxItemPool* ) const SfxItemPresentation SvxBoxItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, XubString& rText, const IntlWrapper *pIntl -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -2315,7 +2315,7 @@ SfxItemPresentation SvxBoxItem::GetPresentation SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { rStrm << (sal_uInt16) GetDistance(); - const SvxBorderLine* pLine[ 4 ]; // top, left, right, bottom + const SvxBorderLine* pLine[ 4 ]; // top, left, right, bottom pLine[ 0 ] = GetTop(); pLine[ 1 ] = GetLeft(); pLine[ 2 ] = GetRight(); @@ -2371,10 +2371,10 @@ sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const bool SvxBoxItem::ScaleMetrics( long nMult, long nDiv ) { - if ( pTop ) pTop->ScaleMetrics( nMult, nDiv ); - if ( pBottom ) pBottom->ScaleMetrics( nMult, nDiv ); - if ( pLeft ) pLeft->ScaleMetrics( nMult, nDiv ); - if ( pRight ) pBottom->ScaleMetrics( nMult, nDiv ); + if ( pTop ) pTop->ScaleMetrics( nMult, nDiv ); + if ( pBottom ) pBottom->ScaleMetrics( nMult, nDiv ); + if ( pLeft ) pLeft->ScaleMetrics( nMult, nDiv ); + if ( pRight ) pBottom->ScaleMetrics( nMult, nDiv ); nTopDist = (sal_uInt16)Scale( nTopDist, nMult, nDiv ); nBottomDist = (sal_uInt16)Scale( nBottomDist, nMult, nDiv ); nLeftDist = (sal_uInt16)Scale( nLeftDist, nMult, nDiv ); @@ -2595,8 +2595,8 @@ sal_uInt16 SvxBoxItem::CalcLineSpace( sal_uInt16 nLine, sal_Bool bIgnoreLine ) c SvxBoxInfoItem::SvxBoxInfoItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), - pHori ( 0 ), - pVert ( 0 ), + pHori ( 0 ), + pVert ( 0 ), mbEnableHor( false ), mbEnableVer( false ), nDefDist( 0 ) @@ -2612,12 +2612,12 @@ SvxBoxInfoItem::SvxBoxInfoItem( const SvxBoxInfoItem& rCpy ) : mbEnableHor( rCpy.mbEnableHor ), mbEnableVer( rCpy.mbEnableVer ) { - pHori = rCpy.GetHori() ? new SvxBorderLine( *rCpy.GetHori() ) : 0; - pVert = rCpy.GetVert() ? new SvxBorderLine( *rCpy.GetVert() ) : 0; - bDist = rCpy.IsDist(); - bMinDist = rCpy.IsMinDist(); + pHori = rCpy.GetHori() ? new SvxBorderLine( *rCpy.GetHori() ) : 0; + pVert = rCpy.GetVert() ? new SvxBorderLine( *rCpy.GetVert() ) : 0; + bDist = rCpy.IsDist(); + bMinDist = rCpy.IsMinDist(); nValidFlags = rCpy.nValidFlags; - nDefDist = rCpy.GetDefDist(); + nDefDist = rCpy.GetDefDist(); } // ----------------------------------------------------------------------- @@ -2634,14 +2634,14 @@ SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy ) { delete pHori; delete pVert; - pHori = rCpy.GetHori() ? new SvxBorderLine( *rCpy.GetHori() ) : 0; - pVert = rCpy.GetVert() ? new SvxBorderLine( *rCpy.GetVert() ) : 0; + pHori = rCpy.GetHori() ? new SvxBorderLine( *rCpy.GetHori() ) : 0; + pVert = rCpy.GetVert() ? new SvxBorderLine( *rCpy.GetVert() ) : 0; mbEnableHor = rCpy.mbEnableHor; mbEnableVer = rCpy.mbEnableVer; - bDist = rCpy.IsDist(); - bMinDist = rCpy.IsMinDist(); + bDist = rCpy.IsDist(); + bMinDist = rCpy.IsMinDist(); nValidFlags = rCpy.nValidFlags; - nDefDist = rCpy.GetDefDist(); + nDefDist = rCpy.GetDefDist(); return *this; } @@ -2655,10 +2655,10 @@ int SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const return ( mbEnableHor == rBoxInfo.mbEnableHor && mbEnableVer == rBoxInfo.mbEnableVer - && bDist == rBoxInfo.IsDist() - && bMinDist == rBoxInfo.IsMinDist() - && nValidFlags == rBoxInfo.nValidFlags - && nDefDist == rBoxInfo.GetDefDist() + && bDist == rBoxInfo.IsDist() + && bMinDist == rBoxInfo.IsMinDist() + && nValidFlags == rBoxInfo.nValidFlags + && nDefDist == rBoxInfo.GetDefDist() && CmpBrdLn( pHori, rBoxInfo.GetHori() ) && CmpBrdLn( pVert, rBoxInfo.GetVert() ) ); @@ -2831,7 +2831,7 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const void SvxBoxInfoItem::ResetFlags() { - nValidFlags = 0x7F; // alles g"ultig au/ser Disable + nValidFlags = 0x7F; // alles g"ultig au/ser Disable } bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const @@ -3139,12 +3139,12 @@ bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) SvxBreak eBreak = SVX_BREAK_NONE; switch( nBreak ) { - case style::BreakType_COLUMN_BEFORE: eBreak = SVX_BREAK_COLUMN_BEFORE; break; - case style::BreakType_COLUMN_AFTER: eBreak = SVX_BREAK_COLUMN_AFTER; break; - case style::BreakType_COLUMN_BOTH: eBreak = SVX_BREAK_COLUMN_BOTH; break; - case style::BreakType_PAGE_BEFORE: eBreak = SVX_BREAK_PAGE_BEFORE; break; - case style::BreakType_PAGE_AFTER: eBreak = SVX_BREAK_PAGE_AFTER; break; - case style::BreakType_PAGE_BOTH: eBreak = SVX_BREAK_PAGE_BOTH; break; + case style::BreakType_COLUMN_BEFORE: eBreak = SVX_BREAK_COLUMN_BEFORE; break; + case style::BreakType_COLUMN_AFTER: eBreak = SVX_BREAK_COLUMN_AFTER; break; + case style::BreakType_COLUMN_BOTH: eBreak = SVX_BREAK_COLUMN_BOTH; break; + case style::BreakType_PAGE_BEFORE: eBreak = SVX_BREAK_PAGE_BEFORE; break; + case style::BreakType_PAGE_AFTER: eBreak = SVX_BREAK_PAGE_AFTER; break; + case style::BreakType_PAGE_BOTH: eBreak = SVX_BREAK_PAGE_BOTH; break; default: ;//prevent warning } SetValue((sal_uInt16) eBreak); @@ -3196,7 +3196,7 @@ SfxPoolItem* SvxFmtBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) con sal_uInt16 SvxFmtBreakItem::GetValueCount() const { - return SVX_BREAK_END; // SVX_BREAK_PAGE_BOTH + 1 + return SVX_BREAK_END; // SVX_BREAK_PAGE_BOTH + 1 } // class SvxFmtKeepItem ------------------------------------------------- @@ -3260,7 +3260,7 @@ SfxItemPresentation SvxFmtKeepItem::GetPresentation SvxLineItem::SvxLineItem( const sal_uInt16 nId ) : - SfxPoolItem ( nId ), + SfxPoolItem ( nId ), pLine( NULL ) { @@ -3322,9 +3322,9 @@ bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const switch ( nMemId ) { case MID_FG_COLOR: rVal <<= sal_Int32(pLine->GetColor().GetColor()); break; - case MID_OUTER_WIDTH: rVal <<= sal_Int32(pLine->GetOutWidth()); break; - case MID_INNER_WIDTH: rVal <<= sal_Int32(pLine->GetInWidth( )); break; - case MID_DISTANCE: rVal <<= sal_Int32(pLine->GetDistance()); break; + case MID_OUTER_WIDTH: rVal <<= sal_Int32(pLine->GetOutWidth()); break; + case MID_INNER_WIDTH: rVal <<= sal_Int32(pLine->GetInWidth( )); break; + case MID_DISTANCE: rVal <<= sal_Int32(pLine->GetDistance()); break; default: DBG_ERROR( "Wrong MemberId" ); return false; @@ -3382,10 +3382,10 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId ) SfxItemPresentation SvxLineItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, XubString& rText, const IntlWrapper *pIntl -) const +) const { #ifndef SVX_LIGHT rText.Erase(); @@ -3444,8 +3444,8 @@ bool SvxLineItem::HasMetrics() const SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const { SvxLineItem* _pLine = new SvxLineItem( Which() ); - short nOutline, nInline, nDistance; - Color aColor; + short nOutline, nInline, nDistance; + Color aColor; rStrm >> aColor >> nOutline >> nInline >> nDistance; if( nOutline ) @@ -3470,20 +3470,20 @@ void SvxLineItem::SetLine( const SvxBorderLine* pNew ) // class SvxBrushItem ---------------------------------------------------- -#define LOAD_GRAPHIC ((sal_uInt16)0x0001) -#define LOAD_LINK ((sal_uInt16)0x0002) -#define LOAD_FILTER ((sal_uInt16)0x0004) +#define LOAD_GRAPHIC ((sal_uInt16)0x0001) +#define LOAD_LINK ((sal_uInt16)0x0002) +#define LOAD_FILTER ((sal_uInt16)0x0004) // class SvxBrushItem_Impl ----------------------------------------------- class SvxBrushItem_Impl { public: - GraphicObject* pGraphicObject; + GraphicObject* pGraphicObject; sal_Int8 nGraphicTransparency; //contains a percentage value which is //copied to the GraphicObject when necessary - Link aDoneLink; - SvStream* pStream; + Link aDoneLink; + SvStream* pStream; SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {} }; @@ -3501,12 +3501,12 @@ SvxBrushItem::SvxBrushItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ), - aColor ( COL_TRANSPARENT ), - pImpl ( new SvxBrushItem_Impl( 0 ) ), - pStrLink ( NULL ), - pStrFilter ( NULL ), - eGraphicPos ( GPOS_NONE ), - bLoadAgain ( sal_True ) + aColor ( COL_TRANSPARENT ), + pImpl ( new SvxBrushItem_Impl( 0 ) ), + pStrLink ( NULL ), + pStrFilter ( NULL ), + eGraphicPos ( GPOS_NONE ), + bLoadAgain ( sal_True ) { } @@ -3517,12 +3517,12 @@ SvxBrushItem::SvxBrushItem( const Color& rColor, sal_uInt16 _nWhich) : SfxPoolItem( _nWhich ), - aColor ( rColor ), - pImpl ( new SvxBrushItem_Impl( 0 ) ), - pStrLink ( NULL ), - pStrFilter ( NULL ), - eGraphicPos ( GPOS_NONE ), - bLoadAgain ( sal_True ) + aColor ( rColor ), + pImpl ( new SvxBrushItem_Impl( 0 ) ), + pStrLink ( NULL ), + pStrFilter ( NULL ), + eGraphicPos ( GPOS_NONE ), + bLoadAgain ( sal_True ) { } @@ -3534,12 +3534,12 @@ SvxBrushItem::SvxBrushItem( const Graphic& rGraphic, SvxGraphicPosition ePos, SfxPoolItem( _nWhich ), - aColor ( COL_TRANSPARENT ), - pImpl ( new SvxBrushItem_Impl( new GraphicObject( rGraphic ) ) ), - pStrLink ( NULL ), - pStrFilter ( NULL ), - eGraphicPos ( ( GPOS_NONE != ePos ) ? ePos : GPOS_MM ), - bLoadAgain ( sal_True ) + aColor ( COL_TRANSPARENT ), + pImpl ( new SvxBrushItem_Impl( new GraphicObject( rGraphic ) ) ), + pStrLink ( NULL ), + pStrFilter ( NULL ), + eGraphicPos ( ( GPOS_NONE != ePos ) ? ePos : GPOS_MM ), + bLoadAgain ( sal_True ) { DBG_ASSERT( GPOS_NONE != ePos, "SvxBrushItem-Ctor with GPOS_NONE == ePos" ); @@ -3552,12 +3552,12 @@ SvxBrushItem::SvxBrushItem( const GraphicObject& rGraphicObj, SfxPoolItem( _nWhich ), - aColor ( COL_TRANSPARENT ), - pImpl ( new SvxBrushItem_Impl( new GraphicObject( rGraphicObj ) ) ), - pStrLink ( NULL ), - pStrFilter ( NULL ), - eGraphicPos ( ( GPOS_NONE != ePos ) ? ePos : GPOS_MM ), - bLoadAgain ( sal_True ) + aColor ( COL_TRANSPARENT ), + pImpl ( new SvxBrushItem_Impl( new GraphicObject( rGraphicObj ) ) ), + pStrLink ( NULL ), + pStrFilter ( NULL ), + eGraphicPos ( ( GPOS_NONE != ePos ) ? ePos : GPOS_MM ), + bLoadAgain ( sal_True ) { DBG_ASSERT( GPOS_NONE != ePos, "SvxBrushItem-Ctor with GPOS_NONE == ePos" ); @@ -3571,12 +3571,12 @@ SvxBrushItem::SvxBrushItem( SfxPoolItem( _nWhich ), - aColor ( COL_TRANSPARENT ), - pImpl ( new SvxBrushItem_Impl( NULL ) ), - pStrLink ( new String( rLink ) ), - pStrFilter ( new String( rFilter ) ), - eGraphicPos ( ( GPOS_NONE != ePos ) ? ePos : GPOS_MM ), - bLoadAgain ( sal_True ) + aColor ( COL_TRANSPARENT ), + pImpl ( new SvxBrushItem_Impl( NULL ) ), + pStrLink ( new String( rLink ) ), + pStrFilter ( new String( rFilter ) ), + eGraphicPos ( ( GPOS_NONE != ePos ) ? ePos : GPOS_MM ), + bLoadAgain ( sal_True ) { DBG_ASSERT( GPOS_NONE != ePos, "SvxBrushItem-Ctor with GPOS_NONE == ePos" ); @@ -3589,11 +3589,11 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, SfxPoolItem( _nWhich ), - aColor ( COL_TRANSPARENT ), - pImpl ( new SvxBrushItem_Impl( NULL ) ), - pStrLink ( NULL ), - pStrFilter ( NULL ), - eGraphicPos ( GPOS_NONE ) + aColor ( COL_TRANSPARENT ), + pImpl ( new SvxBrushItem_Impl( NULL ) ), + pStrLink ( NULL ), + pStrFilter ( NULL ), + eGraphicPos ( GPOS_NONE ) { sal_Bool bTrans; @@ -3610,9 +3610,9 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, { case 8://BRUSH_25: { - sal_uInt32 nRed = aTempColor.GetRed(); - sal_uInt32 nGreen = aTempColor.GetGreen(); - sal_uInt32 nBlue = aTempColor.GetBlue(); + sal_uInt32 nRed = aTempColor.GetRed(); + sal_uInt32 nGreen = aTempColor.GetGreen(); + sal_uInt32 nBlue = aTempColor.GetBlue(); nRed += (sal_uInt32)(aTempFillColor.GetRed())*2; nGreen += (sal_uInt32)(aTempFillColor.GetGreen())*2; nBlue += (sal_uInt32)(aTempFillColor.GetBlue())*2; @@ -3622,9 +3622,9 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, case 9://BRUSH_50: { - sal_uInt32 nRed = aTempColor.GetRed(); - sal_uInt32 nGreen = aTempColor.GetGreen(); - sal_uInt32 nBlue = aTempColor.GetBlue(); + sal_uInt32 nRed = aTempColor.GetRed(); + sal_uInt32 nGreen = aTempColor.GetGreen(); + sal_uInt32 nBlue = aTempColor.GetBlue(); nRed += (sal_uInt32)(aTempFillColor.GetRed()); nGreen += (sal_uInt32)(aTempFillColor.GetGreen()); nBlue += (sal_uInt32)(aTempFillColor.GetBlue()); @@ -3634,9 +3634,9 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, case 10://BRUSH_75: { - sal_uInt32 nRed = aTempColor.GetRed()*2; - sal_uInt32 nGreen = aTempColor.GetGreen()*2; - sal_uInt32 nBlue = aTempColor.GetBlue()*2; + sal_uInt32 nRed = aTempColor.GetRed()*2; + sal_uInt32 nGreen = aTempColor.GetGreen()*2; + sal_uInt32 nBlue = aTempColor.GetBlue()*2; nRed += (sal_uInt32)(aTempFillColor.GetRed()); nGreen += (sal_uInt32)(aTempFillColor.GetGreen()); nBlue += (sal_uInt32)(aTempFillColor.GetBlue()); @@ -3706,11 +3706,11 @@ SvxBrushItem::SvxBrushItem( const SvxBrushItem& rItem ) : SfxPoolItem( rItem.Which() ), - pImpl ( new SvxBrushItem_Impl( NULL ) ), - pStrLink ( NULL ), - pStrFilter ( NULL ), - eGraphicPos ( GPOS_NONE ), - bLoadAgain ( sal_True ) + pImpl ( new SvxBrushItem_Impl( NULL ) ), + pStrLink ( NULL ), + pStrFilter ( NULL ), + eGraphicPos ( GPOS_NONE ), + bLoadAgain ( sal_True ) { *this = rItem; @@ -4111,7 +4111,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject() const if( pStrLink->Len() ) { // currently we don't have asynchronous processing -/* if( pImpl->aDoneLink.IsSet() ) +/* if( pImpl->aDoneLink.IsSet() ) { // Auf besonderen Wunsch des Writers wird der synchrone und der // asynchrone Fall was die Benachrichtigung angeht unterschiedlich @@ -4129,7 +4129,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject() const if( pImpl->pStream && !pImpl->pStream->GetError() ) { Graphic aGraphic; - int nRes; + int nRes; pImpl->pStream->Seek( STREAM_SEEK_TO_BEGIN ); nRes = GraphicFilter::GetGraphicFilter()-> ImportGraphic( aGraphic, *pStrLink, *pImpl->pStream, @@ -4152,7 +4152,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject() const } // currently we don't have asynchronous processing -// pThis->pImpl->aDoneLink.Call( pThis ); +// pThis->pImpl->aDoneLink.Call( pThis ); } } @@ -4323,7 +4323,7 @@ SvxBrushItem::SvxBrushItem( const CntWallpaperItem& rItem, sal_uInt16 _nWhich ) if( rItem.GetBitmapURL().Len() ) { - pStrLink = new String( rItem.GetBitmapURL() ); + pStrLink = new String( rItem.GetBitmapURL() ); SetGraphicPos( WallpaperStyle2GraphicPos((WallpaperStyle)rItem.GetStyle() ) ); } } @@ -4343,7 +4343,7 @@ CntWallpaperItem* SvxBrushItem::CreateCntWallpaperItem() const { DBG_ERRORFILE( "Don't know what to do with a graphic" ); } -// pItem->SetGraphic( *pImpl->pGraphic, bLink ); +// pItem->SetGraphic( *pImpl->pGraphic, bLink ); return pItem; } diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx index 2488ce72a92b..6a8ee03e3860 100644 --- a/editeng/source/items/itemtype.cxx +++ b/editeng/source/items/itemtype.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index f02718f8bc3b..31907ecca4cf 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -101,10 +101,10 @@ bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const switch ( (SvxCellHorJustify)GetValue() ) { case SVX_HOR_JUSTIFY_STANDARD: eUno = table::CellHoriJustify_STANDARD; break; - case SVX_HOR_JUSTIFY_LEFT: eUno = table::CellHoriJustify_LEFT; break; + case SVX_HOR_JUSTIFY_LEFT: eUno = table::CellHoriJustify_LEFT; break; case SVX_HOR_JUSTIFY_CENTER: eUno = table::CellHoriJustify_CENTER; break; - case SVX_HOR_JUSTIFY_RIGHT: eUno = table::CellHoriJustify_RIGHT; break; - case SVX_HOR_JUSTIFY_BLOCK: eUno = table::CellHoriJustify_BLOCK; break; + case SVX_HOR_JUSTIFY_RIGHT: eUno = table::CellHoriJustify_RIGHT; break; + case SVX_HOR_JUSTIFY_BLOCK: eUno = table::CellHoriJustify_BLOCK; break; case SVX_HOR_JUSTIFY_REPEAT: eUno = table::CellHoriJustify_REPEAT; break; } rVal <<= eUno; @@ -112,8 +112,8 @@ bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; case MID_HORJUST_ADJUST: { - // ParagraphAdjust values, as in SvxAdjustItem - // (same value for ParaAdjust and ParaLastLineAdjust) + // ParagraphAdjust values, as in SvxAdjustItem + // (same value for ParaAdjust and ParaLastLineAdjust) sal_Int16 nAdjust = style::ParagraphAdjust_LEFT; switch ( (SvxCellHorJustify)GetValue() ) @@ -121,12 +121,12 @@ bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const // ParagraphAdjust_LEFT is used for STANDARD and REPEAT case SVX_HOR_JUSTIFY_STANDARD: case SVX_HOR_JUSTIFY_REPEAT: - case SVX_HOR_JUSTIFY_LEFT: nAdjust = style::ParagraphAdjust_LEFT; break; + case SVX_HOR_JUSTIFY_LEFT: nAdjust = style::ParagraphAdjust_LEFT; break; case SVX_HOR_JUSTIFY_CENTER: nAdjust = style::ParagraphAdjust_CENTER; break; - case SVX_HOR_JUSTIFY_RIGHT: nAdjust = style::ParagraphAdjust_RIGHT; break; - case SVX_HOR_JUSTIFY_BLOCK: nAdjust = style::ParagraphAdjust_BLOCK; break; + case SVX_HOR_JUSTIFY_RIGHT: nAdjust = style::ParagraphAdjust_RIGHT; break; + case SVX_HOR_JUSTIFY_BLOCK: nAdjust = style::ParagraphAdjust_BLOCK; break; } - rVal <<= nAdjust; // as sal_Int16 + rVal <<= nAdjust; // as sal_Int16 } break; } @@ -152,10 +152,10 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) switch (eUno) { case table::CellHoriJustify_STANDARD: eSvx = SVX_HOR_JUSTIFY_STANDARD; break; - case table::CellHoriJustify_LEFT: eSvx = SVX_HOR_JUSTIFY_LEFT; break; + case table::CellHoriJustify_LEFT: eSvx = SVX_HOR_JUSTIFY_LEFT; break; case table::CellHoriJustify_CENTER: eSvx = SVX_HOR_JUSTIFY_CENTER; break; - case table::CellHoriJustify_RIGHT: eSvx = SVX_HOR_JUSTIFY_RIGHT; break; - case table::CellHoriJustify_BLOCK: eSvx = SVX_HOR_JUSTIFY_BLOCK; break; + case table::CellHoriJustify_RIGHT: eSvx = SVX_HOR_JUSTIFY_RIGHT; break; + case table::CellHoriJustify_BLOCK: eSvx = SVX_HOR_JUSTIFY_BLOCK; break; case table::CellHoriJustify_REPEAT: eSvx = SVX_HOR_JUSTIFY_REPEAT; break; default: ; //prevent warning } @@ -164,7 +164,7 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) break; case MID_HORJUST_ADJUST: { - // property contains ParagraphAdjust values as sal_Int16 + // property contains ParagraphAdjust values as sal_Int16 sal_Int16 nVal = sal_Int16(); if(!(rVal >>= nVal)) return false; @@ -172,7 +172,7 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) SvxCellHorJustify eSvx = SVX_HOR_JUSTIFY_STANDARD; switch (nVal) { - // STRETCH is treated as BLOCK + // STRETCH is treated as BLOCK case style::ParagraphAdjust_LEFT: eSvx = SVX_HOR_JUSTIFY_LEFT; break; case style::ParagraphAdjust_RIGHT: eSvx = SVX_HOR_JUSTIFY_RIGHT; break; case style::ParagraphAdjust_STRETCH: @@ -212,7 +212,7 @@ SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, USHORT ) const USHORT SvxHorJustifyItem::GetValueCount() const { - return SVX_HOR_JUSTIFY_REPEAT + 1; // letzter Enum-Wert + 1 + return SVX_HOR_JUSTIFY_REPEAT + 1; // letzter Enum-Wert + 1 } // class SvxVerJustifyItem ----------------------------------------------- @@ -264,9 +264,9 @@ bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const style::VerticalAlignment eUno = style::VerticalAlignment_TOP; switch ( (SvxCellVerJustify)GetValue() ) { - case SVX_VER_JUSTIFY_TOP: eUno = style::VerticalAlignment_TOP; break; - case SVX_VER_JUSTIFY_CENTER: eUno = style::VerticalAlignment_MIDDLE; break; - case SVX_VER_JUSTIFY_BOTTOM: eUno = style::VerticalAlignment_BOTTOM; break; + case SVX_VER_JUSTIFY_TOP: eUno = style::VerticalAlignment_TOP; break; + case SVX_VER_JUSTIFY_CENTER: eUno = style::VerticalAlignment_MIDDLE; break; + case SVX_VER_JUSTIFY_BOTTOM: eUno = style::VerticalAlignment_BOTTOM; break; default: ; //prevent warning } rVal <<= eUno; @@ -298,7 +298,7 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) { case MID_HORJUST_ADJUST: { - // property contains ParagraphAdjust values as sal_Int16 + // property contains ParagraphAdjust values as sal_Int16 style::VerticalAlignment nVal = style::VerticalAlignment_TOP; if(!(rVal >>= nVal)) return false; @@ -368,7 +368,7 @@ SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, USHORT ) const USHORT SvxVerJustifyItem::GetValueCount() const { - return SVX_VER_JUSTIFY_BOTTOM + 1; // letzter Enum-Wert + 1 + return SVX_VER_JUSTIFY_BOTTOM + 1; // letzter Enum-Wert + 1 } @@ -473,7 +473,7 @@ SfxPoolItem* SvxJustifyMethodItem::Create( SvStream& rStream, USHORT ) const USHORT SvxJustifyMethodItem::GetValueCount() const { - return SVX_JUSTIFY_METHOD_DISTRIBUTE + 1; // letzter Enum-Wert + 1 + return SVX_JUSTIFY_METHOD_DISTRIBUTE + 1; // letzter Enum-Wert + 1 } SvxJustifyMethodItem& SvxJustifyMethodItem::operator=(const SvxJustifyMethodItem& r) diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index a492c94bdc04..341907242dd8 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,10 +52,10 @@ #include <editeng/unonrule.hxx> -#define MM100_TO_TWIP(MM100) ((MM100*72L+63L)/127L) +#define MM100_TO_TWIP(MM100) ((MM100*72L+63L)/127L) -#define DEF_WRITER_LSPACE 500 //Standardeinrueckung -#define DEF_DRAW_LSPACE 800 //Standardeinrueckung +#define DEF_WRITER_LSPACE 500 //Standardeinrueckung +#define DEF_DRAW_LSPACE 800 //Standardeinrueckung #define NUMITEM_VERSION_01 0x01 #define NUMITEM_VERSION_02 0x02 @@ -76,7 +76,7 @@ void lcl_getFormatter(com::sun::star::uno::Reference<com::sun::star::text::XNumb if(!_xFormatter.is()) { try - { + { Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); Reference < XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) ); @@ -117,7 +117,7 @@ String SvxNumberType::GetNumStr( ULONG nNo ) const return GetNumStr( nNo, aLocale ); } -String SvxNumberType::GetNumStr( ULONG nNo, const Locale& rLocale ) const +String SvxNumberType::GetNumStr( ULONG nNo, const Locale& rLocale ) const { lcl_getFormatter(xFormatter); String aTmpStr; @@ -287,7 +287,7 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream) } } } - + if( NUMITEM_VERSION_04 <= nVersion ) { rStream >> nUSHORT; @@ -297,11 +297,11 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream) long nLong; rStream >> nLong; mnListtabPos = nLong; - rStream >> nLong; + rStream >> nLong; mnFirstLineIndent = nLong; rStream >> nLong; mnIndentAt = nLong; - } + } } SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverter) @@ -377,24 +377,24 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat ) { SetNumberingType(rFormat.GetNumberingType()); - eNumAdjust = rFormat.eNumAdjust ; - nInclUpperLevels = rFormat.nInclUpperLevels ; - nStart = rFormat.nStart ; - cBullet = rFormat.cBullet ; + eNumAdjust = rFormat.eNumAdjust ; + nInclUpperLevels = rFormat.nInclUpperLevels ; + nStart = rFormat.nStart ; + cBullet = rFormat.cBullet ; mePositionAndSpaceMode = rFormat.mePositionAndSpaceMode; - nFirstLineOffset = rFormat.nFirstLineOffset; - nAbsLSpace = rFormat.nAbsLSpace ; + nFirstLineOffset = rFormat.nFirstLineOffset; + nAbsLSpace = rFormat.nAbsLSpace ; nLSpace = rFormat.nLSpace ; - nCharTextDistance = rFormat.nCharTextDistance ; + nCharTextDistance = rFormat.nCharTextDistance ; meLabelFollowedBy = rFormat.meLabelFollowedBy; mnListtabPos = rFormat.mnListtabPos; mnFirstLineIndent = rFormat.mnFirstLineIndent; mnIndentAt = rFormat.mnIndentAt; eVertOrient = rFormat.eVertOrient ; - sPrefix = rFormat.sPrefix ; + sPrefix = rFormat.sPrefix ; sSuffix = rFormat.sSuffix ; - aGraphicSize = rFormat.aGraphicSize ; - nBulletColor = rFormat.nBulletColor ; + aGraphicSize = rFormat.aGraphicSize ; + nBulletColor = rFormat.nBulletColor ; nBulletRelSize = rFormat.nBulletRelSize; SetShowSymbol(rFormat.IsShowSymbol()); sCharStyleName = rFormat.sCharStyleName; @@ -413,33 +413,33 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat ) BOOL SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const { if( GetNumberingType() != rFormat.GetNumberingType() || - eNumAdjust != rFormat.eNumAdjust || - nInclUpperLevels != rFormat.nInclUpperLevels || - nStart != rFormat.nStart || - cBullet != rFormat.cBullet || + eNumAdjust != rFormat.eNumAdjust || + nInclUpperLevels != rFormat.nInclUpperLevels || + nStart != rFormat.nStart || + cBullet != rFormat.cBullet || mePositionAndSpaceMode != rFormat.mePositionAndSpaceMode || - nFirstLineOffset != rFormat.nFirstLineOffset || - nAbsLSpace != rFormat.nAbsLSpace || + nFirstLineOffset != rFormat.nFirstLineOffset || + nAbsLSpace != rFormat.nAbsLSpace || nLSpace != rFormat.nLSpace || - nCharTextDistance != rFormat.nCharTextDistance || + nCharTextDistance != rFormat.nCharTextDistance || meLabelFollowedBy != rFormat.meLabelFollowedBy || mnListtabPos != rFormat.mnListtabPos || mnFirstLineIndent != rFormat.mnFirstLineIndent || mnIndentAt != rFormat.mnIndentAt || - eVertOrient != rFormat.eVertOrient || - sPrefix != rFormat.sPrefix || + eVertOrient != rFormat.eVertOrient || + sPrefix != rFormat.sPrefix || sSuffix != rFormat.sSuffix || - aGraphicSize != rFormat.aGraphicSize || - nBulletColor != rFormat.nBulletColor || + aGraphicSize != rFormat.aGraphicSize || + nBulletColor != rFormat.nBulletColor || nBulletRelSize != rFormat.nBulletRelSize || - IsShowSymbol() != rFormat.IsShowSymbol() || + IsShowSymbol() != rFormat.IsShowSymbol() || sCharStyleName != rFormat.sCharStyleName ) return FALSE; if ( (pGraphicBrush && !rFormat.pGraphicBrush) || (!pGraphicBrush && rFormat.pGraphicBrush) || - (pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush) + (pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush) ) { return FALSE; @@ -614,12 +614,12 @@ Size SvxNumberFormat::GetGraphicSizeMM100(const Graphic* pGraphic) String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper ) { - nNo %= 4000; // mehr kann nicht dargestellt werden -// i, ii, iii, iv, v, vi, vii, vii, viii, ix -// (Dummy),1000,500,100,50,10,5,1 + nNo %= 4000; // mehr kann nicht dargestellt werden +// i, ii, iii, iv, v, vi, vii, vii, viii, ix +// (Dummy),1000,500,100,50,10,5,1 const char *cRomanArr = bUpper - ? "MDCLXVI--" // +2 Dummy-Eintraege !! - : "mdclxvi--"; // +2 Dummy-Eintraege !! + ? "MDCLXVI--" // +2 Dummy-Eintraege !! + : "mdclxvi--"; // +2 Dummy-Eintraege !! String sRet; USHORT nMask = 1000; @@ -638,21 +638,21 @@ String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper ) } switch( nZahl ) { - case 3: { sRet += sal_Unicode(*cRomanArr); } - case 2: { sRet += sal_Unicode(*cRomanArr); } - case 1: { sRet += sal_Unicode(*cRomanArr); } + case 3: { sRet += sal_Unicode(*cRomanArr); } + case 2: { sRet += sal_Unicode(*cRomanArr); } + case 1: { sRet += sal_Unicode(*cRomanArr); } break; - case 4: { + case 4: { sRet += sal_Unicode(*cRomanArr); sRet += sal_Unicode(*(cRomanArr-nDiff)); } break; - case 5: { sRet += sal_Unicode(*(cRomanArr-nDiff)); } + case 5: { sRet += sal_Unicode(*(cRomanArr-nDiff)); } break; } - nMask /= 10; // zur naechsten Dekade + nMask /= 10; // zur naechsten Dekade cRomanArr += 2; } return sRet; @@ -692,14 +692,14 @@ void SvxNumberFormat::GetCharStrN( ULONG nNo, String& rStr ) const } #endif //OLD_NUMBER_FORMATTING -const String& SvxNumberFormat::GetCharFmtName()const +const String& SvxNumberFormat::GetCharFmtName()const { return sCharStyleName; } sal_Int32 SvxNumRule::nRefCount = 0; -static SvxNumberFormat* pStdNumFmt = 0; -static SvxNumberFormat* pStdOutlineNumFmt = 0; +static SvxNumberFormat* pStdNumFmt = 0; +static SvxNumberFormat* pStdOutlineNumFmt = 0; SvxNumRule::SvxNumRule( ULONG nFeatures, USHORT nLevels, BOOL bCont, @@ -760,11 +760,11 @@ SvxNumRule::SvxNumRule( ULONG nFeatures, SvxNumRule::SvxNumRule(const SvxNumRule& rCopy) { ++nRefCount; - aLocale = rCopy.aLocale; + aLocale = rCopy.aLocale; nLevelCount = rCopy.nLevelCount ; nFeatureFlags = rCopy.nFeatureFlags ; bContinuousNumbering = rCopy.bContinuousNumbering; - eNumberingType = rCopy.eNumberingType; + eNumberingType = rCopy.eNumberingType; memset( aFmts, 0, sizeof( aFmts )); for(USHORT i = 0; i < SVX_MAX_NUM; i++) { @@ -898,7 +898,7 @@ int SvxNumRule::operator==( const SvxNumRule& rCopy) const return TRUE; } -const SvxNumberFormat* SvxNumRule::Get(USHORT nLevel)const +const SvxNumberFormat* SvxNumRule::Get(USHORT nLevel)const { DBG_ASSERT(nLevel < SVX_MAX_NUM, "falsches Level" ); if( nLevel < SVX_MAX_NUM ) @@ -907,7 +907,7 @@ const SvxNumberFormat* SvxNumRule::Get(USHORT nLevel)const return 0; } -const SvxNumberFormat& SvxNumRule::GetLevel(USHORT nLevel)const +const SvxNumberFormat& SvxNumRule::GetLevel(USHORT nLevel)const { if(!pStdNumFmt) { @@ -952,7 +952,7 @@ void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt) } } -String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) const +String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) const { String aStr; if( SVX_NO_NUM > rNum.GetLevel() && !( SVX_NO_NUMLEVEL & rNum.GetLevel() ) ) @@ -963,7 +963,7 @@ String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) c BYTE i = rNum.GetLevel(); if( !IsContinuousNumbering() && - 1 < rMyNFmt.GetIncludeUpperLevels() ) // nur der eigene Level ? + 1 < rMyNFmt.GetIncludeUpperLevels() ) // nur der eigene Level ? { BYTE n = rMyNFmt.GetIncludeUpperLevels(); if( 1 < n ) @@ -995,7 +995,7 @@ String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) c bDot = sal_False; } else - aStr += sal_Unicode('0'); // alle 0-Level sind eine 0 + aStr += sal_Unicode('0'); // alle 0-Level sind eine 0 if( i != rNum.GetLevel() && bDot) aStr += sal_Unicode('.'); } diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index 260191080088..82df688afdb2 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,12 +73,12 @@ SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) : SfxItemPresentation SfxSpellCheckItem::GetPresentation ( - SfxItemPresentation ePres, - SfxMapUnit , - SfxMapUnit , - String& rText, + SfxItemPresentation ePres, + SfxMapUnit , + SfxMapUnit , + String& rText, const IntlWrapper* -) const +) const { switch ( ePres ) { @@ -124,10 +124,10 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const sal_uInt16 nId ) : SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) : - SfxPoolItem ( rItem ), + SfxPoolItem ( rItem ), - nMinLead ( rItem.GetMinLead() ), - nMinTrail ( rItem.GetMinTrail() ) + nMinLead ( rItem.GetMinLead() ), + nMinTrail ( rItem.GetMinTrail() ) { } @@ -153,11 +153,11 @@ SfxPoolItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const SfxItemPresentation SfxHyphenRegionItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit , - SfxMapUnit , - String& rText, + SfxMapUnit , + SfxMapUnit , + String& rText, const IntlWrapper* -) const +) const { switch ( ePres ) { diff --git a/editeng/source/items/page.src b/editeng/source/items/page.src index 9fe7f3013ce6..9a39dc85e680 100644 --- a/editeng/source/items/page.src +++ b/editeng/source/items/page.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx index a83040f72049..280bd7650bff 100644 --- a/editeng/source/items/paperinf.cxx +++ b/editeng/source/items/paperinf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include <editeng/eerdll.hxx> /*-------------------------------------------------------------------- - Beschreibung: Ist der Printer gueltig + Beschreibung: Ist der Printer gueltig --------------------------------------------------------------------*/ inline BOOL IsValidPrinter( const Printer* pPtr ) @@ -58,7 +58,7 @@ Size SvxPaperInfo::GetPaperSize( Paper ePaper, MapUnit eUnit ) } /*------------------------------------------------------------------------ - Beschreibung: Papiergroesse der Druckers liefern, aligned auf + Beschreibung: Papiergroesse der Druckers liefern, aligned auf die eigenen Groessen. Falls kein Printer im System eingestellt ist, wird DIN A4 Portrait als Defaultpapiergroesse geliefert. @@ -130,53 +130,53 @@ Size SvxPaperInfo::GetDefaultPaperSize( MapUnit eUnit ) } /*------------------------------------------------------------------------ - Beschreibung: String Repr"asentation f"ur die SV-Defines f"ur + Beschreibung: String Repr"asentation f"ur die SV-Defines f"ur Papiergroessen. ------------------------------------------------------------------------*/ String SvxPaperInfo::GetName( Paper ePaper ) { - USHORT nResId = 0; + USHORT nResId = 0; switch ( ePaper ) { - case PAPER_A0: nResId = RID_SVXSTR_PAPER_A0; break; - case PAPER_A1: nResId = RID_SVXSTR_PAPER_A1; break; - case PAPER_A2: nResId = RID_SVXSTR_PAPER_A2; break; - case PAPER_A3: nResId = RID_SVXSTR_PAPER_A3; break; - case PAPER_A4: nResId = RID_SVXSTR_PAPER_A4; break; - case PAPER_A5: nResId = RID_SVXSTR_PAPER_A5; break; - case PAPER_B4_ISO: nResId = RID_SVXSTR_PAPER_B4_ISO; break; - case PAPER_B5_ISO: nResId = RID_SVXSTR_PAPER_B5_ISO; break; - case PAPER_LETTER: nResId = RID_SVXSTR_PAPER_LETTER; break; - case PAPER_LEGAL: nResId = RID_SVXSTR_PAPER_LEGAL; break; - case PAPER_TABLOID: nResId = RID_SVXSTR_PAPER_TABLOID; break; - case PAPER_USER: nResId = RID_SVXSTR_PAPER_USER; break; - case PAPER_B6_ISO: nResId = RID_SVXSTR_PAPER_B6_ISO; break; - case PAPER_ENV_C4: nResId = RID_SVXSTR_PAPER_C4; break; - case PAPER_ENV_C5: nResId = RID_SVXSTR_PAPER_C5; break; - case PAPER_ENV_C6: nResId = RID_SVXSTR_PAPER_C6; break; - case PAPER_ENV_C65: nResId = RID_SVXSTR_PAPER_C65; break; - case PAPER_ENV_DL: nResId = RID_SVXSTR_PAPER_DL; break; - case PAPER_SLIDE_DIA: nResId = RID_SVXSTR_PAPER_DIA; break; - case PAPER_SCREEN: nResId = RID_SVXSTR_PAPER_SCREEN; break; - case PAPER_C: nResId = RID_SVXSTR_PAPER_C; break; - case PAPER_D: nResId = RID_SVXSTR_PAPER_D; break; - case PAPER_E: nResId = RID_SVXSTR_PAPER_E; break; - case PAPER_EXECUTIVE: nResId = RID_SVXSTR_PAPER_EXECUTIVE;break; - case PAPER_FANFOLD_LEGAL_DE: nResId = RID_SVXSTR_PAPER_LEGAL2; break; - case PAPER_ENV_MONARCH: nResId = RID_SVXSTR_PAPER_MONARCH; break; - case PAPER_ENV_PERSONAL: nResId = RID_SVXSTR_PAPER_COM675; break; - case PAPER_ENV_9: nResId = RID_SVXSTR_PAPER_COM9; break; - case PAPER_ENV_10: nResId = RID_SVXSTR_PAPER_COM10; break; - case PAPER_ENV_11: nResId = RID_SVXSTR_PAPER_COM11; break; - case PAPER_ENV_12: nResId = RID_SVXSTR_PAPER_COM12; break; - case PAPER_KAI16: nResId = RID_SVXSTR_PAPER_KAI16; break; - case PAPER_KAI32: nResId = RID_SVXSTR_PAPER_KAI32; break; - case PAPER_KAI32BIG: nResId = RID_SVXSTR_PAPER_KAI32BIG; break; - case PAPER_B4_JIS: nResId = RID_SVXSTR_PAPER_B4_JIS; break; - case PAPER_B5_JIS: nResId = RID_SVXSTR_PAPER_B5_JIS; break; - case PAPER_B6_JIS: nResId = RID_SVXSTR_PAPER_B6_JIS; break; + case PAPER_A0: nResId = RID_SVXSTR_PAPER_A0; break; + case PAPER_A1: nResId = RID_SVXSTR_PAPER_A1; break; + case PAPER_A2: nResId = RID_SVXSTR_PAPER_A2; break; + case PAPER_A3: nResId = RID_SVXSTR_PAPER_A3; break; + case PAPER_A4: nResId = RID_SVXSTR_PAPER_A4; break; + case PAPER_A5: nResId = RID_SVXSTR_PAPER_A5; break; + case PAPER_B4_ISO: nResId = RID_SVXSTR_PAPER_B4_ISO; break; + case PAPER_B5_ISO: nResId = RID_SVXSTR_PAPER_B5_ISO; break; + case PAPER_LETTER: nResId = RID_SVXSTR_PAPER_LETTER; break; + case PAPER_LEGAL: nResId = RID_SVXSTR_PAPER_LEGAL; break; + case PAPER_TABLOID: nResId = RID_SVXSTR_PAPER_TABLOID; break; + case PAPER_USER: nResId = RID_SVXSTR_PAPER_USER; break; + case PAPER_B6_ISO: nResId = RID_SVXSTR_PAPER_B6_ISO; break; + case PAPER_ENV_C4: nResId = RID_SVXSTR_PAPER_C4; break; + case PAPER_ENV_C5: nResId = RID_SVXSTR_PAPER_C5; break; + case PAPER_ENV_C6: nResId = RID_SVXSTR_PAPER_C6; break; + case PAPER_ENV_C65: nResId = RID_SVXSTR_PAPER_C65; break; + case PAPER_ENV_DL: nResId = RID_SVXSTR_PAPER_DL; break; + case PAPER_SLIDE_DIA: nResId = RID_SVXSTR_PAPER_DIA; break; + case PAPER_SCREEN: nResId = RID_SVXSTR_PAPER_SCREEN; break; + case PAPER_C: nResId = RID_SVXSTR_PAPER_C; break; + case PAPER_D: nResId = RID_SVXSTR_PAPER_D; break; + case PAPER_E: nResId = RID_SVXSTR_PAPER_E; break; + case PAPER_EXECUTIVE: nResId = RID_SVXSTR_PAPER_EXECUTIVE;break; + case PAPER_FANFOLD_LEGAL_DE: nResId = RID_SVXSTR_PAPER_LEGAL2; break; + case PAPER_ENV_MONARCH: nResId = RID_SVXSTR_PAPER_MONARCH; break; + case PAPER_ENV_PERSONAL: nResId = RID_SVXSTR_PAPER_COM675; break; + case PAPER_ENV_9: nResId = RID_SVXSTR_PAPER_COM9; break; + case PAPER_ENV_10: nResId = RID_SVXSTR_PAPER_COM10; break; + case PAPER_ENV_11: nResId = RID_SVXSTR_PAPER_COM11; break; + case PAPER_ENV_12: nResId = RID_SVXSTR_PAPER_COM12; break; + case PAPER_KAI16: nResId = RID_SVXSTR_PAPER_KAI16; break; + case PAPER_KAI32: nResId = RID_SVXSTR_PAPER_KAI32; break; + case PAPER_KAI32BIG: nResId = RID_SVXSTR_PAPER_KAI32BIG; break; + case PAPER_B4_JIS: nResId = RID_SVXSTR_PAPER_B4_JIS; break; + case PAPER_B5_JIS: nResId = RID_SVXSTR_PAPER_B5_JIS; break; + case PAPER_B6_JIS: nResId = RID_SVXSTR_PAPER_B6_JIS; break; default: DBG_ERRORFILE( "unknown papersize" ); } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 27b3629f5d39..a89a7a62c7b4 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ using namespace ::rtl; using namespace ::com::sun::star; // Konvertierung fuer UNO -#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) +#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) #define TWIP_TO_MM100_UNSIGNED(TWIP) ((((TWIP)*127L+36L)/72L)) #define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) #define MM100_TO_TWIP_UNSIGNED(MM100) ((((MM100)*72L+63L)/127L)) @@ -271,7 +271,7 @@ SfxItemPresentation SvxLineSpacingItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * -) const +) const { #ifdef DBG_UTIL rText.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "SvxLineSpacingItem" )); @@ -285,10 +285,10 @@ SfxItemPresentation SvxLineSpacingItem::GetPresentation SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const { - sal_Int8 nPropSpace; - short nInterSpace; - sal_uInt16 nHeight; - sal_Int8 nRule, nInterRule; + sal_Int8 nPropSpace; + short nInterSpace; + sal_uInt16 nHeight; + sal_Int8 nRule, nInterRule; rStrm >> nPropSpace >> nInterSpace @@ -320,7 +320,7 @@ SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion* sal_uInt16 SvxLineSpacingItem::GetValueCount() const { - return SVX_LINESPACE_END; // SVX_LINESPACE_TWO_LINES + 1 + return SVX_LINESPACE_END; // SVX_LINESPACE_TWO_LINES + 1 } // ----------------------------------------------------------------------- @@ -331,10 +331,10 @@ XubString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const XubString aText; switch ( nPos ) { - case SVX_LINESPACE_USER : aText.AppendAscii( "Benutzer" ); break; - case SVX_LINESPACE_ONE_LINE : aText.AppendAscii( "Einzeilig" ); break; - case SVX_LINESPACE_ONE_POINT_FIVE_LINES : aText.AppendAscii( "1,5zeilig" ); break; - case SVX_LINESPACE_TWO_LINES : aText.AppendAscii( "Zweizeilig" ); break; + case SVX_LINESPACE_USER : aText.AppendAscii( "Benutzer" ); break; + case SVX_LINESPACE_ONE_LINE : aText.AppendAscii( "Einzeilig" ); break; + case SVX_LINESPACE_ONE_POINT_FIVE_LINES : aText.AppendAscii( "1,5zeilig" ); break; + case SVX_LINESPACE_TWO_LINES : aText.AppendAscii( "Zweizeilig" ); break; } return aText; } @@ -346,10 +346,10 @@ sal_uInt16 SvxLineSpacingItem::GetEnumValue() const sal_uInt16 nVal; switch ( nPropLineSpace ) { - case 100: nVal = SVX_LINESPACE_ONE_LINE; break; - case 150: nVal = SVX_LINESPACE_ONE_POINT_FIVE_LINES; break; - case 200: nVal = SVX_LINESPACE_TWO_LINES; break; - default: nVal = SVX_LINESPACE_USER; break; + case 100: nVal = SVX_LINESPACE_ONE_LINE; break; + case 150: nVal = SVX_LINESPACE_ONE_POINT_FIVE_LINES; break; + case 200: nVal = SVX_LINESPACE_TWO_LINES; break; + default: nVal = SVX_LINESPACE_USER; break; } return nVal; } @@ -360,9 +360,9 @@ void SvxLineSpacingItem::SetEnumValue( sal_uInt16 nVal ) { switch ( nVal ) { - case SVX_LINESPACE_ONE_LINE: nPropLineSpace = 100; break; + case SVX_LINESPACE_ONE_LINE: nPropLineSpace = 100; break; case SVX_LINESPACE_ONE_POINT_FIVE_LINES: nPropLineSpace = 150; break; - case SVX_LINESPACE_TWO_LINES: nPropLineSpace = 200; break; + case SVX_LINESPACE_TWO_LINES: nPropLineSpace = 200; break; } } @@ -397,7 +397,7 @@ bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const nMemberId &= ~CONVERT_TWIPS; switch( nMemberId ) { - case MID_PARA_ADJUST : rVal <<= (sal_Int16)GetAdjust(); break; + case MID_PARA_ADJUST : rVal <<= (sal_Int16)GetAdjust(); break; case MID_LAST_LINE_ADJUST : rVal <<= (sal_Int16)GetLastBlock(); break; case MID_EXPAND_SINGLE : { @@ -419,7 +419,7 @@ bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) nMemberId &= ~CONVERT_TWIPS; switch( nMemberId ) { - case MID_PARA_ADJUST : + case MID_PARA_ADJUST : case MID_LAST_LINE_ADJUST : { sal_Int32 eVal = - 1; @@ -464,7 +464,7 @@ SfxItemPresentation SvxAdjustItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * -) const +) const { switch ( ePres ) { @@ -484,7 +484,7 @@ SfxItemPresentation SvxAdjustItem::GetPresentation sal_uInt16 SvxAdjustItem::GetValueCount() const { - return SVX_ADJUST_END; // SVX_ADJUST_BLOCKLINE + 1 + return SVX_ADJUST_END; // SVX_ADJUST_BLOCKLINE + 1 } // ----------------------------------------------------------------------- @@ -593,7 +593,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * -) const +) const { switch ( ePres ) { @@ -615,13 +615,13 @@ SfxItemPresentation SvxWidowsItem::GetPresentation rText += ' '; rText += EE_RESSTR(RID_SVXITEMS_LINES); } - + default: { DBG_ERRORFILE( "SvxWidowsItem::GetPresentation(): unknown SfxItemPresentation" ); } } - + rText.SearchAndReplace( String::CreateFromAscii( "%1" ), String::CreateFromInt32( GetValue() ) ); return ePres; } @@ -665,7 +665,7 @@ SfxItemPresentation SvxOrphansItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * -) const +) const { switch ( ePres ) { @@ -687,13 +687,13 @@ SfxItemPresentation SvxOrphansItem::GetPresentation rText += ' '; rText += EE_RESSTR(RID_SVXITEMS_LINES); } - + default: { DBG_ERRORFILE( "SvxOrphansItem::GetPresentation(): unknown SfxItemPresentation" ); } } - + rText.SearchAndReplace( String::CreateFromAscii( "%1" ), String::CreateFromInt32( GetValue() ) ); return ePres; } @@ -710,7 +710,7 @@ SvxHyphenZoneItem::SvxHyphenZoneItem( const sal_Bool bHyph, const sal_uInt16 nId } // ----------------------------------------------------------------------- -bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -788,7 +788,7 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * -) const +) const { switch ( ePres ) { @@ -1002,12 +1002,12 @@ SvxTabStopItem& SvxTabStopItem::operator=( const SvxTabStopItem& rTSI ) TABALIGN_DECIMAL }; -struct ::com::sun::star::style::TabStop +struct ::com::sun::star::style::TabStop { - long Position; - ::com::sun::star::style::TabAlign ::com::sun::star::drawing::Alignment; - unsigned short DecimalChar; - unsigned short FillChar; + long Position; + ::com::sun::star::style::TabAlign ::com::sun::star::drawing::Alignment; + unsigned short DecimalChar; + unsigned short FillChar; }; typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence; @@ -1041,8 +1041,8 @@ bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const pArr[i].Alignment = style::TabAlign_DEFAULT; } - pArr[i].DecimalChar = rTab.GetDecimal(); - pArr[i].FillChar = rTab.GetFill(); + pArr[i].DecimalChar = rTab.GetDecimal(); + pArr[i].FillChar = rTab.GetFill(); } rVal <<= aSeq; break; @@ -1183,10 +1183,10 @@ SfxPoolItem* SvxTabStopItem::Clone( SfxItemPool * ) const SfxItemPresentation SvxTabStopItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, - SfxMapUnit ePresUnit, + SfxMapUnit eCoreUnit, + SfxMapUnit ePresUnit, XubString& rText, const IntlWrapper *pIntl -) const +) const { rText.Erase(); @@ -1251,17 +1251,17 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) && ::IsDefaultItem( this ); const short nTabs = Count(); - sal_uInt16 nCount = 0, nDefDist = 0; + sal_uInt16 nCount = 0, nDefDist = 0; long nNew = 0; if( bStoreDefTabs ) { const SvxTabStopItem& rDefTab = (const SvxTabStopItem &) - pPool->GetDefaultItem( pPool->GetWhich( SID_ATTR_TABSTOP, sal_False ) ); + pPool->GetDefaultItem( pPool->GetWhich( SID_ATTR_TABSTOP, sal_False ) ); nDefDist = sal_uInt16( rDefTab.GetStart()->GetTabPos() ); const long nPos = nTabs > 0 ? (*this)[nTabs-1].GetTabPos() : 0; - nCount = (sal_uInt16)(nPos / nDefDist); - nNew = (nCount + 1) * nDefDist; + nCount = (sal_uInt16)(nPos / nDefDist); + nNew = (nCount + 1) * nDefDist; if( nNew <= nPos + 50 ) nNew += nDefDist; @@ -1353,7 +1353,7 @@ SfxItemPresentation SvxFmtSplitItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * -) const +) const { switch ( ePres ) { @@ -1421,7 +1421,7 @@ SfxItemPresentation SvxPageModelItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * -) const +) const { rText.Erase(); bool bSet = ( GetValue().Len() > 0 ); @@ -1467,7 +1467,7 @@ SfxPoolItem* SvxScriptSpaceItem::Create(SvStream & rStrm, USHORT) const return new SvxScriptSpaceItem( bFlag, Which() ); } -USHORT SvxScriptSpaceItem::GetVersion( USHORT nFFVer ) const +USHORT SvxScriptSpaceItem::GetVersion( USHORT nFFVer ) const { DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer || SOFFICE_FILEFORMAT_40==nFFVer || diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx index 52a3edf6d362..8f262716f0c9 100644 --- a/editeng/source/items/svdfield.cxx +++ b/editeng/source/items/svdfield.cxx @@ -2,7 +2,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 diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index e23d9e836aa2..38795f055428 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,12 +50,12 @@ #define KAPITAELCHENPROP 80 #ifndef REDUCEDSVXFONT - const sal_Unicode CH_BLANK = sal_Unicode(' '); // ' ' Leerzeichen + const sal_Unicode CH_BLANK = sal_Unicode(' '); // ' ' Leerzeichen static sal_Char __READONLY_DATA sDoubleSpace[] = " "; #endif /************************************************************************* - * class SvxFont + * class SvxFont *************************************************************************/ SvxFont::SvxFont() @@ -76,7 +76,7 @@ SvxFont::SvxFont( const Font &rFont ) } /************************************************************************* - * class SvxFont: Copy-Ctor + * class SvxFont: Copy-Ctor *************************************************************************/ SvxFont::SvxFont( const SvxFont &rFont ) @@ -90,7 +90,7 @@ SvxFont::SvxFont( const SvxFont &rFont ) } /************************************************************************* - * static SvxFont::DrawArrow + * static SvxFont::DrawArrow *************************************************************************/ void SvxFont::DrawArrow( OutputDevice &rOut, const Rectangle& rRect, @@ -197,7 +197,7 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const #ifndef REDUCEDSVXFONT /************************************************************************* - * class SvxDoCapitals + * class SvxDoCapitals * die virtuelle Methode Do wird von SvxFont::DoOnCapitals abwechselnd mit * den "Gross-" und "Kleinbuchstaben"-Teilen aufgerufen. * Die Ableitungen von SvxDoCapitals erfuellen diese Methode mit Leben. @@ -237,7 +237,7 @@ void SvxDoCapitals::Do( const XubString &/*_rTxt*/, const xub_StrLen /*_nIdx*/, const xub_StrLen /*_nLen*/, const BOOL /*bUpper*/ ) { } /************************************************************************* - * SvxFont::DoOnCapitals() const + * SvxFont::DoOnCapitals() const * zerlegt den String in Gross- und Kleinbuchstaben und ruft jeweils die * Methode SvxDoCapitals::Do( ) auf. *************************************************************************/ @@ -260,8 +260,8 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const const LanguageType eLng = LANGUAGE_DONTKNOW == eLang ? LANGUAGE_SYSTEM : eLang; - CharClass aCharClass( SvxCreateLocale( eLng ) ); - String aCharString; + CharClass aCharClass( SvxCreateLocale( eLng ) ); + String aCharString; while( nPos < nTxtLen ) { @@ -290,7 +290,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const // potential difference const XubString aSnippet(rTxt, nIdx + nOldPos, nPos-nOldPos); XubString aNewText = CalcCaseMap(aSnippet); - + rDo.Do( aNewText, 0, aNewText.Len(), TRUE ); } else @@ -303,7 +303,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const // Nun werden die Lower-Chars verarbeitet (ohne Blanks) while( nPos < nTxtLen ) { - sal_uInt32 nCharacterType = aCharClass.getCharacterType( aCharString, 0 ); + sal_uInt32 nCharacterType = aCharClass.getCharacterType( aCharString, 0 ); if ( ( nCharacterType & ::com::sun::star::i18n::KCharacterType::UPPER ) ) break; if ( CH_BLANK == aCharString ) @@ -320,7 +320,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const // potential difference const XubString aSnippet(rTxt, nIdx + nOldPos, nPos - nOldPos); XubString aNewText = CalcCaseMap(aSnippet); - + rDo.Do( aNewText, 0, aNewText.Len(), FALSE ); } else @@ -337,7 +337,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const if( nOldPos != nPos ) { rDo.DoSpace( FALSE ); - + if(bCaseMapLengthDiffers) { // #108210# @@ -345,7 +345,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const // potential difference const XubString aSnippet(rTxt, nIdx + nOldPos, nPos - nOldPos); XubString aNewText = CalcCaseMap(aSnippet); - + rDo.Do( aNewText, 0, aNewText.Len(), FALSE ); } else @@ -361,7 +361,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const } /************************************************************************** - * SvxFont::SetPhysFont() + * SvxFont::SetPhysFont() *************************************************************************/ void SvxFont::SetPhysFont( OutputDevice *pOut ) const @@ -376,7 +376,7 @@ void SvxFont::SetPhysFont( OutputDevice *pOut ) const { Font aNewFont( *this ); Size aSize( aNewFont.GetSize() ); - aNewFont.SetSize( Size( aSize.Width() * nPropr / 100L, + aNewFont.SetSize( Size( aSize.Width() * nPropr / 100L, aSize.Height() * nPropr / 100L ) ); if ( !rCurrentFont.IsSameInstance( aNewFont ) ) pOut->SetFont( aNewFont ); @@ -384,7 +384,7 @@ void SvxFont::SetPhysFont( OutputDevice *pOut ) const } /************************************************************************* - * SvxFont::ChgPhysFont() + * SvxFont::ChgPhysFont() *************************************************************************/ Font SvxFont::ChgPhysFont( OutputDevice *pOut ) const @@ -395,7 +395,7 @@ Font SvxFont::ChgPhysFont( OutputDevice *pOut ) const } /************************************************************************* - * SvxFont::GetPhysTxtSize() + * SvxFont::GetPhysTxtSize() *************************************************************************/ Size SvxFont::GetPhysTxtSize( const OutputDevice *pOut, const XubString &rTxt, @@ -487,14 +487,14 @@ Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const XubString &rTxt, } /************************************************************************* - * SvxFont::GetTxtSize() + * SvxFont::GetTxtSize() *************************************************************************/ Size SvxFont::GetTxtSize( const OutputDevice *pOut, const XubString &rTxt, const xub_StrLen nIdx, const xub_StrLen nLen ) { xub_StrLen nTmp = nLen; - if ( nTmp == STRING_LEN ) // schon initialisiert? + if ( nTmp == STRING_LEN ) // schon initialisiert? nTmp = rTxt.Len(); Font aOldFont( ChgPhysFont((OutputDevice *)pOut) ); Size aTxtSize; @@ -508,16 +508,16 @@ Size SvxFont::GetTxtSize( const OutputDevice *pOut, const XubString &rTxt, } /************************************************************************* - * SvxFont::DrawText() + * SvxFont::DrawText() *************************************************************************/ void SvxFont::DrawText( OutputDevice *pOut, const Point &rPos, const XubString &rTxt, const xub_StrLen nIdx, const xub_StrLen nLen ) const { - if( !nLen || !rTxt.Len() ) return; + if( !nLen || !rTxt.Len() ) return; xub_StrLen nTmp = nLen; - if ( nTmp == STRING_LEN ) // schon initialisiert? + if ( nTmp == STRING_LEN ) // schon initialisiert? nTmp = rTxt.Len(); Point aPos( rPos ); if ( nEsc ) @@ -603,7 +603,7 @@ void SvxFont::DrawPrev( OutputDevice *pOut, Printer* pPrinter, return; xub_StrLen nTmp = nLen; - if ( nTmp == STRING_LEN ) // schon initialisiert? + if ( nTmp == STRING_LEN ) // schon initialisiert? nTmp = rTxt.Len(); Point aPos( rPos ); @@ -676,7 +676,7 @@ SvxFont& SvxFont::operator=( const SvxFont& rFont ) /************************************************************************* - * class SvxDoGetCapitalSize + * class SvxDoGetCapitalSize * wird von SvxFont::GetCapitalSize() zur Berechnung der TxtSize bei * eingestellten Kapitaelchen benutzt. *************************************************************************/ @@ -684,9 +684,9 @@ SvxFont& SvxFont::operator=( const SvxFont& rFont ) class SvxDoGetCapitalSize : public SvxDoCapitals { protected: - SvxFont* pFont; - Size aTxtSize; - short nKern; + SvxFont* pFont; + Size aTxtSize; + short nKern; public: SvxDoGetCapitalSize( SvxFont *_pFnt, const OutputDevice *_pOut, const XubString &_rTxt, const xub_StrLen _nIdx, @@ -727,7 +727,7 @@ void SvxDoGetCapitalSize::Do( const XubString &_rTxt, const xub_StrLen _nIdx, } /************************************************************************* - * SvxFont::GetCapitalSize() + * SvxFont::GetCapitalSize() * berechnet TxtSize, wenn Kapitaelchen eingestellt sind. *************************************************************************/ @@ -749,7 +749,7 @@ Size SvxFont::GetCapitalSize( const OutputDevice *pOut, const XubString &rTxt, } /************************************************************************* - * class SvxDoDrawCapital + * class SvxDoDrawCapital * wird von SvxFont::DrawCapital zur Ausgabe von Kapitaelchen benutzt. *************************************************************************/ diff --git a/editeng/source/items/svxitems.src b/editeng/source/items/svxitems.src index 2158b97f66b5..d99c004f2971 100644 --- a/editeng/source/items/svxitems.src +++ b/editeng/source/items/svxitems.src @@ -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 diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index ff0b1868ed69..e414e1e8c89a 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,8 +120,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::text; // Konvertierung fuer UNO -#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) -#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) +#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) +#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) #define TWIP_TO_MM100_UNSIGNED(TWIP) ((((TWIP)*127L+36L)/72L)) #define MM100_TO_TWIP_UNSIGNED(MM100) ((((MM100)*72L+63L)/127L)) @@ -224,7 +224,7 @@ SfxItemPresentation SvxFontListItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { rText.Erase(); return SFX_ITEM_PRESENTATION_NONE; @@ -275,15 +275,15 @@ bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const rVal <<= aFontDescriptor; } break; - case MID_FONT_FAMILY_NAME : + case MID_FONT_FAMILY_NAME : rVal <<= OUString(aFamilyName.GetBuffer()); break; case MID_FONT_STYLE_NAME: rVal <<= OUString(aStyleName.GetBuffer()); break; - case MID_FONT_FAMILY : rVal <<= (sal_Int16)(eFamily); break; - case MID_FONT_CHAR_SET : rVal <<= (sal_Int16)(eTextEncoding); break; - case MID_FONT_PITCH : rVal <<= (sal_Int16)(ePitch); break; + case MID_FONT_FAMILY : rVal <<= (sal_Int16)(eFamily); break; + case MID_FONT_CHAR_SET : rVal <<= (sal_Int16)(eTextEncoding); break; + case MID_FONT_PITCH : rVal <<= (sal_Int16)(ePitch); break; } return true; } @@ -307,7 +307,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId) ePitch = (FontPitch)aFontDescriptor.Pitch; } break; - case MID_FONT_FAMILY_NAME : + case MID_FONT_FAMILY_NAME : { OUString aStr; if(!(rVal >>= aStr)) @@ -390,8 +390,8 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const GetFamilyName().EqualsAscii( "OpenSymbol", 0, sizeof("OpenSymbol")-1 ); // #90477# rStrm << (BYTE) GetFamily() - // << (BYTE) GetPitch() - // << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetStoreCharSet( GetCharSet(), (USHORT)rStrm.GetVersion() ) ); + // << (BYTE) GetPitch() + // << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetStoreCharSet( GetCharSet(), (USHORT)rStrm.GetVersion() ) ); rStrm << (BYTE) GetFamily() << (BYTE) GetPitch() << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion())); @@ -453,7 +453,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, USHORT) const return new SvxFontItem( (FontFamily)_eFamily, aName, aStyle, - (FontPitch)eFontPitch, (rtl_TextEncoding)eFontTextEncoding, Which() ); + (FontPitch)eFontPitch, (rtl_TextEncoding)eFontTextEncoding, Which() ); } //------------------------------------------------------------------------ @@ -464,7 +464,7 @@ SfxItemPresentation SvxFontItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -505,7 +505,7 @@ SfxPoolItem* SvxPostureItem::Clone( SfxItemPool * ) const USHORT SvxPostureItem::GetValueCount() const { - return ITALIC_NORMAL + 1; // auch ITALIC_NONE geh"ort dazu + return ITALIC_NORMAL + 1; // auch ITALIC_NONE geh"ort dazu } // ----------------------------------------------------------------------- @@ -533,7 +533,7 @@ SfxItemPresentation SvxPostureItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -561,9 +561,9 @@ XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const switch ( eItalic ) { - case ITALIC_NONE: nId = RID_SVXITEMS_ITALIC_NONE; break; - case ITALIC_OBLIQUE: nId = RID_SVXITEMS_ITALIC_OBLIQUE; break; - case ITALIC_NORMAL: nId = RID_SVXITEMS_ITALIC_NORMAL; break; + case ITALIC_NONE: nId = RID_SVXITEMS_ITALIC_NONE; break; + case ITALIC_OBLIQUE: nId = RID_SVXITEMS_ITALIC_OBLIQUE; break; + case ITALIC_NORMAL: nId = RID_SVXITEMS_ITALIC_NORMAL; break; default: ;//prevent warning } @@ -586,7 +586,7 @@ bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const rVal = Bool2Any(GetBoolValue()); break; case MID_POSTURE: - rVal <<= (awt::FontSlant)GetValue(); // Werte von awt::FontSlant und FontItalic sind gleich + rVal <<= (awt::FontSlant)GetValue(); // Werte von awt::FontSlant und FontItalic sind gleich break; } return true; @@ -674,7 +674,7 @@ void SvxWeightItem::SetBoolValue( sal_Bool bVal ) USHORT SvxWeightItem::GetValueCount() const { - return WEIGHT_BLACK; // WEIGHT_DONTKNOW geh"ort nicht dazu + return WEIGHT_BLACK; // WEIGHT_DONTKNOW geh"ort nicht dazu } // ----------------------------------------------------------------------- @@ -709,7 +709,7 @@ SfxItemPresentation SvxWeightItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -742,7 +742,7 @@ bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const nMemberId &= ~CONVERT_TWIPS; switch( nMemberId ) { - case MID_BOLD : + case MID_BOLD : rVal = Bool2Any(GetBoolValue()); break; case MID_WEIGHT: @@ -762,7 +762,7 @@ bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) nMemberId &= ~CONVERT_TWIPS; switch( nMemberId ) { - case MID_BOLD : + case MID_BOLD : SetBoolValue(Any2Bool(rVal)); break; case MID_WEIGHT: @@ -789,7 +789,7 @@ SvxFontHeightItem::SvxFontHeightItem( const ULONG nSz, const USHORT nId ) : SfxPoolItem( nId ) { - SetHeight( nSz,nPrp ); // mit den Prozenten rechnen + SetHeight( nSz,nPrp ); // mit den Prozenten rechnen } // ----------------------------------------------------------------------- @@ -860,8 +860,8 @@ int SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const --------------------------------------------------*/ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { - // In StarOne sind im uno::Any immer 1/100mm. Ueber die MemberId wird - // gesteuert, ob der Wert im Item 1/100mm oder Twips sind. + // In StarOne sind im uno::Any immer 1/100mm. Ueber die MemberId wird + // gesteuert, ob der Wert im Item 1/100mm oder Twips sind. sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -871,8 +871,8 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { ::com::sun::star::frame::status::FontHeight aFontHeight; - // Point (also Twips) sind gefragt, - // also umrechnen, wenn CONVERT_TWIPS nicht gesetzt ist + // Point (also Twips) sind gefragt, + // also umrechnen, wenn CONVERT_TWIPS nicht gesetzt ist if( bConvert ) { long nTwips = bConvert ? nHeight : MM100_TO_TWIP_UNSIGNED(nHeight); @@ -912,8 +912,8 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const break; case MID_FONTHEIGHT: { - // Point (also Twips) sind gefragt, - // also umrechnen, wenn CONVERT_TWIPS nicht gesetzt ist + // Point (also Twips) sind gefragt, + // also umrechnen, wenn CONVERT_TWIPS nicht gesetzt ist if( bConvert ) { long nTwips = bConvert ? nHeight : MM100_TO_TWIP_UNSIGNED(nHeight); @@ -958,7 +958,7 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return sal_True; } /* -----------------01.07.98 13:43------------------- - * Relative Abweichung aus der Hoehe herausrechnen + * Relative Abweichung aus der Hoehe herausrechnen * --------------------------------------------------*/ sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUnit eProp, sal_Bool bCoreInTwip) { @@ -1014,7 +1014,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) if( fPoint < 0. || fPoint > 10000. ) return sal_False; - nHeight = (long)( fPoint * 20.0 + 0.5 ); // Twips + nHeight = (long)( fPoint * 20.0 + 0.5 ); // Twips if (!bConvert) nHeight = TWIP_TO_MM100_UNSIGNED(nHeight); // umrechnen, wenn das Item 1/100mm enthaelt @@ -1039,7 +1039,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) if(fPoint < 0. || fPoint > 10000.) return sal_False; - nHeight = (long)( fPoint * 20.0 + 0.5 ); // Twips + nHeight = (long)( fPoint * 20.0 + 0.5 ); // Twips if (!bConvert) nHeight = TWIP_TO_MM100_UNSIGNED(nHeight); // umrechnen, wenn das Item 1/100mm enthaelt } @@ -1084,10 +1084,10 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) SfxItemPresentation SvxFontHeightItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, + SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper *pIntl -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -1296,10 +1296,10 @@ bool SvxFontWidthItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) SfxItemPresentation SvxFontWidthItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, + SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper *pIntl -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -1367,7 +1367,7 @@ SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const USHORT SvxTextLineItem::GetValueCount() const { - return UNDERLINE_DOTTED + 1; // auch UNDERLINE_NONE geh"ort dazu + return UNDERLINE_DOTTED + 1; // auch UNDERLINE_NONE geh"ort dazu } // ----------------------------------------------------------------------- @@ -1395,7 +1395,7 @@ SfxItemPresentation SvxTextLineItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -1597,7 +1597,7 @@ void SvxCrossedOutItem::SetBoolValue( sal_Bool bVal ) USHORT SvxCrossedOutItem::GetValueCount() const { - return STRIKEOUT_DOUBLE + 1; // auch STRIKEOUT_NONE geh"ort dazu + return STRIKEOUT_DOUBLE + 1; // auch STRIKEOUT_NONE geh"ort dazu } // ----------------------------------------------------------------------- @@ -1632,7 +1632,7 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -1736,7 +1736,7 @@ SfxItemPresentation SvxShadowedItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -1797,7 +1797,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -1859,7 +1859,7 @@ SfxItemPresentation SvxWordLineModeItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -1920,7 +1920,7 @@ SfxItemPresentation SvxContourItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -1981,7 +1981,7 @@ SfxItemPresentation SvxPropSizeItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { rText.Erase(); return SFX_ITEM_PRESENTATION_NONE; @@ -2043,7 +2043,7 @@ int SvxColorItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); - return mColor == ( (const SvxColorItem&)rAttr ).mColor; + return mColor == ( (const SvxColorItem&)rAttr ).mColor; } // ----------------------------------------------------------------------- @@ -2100,7 +2100,7 @@ SfxItemPresentation SvxColorItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -2158,7 +2158,7 @@ SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const { // #90477# rStrm << (BYTE) GetStoreCharSet( GetCharSet(), (USHORT)rStrm.GetVersion() ) - // << GetValue(); + // << GetValue(); rStrm << (BYTE)GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion()) << GetValue(); return rStrm; @@ -2182,7 +2182,7 @@ SfxItemPresentation SvxCharSetColorItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { rText.Erase(); return SFX_ITEM_PRESENTATION_NONE; @@ -2239,10 +2239,10 @@ SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, USHORT) const SfxItemPresentation SvxKerningItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit eCoreUnit, + SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper *pIntl -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -2309,7 +2309,7 @@ SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const USHORT nId ) : USHORT SvxCaseMapItem::GetValueCount() const { - return SVX_CASEMAP_END; // SVX_CASEMAP_KAPITAELCHEN + 1 + return SVX_CASEMAP_END; // SVX_CASEMAP_KAPITAELCHEN + 1 } // ----------------------------------------------------------------------- @@ -2344,7 +2344,7 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -2376,7 +2376,7 @@ bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const sal_Int16 nRet = style::CaseMap::NONE; switch( GetValue() ) { -// case SVX_CASEMAP_NOT_MAPPED : nRet = style::CaseMap::NONE ; break; +// case SVX_CASEMAP_NOT_MAPPED : nRet = style::CaseMap::NONE ; break; case SVX_CASEMAP_VERSALIEN : nRet = style::CaseMap::UPPERCASE; break; case SVX_CASEMAP_GEMEINE : nRet = style::CaseMap::LOWERCASE; break; case SVX_CASEMAP_TITEL : nRet = style::CaseMap::TITLE ; break; @@ -2396,7 +2396,7 @@ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) switch( nVal ) { - case style::CaseMap::NONE : nVal = SVX_CASEMAP_NOT_MAPPED ; break; + case style::CaseMap::NONE : nVal = SVX_CASEMAP_NOT_MAPPED ; break; case style::CaseMap::UPPERCASE: nVal = SVX_CASEMAP_VERSALIEN ; break; case style::CaseMap::LOWERCASE: nVal = SVX_CASEMAP_GEMEINE ; break; case style::CaseMap::TITLE : nVal = SVX_CASEMAP_TITEL ; break; @@ -2411,8 +2411,8 @@ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) SvxEscapementItem::SvxEscapementItem( const USHORT nId ) : SfxEnumItemInterface( nId ), - nEsc ( 0 ), - nProp ( 100 ) + nEsc ( 0 ), + nProp ( 100 ) { } @@ -2487,7 +2487,7 @@ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, USHORT) const USHORT SvxEscapementItem::GetValueCount() const { - return SVX_ESCAPEMENT_END; // SVX_ESCAPEMENT_SUBSCRIPT + 1 + return SVX_ESCAPEMENT_END; // SVX_ESCAPEMENT_SUBSCRIPT + 1 } //------------------------------------------------------------------------ @@ -2498,7 +2498,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -2670,7 +2670,7 @@ SfxItemPresentation SvxLanguageItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { #ifndef SVX_LIGHT switch ( ePres ) @@ -2782,7 +2782,7 @@ SfxItemPresentation SvxNoLinebreakItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { rText.Erase(); return SFX_ITEM_PRESENTATION_NONE; @@ -2827,7 +2827,7 @@ SfxItemPresentation SvxNoHyphenItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { rText.Erase(); return SFX_ITEM_PRESENTATION_NONE; @@ -2881,9 +2881,9 @@ SfxItemPresentation SvxLineColorItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, - XubString& rText, + XubString& rText, const IntlWrapper * pIntlWrapper -) const +) const { return SvxColorItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper ); @@ -2929,7 +2929,7 @@ SfxItemPresentation SvxBlinkItem::GetPresentation SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -2991,9 +2991,9 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, + XubString& rText, const IntlWrapper * /*pIntl*/ -) const +) const { switch ( ePres ) { @@ -3034,11 +3034,11 @@ bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const sal_Int16 nRet = 0; switch(nValue & EMPHASISMARK_STYLE) { - case EMPHASISMARK_NONE : nRet = FontEmphasis::NONE; break; - case EMPHASISMARK_DOT : nRet = FontEmphasis::DOT_ABOVE; break; - case EMPHASISMARK_CIRCLE : nRet = FontEmphasis::CIRCLE_ABOVE; break; - case EMPHASISMARK_DISC : nRet = FontEmphasis::DISK_ABOVE; break; - case EMPHASISMARK_ACCENT : nRet = FontEmphasis::ACCENT_ABOVE; break; + case EMPHASISMARK_NONE : nRet = FontEmphasis::NONE; break; + case EMPHASISMARK_DOT : nRet = FontEmphasis::DOT_ABOVE; break; + case EMPHASISMARK_CIRCLE : nRet = FontEmphasis::CIRCLE_ABOVE; break; + case EMPHASISMARK_DISC : nRet = FontEmphasis::DISK_ABOVE; break; + case EMPHASISMARK_ACCENT : nRet = FontEmphasis::ACCENT_ABOVE; break; } if(nRet && nValue & EMPHASISMARK_POS_BELOW) nRet += 10; @@ -3062,7 +3062,7 @@ bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) rVal >>= nValue; switch(nValue) { - case FontEmphasis::NONE : nValue = EMPHASISMARK_NONE; break; + case FontEmphasis::NONE : nValue = EMPHASISMARK_NONE; break; case FontEmphasis::DOT_ABOVE : nValue = EMPHASISMARK_DOT|EMPHASISMARK_POS_ABOVE; break; case FontEmphasis::CIRCLE_ABOVE: nValue = EMPHASISMARK_CIRCLE|EMPHASISMARK_POS_ABOVE; break; case FontEmphasis::DISK_ABOVE : nValue = EMPHASISMARK_DISC|EMPHASISMARK_POS_ABOVE; break; @@ -3613,7 +3613,7 @@ SfxPoolItem* SvxScriptTypeItem::Clone( SfxItemPool * ) const SvxScriptSetItem::SvxScriptSetItem( USHORT nSlotId, SfxItemPool& rPool ) : SfxSetItem( nSlotId, new SfxItemSet( rPool, - SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT )) + SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT )) { USHORT nLatin, nAsian, nComplex; GetWhichIds( nLatin, nAsian, nComplex ); @@ -3658,7 +3658,7 @@ const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( USHORT nSlotId, const SfxI const SfxPoolItem *pRet, *pAsn, *pCmplx; switch( nScript ) { - default: //no one valid -> match to latin + default: //no one valid -> match to latin // case SCRIPTTYPE_LATIN: pRet = GetItemOfScriptSet( rSet, nLatin ); break; diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 8120b9ddf76f..efc9b5359b1b 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 395bbcd9ef5a..54c604d9cae8 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx index 1853b4ab5399..de5f2af02258 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,24 +40,24 @@ using namespace ::xmloff::token; using namespace ::rtl; // #110680# -SvXMLAutoCorrectExport::SvXMLAutoCorrectExport( +SvXMLAutoCorrectExport::SvXMLAutoCorrectExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, - const SvxAutocorrWordList * pNewAutocorr_List, + const SvxAutocorrWordList * pNewAutocorr_List, const rtl::OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler) -: SvXMLExport( xServiceFactory, rFileName, rHandler ), +: SvXMLExport( xServiceFactory, rFileName, rHandler ), pAutocorr_List( pNewAutocorr_List ) { _GetNamespaceMap().Add( GetXMLToken ( XML_NP_BLOCK_LIST), - GetXMLToken ( XML_N_BLOCK_LIST ), + GetXMLToken ( XML_N_BLOCK_LIST ), XML_NAMESPACE_BLOCKLIST ); -} +} sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/) { GetDocHandler()->startDocument(); - - AddAttribute ( XML_NAMESPACE_NONE, + + AddAttribute ( XML_NAMESPACE_NONE, _GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ), _GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) ); { @@ -67,13 +67,13 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/) { SvxAutocorrWord* p = pAutocorr_List->GetObject(i); - AddAttribute( XML_NAMESPACE_BLOCKLIST, - XML_ABBREVIATED_NAME, + AddAttribute( XML_NAMESPACE_BLOCKLIST, + XML_ABBREVIATED_NAME, OUString(p->GetShort())); - AddAttribute( XML_NAMESPACE_BLOCKLIST, - XML_NAME, + AddAttribute( XML_NAMESPACE_BLOCKLIST, + XML_NAME, OUString(p->IsTextOnly() ? p->GetLong() : p->GetShort())); - + SvXMLElementExport aBlock( *this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK, sal_True, sal_True); } } @@ -82,24 +82,24 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/) } // #110680# -SvXMLExceptionListExport::SvXMLExceptionListExport( +SvXMLExceptionListExport::SvXMLExceptionListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, - const SvStringsISortDtor &rNewList, + const SvStringsISortDtor &rNewList, const rtl::OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler) -: SvXMLExport( xServiceFactory, rFileName, rHandler ), +: SvXMLExport( xServiceFactory, rFileName, rHandler ), rList( rNewList ) { _GetNamespaceMap().Add( GetXMLToken ( XML_NP_BLOCK_LIST ), - GetXMLToken ( XML_N_BLOCK_LIST ), + GetXMLToken ( XML_N_BLOCK_LIST ), XML_NAMESPACE_BLOCKLIST ); -} +} sal_uInt32 SvXMLExceptionListExport::exportDoc(enum XMLTokenEnum /*eClass*/) { GetDocHandler()->startDocument(); - - AddAttribute ( XML_NAMESPACE_NONE, + + AddAttribute ( XML_NAMESPACE_NONE, _GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ), _GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) ); { @@ -107,8 +107,8 @@ sal_uInt32 SvXMLExceptionListExport::exportDoc(enum XMLTokenEnum /*eClass*/) sal_uInt16 nBlocks= rList.Count(); for ( sal_uInt16 i = 0; i < nBlocks; i++) { - AddAttribute( XML_NAMESPACE_BLOCKLIST, - XML_ABBREVIATED_NAME, + AddAttribute( XML_NAMESPACE_BLOCKLIST, + XML_ABBREVIATED_NAME, OUString( *rList[i] ) ); SvXMLElementExport aBlock( *this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK, sal_True, sal_True); } diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx index 0a89d0f920eb..9a2bb77ee7dc 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,12 +37,12 @@ class SvXMLAutoCorrectExport : public SvXMLExport { private: - const SvxAutocorrWordList *pAutocorr_List; + const SvxAutocorrWordList *pAutocorr_List; public: // #110680# - SvXMLAutoCorrectExport( + SvXMLAutoCorrectExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, - const SvxAutocorrWordList * pNewAutocorr_List, + const SvxAutocorrWordList * pNewAutocorr_List, const rtl::OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); @@ -61,9 +61,9 @@ private: const SvStringsISortDtor & rList; public: // #110680# - SvXMLExceptionListExport( + SvXMLExceptionListExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, - const SvStringsISortDtor &rNewList, + const SvStringsISortDtor &rNewList, const rtl::OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index 19616f36ab26..e81e912ed6be 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ SvXMLAutoCorrectImport::SvXMLAutoCorrectImport( SvxAutocorrWordList *pNewAutocorr_List, SvxAutoCorrect &rNewAutoCorrect, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rNewStorage) -: SvXMLImport( xServiceFactory ), +: SvXMLImport( xServiceFactory ), pAutocorr_List (pNewAutocorr_List), rAutoCorrect ( rNewAutoCorrect ), xStorage ( rNewStorage ) @@ -141,8 +141,8 @@ SvXMLWordContext::SvXMLWordContext( if (!sWrong.Len() || !sRight.Len() ) return; -// const International& rInter = Application::GetAppInternational(); -// BOOL bOnlyTxt = COMPARE_EQUAL != rInter.Compare( sRight, sWrong, INTN_COMPARE_IGNORECASE ); +// const International& rInter = Application::GetAppInternational(); +// BOOL bOnlyTxt = COMPARE_EQUAL != rInter.Compare( sRight, sWrong, INTN_COMPARE_IGNORECASE ); BOOL bOnlyTxt = sRight != sWrong; if( !bOnlyTxt ) { @@ -168,7 +168,7 @@ SvXMLWordContext::~SvXMLWordContext ( void ) SvXMLExceptionListImport::SvXMLExceptionListImport( const uno::Reference< lang::XMultiServiceFactory > xServiceFactory, SvStringsISortDtor & rNewList ) -: SvXMLImport( xServiceFactory ), +: SvXMLImport( xServiceFactory ), rList (rNewList) { GetNamespaceMap().Add( diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index 9a2391833955..d79f4509cf59 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: - SvxAutocorrWordList *pAutocorr_List; - SvxAutoCorrect &rAutoCorrect; + SvxAutocorrWordList *pAutocorr_List; + SvxAutoCorrect &rAutoCorrect; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStorage; //SvStorageRef &rStorage; @@ -103,7 +103,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: - SvStringsISortDtor &rList; + SvStringsISortDtor &rList; // #110680# SvXMLExceptionListImport( diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index 3d8ad6be94c8..ff5b92bf58f9 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ using namespace com::sun::star::uno; static SvxAutoCorrCfg* pAutoCorrCfg = 0; /*-------------------------------------------------------------------- - Beschreibung: Ctor Dtor + Beschreibung: Ctor Dtor --------------------------------------------------------------------*/ SvxAutoCorrCfg::SvxAutoCorrCfg() : @@ -99,27 +99,27 @@ void SvxAutoCorrCfg::SetAutoCorrect( SvxAutoCorrect* pNew ) /*-- 12.10.00 11:44:17--------------------------------------------------- -----------------------------------------------------------------------*/ -Sequence<OUString> SvxBaseAutoCorrCfg::GetPropertyNames() +Sequence<OUString> SvxBaseAutoCorrCfg::GetPropertyNames() { static const char* aPropNames[] = { - "Exceptions/TwoCapitalsAtStart", // 0 - "Exceptions/CapitalAtStartSentence", // 1 - "UseReplacementTable", // 2 - "TwoCapitalsAtStart", // 3 - "CapitalAtStartSentence", // 4 - "ChangeUnderlineWeight", // 5 - "SetInetAttribute", // 6 - "ChangeOrdinalNumber", // 7 + "Exceptions/TwoCapitalsAtStart", // 0 + "Exceptions/CapitalAtStartSentence", // 1 + "UseReplacementTable", // 2 + "TwoCapitalsAtStart", // 3 + "CapitalAtStartSentence", // 4 + "ChangeUnderlineWeight", // 5 + "SetInetAttribute", // 6 + "ChangeOrdinalNumber", // 7 "AddNonBreakingSpace", // 8 - "ChangeDash", // 9 - "RemoveDoubleSpaces", // 10 - "ReplaceSingleQuote", // 11 - "SingleQuoteAtStart", // 12 - "SingleQuoteAtEnd", // 13 - "ReplaceDoubleQuote", // 14 - "DoubleQuoteAtStart", // 15 - "DoubleQuoteAtEnd", // 16 + "ChangeDash", // 9 + "RemoveDoubleSpaces", // 10 + "ReplaceSingleQuote", // 11 + "SingleQuoteAtStart", // 12 + "SingleQuoteAtEnd", // 13 + "ReplaceDoubleQuote", // 14 + "DoubleQuoteAtStart", // 15 + "DoubleQuoteAtEnd", // 16 "CorrectAccidentalCapsLock" // 17 }; const int nCount = 18; @@ -142,7 +142,7 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit) DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { - long nFlags = 0; // default alles aus + long nFlags = 0; // default alles aus sal_Int32 nTemp = 0; for(int nProp = 0; nProp < aNames.getLength(); nProp++) { @@ -348,14 +348,14 @@ void SvxBaseAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */) /*-- 12.10.00 11:51:48--------------------------------------------------- -----------------------------------------------------------------------*/ -Sequence<OUString> SvxSwAutoCorrCfg::GetPropertyNames() +Sequence<OUString> SvxSwAutoCorrCfg::GetPropertyNames() { static const char* aPropNames[] = { - "Text/FileLinks", // 0 - "Text/InternetLinks", // 1 - "Text/ShowPreview", // 2 - "Text/ShowToolTip", // 3 + "Text/FileLinks", // 0 + "Text/InternetLinks", // 1 + "Text/ShowPreview", // 2 + "Text/ShowToolTip", // 3 "Text/SearchInAllCategories", // 4 "Format/Option/UseReplacementTable", // 5 "Format/Option/TwoCapitalsAtStart", // 6 @@ -677,7 +677,7 @@ void SvxSwAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */ ) Load(sal_False); } -SvxAutoCorrCfg* SvxAutoCorrCfg::Get() +SvxAutoCorrCfg* SvxAutoCorrCfg::Get() { if( !pAutoCorrCfg ) pAutoCorrCfg = new SvxAutoCorrCfg; diff --git a/editeng/source/misc/edtdlg.cxx b/editeng/source/misc/edtdlg.cxx index c628afbf75cc..bf83e6b5de92 100644 --- a/editeng/source/misc/edtdlg.cxx +++ b/editeng/source/misc/edtdlg.cxx @@ -2,7 +2,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 diff --git a/editeng/source/misc/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx index 59b5dc60aa20..6a57ef606ae1 100644 --- a/editeng/source/misc/forbiddencharacterstable.cxx +++ b/editeng/source/misc/forbiddencharacterstable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 7d5d862c837a..83b3ad48362e 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ #include <vcl/stdtext.hxx> #include <unotools/charclass.hxx> -#include <editeng/edtdlg.hxx> +#include <editeng/edtdlg.hxx> #include <editeng/editrids.hrc> #include <editeng/unolingu.hxx> @@ -98,8 +98,8 @@ namespace editeng class HangulHanjaConversion_Impl { private: - typedef ::std::set< ::rtl::OUString, ::std::less< ::rtl::OUString > > StringBag; - typedef ::std::map< ::rtl::OUString, ::rtl::OUString, ::std::less< ::rtl::OUString > > StringMap; + typedef ::std::set< ::rtl::OUString, ::std::less< ::rtl::OUString > > StringBag; + typedef ::std::map< ::rtl::OUString, ::rtl::OUString, ::std::less< ::rtl::OUString > > StringMap; private: StringBag m_sIgnoreList; @@ -108,16 +108,16 @@ namespace editeng // general AbstractHangulHanjaConversionDialog* - m_pConversionDialog; // the dialog to display for user interaction - Window* m_pUIParent; // the parent window for any UI we raise + m_pConversionDialog; // the dialog to display for user interaction + Window* m_pUIParent; // the parent window for any UI we raise Reference< XMultiServiceFactory > - m_xORB; // the service factory to use + m_xORB; // the service factory to use Reference< XTextConversion > - m_xConverter; // the text conversion service + m_xConverter; // the text conversion service Locale m_aSourceLocale; // the locale we're working with // additions for Chinese simplified / traditional conversion - HHC::ConversionType m_eConvType; // conversion type (Hangul/Hanja, simplified/traditional Chinese,...) + HHC::ConversionType m_eConvType; // conversion type (Hangul/Hanja, simplified/traditional Chinese,...) LanguageType m_nSourceLang; // just a 'copy' of m_aSourceLocale in order in order to // save the applications from always converting to this // type in their implementations @@ -130,7 +130,7 @@ namespace editeng // True for Hangul / Hanja conversion // False for Chinese simlified / traditional conversion - HangulHanjaConversion* m_pAntiImpl; // our "anti-impl" instance + HangulHanjaConversion* m_pAntiImpl; // our "anti-impl" instance // options sal_Bool m_bByCharacter; // are we in "by character" mode currently? @@ -146,13 +146,13 @@ namespace editeng // state ::rtl::OUString m_sCurrentPortion; // the text which we are currently working on LanguageType m_nCurrentPortionLang; // language of m_sCurrentPortion found - sal_Int32 m_nCurrentStartIndex; // the start index within m_sCurrentPortion of the current convertible portion - sal_Int32 m_nCurrentEndIndex; // the end index (excluding) within m_sCurrentPortion of the current convertible portion - sal_Int32 m_nReplacementBaseIndex;// index which ReplaceUnit-calls need to be relative to + sal_Int32 m_nCurrentStartIndex; // the start index within m_sCurrentPortion of the current convertible portion + sal_Int32 m_nCurrentEndIndex; // the end index (excluding) within m_sCurrentPortion of the current convertible portion + sal_Int32 m_nReplacementBaseIndex;// index which ReplaceUnit-calls need to be relative to sal_Int32 m_nCurrentConversionOption; sal_Int16 m_nCurrentConversionType; Sequence< ::rtl::OUString > - m_aCurrentSuggestions; // the suggestions for the current unit + m_aCurrentSuggestions; // the suggestions for the current unit // (means for the text [m_nCurrentStartIndex, m_nCurrentEndIndex) in m_sCurrentPortion) sal_Bool m_bTryBothDirections; // specifies if other conversion directions should be tried when looking for convertible characters @@ -170,13 +170,13 @@ namespace editeng public: - static void SetUseSavedConversionDirectionState( sal_Bool bVal ); + static void SetUseSavedConversionDirectionState( sal_Bool bVal ); - void DoDocumentConversion( ); + void DoDocumentConversion( ); - inline sal_Bool IsByCharacter( ) const { return m_bByCharacter; } + inline sal_Bool IsByCharacter( ) const { return m_bByCharacter; } - inline sal_Bool IsValid() const { return m_xConverter.is(); } + inline sal_Bool IsValid() const { return m_xConverter.is(); } inline LanguageType GetSourceLang() const { return m_nSourceLang; } inline LanguageType GetTargetLang() const { return m_nTargetLang; } @@ -185,7 +185,7 @@ namespace editeng inline sal_Bool IsInteractive() const { return m_bIsInteractive; } protected: - void createDialog(); + void createDialog(); /** continue with the conversion, return <TRUE/> if and only if the complete conversion is done @param _bRepeatCurrentUnit @@ -212,35 +212,35 @@ namespace editeng @param _bRepeatCurrentUnit will be passed to the <member>ContinueConversion</member> call */ - void implProceed( bool _bRepeatCurrentUnit ); + void implProceed( bool _bRepeatCurrentUnit ); // change the current convertible, and do _not_ proceed - void implChange( const ::rtl::OUString& _rChangeInto ); + void implChange( const ::rtl::OUString& _rChangeInto ); /** find the next convertible piece of text, with possibly advancing to the next portion @see HangulHanjaConversion::GetNextPortion */ - sal_Bool implNextConvertible( bool _bRepeatUnit ); + sal_Bool implNextConvertible( bool _bRepeatUnit ); /** find the next convertible unit within the current portion @param _bRepeatUnit if <TRUE/>, the search will start at the beginning of the current unit, if <FALSE/>, it will start at the end of the current unit */ - bool implNextConvertibleUnit( const sal_Int32 _nStartAt ); + bool implNextConvertibleUnit( const sal_Int32 _nStartAt ); /** retrieves the next portion, with setting the index members properly @return <TRUE/> if and only if there is a next portion */ - bool implRetrieveNextPortion( ); + bool implRetrieveNextPortion( ); /** determine the ConversionDirection for m_sCurrentPortion @return <FALSE/> if and only if something went wrong */ - bool implGetConversionDirectionForCurrentPortion( HHC::ConversionDirection& rDirection ); + bool implGetConversionDirectionForCurrentPortion( HHC::ConversionDirection& rDirection ); /** member m_aCurrentSuggestions and m_nCurrentEndIndex are updated according to the other settings and current dictionaries @@ -319,11 +319,11 @@ namespace editeng } // set remaining conversion parameters to their default values - m_nConvOptions = _nOptions; - m_bByCharacter = 0 != (_nOptions & CHARACTER_BY_CHARACTER); + m_nConvOptions = _nOptions; + m_bByCharacter = 0 != (_nOptions & CHARACTER_BY_CHARACTER); m_eConversionFormat = HHC::eSimpleConversion; - m_ePrimaryConversionDirection = HHC::eHangulToHanja; // used for eConvHangulHanja - m_eCurrentConversionDirection = HHC::eHangulToHanja; // used for eConvHangulHanja + m_ePrimaryConversionDirection = HHC::eHangulToHanja; // used for eConvHangulHanja + m_eCurrentConversionDirection = HHC::eHangulToHanja; // used for eConvHangulHanja if ( m_xORB.is() ) { @@ -411,7 +411,7 @@ namespace editeng bFoundAny = bFoundPrimary; if ( m_bTryBothDirections ) - { // see if we find another convertible when assuming the other direction + { // see if we find another convertible when assuming the other direction TextConversionResult aSecondResult = m_xConverter->getConversions( m_sCurrentPortion, nStartSearch, @@ -421,13 +421,13 @@ namespace editeng m_nCurrentConversionOption ); if ( aSecondResult.Boundary.startPos < aSecondResult.Boundary.endPos ) - { // we indeed found such a convertible + { // we indeed found such a convertible // in case the first attempt (with the original conversion direction) // didn't find anything - if ( !bFoundPrimary + if ( !bFoundPrimary // or if the second location is _before_ the first one - || ( aSecondResult.Boundary.startPos < aResult.Boundary.startPos ) + || ( aSecondResult.Boundary.startPos < aResult.Boundary.startPos ) ) { // then use the second finding @@ -554,8 +554,8 @@ namespace editeng { if ( implNextConvertibleUnit( _bRepeatUnit - ? ( IsByCharacter() ? m_nCurrentStartIndex : m_nCurrentStartIndex ) - : m_nCurrentEndIndex + ? ( IsByCharacter() ? m_nCurrentStartIndex : m_nCurrentStartIndex ) + : m_nCurrentEndIndex ) ) return sal_True; } @@ -566,7 +566,7 @@ namespace editeng { // next portion if ( implRetrieveNextPortion( ) ) - { // there is a next portion + { // there is a next portion // -> find the next convertible unit in the current portion if ( implNextConvertibleUnit( 0 ) ) return sal_True; @@ -595,8 +595,8 @@ namespace editeng //------------------------------------------------------------------------- sal_Bool HangulHanjaConversion_Impl::ContinueConversion( bool _bRepeatCurrentUnit ) { - sal_Bool bNeedUserInteraction = sal_False; // when we leave here, do we need user interaction? - sal_Bool bDocumentDone = sal_False; // did we already check the whole document? + sal_Bool bNeedUserInteraction = sal_False; // when we leave here, do we need user interaction? + sal_Bool bDocumentDone = sal_False; // did we already check the whole document? while ( !bDocumentDone && !bNeedUserInteraction && implNextConvertible( _bRepeatCurrentUnit ) ) { @@ -644,14 +644,14 @@ namespace editeng /* if ( bDocumentDone ) - return sal_True; // we explicitly know that the complete document is done + return sal_True; // we explicitly know that the complete document is done else if ( bNeedUserInteraction ) - return sal_False; // the doc is not done, we found a convertible, but need the user to decide + return sal_False; // the doc is not done, we found a convertible, but need the user to decide else - return sal_True; // we did not find a next convertible, so the document is implicitly done + return sal_True; // we did not find a next convertible, so the document is implicitly done */ - return bDocumentDone || !bNeedUserInteraction; + return bDocumentDone || !bNeedUserInteraction; } //------------------------------------------------------------------------- @@ -683,14 +683,14 @@ namespace editeng if ( -1 == nNextAsianScript ) nNextAsianScript = xBreakIter->nextScript( m_sCurrentPortion, m_nCurrentStartIndex, com::sun::star::i18n::ScriptType::ASIAN ); if ( ( nNextAsianScript >= m_nCurrentStartIndex ) && ( nNextAsianScript < m_sCurrentPortion.getLength() ) ) - { // found asian text + { // found asian text // determine if it's Hangul CharClass aCharClassificaton( m_xORB, m_aSourceLocale ); sal_Int16 nScript = aCharClassificaton.getScript( m_sCurrentPortion, sal::static_int_cast< USHORT >(nNextAsianScript) ); - if ( ( UnicodeScript_kHangulJamo == nScript ) - || ( UnicodeScript_kHangulCompatibilityJamo == nScript ) - || ( UnicodeScript_kHangulSyllable == nScript ) + if ( ( UnicodeScript_kHangulJamo == nScript ) + || ( UnicodeScript_kHangulCompatibilityJamo == nScript ) + || ( UnicodeScript_kHangulSyllable == nScript ) ) { rDirection = HHC::eHangulToHanja; @@ -779,7 +779,7 @@ namespace editeng void HangulHanjaConversion_Impl::implProceed( bool _bRepeatCurrentUnit ) { if ( ContinueConversion( _bRepeatCurrentUnit ) ) - { // we're done with the whole document + { // we're done with the whole document DBG_ASSERT( !m_bIsInteractive || m_pConversionDialog, "HangulHanjaConversion_Impl::implProceed: we should not reach this here without dialog!" ); if ( m_pConversionDialog ) m_pConversionDialog->EndDialog( RET_OK ); @@ -882,7 +882,7 @@ namespace editeng //------------------------------------------------------------------------- void HangulHanjaConversion_Impl::implReadOptionsFromConfiguration() { - SvtLinguConfig aLngCfg; + SvtLinguConfig aLngCfg; aLngCfg.GetProperty( UPH_IS_IGNORE_POST_POSITIONAL_WORD ) >>= m_bIgnorePostPositionalWord; aLngCfg.GetProperty( UPH_IS_SHOW_ENTRIES_RECENTLY_USED_FIRST ) >>= m_bShowRecentlyUsedFirst; aLngCfg.GetProperty( UPH_IS_AUTO_REPLACE_UNIQUE_ENTRIES ) >>= m_bAutoReplaceUnique; @@ -1033,18 +1033,18 @@ namespace editeng TextConversionResult* pResult = NULL; if ( bHaveToHanja && bHaveToHangul ) - { // it found convertibles in both directions -> use the first + { // it found convertibles in both directions -> use the first if ( aToHangul.Boundary.startPos < aToHanja.Boundary.startPos ) pResult = &aToHangul; else pResult = &aToHanja; } else if ( bHaveToHanja ) - { // only found toHanja + { // only found toHanja pResult = &aToHanja; } else - { // only found toHangul + { // only found toHangul pResult = &aToHangul; } if ( pResult ) @@ -1067,9 +1067,9 @@ namespace editeng //------------------------------------------------------------------------- // static member initialization - sal_Bool HangulHanjaConversion::m_bUseSavedValues = sal_False; - sal_Bool HangulHanjaConversion::m_bTryBothDirectionsSave = sal_False; - HHC::ConversionDirection HangulHanjaConversion::m_ePrimaryConversionDirectionSave = HHC::eHangulToHanja; + sal_Bool HangulHanjaConversion::m_bUseSavedValues = sal_False; + sal_Bool HangulHanjaConversion::m_bTryBothDirectionsSave = sal_False; + HHC::ConversionDirection HangulHanjaConversion::m_ePrimaryConversionDirectionSave = HHC::eHangulToHanja; //------------------------------------------------------------------------- HangulHanjaConversion::HangulHanjaConversion( Window* _pUIParent, @@ -1167,7 +1167,7 @@ namespace editeng } //............................................................................. -} // namespace svx +} // namespace svx //............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/misc/lingu.src b/editeng/source/misc/lingu.src index 0d86b757f850..146753207c79 100644 --- a/editeng/source/misc/lingu.src +++ b/editeng/source/misc/lingu.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 11d335578260..14df4228b12b 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ #include <editeng/svxenum.hxx> #include <editeng/splwrap.hxx> // Der Wrapper -#include <editeng/edtdlg.hxx> +#include <editeng/edtdlg.hxx> #include <editeng/eerdll.hxx> #include <editeng/editrids.hrc> #include <editeng/editids.hrc> @@ -76,7 +76,7 @@ void SvxPrepareAutoCorrect( String &rOldText, String &rNewText ) // rOldText: text to be replaced // rNewText: replacement text - xub_StrLen nOldLen = rOldText.Len(), + xub_StrLen nOldLen = rOldText.Len(), nNewLen = rNewText.Len(); if (nOldLen && nNewLen) { @@ -90,10 +90,10 @@ void SvxPrepareAutoCorrect( String &rOldText, String &rNewText ) // ----------------------------------------------------------------------- -#define SVX_LANG_NEED_CHECK 0 -#define SVX_LANG_OK 1 -#define SVX_LANG_MISSING 2 -#define SVX_LANG_MISSING_DO_WARN 3 +#define SVX_LANG_NEED_CHECK 0 +#define SVX_LANG_OK 1 +#define SVX_LANG_MISSING 2 +#define SVX_LANG_MISSING_DO_WARN 3 #define SVX_FLAGS_NEW @@ -153,12 +153,12 @@ SvxSpellWrapper::~SvxSpellWrapper() } /*-------------------------------------------------------------------- - * Beschreibung: Ctor, die Pruefreihenfolge wird festgelegt + * Beschreibung: Ctor, die Pruefreihenfolge wird festgelegt * - * !bStart && !bOtherCntnt: BODY_END, BODY_START, OTHER - * !bStart && bOtherCntnt: OTHER, BODY - * bStart && !bOtherCntnt: BODY_END, OTHER - * bStart && bOtherCntnt: OTHER + * !bStart && !bOtherCntnt: BODY_END, BODY_START, OTHER + * !bStart && bOtherCntnt: OTHER, BODY + * bStart && !bOtherCntnt: BODY_END, OTHER + * bStart && bOtherCntnt: OTHER * --------------------------------------------------------------------*/ @@ -167,13 +167,13 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn, const sal_Bool bStart, const sal_Bool bIsAllRight, const sal_Bool bOther, const sal_Bool bRevAllow ) : - pWin ( pWn ), - xSpell ( xSpellChecker ), - bOtherCntnt ( bOther ), - bDialog ( sal_False ), - bHyphen ( sal_False ), - bAuto ( sal_False ), - bStartChk ( bOther ), + pWin ( pWn ), + xSpell ( xSpellChecker ), + bOtherCntnt ( bOther ), + bDialog ( sal_False ), + bHyphen ( sal_False ), + bAuto ( sal_False ), + bStartChk ( bOther ), bRevAllowed ( bRevAllow ), bAllRight ( bIsAllRight ) { @@ -192,16 +192,16 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn, SvxSpellWrapper::SvxSpellWrapper( Window* pWn, Reference< XHyphenator > &xHyphenator, const sal_Bool bStart, const sal_Bool bOther ) : - pWin ( pWn ), - xHyph ( xHyphenator ), - bOtherCntnt ( bOther ), - bDialog ( sal_False ), - bHyphen ( sal_False ), - bAuto ( sal_False ), - bReverse ( sal_False ), - bStartDone ( bOther || ( !bReverse && bStart ) ), - bEndDone ( bReverse && bStart && !bOther ), - bStartChk ( bOther ), + pWin ( pWn ), + xHyph ( xHyphenator ), + bOtherCntnt ( bOther ), + bDialog ( sal_False ), + bHyphen ( sal_False ), + bAuto ( sal_False ), + bReverse ( sal_False ), + bStartDone ( bOther || ( !bReverse && bStart ) ), + bEndDone ( bReverse && bStart && !bOther ), + bStartChk ( bOther ), bRevAllowed ( sal_False ), bAllRight ( sal_True ) { @@ -263,8 +263,8 @@ sal_Int16 SvxSpellWrapper::CheckHyphLang( void SvxSpellWrapper::SpellStart( SvxSpellArea /*eSpell*/ ) -{ // Hier muessen die notwendigen Vorbereitungen fuer SpellContinue -} // im uebergebenen Bereich getroffen werden. +{ // Hier muessen die notwendigen Vorbereitungen fuer SpellContinue +} // im uebergebenen Bereich getroffen werden. // ----------------------------------------------------------------------- @@ -286,7 +286,7 @@ sal_Bool SvxSpellWrapper::SpellMore() void SvxSpellWrapper::SpellEnd() -{ // Bereich ist abgeschlossen, ggf. Aufraeumen +{ // Bereich ist abgeschlossen, ggf. Aufraeumen // display error for last language not found ShowLanguageErrors(); @@ -310,14 +310,14 @@ void SvxSpellWrapper::AutoCorrect( const String&, const String& ) void SvxSpellWrapper::ScrollArea() -{ // Scrollarea einstellen +{ // Scrollarea einstellen } // ----------------------------------------------------------------------- void SvxSpellWrapper::ChangeWord( const String&, const sal_uInt16 ) -{ // Wort ersetzen +{ // Wort ersetzen } // ----------------------------------------------------------------------- @@ -348,7 +348,7 @@ void SvxSpellWrapper::StartThesaurus( const String &rWord, sal_uInt16 nLanguage return; } - WAIT_ON(); // while looking up for initial word + WAIT_ON(); // while looking up for initial word EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create(); AbstractThesaurusDialog* pDlg = pFact->CreateThesaurusDialog( pWin, xThes, rWord, nLanguage ); WAIT_OFF(); @@ -362,21 +362,21 @@ void SvxSpellWrapper::StartThesaurus( const String &rWord, sal_uInt16 nLanguage // ----------------------------------------------------------------------- void SvxSpellWrapper::ReplaceAll( const String &, sal_Int16 ) -{ // Wort aus der Replace-Liste ersetzen +{ // Wort aus der Replace-Liste ersetzen } // ----------------------------------------------------------------------- void SvxSpellWrapper::SetLanguage( const sal_uInt16 ) -{ // Sprache aendern +{ // Sprache aendern } // ----------------------------------------------------------------------- void SvxSpellWrapper::InsertHyphen( const sal_uInt16 ) -{ // Hyphen einfuegen bzw. loeschen +{ // Hyphen einfuegen bzw. loeschen } // ----------------------------------------------------------------------- @@ -398,15 +398,15 @@ void SvxSpellWrapper::SpellDocument( ) if ( FindSpellError() ) { - Reference< XSpellAlternatives > xAlt( GetLast(), UNO_QUERY ); - Reference< XHyphenatedWord > xHyphWord( GetLast(), UNO_QUERY ); + Reference< XSpellAlternatives > xAlt( GetLast(), UNO_QUERY ); + Reference< XHyphenatedWord > xHyphWord( GetLast(), UNO_QUERY ); Window *pOld = pWin; bDialog = sal_True; if (xHyphWord.is()) { EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create(); - AbstractHyphenWordDialog* pDlg = pFact->CreateHyphenWordDialog( pWin, + AbstractHyphenWordDialog* pDlg = pFact->CreateHyphenWordDialog( pWin, xHyphWord->getWord(), SvxLocaleToLanguage( xHyphWord->getLocale() ), xHyph, this ); @@ -434,17 +434,17 @@ sal_Bool SvxSpellWrapper::SpellNext( ) // bActRev ist die Richtung nach dem Spellen, bReverse die am Anfang. if( bActRev == bReverse ) - { // Keine Richtungsaenderung, also ist + { // Keine Richtungsaenderung, also ist if( bStartChk ) // der gewuenschte Bereich ( bStartChk ) bStartDone = sal_True; // vollstaendig abgearbeitet. else bEndDone = sal_True; } else if( bReverse == bStartChk ) // Bei einer Richtungsaenderung kann - { // u.U. auch ein Bereich abgearbeitet sein. + { // u.U. auch ein Bereich abgearbeitet sein. if( bStartChk ) // Sollte der vordere Teil rueckwaerts gespellt bEndDone = sal_True; // werden und wir kehren unterwegs um, so ist - else // der hintere Teil abgearbeitet (und umgekehrt). + else // der hintere Teil abgearbeitet (und umgekehrt). bStartDone = sal_True; } @@ -576,7 +576,7 @@ sal_Bool SvxSpellWrapper::FindSpellError() { ShowLanguageErrors(); - Reference< XInterface > xRef; + Reference< XInterface > xRef; WAIT_ON(); sal_Bool bSpell = sal_True; @@ -589,8 +589,8 @@ sal_Bool SvxSpellWrapper::FindSpellError() { SpellContinue(); - Reference< XSpellAlternatives > xAlt( GetLast(), UNO_QUERY ); - Reference< XHyphenatedWord > xHyphWord( GetLast(), UNO_QUERY ); + Reference< XSpellAlternatives > xAlt( GetLast(), UNO_QUERY ); + Reference< XHyphenatedWord > xHyphWord( GetLast(), UNO_QUERY ); if (xAlt.is()) { @@ -603,7 +603,7 @@ sal_Bool SvxSpellWrapper::FindSpellError() // look up in ChangeAllList for misspelled word Reference< XDictionary > xChangeAllList( SvxGetChangeAllList(), UNO_QUERY ); - Reference< XDictionaryEntry > xEntry; + Reference< XDictionaryEntry > xEntry; if (xChangeAllList.is()) xEntry = xChangeAllList->getEntry( xAlt->getWord() ); diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index cd0f5a66fbf3..162cbac5adff 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ #include <xmloff/xmltoken.hxx> #include <vcl/help.hxx> -#define CHAR_HARDBLANK ((sal_Unicode)0x00A0) +#define CHAR_HARDBLANK ((sal_Unicode)0x00A0) using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::uno; @@ -85,10 +85,10 @@ using namespace ::xmloff::token; using namespace ::rtl; using namespace ::utl; -const int C_NONE = 0x00; -const int C_FULL_STOP = 0x01; -const int C_EXCLAMATION_MARK = 0x02; -const int C_QUESTION_MARK = 0x04; +const int C_NONE = 0x00; +const int C_FULL_STOP = 0x01; +const int C_EXCLAMATION_MARK = 0x02; +const int C_QUESTION_MARK = 0x04; static const sal_Char pImplWrdStt_ExcptLstStr[] = "WordExceptList"; static const sal_Char pImplCplStt_ExcptLstStr[] = "SentenceExceptList"; @@ -99,9 +99,9 @@ static const sal_Char pXMLImplAutocorr_ListStr[] = "DocumentList.xml"; static const sal_Char /* auch bei diesen Anfaengen - Klammern auf und alle Arten von Anf.Zei. */ - sImplSttSkipChars[] = "\"\'([{\x83\x84\x89\x91\x92\x93\x94", + sImplSttSkipChars[] = "\"\'([{\x83\x84\x89\x91\x92\x93\x94", /* auch bei diesen Ende - Klammern auf und alle Arten von Anf.Zei. */ - sImplEndSkipChars[] = "\"\')]}\x83\x84\x89\x91\x92\x93\x94"; + sImplEndSkipChars[] = "\"\')]}\x83\x84\x89\x91\x92\x93\x94"; // diese Zeichen sind in Worten erlaubt: (fuer FnCptlSttSntnc) static const sal_Char sImplWordChars[] = "-'"; @@ -111,8 +111,8 @@ void DecryptBlockName_Imp( String& rName ); // FileVersions Nummern fuer die Ersetzungs-/Ausnahmelisten getrennt -#define WORDLIST_VERSION_358 1 -#define EXEPTLIST_VERSION_358 0 +#define WORDLIST_VERSION_358 1 +#define EXEPTLIST_VERSION_358 0 _SV_IMPL_SORTAR_ALG( SvxAutocorrWordList, SvxAutocorrWordPtr ) @@ -178,8 +178,8 @@ SvxAutoCorrDoc::~SvxAutoCorrDoc() // wird nach dem austauschen der Zeichen von den Funktionen - // - FnCptlSttWrd - // - FnCptlSttSntnc + // - FnCptlSttWrd + // - FnCptlSttSntnc // gerufen. Dann koennen die Worte ggfs. in die Ausnahmelisten // aufgenommen werden. void SvxAutoCorrDoc::SaveCpltSttWord( ULONG, xub_StrLen, const String&, @@ -318,7 +318,7 @@ sal_Bool SvxAutoCorrect::IsAutoCorrectChar( sal_Unicode cChar ) sal_Bool SvxAutoCorrect::NeedsHardspaceAutocorr( sal_Unicode cChar ) { - return cChar == ';' || cChar == ':' || cChar == '?' || cChar == '!' || + return cChar == ';' || cChar == ':' || cChar == '?' || cChar == '!' || cChar == '/' /*case for the urls exception*/; } @@ -375,7 +375,7 @@ SvxAutoCorrect::SvxAutoCorrect( const String& rShareAutocorrFile, } SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect& rCpy ) -: sShareAutoCorrFile( rCpy.sShareAutoCorrFile ), +: sShareAutoCorrFile( rCpy.sShareAutoCorrFile ), sUserAutoCorrFile( rCpy.sUserAutoCorrFile ), aSwFlags( rCpy.aSwFlags ), @@ -492,10 +492,10 @@ BOOL SvxAutoCorrect::FnChgOrdinalNumber( rCC.isDigit( rTxt, nEndPos - 3 ) ) { static sal_Char __READONLY_DATA - sAll[] = "th", /* rest */ - sFirst[] = "st", /* 1 */ - sSecond[] = "nd", /* 2 */ - sThird[] = "rd"; /* 3 */ + sAll[] = "th", /* rest */ + sFirst[] = "st", /* 1 */ + sSecond[] = "nd", /* 2 */ + sThird[] = "rd"; /* 3 */ static const sal_Char* __READONLY_DATA aNumberTab[ 4 ] = { sAll, sFirst, sSecond, sThird @@ -523,7 +523,7 @@ BOOL SvxAutoCorrect::FnChgOrdinalNumber( break; } - if( bChg ) // dann setze mal das Escapement Attribut + if( bChg ) // dann setze mal das Escapement Attribut { SvxEscapementItem aSvxEscapementItem( DFLT_ESC_AUTO_SUPER, DFLT_ESC_PROP, SID_ATTR_CHAR_ESCAPEMENT ); @@ -620,7 +620,7 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash( // Replace [A-z0-9]--[A-z0-9] double dash with "emDash" or "enDash". // Finnish and Hungarian use enDash instead of emDash. - bool bEnDash = (eLang == LANGUAGE_HUNGARIAN || eLang == LANGUAGE_FINNISH); + bool bEnDash = (eLang == LANGUAGE_HUNGARIAN || eLang == LANGUAGE_FINNISH); if( ((cEmDash && !bEnDash) || (cEnDash && bEnDash)) && 4 <= nEndPos - nSttPos ) { String sTmp( rTxt.Copy( nSttPos, nEndPos - nSttPos ) ); @@ -647,7 +647,7 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace( LanguageType eLang ) { bool bRet = false; - + CharClass& rCC = GetCharClass( eLang ); const lang::Locale rLocale = rCC.getLocale( ); @@ -668,7 +668,7 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace( xub_StrLen nSttWdPos = nEndPos; while( nSttWdPos && !IsWordDelim( rTxt.GetChar( --nSttWdPos ))) ; - + // Check the presence of "://" in the word xub_StrLen nStrPos = rTxt.Search( String::CreateFromAscii( "://" ), nSttWdPos + 1 ); if ( STRING_NOTFOUND == nStrPos && nEndPos > 0 ) @@ -676,7 +676,7 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace( // Check the previous char sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 ); if ( ( chars.indexOf( cPrevChar ) == -1 ) && cPrevChar != '\t' ) - { + { // Remove any previous normal space xub_StrLen nPos = nEndPos - 1; while ( cPrevChar == ' ' || cPrevChar == CHAR_HARDBLANK ) @@ -685,7 +685,7 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace( nPos--; cPrevChar = rTxt.GetChar( nPos ); } - + nPos++; if ( nEndPos - nPos > 0 ) rDoc.Delete( nPos, nEndPos ); @@ -723,7 +723,7 @@ BOOL SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const String& rTxt, String sURL( URIHelper::FindFirstURLInText( rTxt, nSttPos, nEndPos, GetCharClass( eLang ) )); BOOL bRet = 0 != sURL.Len(); - if( bRet ) // also Attribut setzen: + if( bRet ) // also Attribut setzen: rDoc.SetINetAttr( nSttPos, nEndPos, sURL ); return bRet; } @@ -734,10 +734,10 @@ BOOL SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const String& rTxt LanguageType eLang ) { // Bedingung: - // Am Anfang: _ oder * hinter Space mit nachfolgenden !Space - // Am Ende: _ oder * vor Space (Worttrenner?) + // Am Anfang: _ oder * hinter Space mit nachfolgenden !Space + // Am Ende: _ oder * vor Space (Worttrenner?) - sal_Unicode c, cInsChar = rTxt.GetChar( nEndPos ); // unterstreichen oder fett + sal_Unicode c, cInsChar = rTxt.GetChar( nEndPos ); // unterstreichen oder fett if( ++nEndPos != rTxt.Len() && !IsWordDelim( rTxt.GetChar( nEndPos ) ) ) return FALSE; @@ -776,14 +776,14 @@ BOOL SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const String& rTxt { // ueber den gefundenen Bereich das Attribut aufspannen und // das gefunde und am Ende stehende Zeichen loeschen - if( '*' == cInsChar ) // Fett + if( '*' == cInsChar ) // Fett { SvxWeightItem aSvxWeightItem( WEIGHT_BOLD, SID_ATTR_CHAR_WEIGHT ); rDoc.SetAttr( nFndPos + 1, nEndPos, SID_ATTR_CHAR_WEIGHT, aSvxWeightItem); } - else // unterstrichen + else // unterstrichen { SvxUnderlineItem aSvxUnderlineItem( UNDERLINE_SINGLE, SID_ATTR_CHAR_UNDERLINE ); rDoc.SetAttr( nFndPos + 1, nEndPos, @@ -845,7 +845,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, } while( 0 == ( bAtStart = (pStart == pStr)) ); - if( !pWordStt || + if( !pWordStt || rCC.isDigit( aText, sal::static_int_cast< xub_StrLen >( pStr - pStart ) ) || IsUpperLetter( @@ -853,16 +853,16 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, aText, sal::static_int_cast< xub_StrLen >( pWordStt - pStart ) ) ) || 0x1 == *pWordStt || 0x2 == *pWordStt ) - return FALSE; // kein zu ersetzendes Zeichen, oder schon ok + return FALSE; // kein zu ersetzendes Zeichen, oder schon ok // JP 27.10.97: wenn das Wort weniger als 3 Zeichen hat und der Trenner - // ein "Num"-Trenner ist, dann nicht ersetzen! - // Damit wird ein "a.", "a)", "a-a" nicht ersetzt! + // ein "Num"-Trenner ist, dann nicht ersetzen! + // Damit wird ein "a.", "a)", "a-a" nicht ersetzt! if( *pDelim && 2 >= pDelim - pWordStt && lcl_IsInAsciiArr( ".-)>", *pDelim ) ) return FALSE; - if( !bAtStart ) // noch kein Absatz Anfang ? + if( !bAtStart ) // noch kein Absatz Anfang ? { if ( IsWordDelim( *pStr ) ) { @@ -876,7 +876,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, return FALSE; // kein gueltiger Trenner -> keine Ersetzung } - if( bAtStart ) // am Absatz Anfang ? + if( bAtStart ) // am Absatz Anfang ? { // Ueberpruefe den vorherigen Absatz, wenn es diesen gibt. // Wenn ja, dann pruefe auf SatzTrenner am Ende. @@ -896,14 +896,14 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, pStart = aText.GetBuffer(); pStr = pStart + aText.Len(); - do { // alle Blanks ueberlesen + do { // alle Blanks ueberlesen --pStr; if( !IsWordDelim( *pStr )) break; } while( 0 == ( bAtStart = (pStart == pStr)) ); if( bAtStart ) - return FALSE; // kein gueltiger Trenner -> keine Ersetzung + return FALSE; // kein gueltiger Trenner -> keine Ersetzung } // bis hierhier wurde [ \t]+[A-Z0-9]+ gefunden. Test jetzt auf den @@ -922,7 +922,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, case 0xFF0E : { if( nFlag & C_FULL_STOP ) - return FALSE; // kein gueltiger Trenner -> keine Ersetzung + return FALSE; // kein gueltiger Trenner -> keine Ersetzung nFlag |= C_FULL_STOP; pExceptStt = pStr; } @@ -931,7 +931,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, case 0xFF01 : { if( nFlag & C_EXCLAMATION_MARK ) - return FALSE; // kein gueltiger Trenner -> keine Ersetzung + return FALSE; // kein gueltiger Trenner -> keine Ersetzung nFlag |= C_EXCLAMATION_MARK; } break; @@ -939,13 +939,13 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, case 0xFF1F : { if( nFlag & C_QUESTION_MARK) - return FALSE; // kein gueltiger Trenner -> keine Ersetzung + return FALSE; // kein gueltiger Trenner -> keine Ersetzung nFlag |= C_QUESTION_MARK; } break; default: if( !nFlag ) - return FALSE; // kein gueltiger Trenner -> keine Ersetzung + return FALSE; // kein gueltiger Trenner -> keine Ersetzung else bWeiter = FALSE; break; @@ -954,10 +954,10 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, if( bWeiter && pStr-- == pStart ) { // !!! wenn am Anfang, dann nie ersetzen. -// if( !nFlag ) - return FALSE; // kein gueltiger Trenner -> keine Ersetzung -// ++pStr; -// break; // Schleife beenden +// if( !nFlag ) + return FALSE; // kein gueltiger Trenner -> keine Ersetzung +// ++pStr; +// break; // Schleife beenden } } while( bWeiter ); if( C_FULL_STOP != nFlag ) @@ -1004,7 +1004,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, } if( !bValid ) - return FALSE; // kein gueltiger Trenner -> keine Ersetzung + return FALSE; // kein gueltiger Trenner -> keine Ersetzung } BOOL bNumericOnly = '0' <= *(pStr+1) && *(pStr+1) <= '9'; @@ -1023,7 +1023,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc, --pStr; } - if( bNumericOnly ) // besteht nur aus Zahlen, dann nicht + if( bNumericOnly ) // besteht nur aus Zahlen, dann nicht return FALSE; if( IsWordDelim( *pStr )) @@ -1157,7 +1157,7 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang ); //JP 13.02.99: damit beim Undo das "einfuegte" Zeichen wieder erscheint, - // wird es erstmal eingefuegt und dann ueberschrieben + // wird es erstmal eingefuegt und dann ueberschrieben String sChg( cInsChar ); if( bIns ) rDoc.Insert( nInsPos, sChg ); @@ -1165,8 +1165,8 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, rDoc.Replace( nInsPos, sChg ); //JP 13.08.97: Bug 42477 - bei doppelten Anfuehrungszeichen muss bei - // franzoesischer Sprache an Anfang ein Leerzeichen dahinter - // und am Ende ein Leerzeichen dahinter eingefuegt werden. + // franzoesischer Sprache an Anfang ein Leerzeichen dahinter + // und am Ende ein Leerzeichen dahinter eingefuegt werden. sChg = cRet; if( '\"' == cInsChar ) @@ -1181,7 +1181,7 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, case LANGUAGE_FRENCH_SWISS: case LANGUAGE_FRENCH_LUXEMBOURG: // JP 09.02.99: das zusaetzliche Zeichen immer per Insert einfuegen. - // Es ueberschreibt nichts! + // Es ueberschreibt nichts! { String s( static_cast< sal_Unicode >(0xA0) ); // UNICODE code for no break space @@ -1206,8 +1206,8 @@ String SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, String sRet( cRet ); //JP 13.08.97: Bug 42477 - bei doppelten Anfuehrungszeichen muss bei - // franzoesischer Sprache an Anfang ein Leerzeichen dahinter - // und am Ende ein Leerzeichen dahinter eingefuegt werden. + // franzoesischer Sprache an Anfang ein Leerzeichen dahinter + // und am Ende ein Leerzeichen dahinter eingefuegt werden. if( '\"' == cInsChar ) { if( LANGUAGE_SYSTEM == eLang ) @@ -1236,8 +1236,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, ULONG nRet = 0; bool bIsNextRun = bRunNext; bRunNext = false; // if it was set, then it has to be turned off - - do{ // only for middle check loop !! + + do{ // only for middle check loop !! if( cChar ) { //JP 10.02.97: doppelte Spaces verhindern @@ -1259,7 +1259,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, BOOL bSttQuote = !nInsPos || IsWordDelim( ( cPrev = rTxt.GetChar( nInsPos-1 ))) || // os: #56034# - Warum kein schliessendes Anfuehrungszeichen nach dem Bindestrich? -// strchr( "-([{", cPrev ) || +// strchr( "-([{", cPrev ) || lcl_IsInAsciiArr( "([{", cPrev ) || ( cEmDash && cEmDash == cPrev ) || ( cEnDash && cEnDash == cPrev ); @@ -1273,8 +1273,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, rDoc.Insert( nInsPos, cChar ); else rDoc.Replace( nInsPos, cChar ); - - // Hardspaces autocorrection + + // Hardspaces autocorrection if ( IsAutoCorrFlag( AddNonBrkSpace ) ) { if ( NeedsHardspaceAutocorr( cChar ) && @@ -1332,9 +1332,9 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, // Absatz-Anfang oder ein Blank gefunden, suche nach dem Wort // Kuerzel im Auto - xub_StrLen nCapLttrPos = nPos+1; // auf das 1. Zeichen + xub_StrLen nCapLttrPos = nPos+1; // auf das 1. Zeichen if( !nPos && !IsWordDelim( rTxt.GetChar( 0 ))) - --nCapLttrPos; // Absatz Anfang und kein Blank ! + --nCapLttrPos; // Absatz Anfang und kein Blank ! LanguageType eLang = rDoc.GetLanguage( nCapLttrPos, FALSE ); if( LANGUAGE_SYSTEM == eLang ) @@ -1344,7 +1344,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, // Bug 19285: Symbolzeichen nicht anfassen if( lcl_IsSymbolChar( rCC, rTxt, nCapLttrPos, nInsPos )) break; - + if( IsAutoCorrFlag( Autocorrect ) ) { const String* pPara = 0; @@ -1355,9 +1355,9 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, if( !bChgWord ) { // JP 16.06.98: dann versuche mal alle !AlphaNum. Zeichen los zu - // werden und teste dann nochmals + // werden und teste dann nochmals //JP 22.04.99: Bug 63883 - entferne nur die "Klammern Start/-Anfaenge", - // alle anderen Zeichen muessen drin bleiben. + // alle anderen Zeichen muessen drin bleiben. xub_StrLen nCapLttrPos1 = nCapLttrPos, nInsPos1 = nInsPos; while( nCapLttrPos1 < nInsPos && lcl_IsInAsciiArr( sImplSttSkipChars, rTxt.GetChar( nCapLttrPos1 ) ) @@ -1456,13 +1456,13 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, } else { - if( nRet & ChgQuotes) nHelpId = 16; - else if( nRet & ChgSglQuotes) nHelpId = 17; - else if( nRet & SetINetAttr) nHelpId = 18; + if( nRet & ChgQuotes) nHelpId = 16; + else if( nRet & ChgSglQuotes) nHelpId = 17; + else if( nRet & SetINetAttr) nHelpId = 18; else if( nRet & IgnoreDoubleSpace) nHelpId = 19; - else if( nRet & ChgWeightUnderl) nHelpId = 20; + else if( nRet & ChgWeightUnderl) nHelpId = 20; else if( nRet & AddNonBrkSpace) nHelpId = 21; - else if( nRet & ChgOrdinalNumber) nHelpId = 22; + else if( nRet & ChgOrdinalNumber) nHelpId = 22; } if( nHelpId ) @@ -1602,9 +1602,9 @@ BOOL SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc, // Absatz-Anfang oder ein Blank gefunden, suche nach dem Wort // Kuerzel im Auto - xub_StrLen nCapLttrPos = nPos+1; // auf das 1. Zeichen + xub_StrLen nCapLttrPos = nPos+1; // auf das 1. Zeichen if( !nPos && !IsWordDelim( rTxt.GetChar( 0 ))) - --nCapLttrPos; // Absatz Anfang und kein Blank ! + --nCapLttrPos; // Absatz Anfang und kein Blank ! while( lcl_IsInAsciiArr( sImplSttSkipChars, rTxt.GetChar( nCapLttrPos )) ) if( ++nCapLttrPos >= nEnde ) @@ -1684,7 +1684,7 @@ BOOL SvxAutoCorrect::PutText( const String& rShort, const String& rLong, } - // - loesche einen Eintrag + // - loesche einen Eintrag BOOL SvxAutoCorrect::DeleteText( const String& rShort, LanguageType eLang ) { BOOL bRet = FALSE; @@ -1694,14 +1694,14 @@ BOOL SvxAutoCorrect::DeleteText( const String& rShort, LanguageType eLang ) } - // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen - // koennen aus der Wortliste herausgeholt werden!) + // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen + // koennen aus der Wortliste herausgeholt werden!) BOOL SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String& , String& ) { return FALSE; } - // - Text mit Attributierung (kann nur der SWG - SWG-Format!) + // - Text mit Attributierung (kann nur der SWG - SWG-Format!) BOOL SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String&, SfxObjectShell&, String& ) { @@ -1745,11 +1745,11 @@ void DecryptBlockName_Imp( String& rName ) for ( nLen = rName.Len(), nPos = 0; nPos < nLen; ++nPos, ++pName ) switch( *pName ) { - case 0x01: *pName = '!'; break; - case 0x0A: *pName = ':'; break; - case 0x0C: *pName = '\\'; break; - case 0x0E: *pName = '.'; break; - case 0x0F: *pName = '/'; break; + case 0x01: *pName = '!'; break; + case 0x0A: *pName = ':'; break; + case 0x0C: *pName = '\\'; break; + case 0x0E: *pName = '.'; break; + case 0x0F: *pName = '/'; break; } } } @@ -1916,7 +1916,7 @@ BOOL lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord) String sLowerAbk( *pAbk ); sLowerAbk.ToLowerAscii(); for( xub_StrLen i = sLowerAbk.Len(), ii = sLowerWord.Len(); i; ) { - if( !--i ) // stimmt ueberein + if( !--i ) // stimmt ueberein return TRUE; if( sLowerAbk.GetChar( i ) != sLowerWord.GetChar( --ii )) @@ -2011,7 +2011,7 @@ SvxAutoCorrectLanguageLists::SvxAutoCorrectLanguageLists( const String& rShareAutoCorrectFile, const String& rUserAutoCorrectFile, LanguageType eLang) -: sShareAutoCorrFile( rShareAutoCorrectFile ), +: sShareAutoCorrFile( rShareAutoCorrectFile ), sUserAutoCorrFile( rUserAutoCorrectFile ), eLanguage(eLang), pCplStt_ExcptLst( 0 ), @@ -2043,8 +2043,8 @@ BOOL SvxAutoCorrectLanguageLists::IsFileChanged_Imp() Time nMinTime( 0, 2 ); Time nAktTime; - if( aLastCheckTime > nAktTime || // ueberlauf ? - ( nAktTime -= aLastCheckTime ) > nMinTime ) // min Zeit vergangen + if( aLastCheckTime > nAktTime || // ueberlauf ? + ( nAktTime -= aLastCheckTime ) > nMinTime ) // min Zeit vergangen { Date aTstDate; Time aTstTime; if( FStatHelper::GetModifiedDateTimeOfFile( sShareAutoCorrFile, @@ -2487,8 +2487,8 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() INetURLObject aDest; INetURLObject aSource; -// String sDestPath = sUserAutoCorrFile.Copy ( 0, sUserAutoCorrFile.Len()-3); -// sDestPath.AppendAscii ("bak"); +// String sDestPath = sUserAutoCorrFile.Copy ( 0, sUserAutoCorrFile.Len()-3); +// sDestPath.AppendAscii ("bak"); if (sUserAutoCorrFile != sShareAutoCorrFile ) @@ -2517,7 +2517,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() sal_Unicode cSlash = '/'; xub_StrLen nSlashPos = sMain.SearchBackward(cSlash); sMain.Erase(nSlashPos); - ::ucbhelper::Content aNewContent( sMain, uno::Reference< XCommandEnvironment > ()); + ::ucbhelper::Content aNewContent( sMain, uno::Reference< XCommandEnvironment > ()); Any aAny; TransferInfo aInfo; aInfo.NameClash = NameClash::OVERWRITE; @@ -2539,11 +2539,11 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() if( xSrcStg.Is() && xDstStg.Is() ) { - String sWord ( RTL_CONSTASCII_USTRINGPARAM ( pImplWrdStt_ExcptLstStr ) ); + String sWord ( RTL_CONSTASCII_USTRINGPARAM ( pImplWrdStt_ExcptLstStr ) ); String sSentence ( RTL_CONSTASCII_USTRINGPARAM ( pImplCplStt_ExcptLstStr ) ); String sXMLWord ( RTL_CONSTASCII_USTRINGPARAM ( pXMLImplWrdStt_ExcptLstStr ) ); String sXMLSentence ( RTL_CONSTASCII_USTRINGPARAM ( pXMLImplCplStt_ExcptLstStr ) ); - SvStringsISortDtor *pTmpWordList = NULL; + SvStringsISortDtor *pTmpWordList = NULL; if (xSrcStg->IsContained( sXMLWord ) ) LoadXMLExceptList_Imp( pTmpWordList, pXMLImplWrdStt_ExcptLstStr, xSrcStg ); @@ -2655,11 +2655,11 @@ BOOL SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg ) refList->SetBufferSize( 8192 ); rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding(); - String aDummy; // Erkennungszeichen fuer neue Streams + String aDummy; // Erkennungszeichen fuer neue Streams refList->WriteByteString( aDummy, RTL_TEXTENCODING_MS_1252 ) - << (BYTE) 4 // Laenge des Headers (ohne den Leerstring) - << (USHORT)WORDLIST_VERSION_358 // Version des Streams - << (BYTE)eEncoding; // der Zeichensatz + << (BYTE) 4 // Laenge des Headers (ohne den Leerstring) + << (USHORT)WORDLIST_VERSION_358 // Version des Streams + << (BYTE)eEncoding; // der Zeichensatz for( USHORT i = 0; i < pAutocorr_List->Count() && SVSTREAM_OK == refList->GetError(); ++i ) @@ -2711,7 +2711,7 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort, BOOL bRet = xStg.Is() && SVSTREAM_OK == xStg->GetError(); -/* if( bRet ) +/* if( bRet ) { // PutText( *xStg, rShort ); } @@ -2754,7 +2754,7 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort, /* -----------------18.11.98 11:26------------------- * * --------------------------------------------------*/ - // - Text mit Attributierung (kann nur der SWG - SWG-Format!) + // - Text mit Attributierung (kann nur der SWG - SWG-Format!) BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort, SfxObjectShell& rShell ) { @@ -2768,9 +2768,9 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort, try { uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetStorageFromURL( sUserAutoCorrFile, embed::ElementModes::READWRITE ); -// String aName( rShort ); -// EncryptBlockName_Imp( aName ); -// bRet = PutText( *xStg, aName, rShell, sLong ); +// String aName( rShort ); +// EncryptBlockName_Imp( aName ); +// bRet = PutText( *xStg, aName, rShell, sLong ); bRet = rAutoCorrect.PutText( xStg, sUserAutoCorrFile, rShort, rShell, sLong ); xStg = 0; @@ -2797,7 +2797,7 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort, /* -----------------18.11.98 11:26------------------- * * --------------------------------------------------*/ - // - loesche einen Eintrag + // - loesche einen Eintrag BOOL SvxAutoCorrectLanguageLists::DeleteText( const String& rShort ) { // erstmal akt. Liste besorgen! diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx index 038120a057d4..6c1a60a24501 100644 --- a/editeng/source/misc/swafopt.cxx +++ b/editeng/source/misc/swafopt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() bWithRedlining = bAutoCmpltEndless = bAutoCmpltAppendBlanc = - bAutoCmpltShowAsTip = FALSE; + bAutoCmpltShowAsTip = FALSE; bSetBorder = bCreateTable = @@ -78,7 +78,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() bDummy6 = bDummy7 = bDummy8 = FALSE; - nRightMargin = 50; // dflt. 50 % + nRightMargin = 50; // dflt. 50 % nAutoCmpltExpandKey = KEY_RETURN; aBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL ); diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx index cccda2c1f523..00fe357cc680 100644 --- a/editeng/source/misc/txtrange.cxx +++ b/editeng/source/misc/txtrange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const baseg memset( pCache, 0, nCacheSize * sizeof( SvLongsPtr ) ); sal_uInt32 nCount(rPolyPolygon.count()); mpPolyPolygon = new PolyPolygon( (sal_uInt16)nCount ); - + for(sal_uInt32 i(0L); i < nCount; i++) { const basegfx::B2DPolygon aCandidate(rPolyPolygon.getB2DPolygon(i).getDefaultAdaptiveSubdivision()); @@ -181,7 +181,7 @@ class SvxBoundArgs void _NoteFarPoint( long nPx, long nPyDiff, long nDiff ); void NoteFarPoint( long nPx, long nPyDiff, long nDiff ) { if( nDiff ) _NoteFarPoint( nPx, nPyDiff, nDiff ); } - long CalcMax( const Point& rPt1, const Point& rPt2, long nRange, long nFar ); + long CalcMax( const Point& rPt1, const Point& rPt2, long nRange, long nFar ); void CheckCut( const Point& rLst, const Point& rNxt ); inline long A( const Point& rP ) const { return bRotate ? rP.Y() : rP.X(); } inline long B( const Point& rP ) const { return bRotate ? rP.X() : rP.Y(); } @@ -306,7 +306,7 @@ void SvxBoundArgs::NoteRange( BOOL bToggle ) BOOL bOdd = nIdx % 2 ? TRUE : FALSE; // Kein Ueberlappung mit vorhandenen Intervallen? if( nIdx == nCount || ( !bOdd && nMax < (*pLongArr)[ nIdx ] ) ) - { // Dann wird ein neues eingefuegt ... + { // Dann wird ein neues eingefuegt ... pLongArr->Insert( nMin, nIdx ); pLongArr->Insert( nMax, nIdx + 1 ); aBoolArr.Insert( bToggle, nIdx / 2 ); @@ -393,8 +393,8 @@ void SvxBoundArgs::Calc( const PolyPolygon& rPoly ) else NotePoint( A(rNull) ); } - nFirst = 0; // In welcher Richtung wird die Zeile verlassen? - nAct = 3; // Wir sind z.Z. innerhalb der Zeile. + nFirst = 0; // In welcher Richtung wird die Zeile verlassen? + nAct = 3; // Wir sind z.Z. innerhalb der Zeile. } if( nCount > 1 ) { @@ -569,7 +569,7 @@ void SvxBoundArgs::Concat( const PolyPolygon* pPoly ) while( nLeftPos < nOldCount && nLeft > (*pOld)[ nLeftPos ] ) nLeftPos += 2; if( nLeftPos >= nOldCount ) - { // Das aktuelle Intervall gehoert ans Ende des alten Arrays... + { // Das aktuelle Intervall gehoert ans Ende des alten Arrays... if( !bSubtract ) pOld->Insert( pLongArr, nOldCount, i - 2, USHRT_MAX ); break; diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 7761061933fb..84ddce202def 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase1.hxx> // helper for implementations +#include <cppuhelper/implbase1.hxx> // helper for implementations #include <i18npool/mslangid.hxx> #include <unotools/lingucfg.hxx> #include <unotools/ucbhelper.hxx> @@ -418,17 +418,17 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck ) // Since the check is on-demand occuring and executed once it should // not be too troublesome. // 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' +// 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 - //! gets destroyed. + //! gets destroyed. //! Note 2: the new settings in the configuration get applied - //! because the 'LngSvcMgr' (in linguistic/source/lngsvcmgr.hxx) - //! listens to the configuration for changes of the relevant - //! properties and then applies the new settings. + //! because the 'LngSvcMgr' (in linguistic/source/lngsvcmgr.hxx) + //! listens to the configuration for changes of the relevant + //! properties and then applies the new settings. // nothing needs to be done anymore nNeedUpdating = 0; @@ -865,17 +865,17 @@ typedef cppu::WeakImplHelper1 < XEventListener > LinguMgrAppExitLstnrBaseClass; class LinguMgrAppExitLstnr : public LinguMgrAppExitLstnrBaseClass { - uno::Reference< XComponent > xDesktop; + uno::Reference< XComponent > xDesktop; public: LinguMgrAppExitLstnr(); virtual ~LinguMgrAppExitLstnr(); - virtual void AtExit() = 0; + virtual void AtExit() = 0; // lang::XEventListener - virtual void SAL_CALL disposing(const EventObject& rSource) + virtual void SAL_CALL disposing(const EventObject& rSource) throw( RuntimeException ); }; @@ -899,7 +899,7 @@ LinguMgrAppExitLstnr::~LinguMgrAppExitLstnr() if (xDesktop.is()) { xDesktop->removeEventListener( this ); - xDesktop = NULL; //! release reference to desktop + xDesktop = NULL; //! release reference to desktop } DBG_ASSERT(!xDesktop.is(), "reference to desktop should be realeased"); } @@ -910,7 +910,7 @@ void LinguMgrAppExitLstnr::disposing(const EventObject& rSource) if (xDesktop.is() && rSource.Source == xDesktop) { xDesktop->removeEventListener( this ); - xDesktop = NULL; //! release reference to desktop + xDesktop = NULL; //! release reference to desktop AtExit(); } @@ -921,41 +921,41 @@ void LinguMgrAppExitLstnr::disposing(const EventObject& rSource) class LinguMgrExitLstnr : public LinguMgrAppExitLstnr { public: - virtual void AtExit(); + virtual void AtExit(); }; void LinguMgrExitLstnr::AtExit() { // release references - LinguMgr::xLngSvcMgr = 0; - LinguMgr::xSpell = 0; - LinguMgr::xHyph = 0; - LinguMgr::xThes = 0; - LinguMgr::xDicList = 0; - LinguMgr::xProp = 0; - LinguMgr::xIgnoreAll = 0; - LinguMgr::xChangeAll = 0; + LinguMgr::xLngSvcMgr = 0; + LinguMgr::xSpell = 0; + LinguMgr::xHyph = 0; + LinguMgr::xThes = 0; + LinguMgr::xDicList = 0; + LinguMgr::xProp = 0; + LinguMgr::xIgnoreAll = 0; + LinguMgr::xChangeAll = 0; - LinguMgr::bExiting = sal_True; + LinguMgr::bExiting = sal_True; //TL:TODO: MBA fragen wie ich ohne Absturz hier meinen Speicher // wieder freibekomme... //delete LinguMgr::pExitLstnr; - LinguMgr::pExitLstnr = 0; + LinguMgr::pExitLstnr = 0; } /////////////////////////////////////////////////////////////////////////// // static member initialization -LinguMgrExitLstnr * LinguMgr::pExitLstnr = 0; -sal_Bool LinguMgr::bExiting = sal_False; -uno::Reference< XLinguServiceManager > LinguMgr::xLngSvcMgr = 0; -uno::Reference< XSpellChecker1 > LinguMgr::xSpell = 0; -uno::Reference< XHyphenator > LinguMgr::xHyph = 0; -uno::Reference< XThesaurus > LinguMgr::xThes = 0; -uno::Reference< XDictionaryList > LinguMgr::xDicList = 0; -uno::Reference< XPropertySet > LinguMgr::xProp = 0; +LinguMgrExitLstnr * LinguMgr::pExitLstnr = 0; +sal_Bool LinguMgr::bExiting = sal_False; +uno::Reference< XLinguServiceManager > LinguMgr::xLngSvcMgr = 0; +uno::Reference< XSpellChecker1 > LinguMgr::xSpell = 0; +uno::Reference< XHyphenator > LinguMgr::xHyph = 0; +uno::Reference< XThesaurus > LinguMgr::xThes = 0; +uno::Reference< XDictionaryList > LinguMgr::xDicList = 0; +uno::Reference< XPropertySet > LinguMgr::xProp = 0; uno::Reference< XDictionary > LinguMgr::xIgnoreAll = 0; uno::Reference< XDictionary > LinguMgr::xChangeAll = 0; @@ -1201,7 +1201,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard() { xTmpDicList->addDictionary( xTmp ); xTmp->setActive( sal_True ); - } + } xDic = uno::Reference< XDictionary > ( xTmp, UNO_QUERY ); } #if OSL_DEBUG_LEVEL > 1 @@ -1239,7 +1239,7 @@ uno::Reference< XDictionaryList > SvxGetDictionaryList() return LinguMgr::GetDictionaryList(); } -uno::Reference< XPropertySet > SvxGetLinguPropertySet() +uno::Reference< XPropertySet > SvxGetLinguPropertySet() { return LinguMgr::GetLinguPropertySet(); } @@ -1275,11 +1275,11 @@ SvxAlternativeSpelling SvxGetAltSpelling( { OUString aWord( rHyphWord->getWord() ), aAltWord( rHyphWord->getHyphenatedWord() ); - INT16 nHyphenationPos = rHyphWord->getHyphenationPos(), - nHyphenPos = rHyphWord->getHyphenPos(); + INT16 nHyphenationPos = rHyphWord->getHyphenationPos(), + nHyphenPos = rHyphWord->getHyphenPos(); INT16 nLen = (INT16)aWord.getLength(); INT16 nAltLen = (INT16)aAltWord.getLength(); - const sal_Unicode *pWord = aWord.getStr(), + const sal_Unicode *pWord = aWord.getStr(), *pAltWord = aAltWord.getStr(); // count number of chars from the left to the @@ -1300,8 +1300,8 @@ SvxAlternativeSpelling SvxGetAltSpelling( aRes.aReplacement = OUString( aAltWord.copy( nL, nAltLen - nL - nR ) ); aRes.nChangedPos = (INT16) nL; aRes.nChangedLength = nLen - nL - nR; - aRes.bIsAltSpelling = TRUE; - aRes.xHyphWord = rHyphWord; + aRes.bIsAltSpelling = TRUE; + aRes.xHyphWord = rHyphWord; } return aRes; } @@ -1310,7 +1310,7 @@ SvxAlternativeSpelling SvxGetAltSpelling( /////////////////////////////////////////////////////////////////////////// SvxDicListChgClamp::SvxDicListChgClamp( uno::Reference< XDictionaryList > &rxDicList ) : - xDicList ( rxDicList ) + xDicList ( rxDicList ) { if (xDicList.is()) { @@ -1336,7 +1336,7 @@ short SvxDicError( Window *pParent, sal_Int16 nError ) int nRid; switch (nError) { - case DIC_ERR_FULL : nRid = RID_SVXSTR_DIC_ERR_FULL; break; + case DIC_ERR_FULL : nRid = RID_SVXSTR_DIC_ERR_FULL; break; case DIC_ERR_READONLY : nRid = RID_SVXSTR_DIC_ERR_READONLY; break; default: nRid = RID_SVXSTR_DIC_ERR_UNKNOWN; @@ -1349,7 +1349,7 @@ short SvxDicError( Window *pParent, sal_Int16 nError ) LanguageType SvxLocaleToLanguage( const Locale& rLocale ) { - // empty Locale -> LANGUAGE_NONE + // empty Locale -> LANGUAGE_NONE if ( rLocale.Language.getLength() == 0 ) return LANGUAGE_NONE; @@ -1358,7 +1358,7 @@ LanguageType SvxLocaleToLanguage( const Locale& rLocale ) Locale& SvxLanguageToLocale( Locale& rLocale, LanguageType eLang ) { - if ( eLang != LANGUAGE_NONE /* && eLang != LANGUAGE_SYSTEM */) + if ( eLang != LANGUAGE_NONE /* && eLang != LANGUAGE_SYSTEM */) MsLangId::convertLanguageToLocale( eLang, rLocale ); else rLocale = Locale(); diff --git a/editeng/source/outliner/outl_pch.cxx b/editeng/source/outliner/outl_pch.cxx index 22522eb0369d..1eff044ef9d9 100644 --- a/editeng/source/outliner/outl_pch.cxx +++ b/editeng/source/outliner/outl_pch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/outliner/outl_pch.hxx b/editeng/source/outliner/outl_pch.hxx index 06f1f29760a7..289b475f985a 100644 --- a/editeng/source/outliner/outl_pch.hxx +++ b/editeng/source/outliner/outl_pch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx index b7a74cdd3a83..6db152dbfd27 100644 --- a/editeng/source/outliner/outleeng.cxx +++ b/editeng/source/outliner/outleeng.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -184,7 +184,7 @@ void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const Str void OutlinerEditEng::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ) { - EditEngine::FieldClicked( rField, nPara, nPos ); // Falls URL + EditEngine::FieldClicked( rField, nPara, nPos ); // Falls URL pOwner->FieldClicked( rField, nPara, nPos ); } diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx index 021e49841989..a18bd95884f9 100644 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ SV_DECL_PTRARR_DEL( NotifyList, EENotifyPtr, 1, 1 ) class OutlinerEditEng : public EditEngine { - Outliner* pOwner; + Outliner* pOwner; protected: @@ -48,10 +48,10 @@ public: OutlinerEditEng( Outliner* pOwner, SfxItemPool* pPool ); ~OutlinerEditEng(); - virtual void PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ); + virtual void PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ); - virtual void ParagraphInserted( USHORT nNewParagraph ); - virtual void ParagraphDeleted( USHORT nDeletedParagraph ); + virtual void ParagraphInserted( USHORT nNewParagraph ); + virtual void ParagraphDeleted( USHORT nDeletedParagraph ); virtual void ParagraphConnected( USHORT nLeftParagraph, USHORT nRightParagraph ); // #101498# @@ -75,19 +75,19 @@ public: const Color& rOverlineColor, const Color& rTextLineColor); - virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); - virtual void ParaAttribsChanged( USHORT nPara ); - virtual BOOL SpellNextDocument(); - virtual XubString GetUndoComment( USHORT nUndoId ) const; + virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); + virtual void ParaAttribsChanged( USHORT nPara ); + virtual BOOL SpellNextDocument(); + virtual XubString GetUndoComment( USHORT nUndoId ) const; // for text conversion virtual BOOL ConvertNextDocument(); - virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ); - virtual void FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ); - virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ); + virtual void FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ); + virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); - virtual Rectangle GetBulletArea( USHORT nPara ); + virtual Rectangle GetBulletArea( USHORT nPara ); virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ); diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 0a786cff44b7..cf2428eaba2e 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ BOOL Outliner::IsUndoEnabled() const return pEditEngine->IsUndoEnabled(); } -MapMode Outliner::GetRefMapMode() const +MapMode Outliner::GetRefMapMode() const { DBG_CHKTHIS(Outliner,0); return pEditEngine->GetRefMapMode(); diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 2f5107f80f11..d9a42270d52d 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,13 +66,13 @@ // #101498# calculate if it's RTL or not #include <unicode/ubidi.h> -#define DEFAULT_SCALE 75 +#define DEFAULT_SCALE 75 -static const USHORT nDefStyles = 3; // Sonderbehandlung fuer die ersten 3 Ebenen +static const USHORT nDefStyles = 3; // Sonderbehandlung fuer die ersten 3 Ebenen static const USHORT nDefBulletIndent = 800; static const USHORT nDefBulletWidth = 700; -static const USHORT pDefBulletIndents[nDefStyles]= { 1400, 800, 800 }; -static const USHORT pDefBulletWidths[nDefStyles] = { 1000, 850, 700 }; +static const USHORT pDefBulletIndents[nDefStyles]= { 1400, 800, 800 }; +static const USHORT pDefBulletWidths[nDefStyles] = { 1000, 850, 700 }; USHORT lcl_ImplGetDefBulletWidth( sal_Int16 nDepth ) { @@ -501,8 +501,8 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView) USHORT nTabs = 0; ESelection aDelSel; -// const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( (sal_uInt16)nPara ); -// bool bAlreadyOutliner = rAttrs.GetItemState( EE_PARA_OUTLLRSPACE ) == SFX_ITEM_ON ? true : false; +// const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( (sal_uInt16)nPara ); +// bool bAlreadyOutliner = rAttrs.GetItemState( EE_PARA_OUTLLRSPACE ) == SFX_ITEM_ON ? true : false; XubString aName; XubString aHeading_US( RTL_CONSTASCII_USTRINGPARAM( "heading" ) ); @@ -859,7 +859,7 @@ BOOL Outliner::Expand( Paragraph* pPara ) BOOL Outliner::Collapse( Paragraph* pPara ) { DBG_CHKTHIS(Outliner,0); - if ( pParaList->HasVisibleChilds( pPara ) ) // expandiert + if ( pParaList->HasVisibleChilds( pPara ) ) // expandiert { OLUndoExpand* pUndo = 0; BOOL bUndo = FALSE; @@ -988,11 +988,11 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos, Font aOldFont = pOutDev->GetFont(); pOutDev->SetFont( aBulletFont ); - ParagraphInfos aParaInfos = pEditEngine->GetParagraphInfos( nPara ); + ParagraphInfos aParaInfos = pEditEngine->GetParagraphInfos( nPara ); Point aTextPos; if ( !bVertical ) { -// aTextPos.Y() = rStartPos.Y() + aBulletArea.Bottom(); +// aTextPos.Y() = rStartPos.Y() + aBulletArea.Bottom(); aTextPos.Y() = rStartPos.Y() + ( bSymbol ? aBulletArea.Bottom() : aParaInfos.nFirstLineMaxAscent ); if ( !bRightToLeftPara ) aTextPos.X() = rStartPos.X() + aBulletArea.Left(); @@ -1001,7 +1001,7 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos, } else { -// aTextPos.X() = rStartPos.X() - aBulletArea.Bottom(); +// aTextPos.X() = rStartPos.X() - aBulletArea.Bottom(); aTextPos.X() = rStartPos.X() - ( bSymbol ? aBulletArea.Bottom() : aParaInfos.nFirstLineMaxAscent ); aTextPos.Y() = rStartPos.Y() + aBulletArea.Left(); } @@ -1233,7 +1233,7 @@ void Outliner::ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara ) pEditEngine->SetUpdateMode( bUpdate ); } -SfxUndoManager& Outliner::GetUndoManager() +SfxUndoManager& Outliner::GetUndoManager() { DBG_CHKTHIS(Outliner,0); return pEditEngine->GetUndoManager(); @@ -1249,7 +1249,7 @@ void Outliner::ImpTextPasted( ULONG nStartPara, USHORT nCount ) const ULONG nStart = nStartPara; Paragraph* pPara = pParaList->GetParagraph( nStartPara ); -// Paragraph* pLastConverted = NULL; +// Paragraph* pLastConverted = NULL; // bool bFirst = true; while( nCount && pPara ) @@ -1311,10 +1311,10 @@ BOOL Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView ) // eingerueckt werden, evtl folgen aber weitere auf Ebene 0. if ( ( mnFirstSelPage == 0 ) && ( ImplGetOutlinerMode() != OUTLINERMODE_TEXTOBJECT ) ) { - if ( nDepthChangedHdlPrevDepth == 1 ) // ist die einzige Seite + if ( nDepthChangedHdlPrevDepth == 1 ) // ist die einzige Seite return FALSE; else - pCurView->ImpCalcSelectedPages( FALSE ); // ohne die erste + pCurView->ImpCalcSelectedPages( FALSE ); // ohne die erste } return (BOOL)IndentingPagesHdl( pCurView ); } @@ -1333,13 +1333,13 @@ Outliner::Outliner( SfxItemPool* pPool, USHORT nMode ) { DBG_CTOR( Outliner, 0 ); - bStrippingPortions = FALSE; - bPasting = FALSE; + bStrippingPortions = FALSE; + bPasting = FALSE; - nFirstPage = 1; - bBlockInsCallback = FALSE; + nFirstPage = 1; + bBlockInsCallback = FALSE; - nMaxDepth = 9; + nMaxDepth = 9; pParaList = new ParagraphList; pParaList->SetVisibleStateChangedHdl( LINK( this, Outliner, ParaVisibleStateChangedHdl ) ); @@ -1385,7 +1385,7 @@ OutlinerView* Outliner::RemoveView( OutlinerView* pView ) pEditEngine->RemoveView( pView->pEditView ); aViewList.Remove( nPos ); } - return NULL; // MT: return ueberfluessig + return NULL; // MT: return ueberfluessig } OutlinerView* Outliner::RemoveView( ULONG nIndex ) @@ -1397,7 +1397,7 @@ OutlinerView* Outliner::RemoveView( ULONG nIndex ) pEditEngine->RemoveView( (USHORT)nIndex ); aViewList.Remove( nIndex ); - return NULL; // MT: return ueberfluessig + return NULL; // MT: return ueberfluessig } @@ -1617,7 +1617,7 @@ Rectangle Outliner::ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnP aTopLeft.X() = rLR.GetTxtLeft() + rLR.GetTxtFirstLineOfst() + nSpaceBefore; long nBulletWidth = Max( (long) -rLR.GetTxtFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) ); - if ( nBulletWidth < aBulletSize.Width() ) // Bullet macht sich Platz + if ( nBulletWidth < aBulletSize.Width() ) // Bullet macht sich Platz nBulletWidth = aBulletSize.Width(); if ( bAdjust && !bOutlineMode ) @@ -1667,7 +1667,7 @@ Rectangle Outliner::ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnP aTopLeft.X() += ( nBulletWidth - aBulletSize.Width() ) / 2; } - if ( aTopLeft.X() < 0 ) // dann draengeln + if ( aTopLeft.X() < 0 ) // dann draengeln aTopLeft.X() = 0; aBulletArea = Rectangle( aTopLeft, aBulletSize ); @@ -1892,13 +1892,13 @@ static bool isSameNumbering( const SvxNumberFormat& rN1, const SvxNumberFormat& { if( rN1.GetNumberingType() != rN2.GetNumberingType() ) return false; - + if( rN1.GetNumStr(1) != rN2.GetNumStr(1) ) return false; - + if( (rN1.GetPrefix() != rN2.GetPrefix()) || (rN1.GetSuffix() != rN2.GetSuffix()) ) return false; - + return true; } @@ -1923,10 +1923,10 @@ sal_uInt16 Outliner::ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pPar break; const SvxNumberFormat* pFmt = GetNumberFormat( nPara ); - + if( pFmt == 0 ) continue; // ignore paragraphs without bullets - + // check if numbering is the same if( !isSameNumbering( *pFmt, *pParaFmt ) ) break; @@ -2044,7 +2044,7 @@ String Outliner::ImplGetBulletText( USHORT nPara ) if (pPara) { // MT: Optimierung mal wieder aktivieren... -// if( pPara->nFlags & PARAFLAG_SETBULLETTEXT ) +// if( pPara->nFlags & PARAFLAG_SETBULLETTEXT ) ImplCalcBulletText( nPara, FALSE, FALSE ); aRes = pPara->GetText(); } @@ -2176,7 +2176,7 @@ sal_Bool DrawPortionInfo::IsRTL() const // I do not have this info here. Is it necessary? I'll have to ask MT. const BYTE nDefaultDir = UBIDI_LTR; //IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR; - ubidi_setPara(pBidi, reinterpret_cast<const UChar *>(mrText.GetBuffer()), mrText.Len(), nDefaultDir, NULL, &nError); // UChar != sal_Unicode in MinGW + ubidi_setPara(pBidi, reinterpret_cast<const UChar *>(mrText.GetBuffer()), mrText.Len(), nDefaultDir, NULL, &nError); // UChar != sal_Unicode in MinGW nError = U_ZERO_ERROR; // sal_Int32 nCount(ubidi_countRuns(pBidi, &nError)); diff --git a/editeng/source/outliner/outliner.src b/editeng/source/outliner/outliner.src index 42f8195407bd..e7e557e040f5 100644 --- a/editeng/source/outliner/outliner.src +++ b/editeng/source/outliner/outliner.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx index b57ec1be337f..2412dd2af954 100644 --- a/editeng/source/outliner/outlobj.cxx +++ b/editeng/source/outliner/outlobj.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ public: bool mbIsEditDoc; // refcounter - sal_uInt32 mnRefCount; + sal_uInt32 mnRefCount; // constuctor ImplOutlinerParaObject(EditTextObject* pEditTextObject, const ParagraphDataVector& rParagraphDataVector, bool bIsEditDoc) @@ -133,7 +133,7 @@ OutlinerParaObject& OutlinerParaObject::operator=(const OutlinerParaObject& rCan { delete mpImplOutlinerParaObject; } - + mpImplOutlinerParaObject = rCandidate.mpImplOutlinerParaObject; mpImplOutlinerParaObject->mnRefCount++; } diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx index f4d2f939c1e3..051460d36d27 100644 --- a/editeng/source/outliner/outlundo.cxx +++ b/editeng/source/outliner/outlundo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx index b3ed76b08dbd..9e12bb3df70e 100644 --- a/editeng/source/outliner/outlundo.hxx +++ b/editeng/source/outliner/outlundo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,35 +36,35 @@ class OutlinerUndoBase : public EditUndo { private: - Outliner* mpOutliner; + Outliner* mpOutliner; public: OutlinerUndoBase( USHORT nId, Outliner* pOutliner ); - Outliner* GetOutliner() const { return mpOutliner; } + Outliner* GetOutliner() const { return mpOutliner; } }; class OutlinerUndoChangeParaFlags : public OutlinerUndoBase { private: - sal_uInt16 mnPara; - sal_uInt16 mnOldFlags; - sal_uInt16 mnNewFlags; - + sal_uInt16 mnPara; + sal_uInt16 mnOldFlags; + sal_uInt16 mnNewFlags; + void ImplChangeFlags( sal_uInt16 nFlags ); public: OutlinerUndoChangeParaFlags( Outliner* pOutliner, sal_uInt16 nPara, sal_uInt16 nOldDepth, sal_uInt16 nNewDepth ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; class OutlinerUndoChangeParaNumberingRestart : public OutlinerUndoBase { private: - sal_uInt16 mnPara; - + sal_uInt16 mnPara; + struct ParaRestartData { sal_Int16 mnNumberingStartValue; @@ -80,24 +80,24 @@ public: sal_Int16 nOldNumberingStartValue, sal_Int16 mnNewNumberingStartValue, sal_Bool nOldbParaIsNumberingRestart, sal_Bool nbNewParaIsNumberingRestart ); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; - + class OutlinerUndoChangeDepth : public OutlinerUndoBase { using SfxUndoAction::Repeat; private: - USHORT mnPara; - sal_Int16 mnOldDepth; - sal_Int16 mnNewDepth; + USHORT mnPara; + sal_Int16 mnOldDepth; + sal_Int16 mnNewDepth; public: OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth ); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(); + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(); }; // Hilfs-Undo: Wenn es fuer eine Aktion keine OutlinerUndoAction gibst, weil @@ -107,14 +107,14 @@ class OutlinerUndoCheckPara : public OutlinerUndoBase { using SfxUndoAction::Repeat; private: - USHORT mnPara; + USHORT mnPara; public: OutlinerUndoCheckPara( Outliner* pOutliner, USHORT nPara ); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(); + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(); }; diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 650526cda9be..57a13a0051bf 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,12 +59,12 @@ // Breite der Randzonen innerhalb derer beim D&D gescrollt wird -#define OL_SCROLL_LRBORDERWIDTHPIX 10 -#define OL_SCROLL_TBBORDERWIDTHPIX 10 +#define OL_SCROLL_LRBORDERWIDTHPIX 10 +#define OL_SCROLL_TBBORDERWIDTHPIX 10 // Wert, um den Fensterinhalt beim D&D gescrollt wird -#define OL_SCROLL_HOROFFSET 20 /* in % von VisibleSize.Width */ -#define OL_SCROLL_VEROFFSET 20 /* in % von VisibleSize.Height */ +#define OL_SCROLL_HOROFFSET 20 /* in % von VisibleSize.Width */ +#define OL_SCROLL_VEROFFSET 20 /* in % von VisibleSize.Height */ using namespace ::com::sun::star; @@ -75,12 +75,12 @@ OutlinerView::OutlinerView( Outliner* pOut, Window* pWin ) { DBG_CTOR( OutlinerView, 0 ); - pOwner = pOut; - bDDCursorVisible = FALSE; - bInDragMode = FALSE; - nDDScrollLRBorderWidthWin = 0; - nDDScrollTBBorderWidthWin = 0; - pHorTabArrDoc = 0; + pOwner = pOut; + bDDCursorVisible = FALSE; + bInDragMode = FALSE; + nDDScrollLRBorderWidthWin = 0; + nDDScrollTBBorderWidthWin = 0; + pHorTabArrDoc = 0; pEditView = new EditView( pOut->pEditEngine, pWin ); pEditView->SetSelectionMode( EE_SELMODE_TXTONLY ); @@ -172,7 +172,7 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) } } break; - default: // wird dann evtl. unten bearbeitet. + default: // wird dann evtl. unten bearbeitet. eFunc = KEYFUNC_DONTKNOW; } } @@ -230,7 +230,7 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) if( !bSelection && aSel.nEndPos == pOwner->pEditEngine->GetTextLen( aSel.nEndPara ) ) { - ULONG nChilds = pOwner->pParaList->GetChildCount(pPara); + ULONG nChilds = pOwner->pParaList->GetChildCount(pPara); if( nChilds && !pOwner->pParaList->HasVisibleChilds(pPara)) { pOwner->UndoActionStart( OLUNDO_INSERT ); @@ -611,7 +611,7 @@ void OutlinerView::Indent( short nDiff ) if( bUndo ) pOwner->UndoActionStart( OLUNDO_DEPTH ); - sal_Int16 nMinDepth = -1; // Optimierung: Nicht unnoetig viele Absatze neu berechnen + sal_Int16 nMinDepth = -1; // Optimierung: Nicht unnoetig viele Absatze neu berechnen ParaRange aSel = ImpGetSelectedParagraphs( TRUE ); for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ ) @@ -1165,7 +1165,7 @@ USHORT OutlinerView::ImpCalcSelectedPages( BOOL bIncludeFirstSelected ) USHORT nFirstPage = 0xFFFF; USHORT nStartPara = aSel.nStartPara; if ( !bIncludeFirstSelected ) - nStartPara++; // alle nach StartPara kommenden Absaetze werden geloescht + nStartPara++; // alle nach StartPara kommenden Absaetze werden geloescht for ( USHORT nPara = nStartPara; nPara <= aSel.nEndPara; nPara++ ) { Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara ); @@ -1687,9 +1687,9 @@ Selection OutlinerView::GetSurroundingTextSelection() const // returns: true if a word for thesaurus look-up was found at the current cursor position. // The status string will be word + iso language string (e.g. "light#en-US") -bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext( - String &rStatusVal, - LanguageType &rLang, +bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext( + String &rStatusVal, + LanguageType &rLang, const EditView &rEditView ) { // get text and locale for thesaurus look up @@ -1700,21 +1700,21 @@ bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext( aTextSel = pEditEngine->GetWord( aTextSel, i18n::WordType::DICTIONARY_WORD ); aText = pEditEngine->GetText( aTextSel ); aTextSel.Adjust(); - LanguageType nLang = pEditEngine->GetLanguage( aTextSel.nStartPara, aTextSel.nStartPos ); + LanguageType nLang = pEditEngine->GetLanguage( aTextSel.nStartPara, aTextSel.nStartPos ); String aLangText( MsLangId::convertLanguageToIsoString( nLang ) ); - + // set word and locale to look up as status value String aStatusVal( aText ); aStatusVal.AppendAscii( "#" ); aStatusVal += aLangText; - + rStatusVal = aStatusVal; rLang = nLang; return aText.Len() > 0; } - + void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const String &rSynonmText ) { // get selection to use @@ -1730,7 +1730,7 @@ void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const String // replace word ... rEditView.InsertText( rSynonmText ); rEditView.ShowCursor( sal_True, sal_False ); -} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx index e1fc065a3f39..938db521c2e0 100644 --- a/editeng/source/outliner/paralist.cxx +++ b/editeng/source/outliner/paralist.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include "precompiled_editeng.hxx" #include <paralist.hxx> -#include <editeng/outliner.hxx> // nur wegen Paragraph, muss geaendert werden! +#include <editeng/outliner.hxx> // nur wegen Paragraph, muss geaendert werden! #include <editeng/numdef.hxx> DBG_NAME(Paragraph) @@ -234,8 +234,8 @@ Paragraph* ParagraphList::GetParent( Paragraph* pParagraph /*, USHORT& rRelPos * Paragraph* pPrev = GetParagraph( --n ); while ( pPrev && ( pPrev->GetDepth() >= pParagraph->GetDepth() ) ) { -// if ( pPrev->GetDepth() == pParagraph->GetDepth() ) -// rRelPos++; +// if ( pPrev->GetDepth() == pParagraph->GetDepth() ) +// rRelPos++; pPrev = GetParagraph( --n ); } diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx index e63c73c4fad7..355979e86ac5 100644 --- a/editeng/source/outliner/paralist.hxx +++ b/editeng/source/outliner/paralist.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,36 +37,36 @@ class Paragraph; class ParagraphList : private List { private: - Link aVisibleStateChangedHdl; + Link aVisibleStateChangedHdl; public: - void Clear( BOOL bDestroyParagraphs ); + void Clear( BOOL bDestroyParagraphs ); - ULONG GetParagraphCount() const { return List::Count(); } - Paragraph* GetParagraph( ULONG nPos ) const { return (Paragraph*)List::GetObject( nPos ); } + ULONG GetParagraphCount() const { return List::Count(); } + Paragraph* GetParagraph( ULONG nPos ) const { return (Paragraph*)List::GetObject( nPos ); } - ULONG GetAbsPos( Paragraph* pParent ) const { return List::GetPos( pParent ); } - ULONG GetVisPos( Paragraph* pParagraph ); + ULONG GetAbsPos( Paragraph* pParent ) const { return List::GetPos( pParent ); } + ULONG GetVisPos( Paragraph* pParagraph ); - void Insert( Paragraph* pPara, ULONG nAbsPos = LIST_APPEND ) { List::Insert( pPara, nAbsPos ); } - void Remove( ULONG nPara ) { List::Remove( nPara ); } - void MoveParagraphs( ULONG nStart, ULONG nDest, ULONG nCount ); + void Insert( Paragraph* pPara, ULONG nAbsPos = LIST_APPEND ) { List::Insert( pPara, nAbsPos ); } + void Remove( ULONG nPara ) { List::Remove( nPara ); } + void MoveParagraphs( ULONG nStart, ULONG nDest, ULONG nCount ); - Paragraph* NextVisible( Paragraph* ) const; - Paragraph* PrevVisible( Paragraph* ) const; - Paragraph* LastVisible() const; + Paragraph* NextVisible( Paragraph* ) const; + Paragraph* PrevVisible( Paragraph* ) const; + Paragraph* LastVisible() const; - Paragraph* GetParent( Paragraph* pParagraph /*, USHORT& rRelPos */ ) const; - BOOL HasChilds( Paragraph* pParagraph ) const; - BOOL HasHiddenChilds( Paragraph* pParagraph ) const; - BOOL HasVisibleChilds( Paragraph* pParagraph ) const; - ULONG GetChildCount( Paragraph* pParagraph ) const; + Paragraph* GetParent( Paragraph* pParagraph /*, USHORT& rRelPos */ ) const; + BOOL HasChilds( Paragraph* pParagraph ) const; + BOOL HasHiddenChilds( Paragraph* pParagraph ) const; + BOOL HasVisibleChilds( Paragraph* pParagraph ) const; + ULONG GetChildCount( Paragraph* pParagraph ) const; void Expand( Paragraph* pParent ); void Collapse( Paragraph* pParent ); - void SetVisibleStateChangedHdl( const Link& rLink ) { aVisibleStateChangedHdl = rLink; } - Link GetVisibleStateChangedHdl() const { return aVisibleStateChangedHdl; } + void SetVisibleStateChangedHdl( const Link& rLink ) { aVisibleStateChangedHdl = rLink; } + Link GetVisibleStateChangedHdl() const { return aVisibleStateChangedHdl; } }; #endif diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx index 417f1e05d2fc..b7f1162abaaa 100644 --- a/editeng/source/rtf/rtfgrf.cxx +++ b/editeng/source/rtf/rtfgrf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,8 +74,8 @@ void GrfWindow::Paint( const Rectangle& ) #endif static BYTE __FAR_DATA aPal1[ 2 * 4 ] = { - 0x00, 0x00, 0x00, 0x00, // Schwarz - 0xFF, 0xFF, 0xFF, 0x00 // Weiss + 0x00, 0x00, 0x00, 0x00, // Schwarz + 0xFF, 0xFF, 0xFF, 0x00 // Weiss }; static BYTE __FAR_DATA aPal4[ 16 * 4 ] = { @@ -217,22 +217,22 @@ static void WriteBMPHeader( SvStream& rStream, ULONG n4Height = rPicType.nHeight; USHORT n4ColBits = rPicType.nBitsPerPixel; - USHORT nColors = (1 << n4ColBits); // Anzahl der Farben ( 1, 16, 256 ) + USHORT nColors = (1 << n4ColBits); // Anzahl der Farben ( 1, 16, 256 ) USHORT nWdtOut = rPicType.nWidthBytes; if( !nWdtOut ) nWdtOut = (USHORT)((( n4Width * n4ColBits + 31 ) / 32 ) * 4 ); - long nOffset = 14 + 40; // BMP_FILE_HD_SIZ + sizeof(*pBmpInfo); + long nOffset = 14 + 40; // BMP_FILE_HD_SIZ + sizeof(*pBmpInfo); if( 256 >= nColors ) nOffset += nColors * 4; long nSize = nOffset + nWdtOut * n4Height; - rStream << "BM" // = "BM" + rStream << "BM" // = "BM" << SwapLong(nSize) // Filesize in Bytes << SwapShort(0) // Reserviert << SwapShort(0) // Reserviert << SwapLong(nOffset); // Offset? - rStream << SwapLong(40) // sizeof( BmpInfo ) + rStream << SwapLong(40) // sizeof( BmpInfo ) << SwapLong(n4Width) << SwapLong(n4Height) << (USHORT)1 @@ -241,7 +241,7 @@ static void WriteBMPHeader( SvStream& rStream, << SwapLong(0) << SwapLong( rPicType.nGoalWidth ? rPicType.nGoalWidth * 1000L / 254L - : 0 ) // DPI in Pixel per Meter + : 0 ) // DPI in Pixel per Meter << SwapLong( rPicType.nGoalHeight ? rPicType.nGoalHeight * 1000L / 254L // dito : 0 ) @@ -251,9 +251,9 @@ static void WriteBMPHeader( SvStream& rStream, switch( rPicType.nBitsPerPixel ) { - case 1: rStream.Write( aPal1, sizeof( aPal1 )); break; - case 4: rStream.Write( aPal4, sizeof( aPal4 )); break; - case 8: rStream.Write( aPal8, sizeof( aPal8 )); break; + case 1: rStream.Write( aPal1, sizeof( aPal1 )); break; + case 4: rStream.Write( aPal4, sizeof( aPal4 )); break; + case 8: rStream.Write( aPal8, sizeof( aPal8 )); break; } } @@ -266,7 +266,7 @@ xub_StrLen SvxRTFParser::HexToBin( String& rToken ) { // dann mache aus den Hex-Werten mal "Binare Daten" // (missbrauche den String als temp Buffer) - if( rToken.Len() & 1 ) // ungerade Anzahl, mit 0 auffuellen + if( rToken.Len() & 1 ) // ungerade Anzahl, mit 0 auffuellen rToken += '0'; xub_StrLen n, nLen; @@ -302,7 +302,7 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) { // die alten Daten loeschen rGrf.Clear(); -// ULONG nBmpSize = 0; +// ULONG nBmpSize = 0; rtl_TextEncoding eOldEnc = GetSrcEncoding(); SetSrcEncoding( RTL_TEXTENCODING_MS_1252 ); @@ -310,9 +310,9 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) const sal_Char* pFilterNm = 0; SvCacheStream* pTmpFile = 0; - int nToken = 0; + int nToken = 0; bool bValidBmp = true, bFirstTextToken = true; - int _nOpenBrakets = 1, // die erste wurde schon vorher erkannt !! + int _nOpenBrakets = 1, // die erste wurde schon vorher erkannt !! nValidDataBraket = 1; if( RTF_SHPPICT == GetStackPtr(0)->nTokenId ) @@ -325,8 +325,8 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) USHORT nVal = USHORT( nTokenValue ); switch( nToken ) { - case '}': - --_nOpenBrakets; + case '}': + --_nOpenBrakets; if( nShapePropertyBracket > 0 && nShapePropertyBracket > _nOpenBrakets ) { nShapePropertyBracket = -1; @@ -334,8 +334,8 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) { rPicType.aPropertyPairs.push_back( ::std::pair< OUString, OUString >( sShapePropertyName, sShapePropertyValue ) ); sShapePropertyName = sShapePropertyValue = ::rtl::OUString(); - } - } + } + } break; case '{': { @@ -411,13 +411,13 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) } break; - case RTF_PICW: rPicType.nWidth = nVal; break; - case RTF_PICH: rPicType.nHeight = nVal; break; - case RTF_WBMBITSPIXEL: rPicType.nBitsPerPixel = nVal; break; - case RTF_WBMPLANES: rPicType.nPlanes = nVal; break; - case RTF_WBMWIDTHBYTES: rPicType.nWidthBytes = nVal; break; - case RTF_PICWGOAL: rPicType.nGoalWidth = nVal; break; - case RTF_PICHGOAL: rPicType.nGoalHeight = nVal; break; + case RTF_PICW: rPicType.nWidth = nVal; break; + case RTF_PICH: rPicType.nHeight = nVal; break; + case RTF_WBMBITSPIXEL: rPicType.nBitsPerPixel = nVal; break; + case RTF_WBMPLANES: rPicType.nPlanes = nVal; break; + case RTF_WBMWIDTHBYTES: rPicType.nWidthBytes = nVal; break; + case RTF_PICWGOAL: rPicType.nGoalWidth = nVal; break; + case RTF_PICHGOAL: rPicType.nGoalHeight = nVal; break; case RTF_BIN: rPicType.nMode = SvxRTFPictureType::BINARY_MODE; rPicType.uPicLen = nTokenValue; @@ -433,7 +433,7 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) { if (rPicType.uPicLen < nSize) nSize = rPicType.uPicLen; - + rStrm.Read(aData, nSize); pTmpFile->Write(aData, nSize); rPicType.uPicLen -= nSize; @@ -444,14 +444,14 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) nPos = nPos; } break; - case RTF_PICSCALEX: rPicType.nScalX = nVal; break; - case RTF_PICSCALEY: rPicType.nScalY = nVal; break; - case RTF_PICSCALED: break; - - case RTF_PICCROPT: rPicType.nCropT = (short)nTokenValue; break; - case RTF_PICCROPB: rPicType.nCropB = (short)nTokenValue; break; - case RTF_PICCROPL: rPicType.nCropL = (short)nTokenValue; break; - case RTF_PICCROPR: rPicType.nCropR = (short)nTokenValue; break; + case RTF_PICSCALEX: rPicType.nScalX = nVal; break; + case RTF_PICSCALEY: rPicType.nScalY = nVal; break; + case RTF_PICSCALED: break; + + case RTF_PICCROPT: rPicType.nCropT = (short)nTokenValue; break; + case RTF_PICCROPB: rPicType.nCropB = (short)nTokenValue; break; + case RTF_PICCROPL: rPicType.nCropL = (short)nTokenValue; break; + case RTF_PICCROPR: rPicType.nCropR = (short)nTokenValue; break; case RTF_SP: //read pairs of {\sn Name}{\sv Value} nShapePropertyBracket = _nOpenBrakets; @@ -460,20 +460,20 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) nToken = GetNextToken(); if( nToken != '}' ) sShapePropertyName = aToken; - else + else nToken = SkipToken( -1 ); break; case RTF_SV: nToken = GetNextToken(); if( nToken != '}' ) sShapePropertyValue = aToken; - else + else nToken = SkipToken( -1 ); break; case RTF_TEXTTOKEN: // JP 26.06.98: Bug #51719# - nur TextToken auf 1. Ebene - // auswerten. Alle anderen sind irgendwelche - // nicht auszuwertende Daten + // auswerten. Alle anderen sind irgendwelche + // nicht auszuwertende Daten if( nValidDataBraket != _nOpenBrakets ) break; @@ -554,7 +554,7 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) { switch( rPicType.eStyle ) { -//?? ENHANCED_MF, // in den Pict.Daten steht ein Enhanced-Metafile +//?? ENHANCED_MF, // in den Pict.Daten steht ein Enhanced-Metafile case SvxRTFPictureType::RTF_PNG: case SvxRTFPictureType::RTF_JPG: { @@ -581,7 +581,7 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) } SetSrcEncoding( eOldEnc ); - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet return bValidBmp; } diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index ab4d6a18f657..a1fa4aa9e65f 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,8 +92,8 @@ #include <editeng/svxrtf.hxx> #include <editeng/editids.hrc> -#define BRACELEFT '{' -#define BRACERIGHT '}' +#define BRACELEFT '{' +#define BRACERIGHT '}' // einige Hilfs-Funktionen @@ -108,8 +108,8 @@ inline const SvxLRSpaceItem& GetLRSpace(const SfxItemSet& rSet,USHORT nId,BOOL b inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE) { return (const SvxULSpaceItem&)rSet.Get( nId,bInP); } -#define PARDID ((RTFPardAttrMapIds*)aPardMap.GetData()) -#define PLAINID ((RTFPlainAttrMapIds*)aPlainMap.GetData()) +#define PARDID ((RTFPardAttrMapIds*)aPardMap.GetData()) +#define PLAINID ((RTFPlainAttrMapIds*)aPlainMap.GetData()) void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet, SfxPoolItem& rItem ) @@ -219,7 +219,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) { DBG_ASSERT( pSet, "Es muss ein SfxItemSet uebergeben werden!" ); int bFirstToken = TRUE, bWeiter = TRUE; - USHORT nStyleNo = 0; // default + USHORT nStyleNo = 0; // default FontUnderline eUnderline; FontUnderline eOverline; FontEmphasisMark eEmphasis; @@ -229,7 +229,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) int bChkStkPos = !bNewGroup && aAttrStack.Top(); - while( bWeiter && IsParserWorking() ) // solange bekannte Attribute erkannt werden + while( bWeiter && IsParserWorking() ) // solange bekannte Attribute erkannt werden { switch( nToken ) { @@ -245,7 +245,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) break; default: - do { // middle checked loop + do { // middle checked loop if( !bChkStkPos ) break; @@ -461,8 +461,8 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) nTokenValue = short( 100L * aLSpace.GetLineHeight() / long( nTokenValue ) ); - if( nTokenValue > 200 ) // Datenwert fuer PropLnSp - nTokenValue = 200; // ist ein BYTE !!! + if( nTokenValue > 200 ) // Datenwert fuer PropLnSp + nTokenValue = 200; // ist ein BYTE !!! aLSpace.SetPropLineSpace( (const BYTE)nTokenValue ); aLSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO; @@ -533,9 +533,9 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) break; case RTF_FAFIXED: - case RTF_FAAUTO: nFontAlign = SvxParaVertAlignItem::AUTOMATIC; + case RTF_FAAUTO: nFontAlign = SvxParaVertAlignItem::AUTOMATIC; goto SET_FONTALIGNMENT; - case RTF_FAHANG: nFontAlign = SvxParaVertAlignItem::TOP; + case RTF_FAHANG: nFontAlign = SvxParaVertAlignItem::TOP; goto SET_FONTALIGNMENT; case RTF_FAVAR: nFontAlign = SvxParaVertAlignItem::BOTTOM; goto SET_FONTALIGNMENT; @@ -554,7 +554,7 @@ SET_FONTALIGNMENT: /* */ case RTF_B: case RTF_AB: - if( IsAttrSttPos() ) // nicht im Textfluss ? + if( IsAttrSttPos() ) // nicht im Textfluss ? { SvxWeightItem aTmpItem( @@ -567,7 +567,7 @@ SET_FONTALIGNMENT: case RTF_CAPS: case RTF_SCAPS: if( PLAINID->nCaseMap && - IsAttrSttPos() ) // nicht im Textfluss ? + IsAttrSttPos() ) // nicht im Textfluss ? { SvxCaseMap eCaseMap; if( !nTokenValue ) @@ -677,7 +677,7 @@ SET_FONTALIGNMENT: nTokenValue = 240; else nTokenValue *= 10; -// #i66167# +// #i66167# // for the SwRTFParser 'IsCalcValue' will be false and for the EditRTFParser // the converiosn takes now place in EditRTFParser since for other reasons // the wrong MapUnit might still be use there @@ -692,7 +692,7 @@ SET_FONTALIGNMENT: case RTF_I: case RTF_AI: - if( IsAttrSttPos() ) // nicht im Textfluss ? + if( IsAttrSttPos() ) // nicht im Textfluss ? { SvxPostureItem aTmpItem( nTokenValue ? ITALIC_NORMAL : ITALIC_NONE, @@ -703,7 +703,7 @@ SET_FONTALIGNMENT: case RTF_OUTL: if( PLAINID->nContour && - IsAttrSttPos() ) // nicht im Textfluss ? + IsAttrSttPos() ) // nicht im Textfluss ? { pSet->Put( SvxContourItem( nTokenValue ? TRUE : FALSE, PLAINID->nContour )); @@ -712,7 +712,7 @@ SET_FONTALIGNMENT: case RTF_SHAD: if( PLAINID->nShadowed && - IsAttrSttPos() ) // nicht im Textfluss ? + IsAttrSttPos() ) // nicht im Textfluss ? { pSet->Put( SvxShadowedItem( nTokenValue ? TRUE : FALSE, PLAINID->nShadowed )); @@ -721,7 +721,7 @@ SET_FONTALIGNMENT: case RTF_STRIKE: if( PLAINID->nCrossedOut && - IsAttrSttPos() ) // nicht im Textfluss ? + IsAttrSttPos() ) // nicht im Textfluss ? { pSet->Put( SvxCrossedOutItem( nTokenValue ? STRIKEOUT_SINGLE : STRIKEOUT_NONE, @@ -730,7 +730,7 @@ SET_FONTALIGNMENT: break; case RTF_STRIKED: - if( PLAINID->nCrossedOut ) // nicht im Textfluss ? + if( PLAINID->nCrossedOut ) // nicht im Textfluss ? { pSet->Put( SvxCrossedOutItem( nTokenValue ? STRIKEOUT_DOUBLE : STRIKEOUT_NONE, @@ -1007,9 +1007,9 @@ ATTR_SETOVERLINE: PARDID->nDirection)); } break; - case RTF_LOCH: eCharType = LOW_CHARTYPE; break; - case RTF_HICH: eCharType = HIGH_CHARTYPE; break; - case RTF_DBCH: eCharType = DOUBLEBYTE_CHARTYPE; break; + case RTF_LOCH: eCharType = LOW_CHARTYPE; break; + case RTF_HICH: eCharType = HIGH_CHARTYPE; break; + case RTF_DBCH: eCharType = DOUBLEBYTE_CHARTYPE; break; case RTF_ACCNONE: @@ -1035,10 +1035,10 @@ ATTR_SETEMPHASIS: sal_Unicode cStt, cEnd; switch ( nTokenValue ) { - case 1: cStt = '(', cEnd = ')'; break; - case 2: cStt = '[', cEnd = ']'; break; - case 3: cStt = '<', cEnd = '>'; break; - case 4: cStt = '{', cEnd = '}'; break; + case 1: cStt = '(', cEnd = ')'; break; + case 2: cStt = '[', cEnd = ']'; break; + case 3: cStt = '<', cEnd = '>'; break; + case 4: cStt = '{', cEnd = '}'; break; default: cStt = 0, cEnd = 0; break; } @@ -1167,14 +1167,14 @@ ATTR_SETEMPHASIS: pSet->Put( aHypenZone ); } else - SkipGroup(); // ans Ende der Gruppe + SkipGroup(); // ans Ende der Gruppe } break; case RTF_SHADOW: { int bSkip = TRUE; - do { // middle check loop + do { // middle check loop SvxShadowLocation eSL = SvxShadowLocation( nTokenValue ); if( RTF_SHDW_DIST != GetNextToken() ) break; @@ -1191,7 +1191,7 @@ ATTR_SETEMPHASIS: if( RTF_SHDW_FCOL != GetNextToken() ) break; -// USHORT nFillCol = USHORT( nTokenValue ); +// USHORT nFillCol = USHORT( nTokenValue ); Color aColor = GetColor( nCol ); @@ -1203,7 +1203,7 @@ ATTR_SETEMPHASIS: } while( FALSE ); if( bSkip ) - SkipGroup(); // ans Ende der Gruppe + SkipGroup(); // ans Ende der Gruppe } break; @@ -1216,8 +1216,8 @@ ATTR_SETEMPHASIS: /* cmc: #i76140, he who consumed the { must consume the } - We rewound to a state of { being the current - token so it is our responsibility to consume the } + We rewound to a state of { being the current + token so it is our responsibility to consume the } token if we consumed the {. We will not have consumed the { if it belonged to our caller, i.e. if the { we are handling is the "firsttoken" passed to us then @@ -1227,7 +1227,7 @@ ATTR_SETEMPHASIS: if (nToken == BRACELEFT && !bFirstToken) { nToken = GetNextToken(); - DBG_ASSERT( nToken == BRACERIGHT, + DBG_ASSERT( nToken == BRACERIGHT, "} did not follow { as expected\n"); } } @@ -1236,7 +1236,7 @@ ATTR_SETEMPHASIS: nToken = SkipToken( -2 ); ReadBorderAttr( nToken, *pSet ); } - else // also kein Attribut mehr + else // also kein Attribut mehr nSkip = -2; break; } @@ -1258,10 +1258,10 @@ ATTR_SETEMPHASIS: else nSkip = -2; - if( nSkip ) // alles voellig unbekannt + if( nSkip ) // alles voellig unbekannt { if (!bFirstToken) - --nSkip; // BRACELEFT: ist das naechste Token + --nSkip; // BRACELEFT: ist das naechste Token SkipToken( nSkip ); bWeiter = FALSE; } @@ -1306,7 +1306,7 @@ ATTR_SETEMPHASIS: { if( SFX_ITEM_SET == pStyle->aAttrSet.GetItemState( nWhich, FALSE, &pItem ) && *pItem == *aIter.GetCurItem()) - pSet->ClearItem( nWhich ); // loeschen + pSet->ClearItem( nWhich ); // loeschen if( aIter.IsAtEnd() ) break; @@ -1327,14 +1327,14 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet ) do { switch( nToken ) { - case RTF_TB: // BarTab ??? + case RTF_TB: // BarTab ??? case RTF_TX: { if( IsCalcValue() ) CalcValue(); aTabStop.GetTabPos() = nTokenValue; aAttr.Insert( aTabStop ); - aTabStop = SvxTabStop(); // alle Werte default + aTabStop = SvxTabStop(); // alle Werte default } break; @@ -1351,11 +1351,11 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet ) aTabStop.GetAdjustment() = SVX_TAB_ADJUST_DECIMAL; break; - case RTF_TLDOT: aTabStop.GetFill() = '.'; break; - case RTF_TLHYPH: aTabStop.GetFill() = ' '; break; - case RTF_TLUL: aTabStop.GetFill() = '_'; break; - case RTF_TLTH: aTabStop.GetFill() = '-'; break; - case RTF_TLEQ: aTabStop.GetFill() = '='; break; + case RTF_TLDOT: aTabStop.GetFill() = '.'; break; + case RTF_TLHYPH: aTabStop.GetFill() = ' '; break; + case RTF_TLUL: aTabStop.GetFill() = '_'; break; + case RTF_TLTH: aTabStop.GetFill() = '-'; break; + case RTF_TLEQ: aTabStop.GetFill() = '='; break; case BRACELEFT: { @@ -1375,7 +1375,7 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet ) } if( nSkip ) { - SkipToken( nSkip ); // Ignore wieder zurueck + SkipToken( nSkip ); // Ignore wieder zurueck bWeiter = FALSE; } } @@ -1401,7 +1401,7 @@ static void SetBorderLine( int nBorderTyp, SvxBoxItem& rItem, { switch( nBorderTyp ) { - case RTF_BOX: // alle Stufen durchlaufen + case RTF_BOX: // alle Stufen durchlaufen case RTF_BRDRT: rItem.SetLine( &rBorder, BOX_LINE_TOP ); @@ -1434,7 +1434,7 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, if( SFX_ITEM_SET == rSet.GetItemState( PARDID->nBox, FALSE, &pItem ) ) aAttr = *(SvxBoxItem*)pItem; - SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0, 0, 0 ); // einfache Linien + SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0, 0, 0 ); // einfache Linien int bWeiter = TRUE, nBorderTyp = 0; do { @@ -1509,7 +1509,7 @@ SETBORDER: break; case RTF_BRDRBTW: -case RTF_BRDRBAR: break; +case RTF_BRDRBAR: break; case RTF_BRDRCF: @@ -1685,7 +1685,7 @@ SETBORDERLINE: if( nSkip ) { - SkipToken( nSkip ); // Ignore wieder zurueck + SkipToken( nSkip ); // Ignore wieder zurueck bWeiter = FALSE; } } @@ -1837,7 +1837,7 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet, // pard / plain abarbeiten void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet ) { - if( !bNewGroup && aAttrStack.Top() ) // nicht am Anfang einer neuen Gruppe + if( !bNewGroup && aAttrStack.Top() ) // nicht am Anfang einer neuen Gruppe { SvxRTFItemStackType* pAkt = aAttrStack.Top(); @@ -1892,8 +1892,8 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet ) { // Item gesetzt und unterschiedlich -> das Pooldefault setzen //JP 06.04.98: bei Items die nur SlotItems sind, darf nicht - // auf das Default zugefriffen werden. Diese - // werden gecleart + // auf das Default zugefriffen werden. Diese + // werden gecleart if( !*pPtr ) ; else if( SFX_WHICH_MAX < *pPtr ) @@ -1923,7 +1923,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet ) } } else if( bPard ) - pAkt->nStyleNo = 0; // Style-Nummer zuruecksetzen + pAkt->nStyleNo = 0; // Style-Nummer zuruecksetzen *ppSet = &pAkt->aAttrSet; @@ -1953,7 +1953,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue ) bIsLeftToRightDef = TRUE; switch( nToken ) { - case RTF_ADEFF: bIsLeftToRightDef = FALSE; // no break! + case RTF_ADEFF: bIsLeftToRightDef = FALSE; // no break! case RTF_DEFF: { if( -1 == nValue ) @@ -1961,13 +1961,13 @@ void SvxRTFParser::SetDefault( int nToken, int nValue ) const Font& rSVFont = GetFont( USHORT(nValue) ); SvxFontItem aTmpItem( rSVFont.GetFamily(), rSVFont.GetName(), - rSVFont.GetStyleName(), rSVFont.GetPitch(), + rSVFont.GetStyleName(), rSVFont.GetPitch(), rSVFont.GetCharSet(), SID_ATTR_CHAR_FONT ); SetScriptAttr( NOTDEF_CHARTYPE, aTmp, aTmpItem ); } break; - case RTF_ADEFLANG: bIsLeftToRightDef = FALSE; // no break! + case RTF_ADEFLANG: bIsLeftToRightDef = FALSE; // no break! case RTF_DEFLANG: // default Language merken if( -1 != nValue ) diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 4e385920edd4..e9bc5e73714e 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -192,9 +192,9 @@ void SvxRTFParser::NextToken( int nToken ) sal_Unicode cCh; switch( nToken ) { - case RTF_COLORTBL: ReadColorTable(); break; - case RTF_FONTTBL: ReadFontTable(); break; - case RTF_STYLESHEET: ReadStyleTable(); break; + case RTF_COLORTBL: ReadColorTable(); break; + case RTF_FONTTBL: ReadFontTable(); break; + case RTF_STYLESHEET: ReadStyleTable(); break; case RTF_DEFF: if( bNewDoc ) @@ -215,19 +215,19 @@ void SvxRTFParser::NextToken( int nToken ) break; - case RTF_PICT: ReadBitmapData(); break; + case RTF_PICT: ReadBitmapData(); break; - case RTF_LINE: cCh = '\n'; goto INSINGLECHAR; - case RTF_TAB: cCh = '\t'; goto INSINGLECHAR; - case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR; + case RTF_LINE: cCh = '\n'; goto INSINGLECHAR; + case RTF_TAB: cCh = '\t'; goto INSINGLECHAR; + case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR; - case RTF_EMDASH: cCh = 151; goto INSINGLECHAR; - case RTF_ENDASH: cCh = 150; goto INSINGLECHAR; - case RTF_BULLET: cCh = 149; goto INSINGLECHAR; - case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR; - case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR; - case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR; - case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR; + case RTF_EMDASH: cCh = 151; goto INSINGLECHAR; + case RTF_ENDASH: cCh = 150; goto INSINGLECHAR; + case RTF_BULLET: cCh = 149; goto INSINGLECHAR; + case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR; + case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR; + case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR; + case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR; INSINGLECHAR: aToken = ByteString::ConvertToUnicode( (sal_Char)cCh, RTL_TEXTENCODING_MS_1252 ); @@ -251,13 +251,13 @@ INSINGLECHAR: InsertPara(); break; case '{': - if (bNewGroup) // Verschachtelung !! + if (bNewGroup) // Verschachtelung !! _GetAttrSet(); EnterEnvironment(); bNewGroup = true; break; case '}': - if( !bNewGroup ) // leere Gruppe ?? + if( !bNewGroup ) // leere Gruppe ?? AttrGroupEnd(); LeaveEnvironment(); bNewGroup = false; @@ -308,7 +308,7 @@ INSINGLECHAR: default: switch( nToken & ~(0xff | RTF_SWGDEFS) ) { - case RTF_PARFMT: // hier gibts keine Swg-Defines + case RTF_PARFMT: // hier gibts keine Swg-Defines ReadAttr( nToken, &GetAttrSet() ); break; @@ -345,18 +345,18 @@ void SvxRTFParser::ReadStyleTable() { int nToken, bSaveChkStyleAttr = bChkStyleAttr; short nStyleNo = 0; - int _nOpenBrakets = 1; // die erste wurde schon vorher erkannt !! + int _nOpenBrakets = 1; // die erste wurde schon vorher erkannt !! SvxRTFStyleType* pStyle = new SvxRTFStyleType( *pAttrPool, aWhichMap.GetData() ); pStyle->aAttrSet.Put( GetRTFDefaults() ); bIsInReadStyleTab = TRUE; - bChkStyleAttr = FALSE; // Attribute nicht gegen die Styles checken + bChkStyleAttr = FALSE; // Attribute nicht gegen die Styles checken while( _nOpenBrakets && IsParserWorking() ) { switch( nToken = GetNextToken() ) { - case '}': if( --_nOpenBrakets && IsParserWorking() ) + case '}': if( --_nOpenBrakets && IsParserWorking() ) // Style konnte vollstaendig gelesen werden, // also ist das noch ein stabiler Status SaveState( RTF_STYLESHEET ); @@ -381,12 +381,12 @@ void SvxRTFParser::ReadStyleTable() } break; - case RTF_SBASEDON: pStyle->nBasedOn = USHORT(nTokenValue); pStyle->bBasedOnIsSet=TRUE; break; - case RTF_SNEXT: pStyle->nNext = USHORT(nTokenValue); break; + case RTF_SBASEDON: pStyle->nBasedOn = USHORT(nTokenValue); pStyle->bBasedOnIsSet=TRUE; break; + case RTF_SNEXT: pStyle->nNext = USHORT(nTokenValue); break; case RTF_OUTLINELEVEL: - case RTF_SOUTLVL: pStyle->nOutlineNo = BYTE(nTokenValue); break; - case RTF_S: nStyleNo = (short)nTokenValue; break; - case RTF_CS: nStyleNo = (short)nTokenValue; + case RTF_SOUTLVL: pStyle->nOutlineNo = BYTE(nTokenValue); break; + case RTF_S: nStyleNo = (short)nTokenValue; break; + case RTF_CS: nStyleNo = (short)nTokenValue; pStyle->bIsCharFmt = TRUE; break; @@ -416,7 +416,7 @@ void SvxRTFParser::ReadStyleTable() default: switch( nToken & ~(0xff | RTF_SWGDEFS) ) { - case RTF_PARFMT: // hier gibts keine Swg-Defines + case RTF_PARFMT: // hier gibts keine Swg-Defines ReadAttr( nToken, &pStyle->aAttrSet ); break; @@ -440,8 +440,8 @@ void SvxRTFParser::ReadStyleTable() break; } } - delete pStyle; // loesche das letze Style - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + delete pStyle; // loesche das letze Style + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet // Flag wieder auf alten Zustand bChkStyleAttr = bSaveChkStyleAttr; @@ -457,15 +457,15 @@ void SvxRTFParser::ReadColorTable() { switch( nToken ) { - case RTF_RED: nRed = BYTE(nTokenValue); break; - case RTF_GREEN: nGreen = BYTE(nTokenValue); break; - case RTF_BLUE: nBlue = BYTE(nTokenValue); break; + case RTF_RED: nRed = BYTE(nTokenValue); break; + case RTF_GREEN: nGreen = BYTE(nTokenValue); break; + case RTF_BLUE: nBlue = BYTE(nTokenValue); break; - case RTF_TEXTTOKEN: // oder sollte irgendein Unsin darumstehen? + case RTF_TEXTTOKEN: // oder sollte irgendein Unsin darumstehen? if( 1 == aToken.Len() ? aToken.GetChar( 0 ) != ';' : STRING_NOTFOUND == aToken.Search( ';' ) ) - break; // es muss zumindestens das ';' gefunden werden + break; // es muss zumindestens das ';' gefunden werden // else kein break !! @@ -488,13 +488,13 @@ void SvxRTFParser::ReadColorTable() break; } } - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet } void SvxRTFParser::ReadFontTable() { int nToken; - int _nOpenBrakets = 1; // die erste wurde schon vorher erkannt !! + int _nOpenBrakets = 1; // die erste wurde schon vorher erkannt !! Font* pFont = new Font(); short nFontNo(0), nInsFontNo (0); String sAltNm, sFntNm; @@ -620,7 +620,7 @@ void SvxRTFParser::ReadFontTable() } // den letzen muessen wir selbst loeschen delete pFont; - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet // setze den default Font am Doc if( bNewDoc && IsParserWorking() ) @@ -640,13 +640,13 @@ void SvxRTFParser::ReadOLEData() String& SvxRTFParser::GetTextToEndGroup( String& rStr ) { rStr.Erase( 0 ); - int _nOpenBrakets = 1, nToken; // die erste wurde schon vorher erkannt !! + int _nOpenBrakets = 1, nToken; // die erste wurde schon vorher erkannt !! while( _nOpenBrakets && IsParserWorking() ) { switch( nToken = GetNextToken() ) { - case '}': --_nOpenBrakets; break; + case '}': --_nOpenBrakets; break; case '{': { if( RTF_IGNOREFLAG != GetNextToken() ) @@ -671,7 +671,7 @@ String& SvxRTFParser::GetTextToEndGroup( String& rStr ) break; } } - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet return rStr; } @@ -684,23 +684,23 @@ util::DateTime SvxRTFParser::GetDateTimeStamp( ) { switch( nToken = GetNextToken() ) { - case RTF_YR: aDT.Year = (USHORT)nTokenValue; break; - case RTF_MO: aDT.Month = (USHORT)nTokenValue; break; - case RTF_DY: aDT.Day = (USHORT)nTokenValue; break; - case RTF_HR: aDT.Hours = (USHORT)nTokenValue; break; - case RTF_MIN: aDT.Minutes = (USHORT)nTokenValue; break; + case RTF_YR: aDT.Year = (USHORT)nTokenValue; break; + case RTF_MO: aDT.Month = (USHORT)nTokenValue; break; + case RTF_DY: aDT.Day = (USHORT)nTokenValue; break; + case RTF_HR: aDT.Hours = (USHORT)nTokenValue; break; + case RTF_MIN: aDT.Minutes = (USHORT)nTokenValue; break; default: bWeiter = FALSE; } } - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet return aDT; } void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo ) { #ifndef SVX_LIGHT - int _nOpenBrakets = 1, nToken; // die erste wurde schon vorher erkannt !! + int _nOpenBrakets = 1, nToken; // die erste wurde schon vorher erkannt !! DBG_ASSERT(m_xDocProps.is(), "SvxRTFParser::ReadInfo: no DocumentProperties"); String sStr, sComment; @@ -710,7 +710,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo ) { switch( nToken = GetNextToken() ) { - case '}': --_nOpenBrakets; break; + case '}': --_nOpenBrakets; break; case '{': { if( RTF_IGNOREFLAG != GetNextToken() ) @@ -790,7 +790,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo ) NextToken( nToken ); break; -// default: +// default: } } @@ -798,7 +798,7 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo ) COMPARE_EQUAL == sComment.CompareToAscii( pChkForVerNo )) nVersionNo = nVersNo; - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet #endif } @@ -893,7 +893,7 @@ void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType ) if( SFX_WHICH_MAX > nWhich && SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem ) && rPool.GetDefaultItem( nWhich ) == *pItem ) - rSet.ClearItem( nWhich ); // loeschen + rSet.ClearItem( nWhich ); // loeschen } } else @@ -909,32 +909,32 @@ void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType ) // JP 22.06.99: im Style und im Set gleich gesetzt -> loeschen if( SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem ) && *pItem == *pSItem ) - rSet.ClearItem( nWhich ); // loeschen + rSet.ClearItem( nWhich ); // loeschen } // Bug 59571 - falls nicht im Style gesetzt und gleich mit - // dem PoolDefault -> auch dann loeschen + // dem PoolDefault -> auch dann loeschen else if( SFX_WHICH_MAX > nWhich && SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem ) && rPool.GetDefaultItem( nWhich ) == *pItem ) - rSet.ClearItem( nWhich ); // loeschen + rSet.ClearItem( nWhich ); // loeschen } } } -void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen +void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen { if( aAttrStack.Count() ) { SvxRTFItemStackType *pOld = aAttrStack.Pop(); SvxRTFItemStackType *pAkt = aAttrStack.Top(); - do { // middle check loop + do { // middle check loop ULONG nOldSttNdIdx = pOld->pSttNd->GetIdx(); if( !pOld->pChildList && ((!pOld->aAttrSet.Count() && !pOld->nStyleNo ) || (nOldSttNdIdx == pInsPos->GetNodeIdx() && pOld->nSttCnt == pInsPos->GetCntIdx() ))) - break; // keine Attribute oder Bereich + break; // keine Attribute oder Bereich // setze nur die Attribute, die unterschiedlich zum Parent sind if( pAkt && pOld->aAttrSet.Count() ) @@ -988,7 +988,7 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen // jetzt wirds kompliziert: // - alle Zeichen-Attribute behalten den Bereich, // - alle Absatz-Attribute bekommen den Bereich - // bis zum vorherigen Absatz + // bis zum vorherigen Absatz SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pOld, *pInsPos, TRUE ); pNew->aAttrSet.SetParent( pOld->aAttrSet.GetParent() ); @@ -1002,7 +1002,7 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen // gab es ueberhaupt welche ? if( pNew->aAttrSet.Count() == pOld->aAttrSet.Count() ) - delete pNew; // das wars dann + delete pNew; // das wars dann else { pNew->nStyleNo = 0; @@ -1031,8 +1031,8 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen aAttrSetList.Insert( pOld, aAttrSetList.Count() ); aAttrSetList.Insert( pNew, aAttrSetList.Count() ); } - pOld = 0; // pOld nicht loeschen - break; // das wars !! + pOld = 0; // pOld nicht loeschen + break; // das wars !! } } } @@ -1099,7 +1099,7 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen } } -void SvxRTFParser::SetAllAttrOfStk() // end all Attr. and set it into doc +void SvxRTFParser::SetAllAttrOfStk() // end all Attr. and set it into doc { // noch alle Attrbute vom Stack holen !! while( aAttrStack.Count() ) @@ -1132,7 +1132,7 @@ void SvxRTFParser::SetAttrSet( SvxRTFItemStackType &rSet ) } // wurde noch kein Text eingefuegt ? (SttPos vom obersten StackEintrag!) -int SvxRTFParser::IsAttrSttPos() +int SvxRTFParser::IsAttrSttPos() { SvxRTFItemStackType* pAkt = aAttrStack.Top(); return !pAkt || (pAkt->pSttNd->GetIdx() == pInsPos->GetNodeIdx() && @@ -1192,7 +1192,7 @@ const SfxItemSet& SvxRTFParser::GetRTFDefaults() SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const USHORT* pWhichRange ) : aAttrSet( rPool, pWhichRange ) { - nOutlineNo = BYTE(-1); // nicht gesetzt + nOutlineNo = BYTE(-1); // nicht gesetzt nBasedOn = 0; bBasedOnIsSet = FALSE; //$flr #117411# nNext = 0; diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx index 3e1a5f9143ad..5d3c3b468f6e 100644 --- a/editeng/source/uno/UnoForbiddenCharsTable.cxx +++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx index a23590d0f797..d186a3c2c256 100644 --- a/editeng/source/uno/unoedhlp.cxx +++ b/editeng/source/uno/unoedhlp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,14 +38,14 @@ TYPEINIT1( SvxEditSourceHint, TextHint ); -SvxEditSourceHint::SvxEditSourceHint( ULONG _nId ) : +SvxEditSourceHint::SvxEditSourceHint( ULONG _nId ) : TextHint( _nId ), mnStart( 0 ), mnEnd( 0 ) { } -SvxEditSourceHint::SvxEditSourceHint( ULONG _nId, ULONG nValue, ULONG nStart, ULONG nEnd ) : +SvxEditSourceHint::SvxEditSourceHint( ULONG _nId, ULONG nValue, ULONG nStart, ULONG nEnd ) : TextHint( _nId, nValue ), mnStart( nStart), mnEnd( nEnd ) @@ -79,7 +79,7 @@ void SvxEditSourceHint::SetStartValue( ULONG n ) void SvxEditSourceHint::SetEndValue( ULONG n ) { - mnEnd = n; + mnEnd = n; } //------------------------------------------------------------------------ @@ -96,7 +96,7 @@ void SvxEditSourceHint::SetEndValue( ULONG n ) case EE_NOTIFY_PARAGRAPHINSERTED: return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_PARAINSERTED, aNotify->nParagraph ) ); - case EE_NOTIFY_PARAGRAPHREMOVED: + case EE_NOTIFY_PARAGRAPHREMOVED: return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_PARAREMOVED, aNotify->nParagraph ) ); case EE_NOTIFY_PARAGRAPHSMOVED: @@ -135,16 +135,16 @@ void SvxEditSourceHint::SetEndValue( ULONG n ) sal_Bool SvxEditSourceHelper::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex ) { EECharAttribArray aCharAttribs; - + rEE.GetCharAttribs( nPara, aCharAttribs ); - + // find closest index in front of nIndex USHORT nAttr, nCurrIndex; sal_Int32 nClosestStartIndex; for( nAttr=0, nClosestStartIndex=0; nAttr<aCharAttribs.Count(); ++nAttr ) { nCurrIndex = aCharAttribs[nAttr].nStart; - + if( nCurrIndex > nIndex ) break; // aCharAttribs array is sorted in increasing order for nStart values diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 1c42104550f4..23f9878eccc4 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,7 +129,7 @@ public: sal_Bool IsEditableRange( const SvxAccessibleTextIndex& rEnd ) const; private: - USHORT mnPara; + USHORT mnPara; sal_Int32 mnIndex; sal_Int32 mnEEIndex; sal_Int32 mnFieldOffset; @@ -201,7 +201,7 @@ void SvxAccessibleTextIndex::SetEEIndex( USHORT nEEIndex, const SvxTextForwarder mnEEIndex = nEEIndex; // calculate unknowns - USHORT nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() ); + USHORT nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() ); mnIndex = nEEIndex; @@ -247,7 +247,7 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder& mnIndex = nIndex; // calculate unknowns - USHORT nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() ); + USHORT nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() ); DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX, "SvxAccessibleTextIndex::SetIndex: index value overflow"); @@ -589,7 +589,7 @@ void SvxAccessibleTextAdapter::SetParaAttribs( USHORT nPara, const SfxItemSet& r void SvxAccessibleTextAdapter::RemoveAttribs( const ESelection& , sal_Bool , sal_uInt16 ) { DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder"); -} +} void SvxAccessibleTextAdapter::GetPortions( USHORT nPara, SvUShorts& rList ) const { @@ -698,7 +698,7 @@ void SvxAccessibleTextAdapter::FieldClicked( const SvxFieldItem& rField, USHORT sal_Int32 SvxAccessibleTextAdapter::CalcLogicalIndex( USHORT nPara, USHORT nEEIndex ) { DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder"); - + SvxAccessibleTextIndex aIndex; aIndex.SetEEIndex(nPara, nEEIndex, *mrTextForwarder); return aIndex.GetIndex(); @@ -707,7 +707,7 @@ sal_Int32 SvxAccessibleTextAdapter::CalcLogicalIndex( USHORT nPara, USHORT nEEIn USHORT SvxAccessibleTextAdapter::CalcEditEngineIndex( USHORT nPara, sal_Int32 nLogicalIndex ) { DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder"); - + SvxAccessibleTextIndex aIndex; aIndex.SetIndex(nPara, nLogicalIndex, *mrTextForwarder); return aIndex.GetEEIndex(); @@ -1070,12 +1070,12 @@ USHORT SvxAccessibleTextAdapter::GetLineLen( USHORT nPara, USHORT nLine ) const void SvxAccessibleTextAdapter::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const { mrTextForwarder->GetLineBoundaries( rStart, rEnd, nParagraph, nLine ); -} +} USHORT SvxAccessibleTextAdapter::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const { return mrTextForwarder->GetLineNumberAtIndex( nPara, nIndex ); -} +} sal_Bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel ) { @@ -1248,7 +1248,7 @@ Point SvxAccessibleTextEditViewAdapter::PixelToLogic( const Point& rPoint, const return mrViewForwarder->PixelToLogic(rPoint, rMapMode); } - + sal_Bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) const { DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder"); @@ -1308,8 +1308,8 @@ sal_Bool SvxAccessibleTextEditViewAdapter::Paste() return mrViewForwarder->Paste(); } -void SvxAccessibleTextEditViewAdapter::SetForwarder( SvxEditViewForwarder& rForwarder, - SvxAccessibleTextAdapter& rTextForwarder ) +void SvxAccessibleTextEditViewAdapter::SetForwarder( SvxEditViewForwarder& rForwarder, + SvxAccessibleTextAdapter& rTextForwarder ) { mrViewForwarder = &rForwarder; mrTextForwarder = &rTextForwarder; diff --git a/editeng/source/uno/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx index aa54261945fe..91bca0a9e39d 100644 --- a/editeng/source/uno/unoedsrc.cxx +++ b/editeng/source/uno/unoedsrc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ SvxEditViewForwarder* SvxEditSource::GetEditViewForwarder( sal_Bool ) return NULL; } -SfxBroadcaster& SvxEditSource::GetBroadcaster() const +SfxBroadcaster& SvxEditSource::GetBroadcaster() const { DBG_ERROR("SvxEditSource::GetBroadcaster called for implementation missing this feature!"); diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index 7ae4e31700ec..419892316bcc 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -144,12 +144,12 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes const SfxPoolItem* pItem = NULL; { SvxFontItem* pFontItem = (SvxFontItem*)&rSet.Get( EE_CHAR_FONTINFO, TRUE ); - rDesc.Name = pFontItem->GetFamilyName(); - rDesc.StyleName = pFontItem->GetStyleName(); - rDesc.Family = sal::static_int_cast< sal_Int16 >( + rDesc.Name = pFontItem->GetFamilyName(); + rDesc.StyleName = pFontItem->GetStyleName(); + rDesc.Family = sal::static_int_cast< sal_Int16 >( pFontItem->GetFamily()); - rDesc.CharSet = pFontItem->GetCharSet(); - rDesc.Pitch = sal::static_int_cast< sal_Int16 >( + rDesc.CharSet = pFontItem->GetCharSet(); + rDesc.Pitch = sal::static_int_cast< sal_Int16 >( pFontItem->GetPitch()); } { diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 1ef3d1c3ce0b..6a00140341e1 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,45 +54,45 @@ using namespace ::com::sun::star; aAny <<= uno::Reference< xint >(this) -#define WID_DATE 0 -#define WID_BOOL1 1 -#define WID_BOOL2 2 -#define WID_INT32 3 -#define WID_INT16 4 -#define WID_STRING1 5 -#define WID_STRING2 6 -#define WID_STRING3 7 +#define WID_DATE 0 +#define WID_BOOL1 1 +#define WID_BOOL2 2 +#define WID_INT32 3 +#define WID_INT16 4 +#define WID_STRING1 5 +#define WID_STRING2 6 +#define WID_STRING3 7 class SvxUnoFieldData_Impl { public: - sal_Bool mbBoolean1; - sal_Bool mbBoolean2; - sal_Int32 mnInt32; - sal_Int16 mnInt16; - OUString msString1; - OUString msString2; - OUString msString3; + sal_Bool mbBoolean1; + sal_Bool mbBoolean2; + sal_Int32 mnInt32; + sal_Int16 mnInt16; + OUString msString1; + OUString msString2; + OUString msString3; util::DateTime maDateTime; - OUString msPresentation; + OUString msPresentation; }; const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) { static SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("DateTime"), WID_DATE, &::getCppuType((const util::DateTime*)0), 0, 0 }, - { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsDate"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("NumberFormat"), WID_INT32, &::getCppuType((const sal_Int16*)0), 0, 0 }, + { MAP_CHAR_LEN("DateTime"), WID_DATE, &::getCppuType((const util::DateTime*)0), 0, 0 }, + { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsDate"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("NumberFormat"), WID_INT32, &::getCppuType((const sal_Int16*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aExDateTimeFieldPropertySet_Impl(aExDateTimeFieldPropertyMap_Impl); static SfxItemPropertyMapEntry aDateTimeFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("IsDate"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsDate"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aDateTimeFieldPropertySet_Impl(aDateTimeFieldPropertyMap_Impl); @@ -100,10 +100,10 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static SfxItemPropertyMapEntry aUrlFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("Format"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, - { MAP_CHAR_LEN("Representation"), WID_STRING1, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("TargetFrame"), WID_STRING2, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("URL"), WID_STRING3, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("Format"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, + { MAP_CHAR_LEN("Representation"), WID_STRING1, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("TargetFrame"), WID_STRING2, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("URL"), WID_STRING3, &::getCppuType((const OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aUrlFieldPropertySet_Impl(aUrlFieldPropertyMap_Impl); @@ -116,27 +116,27 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) static SfxItemPropertyMapEntry aExtFileFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("FileFormat"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, - { MAP_CHAR_LEN("CurrentPresentation"), WID_STRING1,&::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("FileFormat"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, + { MAP_CHAR_LEN("CurrentPresentation"), WID_STRING1,&::getCppuType((const OUString*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aExtFileFieldPropertySet_Impl(aExtFileFieldPropertyMap_Impl); static SfxItemPropertyMapEntry aAuthorFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("CurrentPresentation"), WID_STRING1,&::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("Content"), WID_STRING2,&::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("AuthorFormat"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, - { MAP_CHAR_LEN("FullName"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsFixed"), WID_BOOL1, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("CurrentPresentation"), WID_STRING1,&::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("Content"), WID_STRING2,&::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("AuthorFormat"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, + { MAP_CHAR_LEN("FullName"), WID_BOOL2, &::getBooleanCppuType(), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aAuthorFieldPropertySet_Impl(aAuthorFieldPropertyMap_Impl); static SfxItemPropertyMapEntry aMeasureFieldPropertyMap_Impl[] = { - { MAP_CHAR_LEN("Kind"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, + { MAP_CHAR_LEN("Kind"), WID_INT16, &::getCppuType((const sal_Int16*)0), 0, 0 }, {0,0,0,0,0,0} }; static SfxItemPropertySet aMeasureFieldPropertySet_Impl(aMeasureFieldPropertyMap_Impl); @@ -157,13 +157,13 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId ) return &aAuthorFieldPropertySet_Impl; case ID_MEASUREFIELD: return &aMeasureFieldPropertySet_Impl; -// case ID_PAGEFIELD: -// case ID_PAGESFIELD: -// case ID_FILEFIELD: -// case ID_TABLEFIELD: -// case ID_HEADERFIELD: -// case ID_FOOTERFIELD: -// case ID_DATETIMEFIELD:: +// case ID_PAGEFIELD: +// case ID_PAGESFIELD: +// case ID_FILEFIELD: +// case ID_TABLEFIELD: +// case ID_HEADERFIELD: +// case ID_FOOTERFIELD: +// case ID_DATETIMEFIELD:: default: return &aEmptyPropertySet_Impl; } @@ -195,10 +195,10 @@ static sal_Int16 getFileNameDisplayFormat( SvxFileFormat nFormat ) { switch( nFormat ) { - case SVXFILEFORMAT_NAME_EXT: return text::FilenameDisplayFormat::NAME_AND_EXT; - case SVXFILEFORMAT_FULLPATH: return text::FilenameDisplayFormat::FULL; - case SVXFILEFORMAT_PATH: return text::FilenameDisplayFormat::PATH; -// case SVXFILEFORMAT_NAME: + case SVXFILEFORMAT_NAME_EXT: return text::FilenameDisplayFormat::NAME_AND_EXT; + case SVXFILEFORMAT_FULLPATH: return text::FilenameDisplayFormat::FULL; + case SVXFILEFORMAT_PATH: return text::FilenameDisplayFormat::PATH; +// case SVXFILEFORMAT_NAME: default: return text::FilenameDisplayFormat::NAME; } } @@ -207,10 +207,10 @@ static SvxFileFormat setFileNameDisplayFormat( sal_Int16 nFormat ) { switch( nFormat ) { - case text::FilenameDisplayFormat::FULL: return SVXFILEFORMAT_FULLPATH; - case text::FilenameDisplayFormat::PATH: return SVXFILEFORMAT_PATH; - case text::FilenameDisplayFormat::NAME: return SVXFILEFORMAT_NAME; -// case text::FilenameDisplayFormat::NAME_AND_EXT: + case text::FilenameDisplayFormat::FULL: return SVXFILEFORMAT_FULLPATH; + case text::FilenameDisplayFormat::PATH: return SVXFILEFORMAT_PATH; + case text::FilenameDisplayFormat::NAME: return SVXFILEFORMAT_NAME; +// case text::FilenameDisplayFormat::NAME_AND_EXT: default: return SVXFILEFORMAT_NAME_EXT; } @@ -261,10 +261,10 @@ inline Time setTime( util::DateTime& rDate ) UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextField ); SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw() -: OComponentHelper( getMutex() ) -, mpPropSet(NULL) -, mnServiceId(nServiceId) -, mpImpl( new SvxUnoFieldData_Impl ) +: OComponentHelper( getMutex() ) +, mpPropSet(NULL) +, mnServiceId(nServiceId) +, mpImpl( new SvxUnoFieldData_Impl ) { mpPropSet = ImplGetFieldItemPropertySet(mnServiceId); @@ -315,11 +315,11 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw() } SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > xAnchor, const OUString& rPresentation, const SvxFieldData* pData ) throw() -: OComponentHelper( getMutex() ) -, mxAnchor( xAnchor ) -, mpPropSet(NULL) -, mnServiceId(ID_UNKNOWN) -, mpImpl( new SvxUnoFieldData_Impl ) +: OComponentHelper( getMutex() ) +, mxAnchor( xAnchor ) +, mpPropSet(NULL) +, mnServiceId(ID_UNKNOWN) +, mpImpl( new SvxUnoFieldData_Impl ) { DBG_ASSERT(pData, "pFieldData == NULL! [CL]" ); @@ -379,14 +379,14 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > xAnchor, co case ID_AUTHORFIELD: mpImpl->msString1 = ((SvxAuthorField*)pData)->GetFormatted(); mpImpl->msString2 = ((SvxAuthorField*)pData)->GetFormatted(); - mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >( + mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >( ((SvxAuthorField*)pData)->GetFormat()); mpImpl->mbBoolean1 = ((SvxAuthorField*)pData)->GetType() == SVXAUTHORTYPE_FIX; mpImpl->mbBoolean2 = ((SvxAuthorField*)pData)->GetFormat() != SVXAUTHORFORMAT_SHORTNAME; break; case ID_MEASUREFIELD: - mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >(((SdrMeasureField*)pData)->GetMeasureFieldKind()); + mpImpl->mnInt16 = sal::static_int_cast< sal_Int16 >(((SdrMeasureField*)pData)->GetMeasureFieldKind()); break; } } @@ -424,7 +424,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() { Time aTime( setTime( mpImpl->maDateTime ) ); pData = new SvxExtTimeField( aTime, mpImpl->mbBoolean1?SVXTIMETYPE_FIX:SVXTIMETYPE_VAR ); - + if( mpImpl->mnInt32 >= SVXTIMEFORMAT_APPDEFAULT && mpImpl->mnInt32 <= SVXTIMEFORMAT_AM_HMSH ) ((SvxExtTimeField*)pData)->SetFormat( (SvxTimeFormat)mpImpl->mnInt32 ); } @@ -567,7 +567,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoTextField::getTypes() *pTypes++ = ::getCppuType(( const uno::Reference< text::XTextField >*)0); *pTypes++ = ::getCppuType(( const uno::Reference< beans::XPropertySet >*)0); *pTypes++ = ::getCppuType(( const uno::Reference< lang::XServiceInfo >*)0); - *pTypes++ = ::getCppuType(( const uno::Reference< lang::XUnoTunnel >*)0); + *pTypes++ = ::getCppuType(( const uno::Reference< lang::XUnoTunnel >*)0); } return maTypeSequence; } @@ -1027,9 +1027,9 @@ sal_Int32 SvxUnoTextField::GetFieldId( const SvxFieldData* pFieldData ) const th return ID_PAGEFIELD; else if( pFieldData->ISA( SvxPagesField ) ) return ID_PAGESFIELD; - else if( pFieldData->ISA( SvxTimeField ) ) + else if( pFieldData->ISA( SvxTimeField ) ) return ID_TIMEFIELD; - else if( pFieldData->ISA( SvxFileField ) ) + else if( pFieldData->ISA( SvxFileField ) ) return ID_FILEFIELD; else if( pFieldData->ISA( SvxTableField ) ) return ID_TABLEFIELD; @@ -1041,7 +1041,7 @@ sal_Int32 SvxUnoTextField::GetFieldId( const SvxFieldData* pFieldData ) const th return ID_AUTHORFIELD; else if( pFieldData->ISA( SvxDateField ) ) return ID_EXT_DATEFIELD; - else if( pFieldData->ISA( SdrMeasureField ) ) + else if( pFieldData->ISA( SdrMeasureField ) ) return ID_MEASUREFIELD; else if( pFieldData->ISA( SvxHeaderField ) ) return ID_HEADERFIELD; @@ -1066,7 +1066,7 @@ static const sal_Char* pOldServiceNames[] = "com.sun.star.text.TextField.PageNumber", "com.sun.star.text.TextField.PageCount", "com.sun.star.text.TextField.DateTime", - "com.sun.star.text.TextField.DocInfo.Title", // SvxFileField is used for title + "com.sun.star.text.TextField.DocInfo.Title", // SvxFileField is used for title "com.sun.star.text.TextField.SheetName", "com.sun.star.text.TextField.DateTime", "com.sun.star.text.TextField.FileName", @@ -1120,7 +1120,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt uno::Reference< uno::XInterface > xRet; const OUString aTextFieldPrexit( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.") ); - + // #i93308# up to OOo 3.2 we used this wrong namespace name with the capital T & F. This is // fixed since OOo 3.2 but for compatibility we will still provide support for the wrong notation. const OUString aTextFieldPrexit2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField.") ); diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 98ec0d7e7701..51ba135f0768 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include <editeng/unoedhlp.hxx> #include <editeng/editdata.hxx> #include <editeng/outliner.hxx> -#include <editeng/editobj.hxx> // nur fuer die GetText-Kruecke +#include <editeng/editobj.hxx> // nur fuer die GetText-Kruecke #include <editeng/unofored.hxx> @@ -54,7 +54,7 @@ SvxEditEngineForwarder::SvxEditEngineForwarder( EditEngine& rEngine ) : SvxEditEngineForwarder::~SvxEditEngineForwarder() { - // die EditEngine muss ggf. von aussen geloescht werden + // die EditEngine muss ggf. von aussen geloescht werden } USHORT SvxEditEngineForwarder::GetParagraphCount() const @@ -128,7 +128,7 @@ void SvxEditEngineForwarder::SetParaAttribs( USHORT nPara, const SfxItemSet& rSe void SvxEditEngineForwarder::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) { rEditEngine.RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich ); -} +} SfxItemPool* SvxEditEngineForwarder::GetPool() const { @@ -161,8 +161,8 @@ void SvxEditEngineForwarder::QuickSetAttribs( const SfxItemSet& rSet, const ESel } BOOL SvxEditEngineForwarder::IsValid() const -{ - // cannot reliably query EditEngine state +{ + // cannot reliably query EditEngine state // while in the middle of an update return rEditEngine.GetUpdateMode(); } @@ -181,7 +181,7 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe { EECharAttribArray aAttribs; - const SfxPoolItem* pLastItem = NULL; + const SfxPoolItem* pLastItem = NULL; SfxItemState eState = SFX_ITEM_DEFAULT; @@ -203,8 +203,8 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe // get list of char attribs rEditEngine.GetCharAttribs( nPara, aAttribs ); - BOOL bEmpty = TRUE; // we found no item inside the selektion of this paragraph - BOOL bGaps = FALSE; // we found items but theire gaps between them + BOOL bEmpty = TRUE; // we found no item inside the selektion of this paragraph + BOOL bGaps = FALSE; // we found items but theire gaps between them USHORT nLastEnd = nPos; const SfxPoolItem* pParaItem = NULL; @@ -216,10 +216,10 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe const sal_Bool bEmptyPortion = aAttrib.nStart == aAttrib.nEnd; if( (!bEmptyPortion && (aAttrib.nStart >= nEndPos)) || (bEmptyPortion && (aAttrib.nStart > nEndPos)) ) - break; // break if we are already behind our selektion + break; // break if we are already behind our selektion if( (!bEmptyPortion && (aAttrib.nEnd <= nPos)) || (bEmptyPortion && (aAttrib.nEnd < nPos)) ) - continue; // or if the attribute ends before our selektion + continue; // or if the attribute ends before our selektion if( aAttrib.pAttr->Which() != nWhich ) continue; // skip if is not the searched item @@ -262,7 +262,7 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe { if( *pParaItem != *pTempItem ) return SFX_ITEM_DONTCARE; - } + } else { pParaItem = pTempItem; @@ -327,7 +327,7 @@ LanguageType SvxEditEngineForwarder::GetLanguage( USHORT nPara, USHORT nIndex ) USHORT SvxEditEngineForwarder::GetFieldCount( USHORT nPara ) const { - return rEditEngine.GetFieldCount(nPara); + return rEditEngine.GetFieldCount(nPara); } EFieldInfo SvxEditEngineForwarder::GetFieldInfo( USHORT nPara, USHORT nField ) const @@ -391,7 +391,7 @@ Rectangle SvxEditEngineForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) c Rectangle SvxEditEngineForwarder::GetParaBounds( USHORT nPara ) const { const Point aPnt = rEditEngine.GetDocPosTopLeft( nPara ); - ULONG nWidth; + ULONG nWidth; ULONG nHeight; ULONG nTextWidth; @@ -409,7 +409,7 @@ Rectangle SvxEditEngineForwarder::GetParaBounds( USHORT nPara ) const } else { - nWidth = rEditEngine.CalcTextWidth(); + nWidth = rEditEngine.CalcTextWidth(); nHeight = rEditEngine.GetTextHeight( nPara ); return Rectangle( 0, aPnt.Y(), nWidth, aPnt.Y() + nHeight ); @@ -431,7 +431,7 @@ sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPa // #101701# Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() ); ::std::swap( aSize.Width(), aSize.Height() ); - Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos, + Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos, aSize, rEditEngine.IsVertical() == TRUE )); @@ -473,17 +473,17 @@ USHORT SvxEditEngineForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const { return rEditEngine.GetLineLen(nPara, nLine); } - + void SvxEditEngineForwarder::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const { rEditEngine.GetLineBoundaries(rStart, rEnd, nPara, nLine); } - + USHORT SvxEditEngineForwarder::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const { return rEditEngine.GetLineNumberAtIndex(nPara, nIndex); } - + sal_Bool SvxEditEngineForwarder::QuickFormatDoc( BOOL ) { @@ -553,7 +553,7 @@ void SvxEditEngineForwarder::CopyText(const SvxTextForwarder& rSource) EditTextObject* pNewTextObject = pSourceForwarder->rEditEngine.CreateTextObject(); rEditEngine.SetText( *pNewTextObject ); delete pNewTextObject; -} +} //------------------------------------------------------------------------ diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index e6978ba453f1..a7b67a342660 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,8 +76,8 @@ USHORT SvxOutlinerForwarder::GetTextLen( USHORT nParagraph ) const String SvxOutlinerForwarder::GetText( const ESelection& rSel ) const { - //! GetText(ESelection) sollte es wohl auch mal am Outliner geben - // solange den Hack fuer die EditEngine uebernehmen: + //! GetText(ESelection) sollte es wohl auch mal am Outliner geben + // solange den Hack fuer die EditEngine uebernehmen: EditEngine* pEditEngine = (EditEngine*)&rOutliner.GetEditEngine(); return pEditEngine->GetText( rSel, LINEEND_LF ); } @@ -128,8 +128,8 @@ SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, BOOL bOnlyH } } - //! gibt's das nicht am Outliner ??? - //! und warum ist GetAttribs an der EditEngine nicht const? + //! gibt's das nicht am Outliner ??? + //! und warum ist GetAttribs an der EditEngine nicht const? EditEngine& rEditEngine = (EditEngine&)rOutliner.GetEditEngine(); SfxItemSet aSet( ImplOutlinerForwarderGetAttribs( rSel, bOnlyHardAttrib, rEditEngine ) ); @@ -431,16 +431,16 @@ USHORT SvxOutlinerForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const { return rOutliner.GetLineLen(nPara, nLine); } - + void SvxOutlinerForwarder::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const { return rOutliner.GetEditEngine().GetLineBoundaries( rStart, rEnd, nPara, nLine ); } - + USHORT SvxOutlinerForwarder::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const { return rOutliner.GetEditEngine().GetLineNumberAtIndex( nPara, nIndex ); -} +} sal_Bool SvxOutlinerForwarder::QuickFormatDoc( BOOL ) { @@ -492,7 +492,7 @@ sal_Bool SvxOutlinerForwarder::SetDepth( USHORT nPara, sal_Int16 nNewDepth ) { rOutliner.SetDepth( pPara, nNewDepth ); -// const bool bOutlinerText = pSdrObject && (pSdrObject->GetObjInventor() == SdrInventor) && (pSdrObject->GetObjIdentifier() == OBJ_OUTLINETEXT); +// const bool bOutlinerText = pSdrObject && (pSdrObject->GetObjInventor() == SdrInventor) && (pSdrObject->GetObjIdentifier() == OBJ_OUTLINETEXT); if( bOutlinerText ) rOutliner.SetLevelDependendStyleSheet( nPara ); diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index d3e973444616..3616dda34c80 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ struct SfxItemPropertyMapEntryHash struct SvxIDPropertyCombine { - sal_uInt16 nWID; - uno::Any aAny; + sal_uInt16 nWID; + uno::Any aAny; }; DECLARE_LIST( SvxIDPropertyCombineList, SvxIDPropertyCombine * ) @@ -152,7 +152,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* { if ( !bDontConvertNegativeValues || SvxUnoCheckForPositiveValue( aVal ) ) SvxUnoConvertToMM( eMapUnit, aVal ); - } + } } else if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM && aVal.getValueType() == ::getCppuType((const sal_Int32*)0) ) @@ -267,7 +267,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM) { SvxUnoConvertToMM( eMapUnit, aVal ); - } + } } if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM && @@ -312,10 +312,10 @@ uno::Reference< beans::XPropertySetInfo > SvxItemPropertySet::getPropertySetInf //---------------------------------------------------------------------- #ifndef TWIPS_TO_MM -#define TWIPS_TO_MM(val) ((val * 127 + 36) / 72) +#define TWIPS_TO_MM(val) ((val * 127 + 36) / 72) #endif #ifndef MM_TO_TWIPS -#define MM_TO_TWIPS(val) ((val * 72 + 63) / 127) +#define MM_TO_TWIPS(val) ((val * 72 + 63) / 127) #endif /** converts the given any with a metric to 100th/mm if needed */ diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 12d0d0986af8..a9c5dd6f6da4 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -192,7 +192,7 @@ Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( ) Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sal_Int32 nIndex) const throw() { - // NumberingRule aRule; + // NumberingRule aRule; const SvxNumberFormat& rFmt = maRule.GetLevel((sal_uInt16) nIndex); sal_uInt16 nIdx = 0; @@ -286,7 +286,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa return aSeq; } -void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::PropertyValue >& rProperties, sal_Int32 nIndex) +void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::PropertyValue >& rProperties, sal_Int32 nIndex) throw( RuntimeException, IllegalArgumentException ) { SvxNumberFormat aFmt(maRule.GetLevel( (sal_uInt16)nIndex )); diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index 6a0ebeede6a0..759c8c686da8 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ uno::Reference< text::XText > SAL_CALL SvxAccessibleTextPropertySet::getText() t // TODO (empty?) return uno::Reference< text::XText > (); } - + uno::Any SAL_CALL SvxAccessibleTextPropertySet::queryAggregation( const uno::Type & ) throw(uno::RuntimeException) { // TODO (empty?) @@ -103,7 +103,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() thr { static ::cppu::OTypeCollection* pTypeCollection = NULL ; - // double-checked locking pattern. + // double-checked locking pattern. if ( pTypeCollection == NULL ) { osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ; @@ -112,7 +112,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() thr if ( pTypeCollection == NULL ) { // Create a static typecollection ... - static ::cppu::OTypeCollection aTypeCollection( + static ::cppu::OTypeCollection aTypeCollection( ::getCppuType( static_cast< const uno::Reference< beans::XPropertySet >* > (0) ), ::getCppuType( static_cast< const uno::Reference< beans::XMultiPropertySet >* > (0) ), ::getCppuType( static_cast< const uno::Reference< beans::XPropertyState >* > (0) ), diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 4c9aadfdae98..d0bf0b206b84 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,10 +79,10 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {0,0,0,0,0,0} }; return aSvxTextPortionPropertyMap; @@ -108,8 +108,8 @@ const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, - {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, {0,0,0,0,0,0} }; @@ -118,7 +118,7 @@ const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap() const SfxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSfxPropertySet() { static SfxItemPropertySet aTextCursorSfxPropertySet( ImplGetSvxUnoOutlinerTextCursorPropertyMap() ); - return &aTextCursorSfxPropertySet; + return &aTextCursorSfxPropertySet; } // ==================================================================== @@ -274,15 +274,15 @@ SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxEditSource* pSource, const Sv } SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxUnoTextRangeBase& rRange ) throw() -: text::XTextRange() -, beans::XPropertySet() -, beans::XMultiPropertySet() +: text::XTextRange() +, beans::XPropertySet() +, beans::XMultiPropertySet() , beans::XMultiPropertyStates() -, beans::XPropertyState() -, lang::XServiceInfo() -, text::XTextRangeCompare() -, lang::XUnoTunnel() -, mpPropSet(rRange.getPropertySet()) +, beans::XPropertyState() +, lang::XServiceInfo() +, text::XTextRangeCompare() +, lang::XUnoTunnel() +, mpPropSet(rRange.getPropertySet()) { SolarMutexGuard aGuard; @@ -444,14 +444,14 @@ void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString) CheckSelection( maSelection, pForwarder ); String aConverted( aString ); - aConverted.ConvertLineEnd( LINEEND_LF ); // Zeilenenden nur einfach zaehlen + aConverted.ConvertLineEnd( LINEEND_LF ); // Zeilenenden nur einfach zaehlen pForwarder->QuickInsertText( aConverted, maSelection ); mpEditSource->UpdateData(); - // Selektion anpassen - //! Wenn die EditEngine bei QuickInsertText die Selektion zurueckgeben wuerde, - //! waer's einfacher... + // Selektion anpassen + //! Wenn die EditEngine bei QuickInsertText die Selektion zurueckgeben wuerde, + //! waer's einfacher... CollapseToStart(); sal_uInt16 nLen = aConverted.Len(); @@ -538,9 +538,9 @@ void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pM { if(!SetPropertyValueHelper( rOldSet, pMap, rValue, rNewSet, &rSelection, GetEditSource() )) { - // Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund) - // muss vorher das alte Item aus dem Dokument geholt werden - rNewSet.Put(rOldSet.Get(pMap->nWID)); // altes Item in neuen Set + // Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund) + // muss vorher das alte Item aus dem Dokument geholt werden + rNewSet.Put(rOldSet.Get(pMap->nWID)); // altes Item in neuen Set mpPropSet->setPropertyValue(pMap, rValue, rNewSet, false ); } } @@ -658,7 +658,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& Propert else pAttribs = pForwarder->GetAttribs( GetSelection() ).Clone(); - // Dontcare durch Default ersetzen, damit man immer eine Reflection hat + // Dontcare durch Default ersetzen, damit man immer eine Reflection hat pAttribs->ClearInvalidItems(); getPropertyValue( pMap, aAny, *pAttribs ); @@ -1071,7 +1071,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt return beans::PropertyState_DIRECT_VALUE; case SFX_ITEM_DEFAULT: return beans::PropertyState_DEFAULT_VALUE; -// case SFX_ITEM_UNKNOWN: +// case SFX_ITEM_UNKNOWN: } } } @@ -1213,9 +1213,9 @@ sal_Bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, cons case SFX_ITEM_DEFAULT: rState = beans::PropertyState_DEFAULT_VALUE; break; -// case SFX_ITEM_UNKNOWN: -// case SFX_ITEM_DONTCARE: -// case SFX_ITEM_DISABLED: +// case SFX_ITEM_UNKNOWN: +// case SFX_ITEM_DONTCARE: +// case SFX_ITEM_DISABLED: default: rState = beans::PropertyState_AMBIGUOUS_VALUE; } @@ -1327,7 +1327,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp // Default aus ItemPool holen if(pPool->IsWhich(pMap->nWID)) { - SfxItemSet aSet( *pPool, pMap->nWID, pMap->nWID); + SfxItemSet aSet( *pPool, pMap->nWID, pMap->nWID); aSet.Put(pPool->GetDefaultItem(pMap->nWID)); return mpPropSet->getPropertyValue(pMap, aSet, true, false ); } @@ -1351,7 +1351,7 @@ void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault( ) throw (uno::Run PropertyEntryVector_t::const_iterator aIt = aEntries.begin(); while( aIt != aEntries.end() ) { - _setPropertyToDefault( pForwarder, &(*aIt), -1 ); + _setPropertyToDefault( pForwarder, &(*aIt), -1 ); ++aIt; } } @@ -1409,7 +1409,7 @@ sal_Bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, sal_Bool Expand) throw() { CheckSelection( maSelection, mpEditSource->GetTextForwarder() ); - // #75098# use end position, as in Writer (start is anchor, end is cursor) + // #75098# use end position, as in Writer (start is anchor, end is cursor) sal_uInt16 nNewPos = maSelection.nEndPos; sal_uInt16 nNewPar = maSelection.nEndPara; @@ -1422,7 +1422,7 @@ sal_Bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, sal_Bool Expand) throw() else { if ( !pForwarder ) - pForwarder = mpEditSource->GetTextForwarder(); // erst hier, wenn's noetig ist... + pForwarder = mpEditSource->GetTextForwarder(); // erst hier, wenn's noetig ist... --nNewPar; nCount -= nNewPos + 1; @@ -1451,7 +1451,7 @@ sal_Bool SvxUnoTextRangeBase::GoRight(sal_Int16 nCount, sal_Bool Expand) throw( CheckSelection( maSelection, pForwarder ); - sal_uInt16 nNewPos = maSelection.nEndPos + nCount; //! Ueberlauf ??? + sal_uInt16 nNewPos = maSelection.nEndPos + nCount; //! Ueberlauf ??? sal_uInt16 nNewPar = maSelection.nEndPara; sal_Bool bOk = sal_True; @@ -1528,7 +1528,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames_Static() SAL_THROW(()) { - uno::Sequence< OUString > aSeq; + uno::Sequence< OUString > aSeq; comphelper::ServiceInfoHelper::addToSequence( aSeq, 3, "com.sun.star.style.CharacterProperties", "com.sun.star.style.CharacterPropertiesComplex", "com.sun.star.style.CharacterPropertiesAsian"); @@ -1735,12 +1735,12 @@ SvxUnoTextBase::SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPrope } SvxUnoTextBase::SvxUnoTextBase( const SvxUnoTextBase& rText ) throw() -: SvxUnoTextRangeBase( rText ) +: SvxUnoTextRangeBase( rText ) , text::XTextAppend() , text::XTextCopy() -, container::XEnumerationAccess() -, text::XTextRangeMover() -, lang::XTypeProvider() +, container::XEnumerationAccess() +, text::XTextRangeMover() +, lang::XTypeProvider() { xParentText = rText.xParentText; } @@ -1758,15 +1758,15 @@ ESelection SvxUnoTextBase::InsertField( const SvxFieldItem& rField ) throw() pForwarder->QuickInsertField( rField, GetSelection() ); GetEditSource()->UpdateData(); - // Selektion anpassen - //! Wenn die EditEngine bei QuickInsertText die Selektion zurueckgeben wuerde, - //! waer's einfacher... + // Selektion anpassen + //! Wenn die EditEngine bei QuickInsertText die Selektion zurueckgeben wuerde, + //! waer's einfacher... CollapseToStart(); - GoRight( 1, sal_True ); // Feld ist immer 1 Zeichen + GoRight( 1, sal_True ); // Feld ist immer 1 Zeichen } - return GetSelection(); // Selektion mit dem Feld + return GetSelection(); // Selektion mit dem Feld } // XInterface @@ -1891,11 +1891,11 @@ void SAL_CALL SvxUnoTextBase::insertString( const uno::Reference< text::XTextRan SvxUnoTextRangeBase* pRange = SvxUnoTextRange::getImplementation( xRange ); if(pRange) { - // setString am SvxUnoTextRangeBase statt selber QuickInsertText und UpdateData, - // damit die Selektion am SvxUnoTextRangeBase angepasst wird. - //! Eigentlich muessten alle Cursor-Objekte dieses Textes angepasst werden! + // setString am SvxUnoTextRangeBase statt selber QuickInsertText und UpdateData, + // damit die Selektion am SvxUnoTextRangeBase angepasst wird. + //! Eigentlich muessten alle Cursor-Objekte dieses Textes angepasst werden! - if (!bAbsorb) // nicht ersetzen -> hinten anhaengen + if (!bAbsorb) // nicht ersetzen -> hinten anhaengen pRange->CollapseToEnd(); pRange->setString( aString ); @@ -1921,7 +1921,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text { case text::ControlCharacter::PARAGRAPH_BREAK: { - const String aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht + const String aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht insertString( xRange, aText, bAbsorb ); return; @@ -1964,7 +1964,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text if(pRange) { ESelection aRange = pRange->GetSelection(); -// ESelection aOldSelection = aRange; +// ESelection aOldSelection = aRange; aRange.nStartPos = pForwarder->GetTextLen( aRange.nStartPara ); @@ -1972,7 +1972,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text aRange.nEndPos = aRange.nStartPos; pRange->SetSelection( aRange ); - const String aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht + const String aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht pRange->setString( aText ); aRange.nStartPos = 0; @@ -2208,9 +2208,9 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendParagraph( // set properties for new appended (now last) paragraph ESelection aSel( nParaCount, 0, nParaCount, 0 ); SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() ); - SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, - ImplGetSvxUnoOutlinerTextCursorSfxPropertySet(), - pTextForwarder, + SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, + ImplGetSvxUnoOutlinerTextCursorSfxPropertySet(), + pTextForwarder, nParaCount ); pTextForwarder->QuickSetAttribs( aItemSet, aSel ); pEditSource->UpdateData(); @@ -2240,7 +2240,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph( USHORT nPara = nParaCount - 1; ESelection aSel( nPara, 0, nPara, 0 ); SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() ); - SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, + SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, ImplGetSvxUnoOutlinerTextCursorSfxPropertySet(), pTextForwarder, nPara ); pTextForwarder->QuickSetAttribs( aItemSet, aSel ); pEditSource->UpdateData(); @@ -2278,7 +2278,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion( pEditSource->UpdateData(); SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() ); - SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, + SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, ImplGetSvxTextPortionSfxPropertySet(), pTextForwarder, nPara ); pTextForwarder->QuickSetAttribs( aItemSet, aSel ); SvxUnoTextRange* pRange = new SvxUnoTextRange( *this ); @@ -2673,11 +2673,11 @@ void SvxDummyTextSource::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT { rStart = rEnd = 0; } - + USHORT SvxDummyTextSource::GetLineNumberAtIndex( USHORT /*nPara*/, USHORT /*nIndex*/ ) const { return 0; -} +} sal_Bool SvxDummyTextSource::QuickFormatDoc( BOOL ) { diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index 5a1132fb23ea..ced114204bdf 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,20 +124,20 @@ static SvxUnoText* getDummyText() throw() } SvxUnoTextContent::SvxUnoTextContent() throw() -: SvxUnoTextRangeBase(*getDummyText()) -, mnParagraph(0) -, mrParentText(*getDummyText()) -, maDisposeListeners(maDisposeContainerMutex) -, mbDisposing( false ) +: SvxUnoTextRangeBase(*getDummyText()) +, mnParagraph(0) +, mrParentText(*getDummyText()) +, maDisposeListeners(maDisposeContainerMutex) +, mbDisposing( false ) { } SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw() -: SvxUnoTextRangeBase(rText) -, mnParagraph(nPara) -, mrParentText(rText) -, maDisposeListeners(maDisposeContainerMutex) -, mbDisposing( false ) +: SvxUnoTextRangeBase(rText) +, mnParagraph(nPara) +, mrParentText(rText) +, maDisposeListeners(maDisposeContainerMutex) +, mbDisposing( false ) { mxParentText = const_cast<SvxUnoTextBase*>(&rText); if( GetEditSource() && GetEditSource()->GetTextForwarder() ) @@ -145,14 +145,14 @@ SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextBase& rText, sal_uInt16 nP } SvxUnoTextContent::SvxUnoTextContent( const SvxUnoTextContent& rContent ) throw() -: SvxUnoTextRangeBase(rContent) -, text::XTextContent() -, container::XEnumerationAccess() -, lang::XTypeProvider() -, cppu::OWeakAggObject() -, mrParentText(rContent.mrParentText) -, maDisposeListeners(maDisposeContainerMutex) -, mbDisposing( false ) +: SvxUnoTextRangeBase(rContent) +, text::XTextContent() +, container::XEnumerationAccess() +, lang::XTypeProvider() +, cppu::OWeakAggObject() +, mrParentText(rContent.mrParentText) +, maDisposeListeners(maDisposeContainerMutex) +, mbDisposing( false ) { mxParentText = rContent.mxParentText; mnParagraph = rContent.mnParagraph; @@ -262,7 +262,7 @@ void SAL_CALL SvxUnoTextContent::dispose() SolarMutexGuard aGuard; if( mbDisposing ) - return; // catched a recursion + return; // catched a recursion mbDisposing = true; @@ -408,7 +408,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames() // ==================================================================== SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw() -: mxParentText( const_cast<SvxUnoTextBase*>(&rText) ), +: mxParentText( const_cast<SvxUnoTextBase*>(&rText) ), mrParentText( rText ), mnParagraph( nPara ), mnNextPortion( 0 ) @@ -498,17 +498,17 @@ uno::Reference< uno::XInterface > SvxUnoTextCursor_NewInstance() } SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextBase& rText ) throw() -: SvxUnoTextRangeBase(rText), +: SvxUnoTextRangeBase(rText), mxParentText( const_cast<SvxUnoTextBase*>(&rText) ) { } SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextCursor& rCursor ) throw() -: SvxUnoTextRangeBase(rCursor) -, text::XTextCursor() -, lang::XTypeProvider() -, cppu::OWeakAggObject() -, mxParentText(rCursor.mxParentText) +: SvxUnoTextRangeBase(rCursor) +, text::XTextCursor() +, lang::XTypeProvider() +, cppu::OWeakAggObject() +, mxParentText(rCursor.mxParentText) { } diff --git a/editeng/source/uno/unoviwed.cxx b/editeng/source/uno/unoviwed.cxx index bdc6ada90c86..2ea5fddd09e8 100644 --- a/editeng/source/uno/unoviwed.cxx +++ b/editeng/source/uno/unoviwed.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx index 4bb7bd9dd8c4..6c4c024de39f 100644 --- a/editeng/source/uno/unoviwou.cxx +++ b/editeng/source/uno/unoviwou.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx index 4141bca34935..e412e99d64c5 100644 --- a/editeng/source/xml/editsource.hxx +++ b/editeng/source/xml/editsource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,14 +40,14 @@ public: SvxEditEngineSource( EditEngine* pEditEngine ); virtual ~SvxEditEngineSource(); - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); + virtual void UpdateData(); private: SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl ); - SvxEditEngineSourceImpl* mpImpl; + SvxEditEngineSourceImpl* mpImpl; }; #endif diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index f7f5090f9b44..5062aa730fd2 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,10 +78,10 @@ class SvxEditEngineSourceImpl; class SvxEditEngineSourceImpl { private: - oslInterlockedCount maRefCount; + oslInterlockedCount maRefCount; - EditEngine* mpEditEngine; - SvxTextForwarder* mpTextForwarder; + EditEngine* mpEditEngine; + SvxTextForwarder* mpTextForwarder; ~SvxEditEngineSourceImpl(); @@ -91,7 +91,7 @@ public: void SAL_CALL acquire(); void SAL_CALL release(); - SvxTextForwarder* GetTextForwarder(); + SvxTextForwarder* GetTextForwarder(); }; /////////////////////////////////////////////////////////////////////// @@ -115,10 +115,10 @@ SvxEditEngineSourceImpl::~SvxEditEngineSourceImpl() //------------------------------------------------------------------------ -void SAL_CALL SvxEditEngineSourceImpl::acquire() +void SAL_CALL SvxEditEngineSourceImpl::acquire() { osl_incrementInterlockedCount( &maRefCount ); -} +} //------------------------------------------------------------------------ @@ -126,7 +126,7 @@ void SAL_CALL SvxEditEngineSourceImpl::release() { if( ! osl_decrementInterlockedCount( &maRefCount ) ) delete this; -} +} //------------------------------------------------------------------------ @@ -359,7 +359,7 @@ class SvxXMLTextExportComponent : public SvXMLExport { public: // #110680# - SvxXMLTextExportComponent( + SvxXMLTextExportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, EditEngine* pEditEngine, const ESelection& rSel, @@ -382,13 +382,13 @@ private: /////////////////////////////////////////////////////////////////////// // #110680# -SvxXMLTextExportComponent::SvxXMLTextExportComponent( +SvxXMLTextExportComponent::SvxXMLTextExportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, EditEngine* pEditEngine, const ESelection& rSel, const ::rtl::OUString& rFileName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler) -: SvXMLExport( xServiceFactory, rFileName, xHandler, ((frame::XModel*)new SvxSimpleUnoModel()), MAP_CM ), +: SvXMLExport( xServiceFactory, rFileName, xHandler, ((frame::XModel*)new SvxSimpleUnoModel()), MAP_CM ), mpEditEngine( pEditEngine ), maSelection( rSel ) { @@ -398,10 +398,10 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( { SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, -// SVX_UNOEDIT_OUTLINER_PROPERTIES, - {MAP_CHAR_LEN(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, - {MAP_CHAR_LEN(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,&::getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL, &::getCppuType((const sal_Int16*)0), 0, 0 }, +// SVX_UNOEDIT_OUTLINER_PROPERTIES, + {MAP_CHAR_LEN(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, + {MAP_CHAR_LEN(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,&::getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL, &::getCppuType((const sal_Int16*)0), 0, 0 }, SVX_UNOEDIT_PARA_PROPERTIES, {0,0,0,0,0,0} }; @@ -424,10 +424,10 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& { do { - // create service factory + // create service factory uno::Reference< lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); - + if( !xServiceFactory.is() ) { DBG_ERROR( "got no service manager" ); @@ -437,14 +437,14 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& // create document handler uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) ); - + if( !xWriter.is() ) { DBG_ERROR( "com.sun.star.xml.sax.Writer service missing" ); break; } - uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY ); + uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY ); // create output stream and active data source uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( rStream ) ); diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index ac2819e8d5a1..78f26b79072b 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ public: virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ); -// SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); } +// SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); } private: const uno::Reference< XText > mxText; @@ -120,7 +120,7 @@ class SvxXMLXTextImportComponent : public SvXMLImport { public: // #110680# - SvxXMLXTextImportComponent( + SvxXMLXTextImportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, const uno::Reference< XText > & xText ); @@ -137,10 +137,10 @@ private: // -------------------------------------------------------------------- // #110680# -SvxXMLXTextImportComponent::SvxXMLXTextImportComponent( +SvxXMLXTextImportComponent::SvxXMLXTextImportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, const uno::Reference< XText > & xText ) -: SvXMLImport(xServiceFactory), +: SvXMLImport(xServiceFactory), mxText( xText ) { GetTextImport()->SetCursor( mxText->createTextCursor() ); @@ -158,7 +158,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r { SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, -// SVX_UNOEDIT_OUTLINER_PROPERTIES, +// SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, {0,0,0,0,0,0} }; @@ -173,7 +173,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r { do { - uno::Reference<lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); + uno::Reference<lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); if( !xServiceFactory.is() ) { DBG_ERROR( "SvxXMLXTableImport::load: got no service manager" ); @@ -215,7 +215,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r xSource->setOutputStream( uno::Reference< io::XOutputStream >::query( xPipe ) ); xml::sax::InputSource aParserInput; - aParserInput.aInputStream = uno::Reference< io::XInputStream >::query( xPipe ); + aParserInput.aInputStream = uno::Reference< io::XInputStream >::query( xPipe ); aParserInput.sSystemId = aMedium.GetName(); @@ -234,9 +234,9 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r xParser->setDocumentHandler( xHandler ); xml::sax::InputSource aParserInput; - aParserInput.aInputStream = xInputStream; -// aParserInput.sSystemId = aMedium.GetName(); - xParser->parseStream( aParserInput ); + aParserInput.aInputStream = xInputStream; +// aParserInput.sSystemId = aMedium.GetName(); + xParser->parseStream( aParserInput ); } while(0); } |