diff options
Diffstat (limited to 'sd/source/core')
34 files changed, 729 insertions, 729 deletions
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index 4b7cf5dee74c..b1a7e9bf45b3 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.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/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 0c51d6739187..2ee456775ad8 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.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 @@ -111,7 +111,7 @@ using ::com::sun::star::util::XChangesNotifier; using ::com::sun::star::util::XChangesListener; namespace sd -{ +{ class MainSequenceChangeGuard { public: @@ -141,7 +141,7 @@ private: }; CustomAnimationEffect::CustomAnimationEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) -: mnNodeType(-1), +: mnNodeType(-1), mnPresetClass(-1), mfBegin(-1.0), mfDuration(-1.0), @@ -358,7 +358,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In } else { - sal_Int32 nDone; + sal_Int32 nDone; for( nPos = 0; nPos < nEndPos; nPos++ ) { nPos = xBI->nextCharacters(aText, nPos, aLocale, i18n::CharacterIteratorMode::SKIPCELL, 0, nDone); @@ -644,7 +644,7 @@ bool CustomAnimationEffect::calculateIterateDuration() } } - // if we also animate the form first, we have to add the + // if we also animate the form first, we have to add the // sub effect duration to the whole effect duration if( mnTargetSubItem == ShapeAnimationSubType::AS_WHOLE ) fDuration += fSubEffectDuration; @@ -697,7 +697,7 @@ void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget Reference< XCommand > xCommand( aElem, UNO_QUERY ); if( xCommand.is() ) xCommand->setTarget( rTarget ); - } + } } } } @@ -757,7 +757,7 @@ void CustomAnimationEffect::setDuration( double fDuration ) double fScale = fDuration / mfDuration; mfDuration = fDuration; mfAbsoluteDuration = mfDuration; - + // calculate effect duration and get target shape Reference< XEnumerationAccess > xEnumerationAccess( mxNode, UNO_QUERY ); if( xEnumerationAccess.is() ) @@ -912,7 +912,7 @@ Reference< XShape > CustomAnimationEffect::getTargetShape() const // -------------------------------------------------------------------- -Any CustomAnimationEffect::getRepeatCount() const +Any CustomAnimationEffect::getRepeatCount() const { if( mxNode.is() ) { @@ -927,7 +927,7 @@ Any CustomAnimationEffect::getRepeatCount() const // -------------------------------------------------------------------- -Any CustomAnimationEffect::getEnd() const +Any CustomAnimationEffect::getEnd() const { if( mxNode.is() ) { @@ -982,9 +982,9 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() ); - const char* pServiceName = maDimColor.hasValue() ? + const char* pServiceName = maDimColor.hasValue() ? "com.sun.star.animations.AnimateColor" : "com.sun.star.animations.AnimateSet"; - + Reference< XAnimate > xAnimate( xMsf->createInstance(OUString::createFromAscii(pServiceName) ), UNO_QUERY_THROW ); Any aTo; @@ -1005,7 +1005,7 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const if( !mbAfterEffectOnNextEffect ) // sameClick { Event aEvent; - + aEvent.Source <<= getNode(); aEvent.Trigger = EventTrigger::END_EVENT; aEvent.Repeat = 0; @@ -1042,7 +1042,7 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType ) Reference< XMultiServiceFactory > xMsf( ::comphelper::getProcessServiceFactory() ); const char * pServiceName = nIterateType ? "com.sun.star.animations.IterateContainer" : "com.sun.star.animations.ParallelTimeContainer"; - Reference< XTimeContainer > xNewContainer( + Reference< XTimeContainer > xNewContainer( xMsf->createInstance( OUString::createFromAscii(pServiceName) ), UNO_QUERY_THROW ); Reference< XTimeContainer > xOldContainer( mxNode, UNO_QUERY_THROW ); @@ -1140,7 +1140,7 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval ) // -------------------------------------------------------------------- -::rtl::OUString CustomAnimationEffect::getPath() const +::rtl::OUString CustomAnimationEffect::getPath() const { ::rtl::OUString aPath; @@ -1227,7 +1227,7 @@ Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAt { Sequence<Any> aValues( xAnimate->getValues() ); if( aValues.hasElements() ) - aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ]; + aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ]; } break; } @@ -1274,7 +1274,7 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA case VALUE_FROM: if( xAnimate->getFrom() != rValue ) { - xAnimate->setFrom( rValue ); + xAnimate->setFrom( rValue ); bChanged = true; } break; @@ -1283,9 +1283,9 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA { xAnimate->setTo( rValue ); bChanged = true; - } + } break; - case VALUE_BY: + case VALUE_BY: if( xAnimate->getTo() != rValue ) { xAnimate->setBy( rValue ); @@ -1303,7 +1303,7 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA if( aValues[ nIndex ] != rValue ) { - aValues[ nIndex ] = rValue; + aValues[ nIndex ] = rValue; xAnimate->setValues( aValues ); bChanged = true; } @@ -1424,7 +1424,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor ) xAnimate->setTo(rColor); } break; - + } } } @@ -1468,7 +1468,7 @@ Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType, { Sequence<Any> aValues( xTransform->getValues() ); if( aValues.hasElements() ) - aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ]; + aProperty = aValues[ eValue == VALUE_FIRST ? 0 : aValues.getLength() - 1 ]; } break; } @@ -1512,7 +1512,7 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType, case VALUE_FROM: if( xTransform->getFrom() != rValue ) { - xTransform->setFrom( rValue ); + xTransform->setFrom( rValue ); bChanged = true; } break; @@ -1835,7 +1835,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres } p++; } - + if( bFilter ) { aUserData = ::comphelper::containerToSequence< NamedValue, std::vector< NamedValue > >( aNewUserData ); @@ -1846,9 +1846,9 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres Any aTarget( rTarget ); sal_Int16 nSubItem = ShapeAnimationSubType::AS_WHOLE; - if( aTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + if( aTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) { - nSubItem = ShapeAnimationSubType::ONLY_TEXT; + nSubItem = ShapeAnimationSubType::ONLY_TEXT; } else if( pPreset->isTextOnly() ) { @@ -1858,7 +1858,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres { // thats bad, we target a shape here but the effect is only for text // so change subitem - nSubItem = ShapeAnimationSubType::ONLY_TEXT; + nSubItem = ShapeAnimationSubType::ONLY_TEXT; } } @@ -1869,7 +1869,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres pEffect->setTargetSubItem( nSubItem ); if( fDuration != -1.0 ) pEffect->setDuration( fDuration ); - + maEffects.push_back(pEffect); rebuild(); @@ -1901,8 +1901,8 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb sal_Int16 nSubItem = ShapeAnimationSubType::AS_WHOLE; - if( rTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) - nSubItem = ShapeAnimationSubType::ONLY_TEXT; + if( rTarget.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + nSubItem = ShapeAnimationSubType::ONLY_TEXT; Reference< XAnimationNode > xEffectNode( xEffectContainer, UNO_QUERY_THROW ); pEffect.reset( new CustomAnimationEffect( xEffectNode ) ); @@ -1918,7 +1918,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb pEffect->updatePathFromSdrPathObj( rPathObj ); if( fDuration != -1.0 ) pEffect->setDuration( fDuration ); - + maEffects.push_back(pEffect); rebuild(); @@ -2037,7 +2037,7 @@ void EffectSequenceHelper::implRebuild() Any aBegin( makeAny( aEvent ) ); if( bFirst ) { - // if the first node is not a click action, this click container + // if the first node is not a click action, this click container // must not have INDEFINITE begin but start at 0s bFirst = false; if( pEffect->getNodeType() != EffectNodeType::ON_CLICK ) @@ -2188,8 +2188,8 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode) Reference< XTimeContainer > xClickContainer( xContainer->getParent(), UNO_QUERY_THROW ); Reference< XTimeContainer > xSequenceContainer( xClickContainer->getParent(), UNO_QUERY_THROW ); - Reference< XTimeContainer > xNextContainer; - + Reference< XTimeContainer > xNextContainer; + // first try if we have an after effect container if( !implFindNextContainer( xClickContainer, xContainer, xNextContainer ) ) { @@ -2214,7 +2214,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode) { Reference< XAnimationNode > xNode( xNextContainer, UNO_QUERY_THROW ); xNode->setBegin( makeAny( (double)0.0 ) ); -// xNode->setFill( AnimationFill::HOLD ); +// xNode->setFill( AnimationFill::HOLD ); xNextClickContainer->appendChild( xNode ); } } @@ -2245,7 +2245,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode) { Reference< XAnimationNode > xNode( xNextContainer, UNO_QUERY_THROW ); xNode->setBegin( makeAny( (double)0.0 ) ); -// xNode->setFill( AnimationFill::HOLD ); +// xNode->setFill( AnimationFill::HOLD ); xNewClickContainer->appendChild( xNode ); } } @@ -2456,7 +2456,7 @@ void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTa // -------------------------------------------------------------------- CustomAnimationTextGroup::CustomAnimationTextGroup( const Reference< XShape >& rTarget, sal_Int32 nGroupId ) -: maTarget( rTarget ), +: maTarget( rTarget ), mnGroupId( nGroupId ) { reset(); @@ -2493,7 +2493,7 @@ void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr& pEffect ) if( mnLastPara != -1 ) mbTextReverse = mnLastPara > aParaTarget.Paragraph; - + mnLastPara = aParaTarget.Paragraph; const sal_Int32 nParaDepth = pEffect->getParaDepth(); @@ -2579,7 +2579,7 @@ void EffectSequenceHelper::updateTextGroups() // -------------------------------------------------------------------- -CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse ) +CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse ) { // first finde a free group-id sal_Int32 nGroupId = 0; @@ -2601,7 +2601,7 @@ CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimati Reference< XShape > xTarget( pEffect->getTargetShape() ); - CustomAnimationTextGroupPtr pTextGroup( new CustomAnimationTextGroup( xTarget, nGroupId ) ); + CustomAnimationTextGroupPtr pTextGroup( new CustomAnimationTextGroup( xTarget, nGroupId ) ); maGroupMap[nGroupId] = pTextGroup; bool bUsed = false; @@ -2610,7 +2610,7 @@ CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimati if( (nTextGrouping == 0) || bAnimateForm ) { sal_Int16 nSubItem; - if( nTextGrouping == 0) + if( nTextGrouping == 0) nSubItem = bAnimateForm ? ShapeAnimationSubType::AS_WHOLE : ShapeAnimationSubType::ONLY_TEXT; else nSubItem = ShapeAnimationSubType::ONLY_BACKGROUND; @@ -2666,7 +2666,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG { if( bTextReverse ) // sort them aParaList.push_front( nPara ); - else + else aParaList.push_back( nPara ); } } @@ -2835,7 +2835,7 @@ void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGrou if( bAnimateForm ) { EffectSequence::iterator aInsertIter( find( (*aIter) ) ); - + CustomAnimationEffectPtr pEffect; if( (aEffects.size() == 1) && ((*aIter)->getTarget().getValueType() != ::getCppuType((const ParagraphTarget*)0) ) ) { @@ -2854,7 +2854,7 @@ void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGrou pTextGroup->addEffect( pEffect ); } - + if( !bAnimateForm && (aEffects.size() == 1) ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -3187,7 +3187,7 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode > { (void)e; DBG_ERROR( "sd::EffectSequenceHelper::processAfterEffect(), exception cought!" ); - } + } } /* @@ -3195,7 +3195,7 @@ double EffectSequenceHelper::calculateIterateNodeDuration( { Reference< i18n::XBreakIterator > xBI( ImplGetBreakIterator() ); - sal_Int32 nDone; + sal_Int32 nDone; sal_Int32 nNextCellBreak( xBI->nextCharacters(rTxt, nIdx, rLocale, i18n::CharacterIteratorMode::SKIPCELL, 0, nDone) ); i18n::Boundary nNextWordBoundary( xBI->getWordBoundary(rTxt, nIdx, rLocale, i18n::WordType::ANY_WORD, sal_True) ); sal_Int32 nNextSentenceBreak( xBI->endOfSentence(rTxt, nIdx, rLocale) ); @@ -3494,7 +3494,7 @@ CustomAnimationEffectPtr MainSequence::getEffectFromOffset( sal_Int32 nOffset ) { if( nOffset < getCount() ) return EffectSequenceHelper::getEffectFromOffset( nOffset ); - + nOffset -= getCount(); InteractiveSequenceList::const_iterator aIter( maInteractiveSequenceList.begin() ); @@ -3525,7 +3525,7 @@ bool MainSequence::disposeShape( const Reference< XShape >& xShape ) bChanges = true; } else - { + { bChanges |= (*aIter++)->disposeShape( xShape ); } } diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 8644c9bf625e..9f983671cc5f 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.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 @@ -264,7 +264,7 @@ Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFac try { // create stream - SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ ); + SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ ); Reference<XInputStream> xInputStream( new utl::OInputStreamWrapper( pIStm, sal_True ) ); // prepare ParserInputSrouce @@ -632,10 +632,10 @@ Reference< XAnimationNode > CustomAnimationPresets::getRandomPreset( sal_Int16 n const PresetCategoryList* pCategoryList = 0; switch( nPresetClass ) { - case EffectPresetClass::ENTRANCE: pCategoryList = &maEntrancePresets; break; - case EffectPresetClass::EXIT: pCategoryList = &maExitPresets; break; - case EffectPresetClass::EMPHASIS: pCategoryList = &maEmphasisPresets; break; - case EffectPresetClass::MOTIONPATH: pCategoryList = &maMotionPathsPresets; break; + case EffectPresetClass::ENTRANCE: pCategoryList = &maEntrancePresets; break; + case EffectPresetClass::EXIT: pCategoryList = &maExitPresets; break; + case EffectPresetClass::EMPHASIS: pCategoryList = &maEmphasisPresets; break; + case EffectPresetClass::MOTIONPATH: pCategoryList = &maMotionPathsPresets; break; default: pCategoryList = 0; } diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 61b1a4c502d2..8300bbc42f01 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.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,105 +51,105 @@ using ::rtl::OUString; struct deprecated_FadeEffect_conversion_table_entry { - FadeEffect meFadeEffect; + FadeEffect meFadeEffect; const sal_Char* mpPresetId; } deprecated_FadeEffect_conversion_table[] = { // OOo 1.x transitions - { FadeEffect_FADE_FROM_LEFT, "wipe-right" }, - { FadeEffect_FADE_FROM_TOP, "wipe-down" }, - { FadeEffect_FADE_FROM_RIGHT, "wipe-left" }, - { FadeEffect_FADE_FROM_BOTTOM, "wipe-up" }, - - { FadeEffect_CLOCKWISE, "wheel-clockwise-1-spoke" }, - - { FadeEffect_UNCOVER_TO_LEFT, "uncover-left" }, - { FadeEffect_UNCOVER_TO_UPPERLEFT, "uncover-left-up" }, - { FadeEffect_UNCOVER_TO_TOP, "uncover-up" }, - { FadeEffect_UNCOVER_TO_UPPERRIGHT, "uncover-right-up" }, - { FadeEffect_UNCOVER_TO_RIGHT, "uncover-right" }, - { FadeEffect_UNCOVER_TO_LOWERRIGHT, "uncover-right-down" }, - { FadeEffect_UNCOVER_TO_BOTTOM, "uncover-down" }, - { FadeEffect_UNCOVER_TO_LOWERLEFT, "uncover-left-down" }, - - { FadeEffect_VERTICAL_LINES, "random-bars-vertical" }, - { FadeEffect_HORIZONTAL_LINES, "random-bars-horizontal" }, - - { FadeEffect_VERTICAL_CHECKERBOARD, "checkerboard-down" }, - { FadeEffect_HORIZONTAL_CHECKERBOARD, "checkerboard-across" }, - - { FadeEffect_FADE_TO_CENTER, "box-in" }, - { FadeEffect_FADE_FROM_CENTER, "box-out" }, - - { FadeEffect_VERTICAL_STRIPES, "venetian-blinds-vertical" }, - { FadeEffect_HORIZONTAL_STRIPES, "venetian-blinds-horizontal" }, - - { FadeEffect_MOVE_FROM_LEFT, "cover-right" }, - { FadeEffect_MOVE_FROM_TOP, "cover-down" }, - { FadeEffect_MOVE_FROM_RIGHT, "cover-left" }, - { FadeEffect_MOVE_FROM_BOTTOM, "cover-up" }, - { FadeEffect_MOVE_FROM_UPPERLEFT, "cover-right-down" }, - { FadeEffect_MOVE_FROM_UPPERRIGHT, "cover-left-down" }, - { FadeEffect_MOVE_FROM_LOWERRIGHT, "cover-left-up" }, - { FadeEffect_MOVE_FROM_LOWERLEFT, "cover-right-up" }, - - { FadeEffect_DISSOLVE, "dissolve" }, - - { FadeEffect_RANDOM, "random-transition" }, - - { FadeEffect_ROLL_FROM_LEFT, "push-right" }, - { FadeEffect_ROLL_FROM_TOP, "push-down" }, - { FadeEffect_ROLL_FROM_RIGHT, "push-left" }, - { FadeEffect_ROLL_FROM_BOTTOM, "push-up" }, - - { FadeEffect_CLOSE_VERTICAL, "split-horizontal-in" }, - { FadeEffect_CLOSE_HORIZONTAL, "split-vertical-in" }, - { FadeEffect_OPEN_VERTICAL, "split-horizontal-out" }, - { FadeEffect_OPEN_HORIZONTAL, "split-vertical-out" }, - - { FadeEffect_FADE_FROM_UPPERLEFT, "diagonal-squares-right-down" }, - { FadeEffect_FADE_FROM_UPPERRIGHT, "diagonal-squares-left-down" }, - { FadeEffect_FADE_FROM_LOWERLEFT, "diagonal-squares-right-up" }, - { FadeEffect_FADE_FROM_LOWERRIGHT, "diagonal-squares-left-up" }, + { FadeEffect_FADE_FROM_LEFT, "wipe-right" }, + { FadeEffect_FADE_FROM_TOP, "wipe-down" }, + { FadeEffect_FADE_FROM_RIGHT, "wipe-left" }, + { FadeEffect_FADE_FROM_BOTTOM, "wipe-up" }, + + { FadeEffect_CLOCKWISE, "wheel-clockwise-1-spoke" }, + + { FadeEffect_UNCOVER_TO_LEFT, "uncover-left" }, + { FadeEffect_UNCOVER_TO_UPPERLEFT, "uncover-left-up" }, + { FadeEffect_UNCOVER_TO_TOP, "uncover-up" }, + { FadeEffect_UNCOVER_TO_UPPERRIGHT, "uncover-right-up" }, + { FadeEffect_UNCOVER_TO_RIGHT, "uncover-right" }, + { FadeEffect_UNCOVER_TO_LOWERRIGHT, "uncover-right-down" }, + { FadeEffect_UNCOVER_TO_BOTTOM, "uncover-down" }, + { FadeEffect_UNCOVER_TO_LOWERLEFT, "uncover-left-down" }, + + { FadeEffect_VERTICAL_LINES, "random-bars-vertical" }, + { FadeEffect_HORIZONTAL_LINES, "random-bars-horizontal" }, + + { FadeEffect_VERTICAL_CHECKERBOARD, "checkerboard-down" }, + { FadeEffect_HORIZONTAL_CHECKERBOARD, "checkerboard-across" }, + + { FadeEffect_FADE_TO_CENTER, "box-in" }, + { FadeEffect_FADE_FROM_CENTER, "box-out" }, + + { FadeEffect_VERTICAL_STRIPES, "venetian-blinds-vertical" }, + { FadeEffect_HORIZONTAL_STRIPES, "venetian-blinds-horizontal" }, + + { FadeEffect_MOVE_FROM_LEFT, "cover-right" }, + { FadeEffect_MOVE_FROM_TOP, "cover-down" }, + { FadeEffect_MOVE_FROM_RIGHT, "cover-left" }, + { FadeEffect_MOVE_FROM_BOTTOM, "cover-up" }, + { FadeEffect_MOVE_FROM_UPPERLEFT, "cover-right-down" }, + { FadeEffect_MOVE_FROM_UPPERRIGHT, "cover-left-down" }, + { FadeEffect_MOVE_FROM_LOWERRIGHT, "cover-left-up" }, + { FadeEffect_MOVE_FROM_LOWERLEFT, "cover-right-up" }, + + { FadeEffect_DISSOLVE, "dissolve" }, + + { FadeEffect_RANDOM, "random-transition" }, + + { FadeEffect_ROLL_FROM_LEFT, "push-right" }, + { FadeEffect_ROLL_FROM_TOP, "push-down" }, + { FadeEffect_ROLL_FROM_RIGHT, "push-left" }, + { FadeEffect_ROLL_FROM_BOTTOM, "push-up" }, + + { FadeEffect_CLOSE_VERTICAL, "split-horizontal-in" }, + { FadeEffect_CLOSE_HORIZONTAL, "split-vertical-in" }, + { FadeEffect_OPEN_VERTICAL, "split-horizontal-out" }, + { FadeEffect_OPEN_HORIZONTAL, "split-vertical-out" }, + + { FadeEffect_FADE_FROM_UPPERLEFT, "diagonal-squares-right-down" }, + { FadeEffect_FADE_FROM_UPPERRIGHT, "diagonal-squares-left-down" }, + { FadeEffect_FADE_FROM_LOWERLEFT, "diagonal-squares-right-up" }, + { FadeEffect_FADE_FROM_LOWERRIGHT, "diagonal-squares-left-up" }, // OOo 1.x transitions not in OOo 2.x - { FadeEffect_CLOCKWISE, "clock-wipe-twelve" }, - { FadeEffect_COUNTERCLOCKWISE, "reverse-clock-wipe-twelve" }, - { FadeEffect_SPIRALIN_LEFT, "spiral-wipe-top-left-clockwise" }, - { FadeEffect_SPIRALIN_RIGHT, "spiral-wipe-top-right-counter-clockwise" }, - { FadeEffect_SPIRALOUT_LEFT, "spiral-wipe-out-to-bottom-right-clockwise" }, - { FadeEffect_SPIRALOUT_RIGHT, "spiral-wipe-out-to-bottom-left-counter-clockwise" }, - { FadeEffect_WAVYLINE_FROM_LEFT, "snake-wipe-top-left-vertical" }, - { FadeEffect_WAVYLINE_FROM_TOP, "snake-wipe-top-left-horizontal" }, - { FadeEffect_WAVYLINE_FROM_RIGHT, "snake-wipe-bottom-right-vertical" }, - { FadeEffect_WAVYLINE_FROM_BOTTOM, "snake-wipe-bottom-right-horizontal" }, - { FadeEffect_STRETCH_FROM_LEFT, "wipe-right" }, // todo - { FadeEffect_STRETCH_FROM_TOP, "wipe-down" }, // todo - { FadeEffect_STRETCH_FROM_RIGHT, "wipe-left" }, // todo - { FadeEffect_STRETCH_FROM_BOTTOM, "wipe-up" }, // todo + { FadeEffect_CLOCKWISE, "clock-wipe-twelve" }, + { FadeEffect_COUNTERCLOCKWISE, "reverse-clock-wipe-twelve" }, + { FadeEffect_SPIRALIN_LEFT, "spiral-wipe-top-left-clockwise" }, + { FadeEffect_SPIRALIN_RIGHT, "spiral-wipe-top-right-counter-clockwise" }, + { FadeEffect_SPIRALOUT_LEFT, "spiral-wipe-out-to-bottom-right-clockwise" }, + { FadeEffect_SPIRALOUT_RIGHT, "spiral-wipe-out-to-bottom-left-counter-clockwise" }, + { FadeEffect_WAVYLINE_FROM_LEFT, "snake-wipe-top-left-vertical" }, + { FadeEffect_WAVYLINE_FROM_TOP, "snake-wipe-top-left-horizontal" }, + { FadeEffect_WAVYLINE_FROM_RIGHT, "snake-wipe-bottom-right-vertical" }, + { FadeEffect_WAVYLINE_FROM_BOTTOM, "snake-wipe-bottom-right-horizontal" }, + { FadeEffect_STRETCH_FROM_LEFT, "wipe-right" }, // todo + { FadeEffect_STRETCH_FROM_TOP, "wipe-down" }, // todo + { FadeEffect_STRETCH_FROM_RIGHT, "wipe-left" }, // todo + { FadeEffect_STRETCH_FROM_BOTTOM, "wipe-up" }, // todo // OOo 1.x not available transitions - { FadeEffect_CLOCKWISE, "wheel-clockwise-2-spokes" }, - { FadeEffect_CLOCKWISE, "wheel-clockwise-3-spokes" }, - { FadeEffect_CLOCKWISE, "wheel-clockwise-4-spokes" }, - { FadeEffect_CLOCKWISE, "wheel-clockwise-8-spokes" }, + { FadeEffect_CLOCKWISE, "wheel-clockwise-2-spokes" }, + { FadeEffect_CLOCKWISE, "wheel-clockwise-3-spokes" }, + { FadeEffect_CLOCKWISE, "wheel-clockwise-4-spokes" }, + { FadeEffect_CLOCKWISE, "wheel-clockwise-8-spokes" }, - { FadeEffect_FADE_FROM_CENTER, "shape-circle" }, - { FadeEffect_FADE_FROM_CENTER, "shape-diamond" }, - { FadeEffect_FADE_FROM_CENTER, "shape-plus" }, + { FadeEffect_FADE_FROM_CENTER, "shape-circle" }, + { FadeEffect_FADE_FROM_CENTER, "shape-diamond" }, + { FadeEffect_FADE_FROM_CENTER, "shape-plus" }, - { FadeEffect_CLOCKWISE, "wedge" }, + { FadeEffect_CLOCKWISE, "wedge" }, - { FadeEffect_DISSOLVE, "fade-through-black" }, + { FadeEffect_DISSOLVE, "fade-through-black" }, - { FadeEffect_CLOCKWISE, "zoom-rotate-in" }, + { FadeEffect_CLOCKWISE, "zoom-rotate-in" }, - { FadeEffect_HORIZONTAL_LINES, "comb-horizontal" }, - { FadeEffect_VERTICAL_LINES, "comb-vertical" }, + { FadeEffect_HORIZONTAL_LINES, "comb-horizontal" }, + { FadeEffect_VERTICAL_LINES, "comb-vertical" }, - { FadeEffect_DISSOLVE, "fade-smoothly" }, + { FadeEffect_DISSOLVE, "fade-smoothly" }, { FadeEffect_NONE, 0 } }; @@ -202,7 +202,7 @@ FadeEffect EffectMigration::GetFadeEffect( const SdPage* pPage ) const TransitionPresetList::const_iterator aEndIt( rPresetList.end()); for( ; aIt != aEndIt; ++aIt ) { - if( ( (*aIt)->getTransition() == pPage->getTransitionType() ) && + if( ( (*aIt)->getTransition() == pPage->getTransitionType() ) && ( (*aIt)->getSubtype() == pPage->getTransitionSubtype() ) && ( (*aIt)->getDirection() == pPage->getTransitionDirection() ) && ( (*aIt)->getFadeColor() == pPage->getTransitionFadeColor() ) ) @@ -221,7 +221,7 @@ FadeEffect EffectMigration::GetFadeEffect( const SdPage* pPage ) struct deprecated_AnimationEffect_conversion_table_entry { - AnimationEffect meEffect; + AnimationEffect meEffect; const sal_Char* mpPresetId; const sal_Char* mpPresetSubType; } @@ -252,7 +252,7 @@ deprecated_AnimationEffect_conversion_table[] = { AnimationEffect_MOVE_FROM_LOWERRIGHT, "ooo-entrance-fly-in","from-bottom-right" }, { AnimationEffect_MOVE_FROM_LOWERLEFT, "ooo-entrance-fly-in","from-bottom-left" }, - { AnimationEffect_MOVE_FROM_BOTTOM, "ooo-entrance-fly-in-slow", "from-bottom" }, + { AnimationEffect_MOVE_FROM_BOTTOM, "ooo-entrance-fly-in-slow", "from-bottom" }, { AnimationEffect_MOVE_FROM_LEFT, "ooo-entrance-fly-in-slow", "from-left" }, { AnimationEffect_MOVE_FROM_RIGHT, "ooo-entrance-fly-in-slow", "from-right" }, { AnimationEffect_MOVE_FROM_TOP, "ooo-entrance-fly-in-slow", "from-top" }, @@ -415,7 +415,7 @@ deprecated_AnimationEffect_conversion_table[] = EffectSequence::iterator ImplFindEffect( MainSequencePtr& pMainSequence, const Reference< XShape >& rShape, sal_Int16 nSubItem ) { EffectSequence::iterator aIter; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -566,7 +566,7 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) const Reference< XShape > xShape( pShape ); EffectSequence::iterator aIter; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -587,7 +587,7 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) } // now find old effect - AnimationEffect eEffect = AnimationEffect_NONE; + AnimationEffect eEffect = AnimationEffect_NONE; if( !ConvertPreset( aPresetId, &aPresetSubType, eEffect ) ) ConvertPreset( aPresetId, 0, eEffect ); @@ -659,7 +659,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect { pShapeEffect = (*aIterOnlyBackground); } - else + else { EffectSequence::iterator aIterAsWhole( ImplFindEffect( pMainSequence, xShape, ShapeAnimationSubType::AS_WHOLE ) ); if( aIterAsWhole != aEnd ) @@ -693,7 +693,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect const bool bManual = (pPage == 0) || (pPage->GetPresChange() == PRESCHANGE_MANUAL); // now create effects for each paragraph - pGroup = + pGroup = pMainSequence-> createTextGroup( pShapeEffect, 10, bManual ? -1 : 0.0, sal_True, sal_False ); } @@ -762,7 +762,7 @@ AnimationEffect EffectMigration::GetTextAnimationEffect( SvxShape* pShape ) } // now find old effect - AnimationEffect eEffect = AnimationEffect_NONE; + AnimationEffect eEffect = AnimationEffect_NONE; if( !ConvertPreset( aPresetId, &aPresetSubType, eEffect ) ) ConvertPreset( aPresetId, 0, eEffect ); @@ -781,7 +781,7 @@ bool EffectMigration::ConvertPreset( const OUString& rPresetId, const OUString* deprecated_AnimationEffect_conversion_table_entry* p = deprecated_AnimationEffect_conversion_table; while( p->mpPresetId ) { - if( rPresetId.equalsAscii( p->mpPresetId ) && + if( rPresetId.equalsAscii( p->mpPresetId ) && (( p->mpPresetSubType == 0 ) || ( pPresetSubType == 0) || ( pPresetSubType->equalsAscii( p->mpPresetSubType )) ) ) @@ -855,7 +855,7 @@ void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed EffectSequence::iterator aIter; bool bNeedRebuild = false; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -935,7 +935,7 @@ void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor ) EffectSequence::iterator aIter; bool bNeedRebuild = false; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -966,11 +966,11 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape ) const Reference< XShape > xShape( pShape ); EffectSequence::iterator aIter; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); - if( (pEffect->getTargetShape() == xShape) && + if( (pEffect->getTargetShape() == xShape) && pEffect->getDimColor().hasValue() && pEffect->hasAfterEffect()) { @@ -1006,7 +1006,7 @@ void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide ) EffectSequence::iterator aIter; bool bNeedRebuild = false; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -1080,7 +1080,7 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious ) EffectSequence::iterator aIter; bool bNeedRebuild = false; - + for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ ) { CustomAnimationEffectPtr pEffect( (*aIter) ); @@ -1149,7 +1149,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos { Reference< XShape > xThis( pShape ); Reference< XShape > xCurrent; - + EffectSequence::iterator aIter( rSequence.begin() ); EffectSequence::iterator aEnd( rSequence.end() ); for( nPos = 0; aIter != aEnd; aIter++ ) @@ -1196,7 +1196,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos aEffects.push_back( (*(*aIter)) ); rSequence.erase( (*aIter++) ); } - + if( nNewPos > nCurrentPos ) nNewPos++; @@ -1275,7 +1275,7 @@ void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInf EffectSequence::iterator aIter; bool bNeedRebuild = false; - + OUString aSoundFile; if( pInfo->mbSoundOn ) aSoundFile = pInfo->maSoundFile; @@ -1318,8 +1318,8 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape ) const Reference< XShape > xShape( pShape ); EffectSequence::iterator aIter; - - for( aIter = pMainSequence->getBegin(); + + for( aIter = pMainSequence->getBegin(); (aSoundFile.getLength() == 0) && (aIter != pMainSequence->getEnd()); aIter++ ) { diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx index d02eae13f12a..0343c0680641 100644 --- a/sd/source/core/PageListWatcher.cxx +++ b/sd/source/core/PageListWatcher.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 @@ -106,7 +106,7 @@ SdPage* ImpPageListWatcher::GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum) pRetval = maPageVectorStandard[nPgNum]; else { - DBG_ASSERT(nPgNum <= maPageVectorStandard.size(), + DBG_ASSERT(nPgNum <= maPageVectorStandard.size(), "ImpPageListWatcher::GetSdPage(PK_STANDARD): access out of range"); DBG_WARNING2 (" %d > %d", nPgNum, nPgNum<maPageVectorStandard.size()); @@ -128,15 +128,15 @@ SdPage* ImpPageListWatcher::GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum) } case PK_HANDOUT: { -// #11420# for models used to transfer drawing shapes via clipboard its -// ok to not have a handout page -// DBG_ASSERT(mpHandoutPage, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)"); +// #11420# for models used to transfer drawing shapes via clipboard its +// ok to not have a handout page +// DBG_ASSERT(mpHandoutPage, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)"); DBG_ASSERT(nPgNum == 0L, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)"); if (nPgNum == 0) pRetval = mpHandoutPage; else { - DBG_ASSERT(nPgNum == 0L, + DBG_ASSERT(nPgNum == 0L, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)"); } break; diff --git a/sd/source/core/PageListWatcher.hxx b/sd/source/core/PageListWatcher.hxx index ae6b1235abd9..b45f8bf47314 100644 --- a/sd/source/core/PageListWatcher.hxx +++ b/sd/source/core/PageListWatcher.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,13 +45,13 @@ protected: // typedefs for a vector of SdPages typedef ::std::vector< SdPage* > SdPageVector; - const SdrModel& mrModel; + const SdrModel& mrModel; - SdPageVector maPageVectorStandard; - SdPageVector maPageVectorNotes; - SdPage* mpHandoutPage; + SdPageVector maPageVectorStandard; + SdPageVector maPageVectorNotes; + SdPage* mpHandoutPage; - sal_Bool mbPageListValid; + sal_Bool mbPageListValid; void ImpRecreateSortedPageListOnDemand(); virtual sal_uInt32 ImpGetPageCount() const = 0; diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 46d28a80a423..b567d438b1c0 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.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/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index e4e3c3ec2fe1..e1a298b724e4 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.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,24 +48,24 @@ using namespace ::com::sun::star; SdAnimationInfo::SdAnimationInfo(SdrObject& rObject) : SdrObjUserData(SdUDInventor, SD_ANIMATIONINFO_ID, 0), - mePresObjKind (PRESOBJ_NONE), - meEffect (presentation::AnimationEffect_NONE), - meTextEffect (presentation::AnimationEffect_NONE), - meSpeed (presentation::AnimationSpeed_SLOW), - mbActive (TRUE), - mbDimPrevious (FALSE), - mbIsMovie (FALSE), - mbDimHide (FALSE), - mbSoundOn (FALSE), - mbPlayFull (FALSE), - mpPathObj (NULL), - meClickAction (presentation::ClickAction_NONE), - meSecondEffect (presentation::AnimationEffect_NONE), - meSecondSpeed (presentation::AnimationSpeed_SLOW), - mbSecondSoundOn (FALSE), - mbSecondPlayFull (FALSE), - mnVerb (0), - mnPresOrder (LIST_APPEND), + mePresObjKind (PRESOBJ_NONE), + meEffect (presentation::AnimationEffect_NONE), + meTextEffect (presentation::AnimationEffect_NONE), + meSpeed (presentation::AnimationSpeed_SLOW), + mbActive (TRUE), + mbDimPrevious (FALSE), + mbIsMovie (FALSE), + mbDimHide (FALSE), + mbSoundOn (FALSE), + mbPlayFull (FALSE), + mpPathObj (NULL), + meClickAction (presentation::ClickAction_NONE), + meSecondEffect (presentation::AnimationEffect_NONE), + meSecondSpeed (presentation::AnimationSpeed_SLOW), + mbSecondSoundOn (FALSE), + mbSecondPlayFull (FALSE), + mnVerb (0), + mnPresOrder (LIST_APPEND), mrObject (rObject) { maBlueScreen = RGB_Color(COL_LIGHTMAGENTA); @@ -73,30 +73,30 @@ SdAnimationInfo::SdAnimationInfo(SdrObject& rObject) } SdAnimationInfo::SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject) - : SdrObjUserData (rAnmInfo), - mePresObjKind (PRESOBJ_NONE), - meEffect (rAnmInfo.meEffect), - meTextEffect (rAnmInfo.meTextEffect), - meSpeed (rAnmInfo.meSpeed), - mbActive (rAnmInfo.mbActive), - mbDimPrevious (rAnmInfo.mbDimPrevious), - mbIsMovie (rAnmInfo.mbIsMovie), - mbDimHide (rAnmInfo.mbDimHide), - maBlueScreen (rAnmInfo.maBlueScreen), - maDimColor (rAnmInfo.maDimColor), - maSoundFile (rAnmInfo.maSoundFile), - mbSoundOn (rAnmInfo.mbSoundOn), - mbPlayFull (rAnmInfo.mbPlayFull), - mpPathObj (NULL), - meClickAction (rAnmInfo.meClickAction), - meSecondEffect (rAnmInfo.meSecondEffect), - meSecondSpeed (rAnmInfo.meSecondSpeed), + : SdrObjUserData (rAnmInfo), + mePresObjKind (PRESOBJ_NONE), + meEffect (rAnmInfo.meEffect), + meTextEffect (rAnmInfo.meTextEffect), + meSpeed (rAnmInfo.meSpeed), + mbActive (rAnmInfo.mbActive), + mbDimPrevious (rAnmInfo.mbDimPrevious), + mbIsMovie (rAnmInfo.mbIsMovie), + mbDimHide (rAnmInfo.mbDimHide), + maBlueScreen (rAnmInfo.maBlueScreen), + maDimColor (rAnmInfo.maDimColor), + maSoundFile (rAnmInfo.maSoundFile), + mbSoundOn (rAnmInfo.mbSoundOn), + mbPlayFull (rAnmInfo.mbPlayFull), + mpPathObj (NULL), + meClickAction (rAnmInfo.meClickAction), + meSecondEffect (rAnmInfo.meSecondEffect), + meSecondSpeed (rAnmInfo.meSecondSpeed), maSecondSoundFile (rAnmInfo.maSecondSoundFile), - mbSecondSoundOn (rAnmInfo.mbSecondSoundOn), - mbSecondPlayFull (rAnmInfo.mbSecondPlayFull), -// maBookmark (rAnmInfo.maBookmark), - mnVerb (rAnmInfo.mnVerb), - mnPresOrder (LIST_APPEND), + mbSecondSoundOn (rAnmInfo.mbSecondSoundOn), + mbSecondPlayFull (rAnmInfo.mbSecondPlayFull), +// maBookmark (rAnmInfo.maBookmark), + mnVerb (rAnmInfo.mnVerb), + mnPresOrder (LIST_APPEND), mrObject (rObject) { // can not be copied diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx index b5cca04f057b..2f46db1a1e6d 100644 --- a/sd/source/core/annotations/Annotation.cxx +++ b/sd/source/core/annotations/Annotation.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 @@ -61,7 +61,7 @@ extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& namespace sd { class Annotation : private ::cppu::BaseMutex, - public ::cppu::WeakComponentImplHelper1< XAnnotation>, + public ::cppu::WeakComponentImplHelper1< XAnnotation>, public ::cppu::PropertySetMixin< XAnnotation > { public: @@ -69,7 +69,7 @@ public: SdPage* GetPage() const { return mpPage; } SdrModel* GetModel() { return (mpPage != 0) ? mpPage->GetModel() : 0; } - + // XInterface: virtual Any SAL_CALL queryInterface(Type const & type) throw (RuntimeException); virtual void SAL_CALL acquire() throw () { ::cppu::WeakComponentImplHelper1< XAnnotation >::acquire(); } @@ -85,7 +85,7 @@ public: virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException); // ::com::sun::star::office::XAnnotation: - virtual ::com::sun::star::uno::Any SAL_CALL getAnchor() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getAnchor() throw (::com::sun::star::uno::RuntimeException); virtual RealPoint2D SAL_CALL getPosition() throw (RuntimeException); virtual void SAL_CALL setPosition(const RealPoint2D & the_value) throw (RuntimeException); virtual ::com::sun::star::geometry::RealSize2D SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException); @@ -103,7 +103,7 @@ private: // destructor is private and will be called indirectly by the release call virtual ~Annotation() {} void createChangeUndo(); - + // overload WeakComponentImplHelperBase::disposing() // This function is called upon disposing the component, // if your component needs special work when it becomes @@ -130,7 +130,7 @@ public: protected: rtl::Reference< Annotation > mxAnnotation; - bool mbInsert; + bool mbInsert; int mnIndex; }; @@ -146,15 +146,15 @@ struct AnnotationData m_Position = xAnnotation->getPosition(); m_Size = xAnnotation->getSize(); m_Author = xAnnotation->getAuthor(); - m_DateTime = xAnnotation->getDateTime(); + m_DateTime = xAnnotation->getDateTime(); } - + void set( const rtl::Reference< Annotation >& xAnnotation ) { xAnnotation->setPosition(m_Position); xAnnotation->setSize(m_Size); xAnnotation->setAuthor(m_Author); - xAnnotation->setDateTime(m_DateTime); + xAnnotation->setDateTime(m_DateTime); } }; @@ -175,7 +175,7 @@ protected: void createAnnotation( Reference< XAnnotation >& xAnnotation, SdPage* pPage ) { Reference<XComponentContext> xContext (comphelper_getProcessComponentContext()); - xAnnotation.set( new Annotation(xContext, pPage) ); + xAnnotation.set( new Annotation(xContext, pPage) ); pPage->addAnnotation(xAnnotation); } @@ -267,7 +267,7 @@ void SAL_CALL Annotation::setPosition(const RealPoint2D & the_value) throw (Runt Any(), Any(), 0); { osl::MutexGuard g(m_aMutex); - createChangeUndo(); + createChangeUndo(); m_Position = the_value; } } @@ -286,7 +286,7 @@ void SAL_CALL Annotation::setSize(const RealSize2D & the_value) throw (RuntimeEx Any(), Any(), 0); { osl::MutexGuard g(m_aMutex); - createChangeUndo(); + createChangeUndo(); m_Size = the_value; } } @@ -304,7 +304,7 @@ void SAL_CALL Annotation::setAuthor(const OUString & the_value) throw (RuntimeEx Any(), Any(), 0); { osl::MutexGuard g(m_aMutex); - createChangeUndo(); + createChangeUndo(); m_Author = the_value; } } @@ -316,13 +316,13 @@ util::DateTime SAL_CALL Annotation::getDateTime() throw (RuntimeException) } void SAL_CALL Annotation::setDateTime(const util::DateTime & the_value) throw (RuntimeException) -{ +{ prepareSet( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateTime")), Any(), Any(), 0); { osl::MutexGuard g(m_aMutex); - createChangeUndo(); + createChangeUndo(); m_DateTime = the_value; } } @@ -331,8 +331,8 @@ void Annotation::createChangeUndo() { SdrModel* pModel = GetModel(); if( pModel && pModel->IsUndoEnabled() ) - pModel->AddUndo( new UndoAnnotation( *this ) ); - + pModel->AddUndo( new UndoAnnotation( *this ) ); + if( pModel ) { pModel->SetChanged(); @@ -346,7 +346,7 @@ Reference< XText > SAL_CALL Annotation::getTextRange() throw (RuntimeException) osl::MutexGuard g(m_aMutex); if( !m_TextRange.is() && (mpPage != 0) ) { - m_TextRange = TextApiObject::create( static_cast< SdDrawDocument* >( mpPage->GetModel() ) ); + m_TextRange = TextApiObject::create( static_cast< SdDrawDocument* >( mpPage->GetModel() ) ); } return Reference< XText >( m_TextRange.get() ); } @@ -374,14 +374,14 @@ UndoInsertOrRemoveAnnotation::UndoInsertOrRemoveAnnotation( Annotation& rAnnotat if( pPage ) { Reference< XAnnotation > xAnnotation( &rAnnotation ); - + const AnnotationVector& rVec = pPage->getAnnotations(); for( AnnotationVector::const_iterator iter = rVec.begin(); iter != rVec.end(); iter++ ) { if( (*iter) == xAnnotation ) break; - - mnIndex++; + + mnIndex++; } } } @@ -411,7 +411,7 @@ void UndoInsertOrRemoveAnnotation::Redo() if( pPage && pModel ) { Reference< XAnnotation > xAnnotation( mxAnnotation.get() ); - + if( mbInsert ) { pPage->addAnnotation( xAnnotation, mnIndex ); diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx index e270987dc083..db23fbf706dd 100644 --- a/sd/source/core/annotations/AnnotationEnumeration.cxx +++ b/sd/source/core/annotations/AnnotationEnumeration.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/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx index 02daee172dee..753d7108ec91 100644 --- a/sd/source/core/cusshow.cxx +++ b/sd/source/core/cusshow.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/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 6e60fdaae507..42db21bcae9e 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.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 @@ -111,7 +111,7 @@ SdDrawDocument* SdDrawDocument::pDocLockedInsertingLinks = NULL; ////////////////////////////////////////////////////////////////////////////// PresentationSettings::PresentationSettings() -: mbAll( true ), +: mbAll( true ), mbEndless( false ), mbCustomShow(false), mbManual( false ), @@ -130,7 +130,7 @@ PresentationSettings::PresentationSettings() // --------------------------------------------------------------------------- PresentationSettings::PresentationSettings( const PresentationSettings& r ) -: maPresPage( r.maPresPage ), +: maPresPage( r.maPresPage ), mbAll( r.mbAll ), mbEndless( r.mbEndless ), mbCustomShow( r.mbCustomShow ), @@ -182,7 +182,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) mpMasterPageListWatcher = ::std::auto_ptr<ImpMasterPageListWatcher>( new ImpMasterPageListWatcher(*this)); - SetObjectShell(pDrDocSh); // fuer das VCDrawModel + SetObjectShell(pDrDocSh); // fuer das VCDrawModel if (mpDocSh) { @@ -196,9 +196,9 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) // #92067# Allow UI scale only for draw documents. if( eType == DOCUMENT_TYPE_DRAW ) - SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( nX, nY ) ); // user-defined + SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( nX, nY ) ); // user-defined else - SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( 1, 1 ) ); // default + SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( 1, 1 ) ); // default SetScaleUnit(MAP_100TH_MM); SetScaleFraction(Fraction(1, 1)); @@ -222,7 +222,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) // set linguistic options { const SvtLinguConfig aLinguConfig; - SvtLinguOptions aOptions; + SvtLinguOptions aOptions; aLinguConfig.GetOptions( aOptions ); SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, @@ -347,13 +347,13 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) * * Es werden auf Pages und MasterPages folgende Default-Layer angelegt: * - * Layer STR_LAYOUT : Standardlayer fr alle Zeichenobjekte + * Layer STR_LAYOUT : Standardlayer fr alle Zeichenobjekte * * Layer STR_BCKGRND : Hintergrund der MasterPage - * (auf normalen Pages z.Z. keine Verwendung) + * (auf normalen Pages z.Z. keine Verwendung) * * Layer STR_BCKGRNDOBJ: Objekte auf dem Hintergrund der MasterPage - * (auf normalen Pages z.Z. keine Verwendung) + * (auf normalen Pages z.Z. keine Verwendung) * * Layer STR_CONTROLS : Standardlayer fr Controls * @@ -472,7 +472,7 @@ SdrModel* SdDrawDocument::AllocModel() const { // Dokument wird fuer Drag&Drop/Clipboard erzeugt, dafuer muss dem Dokument eine DocShell (SvPersist) bekannt sein SfxObjectShell* pObj = NULL; - ::sd::DrawDocShell* pNewDocSh = NULL; + ::sd::DrawDocShell* pNewDocSh = NULL; if( meDocType == DOCUMENT_TYPE_IMPRESS ) mpCreatingTransferable->SetDocShell( new ::sd::DrawDocShell( @@ -682,7 +682,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) USHORT nPage, nPageCount; // #96323# create missing layout style sheets for broken documents - // that where created with the 5.2 + // that where created with the 5.2 nPageCount = GetMasterSdPageCount( PK_STANDARD ); for (nPage = 0; nPage < nPageCount; nPage++) { diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 2d53d55b0787..2fc528783f12 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.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,7 +52,7 @@ #include <sfx2/linkmgr.hxx> #include <editeng/editdata.hxx> #include <svx/dialogs.hrc> -#include <svx/dialmgr.hxx> // SVX_RESSTR +#include <svx/dialmgr.hxx> // SVX_RESSTR #include "eetext.hxx" #include <svx/svditer.hxx> @@ -82,7 +82,7 @@ using namespace ::sd; -const long PRINT_OFFSET = 30; // siehe \svx\source\dialog\page.cxx (PB) +const long PRINT_OFFSET = 30; // siehe \svx\source\dialog\page.cxx (PB) using namespace com::sun::star; @@ -260,15 +260,15 @@ USHORT SdDrawDocument::GetMasterSdPageCount(PageKind ePgKind) const /************************************************************************* |* -|* die in den Seitenobjekten der Notizseiten eingetragenen -|* Seitennummern anpassen +|* die in den Seitenobjekten der Notizseiten eingetragenen +|* Seitennummern anpassen |* \************************************************************************/ void SdDrawDocument::UpdatePageObjectsInNotes(USHORT nStartPos) { - USHORT nPageCount = GetPageCount(); - SdPage* pPage = NULL; + USHORT nPageCount = GetPageCount(); + SdPage* pPage = NULL; for (USHORT nPage = nStartPos; nPage < nPageCount; nPage++) { @@ -410,7 +410,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, USHORT nPos, sal_Int3 /************************************************************************* |* -|* Seite verschieben +|* Seite verschieben |* \************************************************************************/ @@ -426,7 +426,7 @@ void SdDrawDocument::MovePage(USHORT nPgNum, USHORT nNewPos) /************************************************************************* |* -|* Seite einfuegen +|* Seite einfuegen |* \************************************************************************/ @@ -447,7 +447,7 @@ void SdDrawDocument::InsertPage(SdrPage* pPage, USHORT nPos) /************************************************************************* |* -|* Seite loeschen +|* Seite loeschen |* \************************************************************************/ @@ -460,14 +460,14 @@ void SdDrawDocument::DeletePage(USHORT nPgNum) /************************************************************************* |* -|* Seite entfernen +|* Seite entfernen |* \************************************************************************/ SdrPage* SdDrawDocument::RemovePage(USHORT nPgNum) { SdrPage* pPage = FmFormModel::RemovePage(nPgNum); - + bool bLast = ((nPgNum+1)/2 == (GetPageCount()+1)/2); ((SdPage*)pPage)->DisconnectLink(); @@ -797,18 +797,18 @@ BOOL SdDrawDocument::CreateMissingNotesAndHandoutPages() /************************************************************************* |* |* - selektierte Seiten hinter genannte Seite schieben -|* (nTargetPage = (USHORT)-1 --> vor erste Seite schieben) +|* (nTargetPage = (USHORT)-1 --> vor erste Seite schieben) |* - ergibt TRUE, wenn Seiten verschoben wurden |* \************************************************************************/ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) { - SdPage* pTargetPage = NULL; - SdPage* pPage = NULL; - USHORT nPage; - USHORT nNoOfPages = GetSdPageCount(PK_STANDARD); - BOOL bSomethingHappened = FALSE; + SdPage* pTargetPage = NULL; + SdPage* pPage = NULL; + USHORT nPage; + USHORT nNoOfPages = GetSdPageCount(PK_STANDARD); + BOOL bSomethingHappened = FALSE; const bool bUndo = IsUndoEnabled(); @@ -816,7 +816,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) BegUndo(String(SdResId(STR_UNDO_MOVEPAGES))); // Liste mit selektierten Seiten - List aPageList; + List aPageList; for (nPage = 0; nPage < nNoOfPages; nPage++) { pPage = GetSdPage(nPage, PK_STANDARD); @@ -871,14 +871,14 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) { pTargetPage = GetSdPage(nPage, PK_STANDARD); nTargetPage = nPage; - nTargetPage = 2 * nTargetPage + 1; // PK_STANDARD --> absolut + nTargetPage = 2 * nTargetPage + 1; // PK_STANDARD --> absolut while (aPageList.Count() > 0) { pPage = (SdPage*)aPageList.GetObject(0); nPage = pPage->GetPageNum(); if (nPage > nTargetPage) { - nTargetPage += 2; // hinter (!) der Seite einfuegen + nTargetPage += 2; // hinter (!) der Seite einfuegen if (nPage != nTargetPage) { @@ -997,7 +997,7 @@ IMPL_LINK( SdDrawDocument, WorkStartupHdl, Timer *, EMPTYARG ) if( mpDocSh ) mpDocSh->SetWaitCursor( TRUE ); - BOOL bChanged = IsChanged(); // merken + BOOL bChanged = IsChanged(); // merken // Autolayouts initialisieren SdPage* pHandoutMPage = GetMasterSdPage(0, PK_HANDOUT); @@ -1075,8 +1075,8 @@ SdAnimationInfo* SdDrawDocument::GetAnimationInfo(SdrObject* pObject) const SdAnimationInfo* SdDrawDocument::GetShapeUserData(SdrObject& rObject, bool bCreate /* = false */ ) { - USHORT nUD = 0; - USHORT nUDCount = rObject.GetUserDataCount(); + USHORT nUD = 0; + USHORT nUDCount = rObject.GetUserDataCount(); SdrObjUserData* pUD = 0; SdAnimationInfo* pRet = 0; @@ -1112,8 +1112,8 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const DBG_ASSERT(pObject, "ohne Objekt keine IMapInfo"); SdrObjUserData* pUserData = NULL; - SdIMapInfo* pIMapInfo = NULL; - USHORT nCount = pObject->GetUserDataCount(); + SdIMapInfo* pIMapInfo = NULL; + USHORT nCount = pObject->GetUserDataCount(); // gibt es in den User-Daten eine IMap-Information? for ( USHORT i = 0; i < nCount; i++ ) @@ -1143,19 +1143,19 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj, if ( pIMapInfo ) { - const MapMode aMap100( MAP_100TH_MM ); - Size aGraphSize; - Point aRelPoint( rWinPoint ); - ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap(); - const Rectangle& rRect = pObj->GetLogicRect(); - BOOL bObjSupported = FALSE; + const MapMode aMap100( MAP_100TH_MM ); + Size aGraphSize; + Point aRelPoint( rWinPoint ); + ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap(); + const Rectangle& rRect = pObj->GetLogicRect(); + BOOL bObjSupported = FALSE; // HitTest ausfuehren if ( pObj->ISA( SdrGrafObj ) ) // einfaches Grafik-Objekt { - const SdrGrafObj* pGrafObj = (const SdrGrafObj*) pObj; - const GeoStat& rGeo = pGrafObj->GetGeoStat(); - SdrGrafObjGeoData* pGeoData = (SdrGrafObjGeoData*) pGrafObj->GetGeoData(); + const SdrGrafObj* pGrafObj = (const SdrGrafObj*) pObj; + const GeoStat& rGeo = pGrafObj->GetGeoStat(); + SdrGrafObjGeoData* pGeoData = (SdrGrafObjGeoData*) pGrafObj->GetGeoData(); // Drehung rueckgaengig if ( rGeo.nDrehWink ) @@ -1206,7 +1206,7 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj, */ void SdDrawDocument::CheckMasterPages() { -// RemoveMasterPage(2); // code to test the creation of notes pages +// RemoveMasterPage(2); // code to test the creation of notes pages USHORT nMaxPages = GetMasterPageCount(); diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 2b86af1e09c9..4de9a83c6da6 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.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 @@ -80,9 +80,9 @@ using namespace ::com::sun::star; -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (USHORT)32768 +#define BASIC_BUFFER_SIZE (USHORT)8192 +#define DOCUMENT_BUFFER_SIZE (USHORT)32768 /************************************************************************* |* @@ -198,12 +198,12 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const String& rBookmarkFile) \************************************************************************/ BOOL SdDrawDocument::InsertBookmark( - List* pBookmarkList, // Liste der Namen der einzufuegenden Bookmarks + List* pBookmarkList, // Liste der Namen der einzufuegenden Bookmarks List* pExchangeList, // Liste der zu verwendenen Namen - BOOL bLink, // Bookmarks sollen als Verknuepfung eingefuegt werden - BOOL bReplace, // Aktuellen Seiten (Standard&Notiz) werden ersetzt - USHORT nInsertPos, // Einfuegeposition fuer Seiten - BOOL bNoDialogs, // Keine Dialoge anzeigen + BOOL bLink, // Bookmarks sollen als Verknuepfung eingefuegt werden + BOOL bReplace, // Aktuellen Seiten (Standard&Notiz) werden ersetzt + USHORT nInsertPos, // Einfuegeposition fuer Seiten + BOOL bNoDialogs, // Keine Dialoge anzeigen ::sd::DrawDocShell* pBookmarkDocSh, // Wenn gesetzt, so ist dieses das Source-Dokument BOOL bCopy, // Seiten werden kopiert Point* pObjPos) // Einfuegeposition fuer Objekte @@ -365,10 +365,10 @@ public: virtual ~InsertBookmarkAsPage_FindDuplicateLayouts() {}; virtual void operator()( SdDrawDocument&, SdPage* ); private: - List* mpLayoutsToTransfer; + List* mpLayoutsToTransfer; SdDrawDocument* mpBookmarkDoc; - List* mpBookmarkList; - USHORT mnBMSdPageCount; + List* mpBookmarkList; + USHORT mnBMSdPageCount; }; void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage* pBMMPage ) @@ -383,7 +383,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc String* pTest = (String*) mpLayoutsToTransfer->First(); BOOL bFound = FALSE; - while (pTest && !bFound) // found yet? + while (pTest && !bFound) // found yet? { if (*pLayout == *pTest) bFound = TRUE; @@ -496,17 +496,17 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( { SdPage* pBMPage = pBookmarkDoc->GetSdPage(0,PK_STANDARD); - if (pBMPage->GetSize() != pRefPage->GetSize() || - pBMPage->GetLftBorder() != pRefPage->GetLftBorder() || - pBMPage->GetRgtBorder() != pRefPage->GetRgtBorder() || - pBMPage->GetUppBorder() != pRefPage->GetUppBorder() || + if (pBMPage->GetSize() != pRefPage->GetSize() || + pBMPage->GetLftBorder() != pRefPage->GetLftBorder() || + pBMPage->GetRgtBorder() != pRefPage->GetRgtBorder() || + pBMPage->GetUppBorder() != pRefPage->GetUppBorder() || pBMPage->GetLwrBorder() != pRefPage->GetLwrBorder()) { String aStr(SdResId(STR_SCALE_OBJECTS)); USHORT nBut = QueryBox( NULL, WB_YES_NO_CANCEL, aStr).Execute(); bScaleObjects = nBut == RET_YES; - bContinue = nBut != RET_CANCEL; + bContinue = nBut != RET_CANCEL; if (!bContinue) { @@ -618,19 +618,19 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( } Merge(*pBookmarkDoc, - 1, // Nicht die Handzettelseite - 0xFFFF, // Aber alle anderen + 1, // Nicht die Handzettelseite + 0xFFFF, // Aber alle anderen nActualInsertPos, // An Position einfuegen bMergeMasterPages, // MasterPages mitnehmen - FALSE, // Aber nur die benoetigten MasterPages - TRUE, // Undo-Aktion erzeugen - bCopy); // Seiten kopieren (oder mergen) + FALSE, // Aber nur die benoetigten MasterPages + TRUE, // Undo-Aktion erzeugen + bCopy); // Seiten kopieren (oder mergen) for (nBMSdPage=0; nBMSdPage < nBMSdPageCount; nBMSdPage++) { - SdPage* pPage = (SdPage*) GetPage(nActualInsertPos); + SdPage* pPage = (SdPage*) GetPage(nActualInsertPos); SdPage* pNotesPage = (SdPage*) GetPage(nActualInsertPos+1); - String* pName = (String*) aNameList.GetObject(nBMSdPage); + String* pName = (String*) aNameList.GetObject(nBMSdPage); // #95991# delay renaming *after* pages are copied (might destroy source otherwise) if( aRenameSet.find(nBMSdPage) != aRenameSet.end() ) @@ -713,13 +713,13 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( } Merge(*pBookmarkDoc, - nBMPage, // Von Seite (Standard) - nBMPage+1, // Bis Seite (Notizen) + nBMPage, // Von Seite (Standard) + nBMPage+1, // Bis Seite (Notizen) nActualInsertPos, // An Position einfuegen bMergeMasterPages, // MasterPages mitnehmen - FALSE, // Aber nur die benoetigten MasterPages - TRUE, // Undo-Aktion erzeugen - bCopy); // Seiten kopieren (oder mergen) + FALSE, // Aber nur die benoetigten MasterPages + TRUE, // Undo-Aktion erzeugen + bCopy); // Seiten kopieren (oder mergen) if( bReplace ) { @@ -856,7 +856,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( USHORT nSdPageStart = (nInsertPos - 1) / 2; USHORT nSdPageEnd = GetSdPageCount(PK_STANDARD) - nSdPageCount + nSdPageStart - 1; - const bool bRemoveEmptyPresObj = pBookmarkDoc && + const bool bRemoveEmptyPresObj = pBookmarkDoc && (pBookmarkDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) && (GetDocumentType() == DOCUMENT_TYPE_DRAW); @@ -1259,7 +1259,7 @@ SvStream* SdDrawDocument::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) uno::Reference < embed::XStorage > xStor; if (mpDocSh) xStor = mpDocSh->GetStorage(); - SvStream* pRet = NULL; + SvStream* pRet = NULL; if( xStor.is() ) { @@ -1316,7 +1316,7 @@ SvStream* SdDrawDocument::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const ULONG nStartPos = pRet->Tell(); const ULONG nEndPos = pRet->Seek( STREAM_SEEK_TO_END ); const ULONG nStmLen = nEndPos - nStartPos; - sal_uChar aTestByte; + sal_uChar aTestByte; // try to read one byte if( nStmLen ) @@ -1441,7 +1441,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl delete pMaster; if( bUndo ) - EndUndo(); // schon hier, damit sich Joes Actions ZWISCHEN unsere eigenen schieben + EndUndo(); // schon hier, damit sich Joes Actions ZWISCHEN unsere eigenen schieben // alte Layoutvorlagen loeschen, wenn sie nicht mehr benoetigt werden BOOL bDeleteOldStyleSheets = TRUE; @@ -1477,7 +1477,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl } if (pMasterPage) - break; // Nur diese eine MasterPage! + break; // Nur diese eine MasterPage! } } @@ -1518,12 +1518,12 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, } SdPage* pSelectedPage = GetSdPage(nSdPageNum, PK_STANDARD); - SdPage* pNotes = (SdPage*) GetPage(pSelectedPage->GetPageNum()+1); - SdPage& rOldMaster = (SdPage&)pSelectedPage->TRG_GetMasterPage(); + SdPage* pNotes = (SdPage*) GetPage(pSelectedPage->GetPageNum()+1); + SdPage& rOldMaster = (SdPage&)pSelectedPage->TRG_GetMasterPage(); SdPage& rOldNotesMaster = (SdPage&)pNotes->TRG_GetMasterPage(); - SdPage* pMaster = NULL; - SdPage* pNotesMaster = NULL; - SdPage* pPage = NULL; + SdPage* pMaster = NULL; + SdPage* pNotesMaster = NULL; + SdPage* pPage = NULL; String aOldPageLayoutName(pSelectedPage->GetLayoutName()); String aOldLayoutName(aOldPageLayoutName); aOldLayoutName.Erase(aOldLayoutName.SearchAscii( SD_LT_SEPARATOR )); @@ -1533,7 +1533,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, if (pSourceDoc) { List* pReplList = NULL; - BOOL bLayoutReloaded = FALSE; // Wurde ex. Layout wieder geladen? + BOOL bLayoutReloaded = FALSE; // Wurde ex. Layout wieder geladen? /********************************************************************* |* LayoutName, Page and Notespage @@ -1613,8 +1613,8 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, pSourceStyleSheetPool->SetSearchMask(SD_STYLE_FAMILY_MASTERPAGE); static_cast<SdStyleSheetPool*>( mxStyleSheetPool.get())->SetSearchMask(SD_STYLE_FAMILY_MASTERPAGE); - pReplList = new List; // Liste fuer ersetzte StyleSheets - SdStyleSheetVector aCreatedStyles; // Liste fuer erzeugte StyleSheets + pReplList = new List; // Liste fuer ersetzte StyleSheets + SdStyleSheetVector aCreatedStyles; // Liste fuer erzeugte StyleSheets SfxStyleSheetBase* pHisSheet = pSourceStyleSheetPool->First(); @@ -1630,7 +1630,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, { // Es ist eine gleichnamige Vorlage vorhanden ist: Inhalte ersetzen #ifdef DBG_UTIL - BOOL bTest = + BOOL bTest = #endif pMySheet->SetName(pHisSheet->GetName()); DBG_ASSERT(bTest, "StyleSheet-Umbenennung fehlgeschlagen"); @@ -1769,7 +1769,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, List* pPageList = new List; // #98456, this has to be removed according to CL (KA 07/08/2002) -// #109884# but we need them again to restore the styles of the presentation objects while undo +// #109884# but we need them again to restore the styles of the presentation objects while undo pPageList->Insert(pMaster, LIST_APPEND); pPageList->Insert(pNotesMaster, LIST_APPEND); @@ -1874,13 +1874,13 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, String aName = String(SdResId(STR_LAYOUT_DEFAULT_NAME)); String aTest; BOOL bNotANewName = TRUE; - USHORT nCount = 0; - USHORT nMPgCount = GetMasterPageCount(); + USHORT nCount = 0; + USHORT nMPgCount = GetMasterPageCount(); for (nCount = 0; bNotANewName; nCount++) { // Testnamen bilden - aTest = aName; // Standard, Standard1, Standard2, ... + aTest = aName; // Standard, Standard1, Standard2, ... if (nCount > 0) aTest += String::CreateFromInt32( nCount ); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index ee03c551aec8..db1ba0e6c2b5 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.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 <editeng/lspcitem.hxx> #include <editeng/adjitem.hxx> #include <svx/dialogs.hrc> -#include <svx/dialmgr.hxx> // SVX_RESSTR +#include <svx/dialmgr.hxx> // SVX_RESSTR #include <editeng/bulitem.hxx> #include <svx/xtable.hxx> #include <svx/sxmsuitm.hxx> @@ -158,16 +158,16 @@ void SdDrawDocument::CreateLayoutTemplates() SfxItemSet& rISet = pSheet->GetItemSet(); SfxItemPool* pPool = rISet.GetPool(); - String aNullStr; + String aNullStr; ::basegfx::B2DPolyPolygon aNullPolyPolygon; - Color aNullCol(RGB_Color(COL_BLACK)); + Color aNullCol(RGB_Color(COL_BLACK)); - XDash aNullDash; + XDash aNullDash; XGradient aNullGrad(aNullCol,RGB_Color(COL_WHITE)); aNullGrad.SetStartIntens( 100 ); aNullGrad.SetEndIntens( 100 ); - XHatch aNullHatch(aNullCol); + XHatch aNullHatch(aNullCol); // Linienattribute (Extended OutputDevice) rISet.Put(XLineStyleItem(XLINE_SOLID)); @@ -196,7 +196,7 @@ void SdDrawDocument::CreateLayoutTemplates() // Schattenattribute (Drawing Engine) rISet.Put(SdrShadowItem(FALSE)); rISet.Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); - rISet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz + rISet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz rISet.Put(SdrShadowYDistItem(300)); Font aLatinFont, aCJKFont, aCTLFont; @@ -241,7 +241,7 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE)); rISet.Put(SvxULSpaceItem(EE_PARA_ULSPACE)); - rISet.Put( SdrTextLeftDistItem( 250 ) ); // sj: (i33745) using text frame distances seems to be a better default + rISet.Put( SdrTextLeftDistItem( 250 ) ); // sj: (i33745) using text frame distances seems to be a better default rISet.Put( SdrTextRightDistItem( 250 ) ); rISet.Put( SdrTextUpperDistItem( 125 ) ); rISet.Put( SdrTextLowerDistItem( 125 ) ); @@ -257,18 +257,18 @@ void SdDrawDocument::CreateLayoutTemplates() // die sind in allen Ebenen identisch aBulletItem.SetStyle(BS_BULLET); aBulletItem.SetStart(1); - aBulletItem.SetScale(45); // in Prozent + aBulletItem.SetScale(45); // in Prozent Font aBulletFont( pSSPool->GetBulletFont() ); - aBulletFont.SetSize(Size(0,635)); // sj: (i33745) changed default from 24 to 18 pt + aBulletFont.SetSize(Size(0,635)); // sj: (i33745) changed default from 24 to 18 pt aBulletItem.SetFont(aBulletFont); - aBulletItem.SetSymbol( 0x25CF ); // Punkt + aBulletItem.SetSymbol( 0x25CF ); // Punkt rISet.Put(aBulletItem); -// SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0); // Bullets nicht sichtbar -// rISet.Put(aBulletStateItem); +// SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0); // Bullets nicht sichtbar +// rISet.Put(aBulletStateItem); // Neues BulletItem pSSPool->PutNumBulletItem( pSheet, aBulletFont ); @@ -308,7 +308,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(SdrShadowItem(TRUE)); pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); - pISet->Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz + pISet->Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz pISet->Put(SdrShadowYDistItem(300)); // ---- Objekt ohne Fllung ------------------------------------------- @@ -370,7 +370,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(XFillStyleItem(XFILL_NONE)); SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE ); - aLRSpaceItem.SetTxtFirstLineOfst(600); // Erstzeileneinzug 6mm, rechts 0 + aLRSpaceItem.SetTxtFirstLineOfst(600); // Erstzeileneinzug 6mm, rechts 0 pISet->Put(aLRSpaceItem); /* #i35937# @@ -406,7 +406,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(SdrShadowItem(TRUE)); pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); - pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz + pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz pISet->Put(SdrShadowYDistItem(200)); pISet->Put(SvxFontHeightItem(846, 100, EE_CHAR_FONTHEIGHT )); // 24 pt @@ -430,13 +430,13 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(SdrShadowItem(TRUE)); pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); - pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz + pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz pISet->Put(SdrShadowYDistItem(200)); pISet->Put(SvxFontHeightItem(1270, 100, EE_CHAR_FONTHEIGHT )); // 36 pt SvxLRSpaceItem aLRSpItem( 200, 200, 0, 0, EE_PARA_LRSPACE); - pISet->Put( aLRSpItem ); // Erstzeileneinzug 0 mm, links und rechts 2 mm + pISet->Put( aLRSpItem ); // Erstzeileneinzug 0 mm, links und rechts 2 mm /* #i35937# // SvxLRSpaceItem hart gesetzt: NumBulletItem anpassen @@ -580,17 +580,17 @@ void SdDrawDocument::CreateDefaultCellStyles() pSheet = &(pSSPool->Make(aDefaultCellStyleName, SD_STYLE_FAMILY_CELL, nMask)); pSheet->SetHelpId( aHelpFile, HID_SD_CELL_STYLE_DEFAULT ); SfxItemSet& rISet = pSheet->GetItemSet(); -// SfxItemPool* pPool = rISet.GetPool(); +// SfxItemPool* pPool = rISet.GetPool(); - String aNullStr; + String aNullStr; - Color aNullCol(RGB_Color(COL_BLACK)); + Color aNullCol(RGB_Color(COL_BLACK)); - XDash aNullDash; + XDash aNullDash; XGradient aNullGrad(aNullCol,RGB_Color(COL_WHITE)); aNullGrad.SetStartIntens( 100 ); aNullGrad.SetEndIntens( 100 ); - XHatch aNullHatch(aNullCol); + XHatch aNullHatch(aNullCol); rISet.Put(XFillStyleItem(XFILL_SOLID)); rISet.Put(XFillColorItem(String(), RGB_Color(0x00ccccff))); @@ -616,13 +616,13 @@ void SdDrawDocument::CreateDefaultCellStyles() rISet.Put( SvxFontHeightItem( 635, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 18 pt rISet.Put( SvxFontHeightItem( convertFontHeightToCTL( 635 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 18 pt -// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ) ); -// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ) ); -// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ) ); +// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ) ); +// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ) ); +// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ) ); -// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC ) ); -// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK ) ); -// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL ) ); +// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC ) ); +// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK ) ); +// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL ) ); // rISet.Put(SvxContourItem(FALSE, EE_CHAR_OUTLINE )); // rISet.Put(SvxShadowedItem(FALSE, EE_CHAR_SHADOW )); @@ -649,7 +649,7 @@ void SdDrawDocument::CreateDefaultCellStyles() Color aWhite( COL_WHITE ); SvxBorderLine aBorderLine( &aWhite, 1, 0, 0 ); - + SvxBoxItem aBoxItem( SDRATTR_TABLE_BORDER ); aBoxItem.SetLine( &aBorderLine, BOX_LINE_TOP ); aBoxItem.SetLine( &aBorderLine, BOX_LINE_BOTTOM ); @@ -678,7 +678,7 @@ void SdDrawDocument::CreateDefaultCellStyles() // ---- Orange -------------------------------------------------- - Any aOrange1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("orange1") ), aDefaultCellStyleName, RGB_COLORDATA(255,204,153))); + Any aOrange1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("orange1") ), aDefaultCellStyleName, RGB_COLORDATA(255,204,153))); Any aOrange2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("orange2") ), aDefaultCellStyleName, RGB_COLORDATA(255,153,102))); Any aOrange3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("orange3") ), aDefaultCellStyleName, RGB_COLORDATA(255,102,51))); @@ -998,7 +998,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) bLock = pModel->isLocked(); pModel->setLock( sal_True ); } - // taking text from the outliner + // taking text from the outliner ((SdrTextObj*) pObj)->SetOutlinerParaObject( pOutl->CreateParaObject() ); pObj->BroadcastObjectChange(); @@ -1209,9 +1209,9 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St aSheetName.Insert(rNewName, 0); StyleReplaceData* pReplData = new StyleReplaceData; - pReplData->nFamily = pSheet->GetFamily(); + pReplData->nFamily = pSheet->GetFamily(); pReplData->nNewFamily = pSheet->GetFamily(); - pReplData->aName = pSheet->GetName(); + pReplData->aName = pSheet->GetName(); pReplData->aNewName = aSheetName; aReplList.Insert(pReplData, LIST_APPEND); @@ -1333,17 +1333,17 @@ void SdDrawDocument::SetTextDefaults() const // BulletItem und BulletFont fuer Titel und Gliederung SvxBulletItem aBulletItem(EE_PARA_BULLET); Font aBulletFont( static_cast<SdStyleSheetPool*>( mxStyleSheetPool.get())->GetBulletFont() ); - aBulletFont.SetSize(Size(0,846)); // 24 pt + aBulletFont.SetSize(Size(0,846)); // 24 pt aBulletItem.SetFont(aBulletFont); aBulletItem.SetStyle(BS_BULLET); aBulletItem.SetStart(1); - aBulletItem.SetScale(45); // in Prozent - aBulletItem.SetSymbol( 0x25CF ); // Punkt + aBulletItem.SetScale(45); // in Prozent + aBulletItem.SetSymbol( 0x25CF ); // Punkt pItemPool->SetPoolDefaultItem( aBulletItem ); // Bullets nicht sichtbar -// SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0); -// pItemPool->SetPoolDefaultItem( aBulletStateItem ); +// SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0); +// pItemPool->SetPoolDefaultItem( aBulletStateItem ); // Neues BulletItem SvxNumberFormat aNumberFormat(SVX_NUM_CHAR_SPECIAL); @@ -1435,9 +1435,9 @@ void SdDrawDocument::getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rC { LanguageType eLatin = GetLanguage( EE_CHAR_LANGUAGE ); - // #108374# / #107782#: If the UI language is Korean, the default Latin font has to - // be queried for Korean, too (the Latin language from the document can't be Korean). - // This is the same logic as in SwDocShell::InitNew. + // #108374# / #107782#: If the UI language is Korean, the default Latin font has to + // be queried for Korean, too (the Latin language from the document can't be Korean). + // This is the same logic as in SwDocShell::InitNew. LanguageType eUiLanguage = Application::GetSettings().GetUILanguage(); switch( eUiLanguage ) { diff --git a/sd/source/core/drawdoc_animations.cxx b/sd/source/core/drawdoc_animations.cxx index 2d024f8a7c84..4eb175597c55 100644 --- a/sd/source/core/drawdoc_animations.cxx +++ b/sd/source/core/drawdoc_animations.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/sd/source/core/glob.src b/sd/source/core/glob.src index f1c7058ddf79..24d4f2231ee5 100755 --- a/sd/source/core/glob.src +++ b/sd/source/core/glob.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 @@ -372,8 +372,8 @@ String STR_SAVE_DOC Text [ en-US ] = "Save Document" ; }; -#define ERR_CODE( class, err ) (class | (err - ERROR_SD_BASE)) -#define WARN_CODE( class, err ) (class | ( err - WARN_SD_BASE)) +#define ERR_CODE( class, err ) (class | (err - ERROR_SD_BASE)) +#define WARN_CODE( class, err ) (class | ( err - WARN_SD_BASE)) Resource RID_SD_ERRHDL { diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index 6c19008f6c16..cb47af891fc6 100644 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.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,7 +38,7 @@ /************************************************************************* |* -|* Ctor +|* Ctor |* \************************************************************************/ diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx index f1e5fd073ea8..41fd0bcea4cf 100644 --- a/sd/source/core/sdattr.cxx +++ b/sd/source/core/sdattr.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 @@ -36,7 +36,7 @@ using namespace ::com::sun::star; /************************************************************************* |* -|* DiaEffectItem +|* DiaEffectItem |* *************************************************************************/ TYPEINIT1_AUTOFACTORY( DiaEffectItem, SfxEnumItem ); @@ -67,7 +67,7 @@ SfxPoolItem* DiaEffectItem::Create( SvStream& rIn, USHORT ) const /************************************************************************* |* -|* DiaSpeedItem +|* DiaSpeedItem |* *************************************************************************/ TYPEINIT1_AUTOFACTORY( DiaSpeedItem, SfxEnumItem ); @@ -98,7 +98,7 @@ SfxPoolItem* DiaSpeedItem::Create( SvStream& rIn, USHORT ) const /************************************************************************* |* -|* DiaAutoItem +|* DiaAutoItem |* *************************************************************************/ TYPEINIT1_AUTOFACTORY( DiaAutoItem, SfxEnumItem ); @@ -128,7 +128,7 @@ SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, USHORT ) const /************************************************************************* |* -|* DiaTimeItem +|* DiaTimeItem |* *************************************************************************/ TYPEINIT1_AUTOFACTORY( DiaTimeItem, SfxUInt32Item ); diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx index f67f550b984c..1f7cc605f94b 100644 --- a/sd/source/core/sdiocmpt.cxx +++ b/sd/source/core/sdiocmpt.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 @@ -37,9 +37,9 @@ ////////////////////////////////////////////////////////////////////////////// old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, UINT16 nNewMode) -: rStream(rNewStream), - nSubRecSiz(0), - nSubRecPos(0), +: rStream(rNewStream), + nSubRecSiz(0), + nSubRecPos(0), nMode(nNewMode), bOpen(FALSE) { @@ -54,56 +54,56 @@ old_SdrDownCompat::~old_SdrDownCompat() void old_SdrDownCompat::Read() { - rStream >> nSubRecSiz; + rStream >> nSubRecSiz; } void old_SdrDownCompat::Write() { - rStream << nSubRecSiz; + rStream << nSubRecSiz; } void old_SdrDownCompat::OpenSubRecord() { - if(rStream.GetError()) + if(rStream.GetError()) return; + + nSubRecPos = rStream.Tell(); - nSubRecPos = rStream.Tell(); - - if(nMode == STREAM_READ) + if(nMode == STREAM_READ) { - Read(); - } - else if(nMode == STREAM_WRITE) + Read(); + } + else if(nMode == STREAM_WRITE) { - Write(); - } + Write(); + } bOpen = TRUE; } void old_SdrDownCompat::CloseSubRecord() { - if(rStream.GetError()) + if(rStream.GetError()) return; UINT32 nAktPos(rStream.Tell()); - - if(nMode == STREAM_READ) + + if(nMode == STREAM_READ) { UINT32 nReadAnz(nAktPos - nSubRecPos); - if(nReadAnz != nSubRecSiz) + if(nReadAnz != nSubRecSiz) { - rStream.Seek(nSubRecPos + nSubRecSiz); + rStream.Seek(nSubRecPos + nSubRecSiz); } - } - else if(nMode == STREAM_WRITE) + } + else if(nMode == STREAM_WRITE) { - nSubRecSiz = nAktPos - nSubRecPos; - rStream.Seek(nSubRecPos); - Write(); - rStream.Seek(nAktPos); - } - + nSubRecSiz = nAktPos - nSubRecPos; + rStream.Seek(nSubRecPos); + Write(); + rStream.Seek(nAktPos); + } + bOpen = FALSE; } @@ -114,7 +114,7 @@ void old_SdrDownCompat::CloseSubRecord() \************************************************************************/ SdIOCompat::SdIOCompat(SvStream& rNewStream, USHORT nNewMode, UINT16 nVer) -: old_SdrDownCompat(rNewStream, nNewMode), nVersion(nVer) +: old_SdrDownCompat(rNewStream, nNewMode), nVersion(nVer) { if (nNewMode == STREAM_WRITE) { @@ -130,7 +130,7 @@ SdIOCompat::SdIOCompat(SvStream& rNewStream, USHORT nNewMode, UINT16 nVer) } } -SdIOCompat::~SdIOCompat() +SdIOCompat::~SdIOCompat() { } diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx index 637fb501822d..d761bed5cf05 100644 --- a/sd/source/core/sdobjfac.cxx +++ b/sd/source/core/sdobjfac.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/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 16469e7b8d44..38af4fabc1de 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.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 @@ -94,33 +94,33 @@ TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall ); /************************************************************************* |* -|* Ctor +|* Ctor |* \************************************************************************/ SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, BOOL bMasterPage) -: FmFormPage(rNewDoc, pBasic, bMasterPage) -, SdrObjUserCall() -, mePageKind(PK_STANDARD) -, meAutoLayout(AUTOLAYOUT_NONE) -, mbSelected(FALSE) -, mePresChange(PRESCHANGE_MANUAL) -, mnTime(1) -, mbSoundOn(FALSE) -, mbExcluded(FALSE) +: FmFormPage(rNewDoc, pBasic, bMasterPage) +, SdrObjUserCall() +, mePageKind(PK_STANDARD) +, meAutoLayout(AUTOLAYOUT_NONE) +, mbSelected(FALSE) +, mePresChange(PRESCHANGE_MANUAL) +, mnTime(1) +, mbSoundOn(FALSE) +, mbExcluded(FALSE) , mbLoopSound(FALSE) -, mbStopSound(FALSE) -, mbScaleObjects(TRUE) -, mbBackgroundFullSize( FALSE ) -, meCharSet(gsl_getSystemTextEncoding()) -, mnPaperBin(PAPERBIN_PRINTER_SETTINGS) -, mpPageLink(NULL) -, mpItems(NULL) -, mnTransitionType(0) -, mnTransitionSubtype(0) -, mbTransitionDirection(sal_True) -, mnTransitionFadeColor(0) -, mfTransitionDuration(2.0) +, mbStopSound(FALSE) +, mbScaleObjects(TRUE) +, mbBackgroundFullSize( FALSE ) +, meCharSet(gsl_getSystemTextEncoding()) +, mnPaperBin(PAPERBIN_PRINTER_SETTINGS) +, mpPageLink(NULL) +, mpItems(NULL) +, mnTransitionType(0) +, mnTransitionSubtype(0) +, mbTransitionDirection(sal_True) +, mnTransitionFadeColor(0) +, mfTransitionDuration(2.0) , mbIsPrecious(true) { // Der Layoutname der Seite wird von SVDRAW benutzt, um die Praesentations- @@ -255,7 +255,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec SdrObject* pSdrObj = NULL; - bool bForceText = false; // forces the shape text to be set even if its empty + bool bForceText = false; // forces the shape text to be set even if its empty bool bEmptyPresObj = true; switch( eObjKind ) @@ -364,7 +364,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec // #i105146# We want no content to be displayed for PK_HANDOUT, // so just never set a page as content pSdrObj = new SdrPageObj(0); -// pSdrObj->SetResizeProtect(TRUE); +// pSdrObj->SetResizeProtect(TRUE); } break; @@ -592,7 +592,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const aName += String(SdResId(STR_LAYOUT_BACKGROUND)); SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool(); - SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE); + SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE); return (SfxStyleSheet*)pResult; } @@ -641,7 +641,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const } SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool(); - SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE); + SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE); return (SfxStyleSheet*)pResult; } @@ -656,8 +656,8 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const sal_uInt16 nNameId; switch( nHelpId ) { - case HID_PSEUDOSHEET_TITLE: nNameId = STR_LAYOUT_TITLE; break; - case HID_PSEUDOSHEET_SUBTITLE: nNameId = STR_LAYOUT_SUBTITLE; break; + case HID_PSEUDOSHEET_TITLE: nNameId = STR_LAYOUT_TITLE; break; + case HID_PSEUDOSHEET_SUBTITLE: nNameId = STR_LAYOUT_SUBTITLE; break; case HID_PSEUDOSHEET_OUTLINE1: case HID_PSEUDOSHEET_OUTLINE2: case HID_PSEUDOSHEET_OUTLINE3: @@ -666,10 +666,10 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const case HID_PSEUDOSHEET_OUTLINE6: case HID_PSEUDOSHEET_OUTLINE7: case HID_PSEUDOSHEET_OUTLINE8: - case HID_PSEUDOSHEET_OUTLINE9: nNameId = STR_LAYOUT_OUTLINE; break; - case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_LAYOUT_BACKGROUNDOBJECTS; break; - case HID_PSEUDOSHEET_BACKGROUND: nNameId = STR_LAYOUT_BACKGROUND; break; - case HID_PSEUDOSHEET_NOTES: nNameId = STR_LAYOUT_NOTES; break; + case HID_PSEUDOSHEET_OUTLINE9: nNameId = STR_LAYOUT_OUTLINE; break; + case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_LAYOUT_BACKGROUNDOBJECTS; break; + case HID_PSEUDOSHEET_BACKGROUND: nNameId = STR_LAYOUT_BACKGROUND; break; + case HID_PSEUDOSHEET_NOTES: nNameId = STR_LAYOUT_NOTES; break; default: DBG_ERROR( "SdPage::getPresentationStyle(), illegal argument!" ); @@ -683,7 +683,7 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const } SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool(); - SfxStyleSheetBase* pResult = pStShPool->Find(aStyleName, SD_STYLE_FAMILY_MASTERPAGE); + SfxStyleSheetBase* pResult = pStShPool->Find(aStyleName, SD_STYLE_FAMILY_MASTERPAGE); return dynamic_cast<SdStyleSheet*>(pResult); } @@ -1102,7 +1102,7 @@ Rectangle SdPage::GetLayoutRect() const |* \*************************************************************************/ -const int MAX_PRESOBJS = 7; // maximum number of presentation objects per layout +const int MAX_PRESOBJS = 7; // maximum number of presentation objects per layout const int VERTICAL = 0x8000; struct LayoutDescriptor @@ -1123,50 +1123,50 @@ LayoutDescriptor::LayoutDescriptor( int nLayout, int k0, int k1, int k2, int k3, meKind[3] = static_cast<PresObjKind>(k3 & (~VERTICAL)); mbVertical[3] = (k3 & VERTICAL) == VERTICAL; meKind[4] = static_cast<PresObjKind>(k4 & (~VERTICAL)); mbVertical[4] = (k4 & VERTICAL) == VERTICAL; meKind[5] = static_cast<PresObjKind>(k5 & (~VERTICAL)); mbVertical[5] = (k5 & VERTICAL) == VERTICAL; - meKind[6] = static_cast<PresObjKind>(k6 & (~VERTICAL)); mbVertical[6] = (k6 & VERTICAL) == VERTICAL; + meKind[6] = static_cast<PresObjKind>(k6 & (~VERTICAL)); mbVertical[6] = (k6 & VERTICAL) == VERTICAL; } static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) { static LayoutDescriptor aLayouts[AUTOLAYOUT__END-AUTOLAYOUT__START] = { - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_TEXT ), // AUTOLAYOUT_TITLE - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ENUM - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHART - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2TEXT - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCHART - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ORG - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCLbIP - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHARTTEXT - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TAB - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CLIPTEXT - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OBJECT ), // AUTOLAYOUT_OBJ - LayoutDescriptor( 2, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXT2OBJ - LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ - LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_OBJOVERTEXT - LayoutDescriptor( 3, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJTEXT - LayoutDescriptor( 5, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJOVERTEXT - LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOVEROBJ - LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4OBJ + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_TEXT ), // AUTOLAYOUT_TITLE + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ENUM + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHART + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2TEXT + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCHART + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ORG + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCLbIP + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHARTTEXT + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TAB + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CLIPTEXT + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OBJECT ), // AUTOLAYOUT_OBJ + LayoutDescriptor( 2, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXT2OBJ + LayoutDescriptor( 1, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ + LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_OBJOVERTEXT + LayoutDescriptor( 3, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJTEXT + LayoutDescriptor( 5, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJOVERTEXT + LayoutDescriptor( 4, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOVEROBJ + LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4OBJ PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TITLE - LayoutDescriptor( 0, PRESOBJ_NONE ), // AUTOLAYOUT_NONE - LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ), // AUTOLAYOUT_NOTES - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT1 - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT2 - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT3 - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT4 - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT6 + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TITLE + LayoutDescriptor( 0, PRESOBJ_NONE ), // AUTOLAYOUT_NONE + LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ), // AUTOLAYOUT_NOTES + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT1 + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT2 + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT3 + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT4 + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT6 LayoutDescriptor( 7, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE ),// AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART - LayoutDescriptor( 8, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE - LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE - LayoutDescriptor( 9, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART - LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT9 + LayoutDescriptor( 8, PRESOBJ_TITLE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE + LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE + LayoutDescriptor( 9, PRESOBJ_TITLE, PRESOBJ_OUTLINE|VERTICAL, PRESOBJ_OUTLINE|VERTICAL ), // AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART + LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT9 LayoutDescriptor( 10, PRESOBJ_TEXT, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TEXT - LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4CLIPART + LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4CLIPART PRESOBJ_GRAPHIC, PRESOBJ_GRAPHIC ), - LayoutDescriptor( 11, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_6CLIPART + LayoutDescriptor( 11, PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_6CLIPART PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ) }; @@ -1380,7 +1380,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe rRectangle[6] = Rectangle (aLayoutPos, aLayoutSize); break; - } + } } } @@ -2235,16 +2235,16 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, /** reuses or creates a presentation shape for an auto layout that fits the given parameter - @param eObjKind + @param eObjKind The kind of presentation shape we like to have - @param nIndex + @param nIndex If > 1 we skip the first nIndex-1 shapes with the presentation shape kind eObjKind while looking for an existing presentation shape - @param bVertical + @param bVertical If true, the shape is created vertical if bInit is true - @param aRect + @param aRect The rectangle that should be used to transform the shape - @param bInit + @param bInit If true the shape is created if not found @returns A presentation shape that was either found or created with the given parameters @@ -2271,10 +2271,10 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, pUndoManager->AddUndoAction( new UndoObjectUserCall( *pObj ) ); } -// if ( pObj->ISA(SdrGrafObj) && !pObj->IsEmptyPresObj() ) +// if ( pObj->ISA(SdrGrafObj) && !pObj->IsEmptyPresObj() ) ( /*(SdrGrafObj*)*/ pObj)->AdjustToMaxRect( aRect ); -// else -// SetLogicRect( pObj, aRect ); +// else +// SetLogicRect( pObj, aRect ); pObj->SetUserCall(this); @@ -2415,7 +2415,7 @@ void SdPage::InsertPresObj(SdrObject* pObj, PresObjKind eKind ) |* \************************************************************************/ -void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const String& rString ) +void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const String& rString ) { if ( pObj ) { @@ -2599,7 +2599,7 @@ const String& SdPage::GetName() const if ((mePageKind == PK_STANDARD || mePageKind == PK_NOTES) && !mbMaster) { // default name for handout pages - USHORT nNum = (GetPageNum() + 1) / 2; + USHORT nNum = (GetPageNum() + 1) / 2; aCreatedPageName = String(SdResId(STR_PAGE)); aCreatedPageName += sal_Unicode( ' ' ); @@ -2846,7 +2846,7 @@ bool SdPage::checkVisibility( if((eKind == PRESOBJ_FOOTER) || (eKind == PRESOBJ_HEADER) || (eKind == PRESOBJ_DATETIME) || (eKind == PRESOBJ_SLIDENUMBER) ) { const bool bSubContentProcessing(rDisplayInfo.GetSubContentActive()); - + if( bSubContentProcessing || ( pCheckPage->GetPageKind() == PK_HANDOUT && bIsPrinting ) ) { // use the page that is currently processed @@ -2873,7 +2873,7 @@ bool SdPage::checkVisibility( } } } // check for placeholders on master - else if( (eKind != PRESOBJ_NONE) && pCheckPage->IsMasterPage() && ( pVisualizedPage != pCheckPage ) ) + else if( (eKind != PRESOBJ_NONE) && pCheckPage->IsMasterPage() && ( pVisualizedPage != pCheckPage ) ) { // presentation objects on master slide are always invisible if slide is shown. return false; @@ -2973,7 +2973,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, long nBottomBorder = rHandoutMaster.GetLwrBorder(); const long nHeaderFooterHeight = static_cast< long >( (aArea.Height() - nTopBorder - nLeftBorder) * 0.05 ); - + nTopBorder += nHeaderFooterHeight; nBottomBorder += nHeaderFooterHeight; @@ -2985,7 +2985,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, const bool bLandscape = aArea.Width() > aArea.Height(); - static sal_uInt16 aOffsets[5][9] = + static sal_uInt16 aOffsets[5][9] = { { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, // AUTOLAYOUT_HANDOUT9, Portrait, Horizontal order { 0, 2, 4, 1, 3, 5, 0, 0, 0 }, // AUTOLAYOUT_HANDOUT3, Landscape, Vertical @@ -3003,7 +3003,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, break; case AUTOLAYOUT_HANDOUT2: - if( bLandscape ) + if( bLandscape ) { nColCnt = 2; nRowCnt = 1; } @@ -3023,7 +3023,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, nColCnt = 2; nRowCnt = 3; } pOffsets = aOffsets[ bLandscape ? 1 : 0 ]; - break; + break; case AUTOLAYOUT_HANDOUT4: nColCnt = 2; nRowCnt = 2; @@ -3046,7 +3046,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, default: case AUTOLAYOUT_HANDOUT9: nColCnt = 3; nRowCnt = 3; - + if( !bHorizontal ) pOffsets = aOffsets[4]; break; diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 0afbca62c771..74d9a0001cca 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.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 @@ -69,9 +69,9 @@ extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& |* Vorlagen fuer Praesentationsobjekte |* |* Vorraussetzungen: - Die Seite muss bereits das richtige Model kennen! -|* - Die entsprechende Masterpage muss bereits im Model sein. -|* - Die entsprechenden StyleSheets muessen bereits im -|* im StyleSheetPool sein. +|* - Die entsprechende Masterpage muss bereits im Model sein. +|* - Die entsprechenden StyleSheets muessen bereits im +|* im StyleSheetPool sein. |* |* bReplaceStyleSheets = TRUE : Benannte StyleSheets werden ausgetauscht |* FALSE: Alle StyleSheets werden neu zugewiesen @@ -91,7 +91,7 @@ void SdPage::SetPresentationLayout(const String& rLayoutName, /********************************************************************* |* Layoutname der Seite \********************************************************************/ - String aOldLayoutName(maLayoutName); // merken + String aOldLayoutName(maLayoutName); // merken maLayoutName = rLayoutName; maLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR )); maLayoutName += String(SdResId(STR_LAYOUT_OUTLINE)); @@ -379,9 +379,9 @@ void SdPage::DisconnectLink() \************************************************************************/ SdPage::SdPage(const SdPage& rSrcPage) -: FmFormPage(rSrcPage) -, SdrObjUserCall() -, mpItems(NULL) +: FmFormPage(rSrcPage) +, SdrObjUserCall() +, mpItems(NULL) { mePageKind = rSrcPage.mePageKind; meAutoLayout = rSrcPage.meAutoLayout; @@ -391,20 +391,20 @@ SdPage::SdPage(const SdPage& rSrcPage) InsertPresObj(GetObj(pObj->GetOrdNum()), rSrcPage.GetPresObjKind(pObj)); mbSelected = FALSE; - mnTransitionType = rSrcPage.mnTransitionType; + mnTransitionType = rSrcPage.mnTransitionType; mnTransitionSubtype = rSrcPage.mnTransitionSubtype; mbTransitionDirection = rSrcPage.mbTransitionDirection; mnTransitionFadeColor = rSrcPage.mnTransitionFadeColor; mfTransitionDuration = rSrcPage.mfTransitionDuration; - mePresChange = rSrcPage.mePresChange; + mePresChange = rSrcPage.mePresChange; mnTime = rSrcPage.mnTime; mbSoundOn = rSrcPage.mbSoundOn; mbExcluded = rSrcPage.mbExcluded; maLayoutName = rSrcPage.maLayoutName; maSoundFile = rSrcPage.maSoundFile; - mbLoopSound = rSrcPage.mbLoopSound; - mbStopSound = rSrcPage.mbStopSound; + mbLoopSound = rSrcPage.mbLoopSound; + mbStopSound = rSrcPage.mbStopSound; maCreatedPageName = String(); maFileName = rSrcPage.maFileName; maBookmarkName = rSrcPage.maBookmarkName; @@ -516,7 +516,7 @@ void SdPage::getAlienAttributes( com::sun::star::uno::Any& rAttributes ) void SdPage::RemoveEmptyPresentationObjects() { - SdrObjListIter aShapeIter( *this, IM_DEEPWITHGROUPS ); + SdrObjListIter aShapeIter( *this, IM_DEEPWITHGROUPS ); SdrObject* pShape; for( pShape = aShapeIter.Next(); pShape; pShape = aShapeIter.Next() ) @@ -530,58 +530,58 @@ void SdPage::RemoveEmptyPresentationObjects() } } -sal_Int16 SdPage::getTransitionType (void) const +sal_Int16 SdPage::getTransitionType (void) const { - return mnTransitionType; + return mnTransitionType; } void SdPage::setTransitionType( sal_Int16 nTransitionType ) { - mnTransitionType = nTransitionType; + mnTransitionType = nTransitionType; ActionChanged(); } sal_Int16 SdPage::getTransitionSubtype (void) const { - return mnTransitionSubtype; + return mnTransitionSubtype; } void SdPage::setTransitionSubtype ( sal_Int16 nTransitionSubtype ) { - mnTransitionSubtype = nTransitionSubtype; + mnTransitionSubtype = nTransitionSubtype; ActionChanged(); } sal_Bool SdPage::getTransitionDirection (void) const { - return mbTransitionDirection; + return mbTransitionDirection; } void SdPage::setTransitionDirection ( sal_Bool bTransitionbDirection ) { - mbTransitionDirection = bTransitionbDirection; + mbTransitionDirection = bTransitionbDirection; ActionChanged(); } sal_Int32 SdPage::getTransitionFadeColor (void) const { - return mnTransitionFadeColor; + return mnTransitionFadeColor; } -void SdPage::setTransitionFadeColor ( sal_Int32 nTransitionFadeColor ) +void SdPage::setTransitionFadeColor ( sal_Int32 nTransitionFadeColor ) { - mnTransitionFadeColor = nTransitionFadeColor; + mnTransitionFadeColor = nTransitionFadeColor; ActionChanged(); } double SdPage::getTransitionDuration (void) const { - return mfTransitionDuration; + return mfTransitionDuration; } void SdPage::setTransitionDuration ( double fTranstionDuration ) { - mfTransitionDuration = fTranstionDuration; + mfTransitionDuration = fTranstionDuration; ActionChanged(); } @@ -605,7 +605,7 @@ void SdPage::addAnnotation( const Reference< XAnnotation >& xAnnotation, int nIn { maAnnotations.insert( maAnnotations.begin() + nIndex, xAnnotation ); } - + if( pModel && pModel->IsUndoEnabled() ) { SdrUndoAction* pAction = CreateUndoInsertOrRemoveAnnotation( xAnnotation, true ); @@ -614,7 +614,7 @@ void SdPage::addAnnotation( const Reference< XAnnotation >& xAnnotation, int nIn } SetChanged(); - + if( pModel ) { pModel->SetChanged(); diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx index e40de790cc99..305c96696249 100644 --- a/sd/source/core/sdpage_animations.cxx +++ b/sd/source/core/sdpage_animations.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/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx index 09b9a5e5bc3c..2185fbf6d843 100644 --- a/sd/source/core/shapelist.cxx +++ b/sd/source/core/shapelist.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/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index bd1e389cf5df..162a361d7c71 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.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 @@ -82,7 +82,7 @@ PresStyleMap& SdStyleFamilyImpl::getStyleSheets() String aLayoutName( maLayoutName ); const sal_uInt16 nLen = aLayoutName.Search(String( RTL_CONSTASCII_USTRINGPARAM(SD_LT_SEPARATOR)))+4; aLayoutName.Erase( nLen ); - + if( (maStyleSheets.size() == 0) || !((*maStyleSheets.begin()).second->GetName().Equals( aLayoutName, 0, nLen )) ) { maStyleSheets.clear(); @@ -130,7 +130,7 @@ SdStyleFamily::~SdStyleFamily() // ---------------------------------------------------------- -void SdStyleFamily::throwIfDisposed() const throw(RuntimeException) +void SdStyleFamily::throwIfDisposed() const throw(RuntimeException) { if( !mxPool.is() ) throw DisposedException(); @@ -179,7 +179,7 @@ SdStyleSheet* SdStyleFamily::GetSheetByName( const OUString& rName ) throw(NoSuc } if( pRet ) return pRet; - + throw NoSuchElementException(); } @@ -279,7 +279,7 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce } } -// *pNames++ = (*iter++).second->GetApiName(); +// *pNames++ = (*iter++).second->GetApiName(); return aNames; } else @@ -298,7 +298,7 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce // ---------------------------------------------------------- -sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(RuntimeException) +sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(RuntimeException) { SolarMutexGuard aGuard; throwIfDisposed(); @@ -454,7 +454,7 @@ void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchE { SolarMutexGuard aGuard; throwIfDisposed(); - + SdStyleSheet* pStyle = GetSheetByName( rName ); if( !pStyle->IsUserDefined() ) @@ -560,10 +560,10 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno OUString sDisplayName; switch( mnFamily ) { - case SD_STYLE_FAMILY_MASTERPAGE: sDisplayName = getName(); break; - case SD_STYLE_FAMILY_CELL: sDisplayName = String( SdResId(STR_CELL_STYLE_FAMILY) ); break; -// case SD_STYLE_FAMILY_GRAPHICS: - default: sDisplayName = String( SdResId(STR_GRAPHICS_STYLE_FAMILY) ); break; + case SD_STYLE_FAMILY_MASTERPAGE: sDisplayName = getName(); break; + case SD_STYLE_FAMILY_CELL: sDisplayName = String( SdResId(STR_CELL_STYLE_FAMILY) ); break; +// case SD_STYLE_FAMILY_GRAPHICS: + default: sDisplayName = String( SdResId(STR_GRAPHICS_STYLE_FAMILY) ); break; } return Any( sDisplayName ); } diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index c14244506d6d..e24ab8df81ae 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.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,7 +56,7 @@ #include <svx/svdattr.hxx> #include "eetext.hxx" -#include <svx/xtable.hxx> // fuer RGB_Color +#include <svx/xtable.hxx> // fuer RGB_Color #include <editeng/bulitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/adjitem.hxx> @@ -85,9 +85,9 @@ using namespace ::com::sun::star::container; // ---------------------------------------------------------- SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pDocument) -: SdStyleSheetPoolBase( _rPool ) -, mpActualStyleSheet(NULL) -, mpDoc(pDocument) +: SdStyleSheetPoolBase( _rPool ) +, mpActualStyleSheet(NULL) +, mpDoc(pDocument) { if( mpDoc ) { @@ -96,18 +96,18 @@ SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pD // create graphics family mxGraphicFamily = new SdStyleFamily( xPool, SD_STYLE_FAMILY_GRAPHICS ); mxCellFamily = new SdStyleFamily( xPool, SD_STYLE_FAMILY_CELL ); - + mxTableFamily = sdr::table::CreateTableDesignFamily(); Reference< XNamed > xNamed( mxTableFamily, UNO_QUERY ); if( xNamed.is() ) msTableFamilyName = xNamed->getName(); - + // create presentation families, one for each master page const sal_uInt16 nCount = mpDoc->GetMasterSdPageCount(PK_STANDARD); for( sal_uInt16 nPage = 0; nPage < nCount; ++nPage ) AddStyleFamily( mpDoc->GetMasterSdPage(nPage,PK_STANDARD) ); -// StartListening( *mpDoc ); +// StartListening( *mpDoc ); } } @@ -267,7 +267,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo ULONG nFontSize = 20; short nFirstIndent = -600; -// USHORT nIndent = nLevel * 1200; +// USHORT nIndent = nLevel * 1200; USHORT nLower = 100; switch (nLevel) @@ -381,9 +381,9 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rTitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ) ); rTitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ) ); rTitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ) ); - rTitleSet.Put(SvxFontHeightItem( 1552, 100, EE_CHAR_FONTHEIGHT ) ); // 44 pt - rTitleSet.Put(SvxFontHeightItem( 1552, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 44 pt - rTitleSet.Put(SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( 1552 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 44 pt + rTitleSet.Put(SvxFontHeightItem( 1552, 100, EE_CHAR_FONTHEIGHT ) ); // 44 pt + rTitleSet.Put(SvxFontHeightItem( 1552, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 44 pt + rTitleSet.Put(SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( 1552 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 44 pt rTitleSet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE )); rTitleSet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE )); rTitleSet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT )); @@ -394,11 +394,11 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rTitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR )); rTitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST )); rTitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); -// rTitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); +// rTitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); // #i16874# enable kerning by default but only for new documents rTitleSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); - aBulletFont.SetSize(Size(0,1552)); // 44 pt + aBulletFont.SetSize(Size(0,1552)); // 44 pt PutNumBulletItem( pSheet, aBulletFont ); } @@ -427,7 +427,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rSubtitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ) ); rSubtitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ) ); rSubtitleSet.Put(SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ) ); - rSubtitleSet.Put( SvxFontHeightItem( 1129, 100, EE_CHAR_FONTHEIGHT ) ); // 32 pt + rSubtitleSet.Put( SvxFontHeightItem( 1129, 100, EE_CHAR_FONTHEIGHT ) ); // 32 pt rSubtitleSet.Put( SvxFontHeightItem( 1129, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 32 pt rSubtitleSet.Put( SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( 1129 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 32 pt rSubtitleSet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE )); @@ -440,14 +440,14 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rSubtitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR )); rSubtitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST )); rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); -// rSubtitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); +// rSubtitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); // #i16874# enable kerning by default but only for new documents rSubtitleSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); aSvxLRSpaceItem.SetTxtLeft(0); rSubtitleSet.Put(aSvxLRSpaceItem); Font aTmpFont( GetBulletFont() ); - aTmpFont.SetSize(Size(0, 1129)); // 32 pt + aTmpFont.SetSize(Size(0, 1129)); // 32 pt PutNumBulletItem( pSheet, aTmpFont ); } @@ -476,7 +476,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rNotesSet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ) ); rNotesSet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ) ); rNotesSet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ) ); - rNotesSet.Put( SvxFontHeightItem( 705, 100, EE_CHAR_FONTHEIGHT ) ); // 20 pt + rNotesSet.Put( SvxFontHeightItem( 705, 100, EE_CHAR_FONTHEIGHT ) ); // 20 pt rNotesSet.Put( SvxFontHeightItem( 705, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 20 pt rNotesSet.Put( SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( 705 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 20 pt rNotesSet.Put( SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE ) ); @@ -487,7 +487,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rNotesSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) ); rNotesSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) ); rNotesSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ) ); -// rNotesSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); +// rNotesSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); rNotesSet.Put( SvxLRSpaceItem( 0, 0, 600, -600, EE_PARA_LRSPACE ) ); // #i16874# enable kerning by default but only for new documents rNotesSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); @@ -519,7 +519,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo SfxItemSet& rBackgroundObjectsSet = pSheet->GetItemSet(); rBackgroundObjectsSet.Put(SdrShadowItem(FALSE)); rBackgroundObjectsSet.Put(SdrShadowColorItem(String(), Color(COL_GRAY))); - rBackgroundObjectsSet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz + rBackgroundObjectsSet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz rBackgroundObjectsSet.Put(SdrShadowYDistItem(300)); // #i16874# enable kerning by default but only for new documents rBackgroundObjectsSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); @@ -553,7 +553,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo |* Graphik-StyleSheets aus dem Quellpool in diesen Pool kopieren |* |* (rSourcePool kann nicht const sein, weil SfxStyleSheetPoolBase::Find -|* nicht const ist) +|* nicht const ist) |* \************************************************************************/ @@ -576,7 +576,7 @@ void SdStyleSheetPool::CopyTableStyles(SdStyleSheetPool& rSourcePool) if( xSource.is() && xFactory.is() && mxTableFamily.is() ) { for( sal_Int32 nIndex = 0; nIndex < xSource->getCount(); nIndex++ ) try - { + { Reference< XStyle > xSourceTableStyle( xSource->getByIndex( nIndex ), UNO_QUERY ); if( xSourceTableStyle.is() ) { @@ -675,7 +675,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily |* StyleSheets gefuellt. |* |* (rSourcePool kann nicht const sein, weil SfxStyleSheetPoolBase::Find -|* nicht const ist) +|* nicht const ist) |* \************************************************************************/ @@ -904,33 +904,33 @@ void SdStyleSheetPool::UpdateStdNames() if( !pStyle->IsUserDefined() ) { - String aOldName = pStyle->GetName(); - ULONG nHelpId = pStyle->GetHelpId( aHelpFile ); - SfxStyleFamily eFam = pStyle->GetFamily(); + String aOldName = pStyle->GetName(); + ULONG nHelpId = pStyle->GetHelpId( aHelpFile ); + SfxStyleFamily eFam = pStyle->GetFamily(); BOOL bHelpKnown = TRUE; String aNewName; USHORT nNameId = 0; switch( nHelpId ) { - case HID_STANDARD_STYLESHEET_NAME: nNameId = STR_STANDARD_STYLESHEET_NAME; break; - case HID_POOLSHEET_OBJWITHARROW: nNameId = STR_POOLSHEET_OBJWITHARROW; break; - case HID_POOLSHEET_OBJWITHSHADOW: nNameId = STR_POOLSHEET_OBJWITHSHADOW; break; - case HID_POOLSHEET_OBJWITHOUTFILL: nNameId = STR_POOLSHEET_OBJWITHOUTFILL; break; - case HID_POOLSHEET_TEXT: nNameId = STR_POOLSHEET_TEXT; break; - case HID_POOLSHEET_TEXTBODY: nNameId = STR_POOLSHEET_TEXTBODY; break; + case HID_STANDARD_STYLESHEET_NAME: nNameId = STR_STANDARD_STYLESHEET_NAME; break; + case HID_POOLSHEET_OBJWITHARROW: nNameId = STR_POOLSHEET_OBJWITHARROW; break; + case HID_POOLSHEET_OBJWITHSHADOW: nNameId = STR_POOLSHEET_OBJWITHSHADOW; break; + case HID_POOLSHEET_OBJWITHOUTFILL: nNameId = STR_POOLSHEET_OBJWITHOUTFILL; break; + case HID_POOLSHEET_TEXT: nNameId = STR_POOLSHEET_TEXT; break; + case HID_POOLSHEET_TEXTBODY: nNameId = STR_POOLSHEET_TEXTBODY; break; case HID_POOLSHEET_TEXTBODY_JUSTIFY:nNameId = STR_POOLSHEET_TEXTBODY_JUSTIFY;break; - case HID_POOLSHEET_TEXTBODY_INDENT: nNameId = STR_POOLSHEET_TEXTBODY_INDENT;break; - case HID_POOLSHEET_TITLE: nNameId = STR_POOLSHEET_TITLE; break; - case HID_POOLSHEET_TITLE1: nNameId = STR_POOLSHEET_TITLE1; break; - case HID_POOLSHEET_TITLE2: nNameId = STR_POOLSHEET_TITLE2; break; - case HID_POOLSHEET_HEADLINE: nNameId = STR_POOLSHEET_HEADLINE; break; - case HID_POOLSHEET_HEADLINE1: nNameId = STR_POOLSHEET_HEADLINE1; break; - case HID_POOLSHEET_HEADLINE2: nNameId = STR_POOLSHEET_HEADLINE2; break; - case HID_POOLSHEET_MEASURE: nNameId = STR_POOLSHEET_MEASURE; break; - - case HID_PSEUDOSHEET_TITLE: nNameId = STR_PSEUDOSHEET_TITLE; break; - case HID_PSEUDOSHEET_SUBTITLE: nNameId = STR_PSEUDOSHEET_SUBTITLE; break; + case HID_POOLSHEET_TEXTBODY_INDENT: nNameId = STR_POOLSHEET_TEXTBODY_INDENT;break; + case HID_POOLSHEET_TITLE: nNameId = STR_POOLSHEET_TITLE; break; + case HID_POOLSHEET_TITLE1: nNameId = STR_POOLSHEET_TITLE1; break; + case HID_POOLSHEET_TITLE2: nNameId = STR_POOLSHEET_TITLE2; break; + case HID_POOLSHEET_HEADLINE: nNameId = STR_POOLSHEET_HEADLINE; break; + case HID_POOLSHEET_HEADLINE1: nNameId = STR_POOLSHEET_HEADLINE1; break; + case HID_POOLSHEET_HEADLINE2: nNameId = STR_POOLSHEET_HEADLINE2; break; + case HID_POOLSHEET_MEASURE: nNameId = STR_POOLSHEET_MEASURE; break; + + case HID_PSEUDOSHEET_TITLE: nNameId = STR_PSEUDOSHEET_TITLE; break; + case HID_PSEUDOSHEET_SUBTITLE: nNameId = STR_PSEUDOSHEET_SUBTITLE; break; case HID_PSEUDOSHEET_OUTLINE1: case HID_PSEUDOSHEET_OUTLINE2: case HID_PSEUDOSHEET_OUTLINE3: @@ -939,17 +939,17 @@ void SdStyleSheetPool::UpdateStdNames() case HID_PSEUDOSHEET_OUTLINE6: case HID_PSEUDOSHEET_OUTLINE7: case HID_PSEUDOSHEET_OUTLINE8: - case HID_PSEUDOSHEET_OUTLINE9: nNameId = STR_PSEUDOSHEET_OUTLINE; break; - case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_PSEUDOSHEET_BACKGROUNDOBJECTS; break; - case HID_PSEUDOSHEET_BACKGROUND: nNameId = STR_PSEUDOSHEET_BACKGROUND; break; - case HID_PSEUDOSHEET_NOTES: nNameId = STR_PSEUDOSHEET_NOTES; break; - - case HID_SD_CELL_STYLE_DEFAULT: nNameId = STR_STANDARD_STYLESHEET_NAME; break; - case HID_SD_CELL_STYLE_BANDED: nNameId = STR_POOLSHEET_BANDED_CELL; break; - case HID_SD_CELL_STYLE_HEADER: nNameId = STR_POOLSHEET_HEADER; break; - case HID_SD_CELL_STYLE_TOTAL: nNameId = STR_POOLSHEET_TOTAL; break; - case HID_SD_CELL_STYLE_FIRST_COLUMN: nNameId = STR_POOLSHEET_FIRST_COLUMN; break; - case HID_SD_CELL_STYLE_LAST_COLUMN: nNameId = STR_POOLSHEET_LAST_COLUMN; break; + case HID_PSEUDOSHEET_OUTLINE9: nNameId = STR_PSEUDOSHEET_OUTLINE; break; + case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_PSEUDOSHEET_BACKGROUNDOBJECTS; break; + case HID_PSEUDOSHEET_BACKGROUND: nNameId = STR_PSEUDOSHEET_BACKGROUND; break; + case HID_PSEUDOSHEET_NOTES: nNameId = STR_PSEUDOSHEET_NOTES; break; + + case HID_SD_CELL_STYLE_DEFAULT: nNameId = STR_STANDARD_STYLESHEET_NAME; break; + case HID_SD_CELL_STYLE_BANDED: nNameId = STR_POOLSHEET_BANDED_CELL; break; + case HID_SD_CELL_STYLE_HEADER: nNameId = STR_POOLSHEET_HEADER; break; + case HID_SD_CELL_STYLE_TOTAL: nNameId = STR_POOLSHEET_TOTAL; break; + case HID_SD_CELL_STYLE_FIRST_COLUMN: nNameId = STR_POOLSHEET_FIRST_COLUMN; break; + case HID_SD_CELL_STYLE_LAST_COLUMN: nNameId = STR_POOLSHEET_LAST_COLUMN; break; default: // 0 oder falsche (alte) HelpId @@ -974,7 +974,7 @@ void SdStyleSheetPool::UpdateStdNames() if ( !pSheetFound ) { // Sheet existiert noch nicht: Altes Sheet wird umbenannt - pStyle->SetName( aNewName ); // setzt auch Parents um + pStyle->SetName( aNewName ); // setzt auch Parents um } else { @@ -1131,7 +1131,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, aNumberFormat.SetFirstLineOffset(nFirstLineOffset); nFontSize = (USHORT)((nFontSize * 2540L) / 72); // Pt --> 1/100 mm - rBulletFont.SetSize(Size(0,846)); // 24 pt + rBulletFont.SetSize(Size(0,846)); // 24 pt aNumberFormat.SetBulletFont(&rBulletFont); aNumRule.SetLevel( i, aNumberFormat ); } @@ -1259,7 +1259,7 @@ Any SAL_CALL SdStyleSheetPool::getByName( const OUString& aName ) throw(NoSuchEl Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeException) { throwIfDisposed(); - + Sequence< OUString > aNames( maStyleFamilyMap.size() + 3 ); OUString* pNames = aNames.getArray(); @@ -1386,7 +1386,7 @@ void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException) { } -// EndListening( *mpDoc ); +// EndListening( *mpDoc ); mpDoc = 0; Clear(); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 2c5ba9cf5258..b58ce02da3e3 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.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,16 +78,16 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::drawing; -#define WID_STYLE_DISPNAME 7998 -#define WID_STYLE_FAMILY 7999 +#define WID_STYLE_DISPNAME 7998 +#define WID_STYLE_FAMILY 7999 static SvxItemPropertySet& GetStylePropertySet() { static const SfxItemPropertyMapEntry aFullPropertyMap_Impl[] = { - { RTL_CONSTASCII_STRINGPARAM("Family"), WID_STYLE_FAMILY, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, - { RTL_CONSTASCII_STRINGPARAM("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &XNameContainer::static_type(), 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("DisplayName"), WID_STYLE_DISPNAME, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, + { RTL_CONSTASCII_STRINGPARAM("Family"), WID_STYLE_FAMILY, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, + { RTL_CONSTASCII_STRINGPARAM("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, &XNameContainer::static_type(), 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("DisplayName"), WID_STYLE_DISPNAME, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0}, SVX_UNOEDIT_NUMBERING_PROPERTIE, SHADOW_PROPERTIES @@ -153,7 +153,7 @@ SdStyleSheet::SdStyleSheet( const SdStyleSheet & r ) SdStyleSheet::~SdStyleSheet() { delete pSet; - pSet = NULL; // damit nachfolgende Destruktoren eine Chance haben + pSet = NULL; // damit nachfolgende Destruktoren eine Chance haben } void SdStyleSheet::SetApiName( const OUString& rApiName ) @@ -248,20 +248,20 @@ SfxItemSet& SdStyleSheet::GetItemSet() // ggfs. das ItemSet 'on demand' anlegen if (!pSet) { - USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, - XATTR_FILL_FIRST, XATTR_FILL_LAST, + USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, + XATTR_FILL_FIRST, XATTR_FILL_LAST, - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, - SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, + SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, + SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, - SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, + SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, - SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST, - SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST, + SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST, + SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST, - EE_PARA_START, EE_CHAR_END, + EE_PARA_START, EE_CHAR_END, - SDRATTR_XMLATTRIBUTES, SDRATTR_TEXT_USEFIXEDCELLHEIGHT, + SDRATTR_XMLATTRIBUTES, SDRATTR_TEXT_USEFIXEDCELLHEIGHT, SDRATTR_3D_FIRST, SDRATTR_3D_LAST, 0, 0 }; @@ -276,18 +276,18 @@ SfxItemSet& SdStyleSheet::GetItemSet() { if (!pSet) { - USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, - XATTR_FILL_FIRST, XATTR_FILL_LAST, + USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, + XATTR_FILL_FIRST, XATTR_FILL_LAST, - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, - SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, + SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, + SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, - SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, + SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, - EE_PARA_START, EE_CHAR_END, + EE_PARA_START, EE_CHAR_END, - SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, - SDRATTR_XMLATTRIBUTES, SDRATTR_XMLATTRIBUTES, + SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, + SDRATTR_XMLATTRIBUTES, SDRATTR_XMLATTRIBUTES, 0, 0 }; @@ -319,14 +319,14 @@ SfxItemSet& SdStyleSheet::GetItemSet() SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, - SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, + SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST, SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST, EE_PARA_START, EE_CHAR_END, - SDRATTR_XMLATTRIBUTES, SDRATTR_TEXT_USEFIXEDCELLHEIGHT, + SDRATTR_XMLATTRIBUTES, SDRATTR_TEXT_USEFIXEDCELLHEIGHT, SDRATTR_3D_FIRST, SDRATTR_3D_LAST, 0, 0 }; @@ -342,7 +342,7 @@ SfxItemSet& SdStyleSheet::GetItemSet() /************************************************************************* |* |* IsUsed(), eine Vorlage gilt als benutzt, wenn sie von eingefuegten Objekten -|* oder von benutzten Vorlagen referenziert wird +|* oder von benutzten Vorlagen referenziert wird |* \************************************************************************/ @@ -409,7 +409,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const ::sd::DrawViewShell* pDrawViewShell = 0; - ::sd::ViewShellBase* pBase = dynamic_cast< ::sd::ViewShellBase* >( SfxViewShell::Current() ); + ::sd::ViewShellBase* pBase = dynamic_cast< ::sd::ViewShellBase* >( SfxViewShell::Current() ); if( pBase ) pDrawViewShell = dynamic_cast< ::sd::DrawViewShell* >( pBase->GetMainViewShell().get() ); @@ -682,31 +682,31 @@ void SdStyleSheet::SetHelpId( const String& r, ULONG nId ) static struct ApiNameMap { const sal_Char* mpApiName; - sal_uInt32 mnApiNameLength; - sal_uInt32 mnHelpId; + sal_uInt32 mnApiNameLength; + sal_uInt32 mnHelpId; } pApiNameMap[] = { - { RTL_CONSTASCII_STRINGPARAM( "title" ), HID_PSEUDOSHEET_TITLE }, - { RTL_CONSTASCII_STRINGPARAM( "subtitle" ), HID_PSEUDOSHEET_SUBTITLE }, - { RTL_CONSTASCII_STRINGPARAM( "background" ), HID_PSEUDOSHEET_BACKGROUND }, + { RTL_CONSTASCII_STRINGPARAM( "title" ), HID_PSEUDOSHEET_TITLE }, + { RTL_CONSTASCII_STRINGPARAM( "subtitle" ), HID_PSEUDOSHEET_SUBTITLE }, + { RTL_CONSTASCII_STRINGPARAM( "background" ), HID_PSEUDOSHEET_BACKGROUND }, { RTL_CONSTASCII_STRINGPARAM( "backgroundobjects" ),HID_PSEUDOSHEET_BACKGROUNDOBJECTS }, - { RTL_CONSTASCII_STRINGPARAM( "notes" ), HID_PSEUDOSHEET_NOTES }, - { RTL_CONSTASCII_STRINGPARAM( "standard" ), HID_STANDARD_STYLESHEET_NAME }, - { RTL_CONSTASCII_STRINGPARAM( "objectwitharrow" ), HID_POOLSHEET_OBJWITHARROW }, - { RTL_CONSTASCII_STRINGPARAM( "objectwithshadow" ), HID_POOLSHEET_OBJWITHSHADOW }, + { RTL_CONSTASCII_STRINGPARAM( "notes" ), HID_PSEUDOSHEET_NOTES }, + { RTL_CONSTASCII_STRINGPARAM( "standard" ), HID_STANDARD_STYLESHEET_NAME }, + { RTL_CONSTASCII_STRINGPARAM( "objectwitharrow" ), HID_POOLSHEET_OBJWITHARROW }, + { RTL_CONSTASCII_STRINGPARAM( "objectwithshadow" ), HID_POOLSHEET_OBJWITHSHADOW }, { RTL_CONSTASCII_STRINGPARAM( "objectwithoutfill" ),HID_POOLSHEET_OBJWITHOUTFILL }, - { RTL_CONSTASCII_STRINGPARAM( "text" ), HID_POOLSHEET_TEXT }, - { RTL_CONSTASCII_STRINGPARAM( "textbody" ), HID_POOLSHEET_TEXTBODY }, - { RTL_CONSTASCII_STRINGPARAM( "textbodyjustfied" ), HID_POOLSHEET_TEXTBODY_JUSTIFY }, - { RTL_CONSTASCII_STRINGPARAM( "textbodyindent" ), HID_POOLSHEET_TEXTBODY_INDENT }, - { RTL_CONSTASCII_STRINGPARAM( "title" ), HID_POOLSHEET_TITLE }, - { RTL_CONSTASCII_STRINGPARAM( "title1" ), HID_POOLSHEET_TITLE1 }, - { RTL_CONSTASCII_STRINGPARAM( "title2" ), HID_POOLSHEET_TITLE2 }, - { RTL_CONSTASCII_STRINGPARAM( "headline" ), HID_POOLSHEET_HEADLINE }, - { RTL_CONSTASCII_STRINGPARAM( "headline1" ), HID_POOLSHEET_HEADLINE1 }, - { RTL_CONSTASCII_STRINGPARAM( "headline2" ), HID_POOLSHEET_HEADLINE2 }, - { RTL_CONSTASCII_STRINGPARAM( "measure" ), HID_POOLSHEET_MEASURE }, + { RTL_CONSTASCII_STRINGPARAM( "text" ), HID_POOLSHEET_TEXT }, + { RTL_CONSTASCII_STRINGPARAM( "textbody" ), HID_POOLSHEET_TEXTBODY }, + { RTL_CONSTASCII_STRINGPARAM( "textbodyjustfied" ), HID_POOLSHEET_TEXTBODY_JUSTIFY }, + { RTL_CONSTASCII_STRINGPARAM( "textbodyindent" ), HID_POOLSHEET_TEXTBODY_INDENT }, + { RTL_CONSTASCII_STRINGPARAM( "title" ), HID_POOLSHEET_TITLE }, + { RTL_CONSTASCII_STRINGPARAM( "title1" ), HID_POOLSHEET_TITLE1 }, + { RTL_CONSTASCII_STRINGPARAM( "title2" ), HID_POOLSHEET_TITLE2 }, + { RTL_CONSTASCII_STRINGPARAM( "headline" ), HID_POOLSHEET_HEADLINE }, + { RTL_CONSTASCII_STRINGPARAM( "headline1" ), HID_POOLSHEET_HEADLINE1 }, + { RTL_CONSTASCII_STRINGPARAM( "headline2" ), HID_POOLSHEET_HEADLINE2 }, + { RTL_CONSTASCII_STRINGPARAM( "measure" ), HID_POOLSHEET_MEASURE }, { 0, 0, 0 } }; @@ -1113,7 +1113,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con if( pEntry->nWID == WID_STYLE_FAMILY ) throw PropertyVetoException(); - + if( (pEntry->nWID == EE_PARA_NUMBULLET) && (GetFamily() == SD_STYLE_FAMILY_MASTERPAGE) ) { String aStr; @@ -1136,8 +1136,8 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con } throw IllegalArgumentException(); } - - SfxItemSet aSet( GetPool().GetPool(), pEntry->nWID, pEntry->nWID); + + SfxItemSet aSet( GetPool().GetPool(), pEntry->nWID, pEntry->nWID); aSet.Put( rStyleSet ); if( !aSet.Count() ) @@ -1231,12 +1231,12 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro } else { - SfxItemSet aSet( GetPool().GetPool(), pEntry->nWID, pEntry->nWID); + SfxItemSet aSet( GetPool().GetPool(), pEntry->nWID, pEntry->nWID); const SfxPoolItem* pItem; SfxItemSet& rStyleSet = GetItemSet(); - if( rStyleSet.GetItemState( pEntry->nWID, sal_True, &pItem ) == SFX_ITEM_SET ) + if( rStyleSet.GetItemState( pEntry->nWID, sal_True, &pItem ) == SFX_ITEM_SET ) aSet.Put( *pItem ); if( !aSet.Count() ) @@ -1246,7 +1246,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro return aAny; // Hole Wert aus ItemSet - aAny = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(),pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(),pEntry, aSet ); } if( *pEntry->pType != aAny.getValueType() ) @@ -1327,13 +1327,13 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN case SFX_ITEM_DEFAULT: eState = PropertyState_DEFAULT_VALUE; break; -// case SFX_ITEM_DONTCARE: -// case SFX_ITEM_DISABLED: +// case SFX_ITEM_DONTCARE: +// case SFX_ITEM_DISABLED: default: eState = PropertyState_AMBIGUOUS_VALUE; break; } - + // if a item is set, this doesn't mean we want it :) if( ( PropertyState_DIRECT_VALUE == eState ) ) { @@ -1351,7 +1351,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) ) eState = PropertyState_DEFAULT_VALUE; } - } + } } return eState; @@ -1415,7 +1415,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( aPropertyName ); if( pEntry == NULL ) throw UnknownPropertyException(); - Any aRet; + Any aRet; if( pEntry->nWID == WID_STYLE_FAMILY ) { aRet <<= GetFamilyString(nFamily); @@ -1431,7 +1431,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t else { SfxItemPool& rMyPool = GetPool().GetPool(); - SfxItemSet aSet( rMyPool, pEntry->nWID, pEntry->nWID); + SfxItemSet aSet( rMyPool, pEntry->nWID, pEntry->nWID); aSet.Put( rMyPool.GetDefaultItem( pEntry->nWID ) ); aRet = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(), pEntry, aSet ); } diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index de3aff4f0d89..e6b945333d1e 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.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 @@ -60,8 +60,8 @@ public: virtual void Redo(); protected: - OutlinerParaObject* mpOldText; - OutlinerParaObject* mpNewText; + OutlinerParaObject* mpOldText; + OutlinerParaObject* mpNewText; rtl::Reference< TextApiObject > mxTextObj; }; @@ -83,8 +83,8 @@ void UndoTextAPIChanged::Undo() { if( !mpNewText ) mpNewText = mxTextObj->CreateText(); - - mxTextObj->SetText( *mpOldText ); + + mxTextObj->SetText( *mpOldText ); } void UndoTextAPIChanged::Redo() @@ -95,32 +95,32 @@ void UndoTextAPIChanged::Redo() } } -struct TextAPIEditSource_Impl +struct TextAPIEditSource_Impl { // needed for "internal" refcounting - SdDrawDocument* mpDoc; - Outliner* mpOutliner; - SvxOutlinerForwarder* mpTextForwarder; - sal_Int32 mnRef; + SdDrawDocument* mpDoc; + Outliner* mpOutliner; + SvxOutlinerForwarder* mpTextForwarder; + sal_Int32 mnRef; }; class TextAPIEditSource : public SvxEditSource { TextAPIEditSource_Impl* pImpl; - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); - explicit TextAPIEditSource( const TextAPIEditSource& rSource ); + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); + virtual void UpdateData(); + explicit TextAPIEditSource( const TextAPIEditSource& rSource ); public: TextAPIEditSource(SdDrawDocument* pDoc); - virtual ~TextAPIEditSource(); + virtual ~TextAPIEditSource(); - void Dispose(); - void SetText( OutlinerParaObject& rText ); + void Dispose(); + void SetText( OutlinerParaObject& rText ); OutlinerParaObject* CreateText(); - String GetText(); + String GetText(); SdDrawDocument* GetDoc() { return pImpl->mpDoc; } }; @@ -132,10 +132,10 @@ const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap() SVX_UNOEDIT_FONT_PROPERTIES, SVX_UNOEDIT_OUTLINER_PROPERTIES, SVX_UNOEDIT_PARA_PROPERTIES, - {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const Reference< XTextField >*)0), PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, - {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const Reference< XTextField >*)0), PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, + {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const Reference< XNameContainer >*)0) , 0, 0}, {0,0,0,0,0,0} }; static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() ); @@ -182,9 +182,9 @@ void TextApiObject::SetText( OutlinerParaObject& rText ) SdrModel* pModel = mpSource->GetDoc(); if( pModel && pModel->IsUndoEnabled() ) pModel->AddUndo( new UndoTextAPIChanged( *pModel, this ) ); - + mpSource->SetText( rText ); - maSelection.nStartPara = 0xffff; + maSelection.nStartPara = 0xffff; } String TextApiObject::GetText() @@ -273,7 +273,7 @@ void TextAPIEditSource::SetText( OutlinerParaObject& rText ) pImpl->mpOutliner = new Outliner( pImpl->mpDoc, OUTLINERMODE_TEXTOBJECT ); pImpl->mpDoc->SetCalcFieldValueHdl( pImpl->mpOutliner ); } - + pImpl->mpOutliner->SetText( rText ); } } diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 4c57f5779988..d140d7510388 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.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 @@ -99,30 +99,30 @@ #include <svl/lckbitem.hxx> -#define CharSetItem SfxUInt16Item -#define FontFamilyItem SfxUInt16Item -#define FontPitchItem SfxUInt16Item -#define FontAlignItem SfxUInt16Item -#define FontWeightItem SfxUInt16Item -#define FontUnderlineItem SfxUInt16Item -#define FontStrikeoutItem SfxUInt16Item -#define FontItalicItem SfxUInt16Item -#define SvxDbTypeItem SfxUInt16Item -#define SvxLineSpaceItem SfxUInt16Item -#define SvxInterLineSpaceItem SfxUInt16Item -#define SvxBreakItem SfxUInt16Item -#define BrushStyleItem SfxUInt16Item -#define SvxNumTypeItem SfxUInt16Item -#define SvxShadowLocationItem SfxUInt16Item -#define SvxDbTypeItem SfxUInt16Item -//#define SvxChooseControlEnumItem SfxUInt16Item -#define SvxDrawToolEnumItem SfxUInt16Item -#define SvxChooseControlItem SfxEnumItem -#define SvxDrawToolItem SfxUInt16Item -#define SvxCellHorJustifyEnumItem SfxUInt16Item -#define SvxCellVerJustifyEnumItem SfxUInt16Item -#define SvxCellOrientationEnumItem SfxUInt16Item -#define SvxLanguage SfxUInt16Item +#define CharSetItem SfxUInt16Item +#define FontFamilyItem SfxUInt16Item +#define FontPitchItem SfxUInt16Item +#define FontAlignItem SfxUInt16Item +#define FontWeightItem SfxUInt16Item +#define FontUnderlineItem SfxUInt16Item +#define FontStrikeoutItem SfxUInt16Item +#define FontItalicItem SfxUInt16Item +#define SvxDbTypeItem SfxUInt16Item +#define SvxLineSpaceItem SfxUInt16Item +#define SvxInterLineSpaceItem SfxUInt16Item +#define SvxBreakItem SfxUInt16Item +#define BrushStyleItem SfxUInt16Item +#define SvxNumTypeItem SfxUInt16Item +#define SvxShadowLocationItem SfxUInt16Item +#define SvxDbTypeItem SfxUInt16Item +//#define SvxChooseControlEnumItem SfxUInt16Item +#define SvxDrawToolEnumItem SfxUInt16Item +#define SvxChooseControlItem SfxEnumItem +#define SvxDrawToolItem SfxUInt16Item +#define SvxCellHorJustifyEnumItem SfxUInt16Item +#define SvxCellVerJustifyEnumItem SfxUInt16Item +#define SvxCellOrientationEnumItem SfxUInt16Item +#define SvxLanguage SfxUInt16Item //#define SfxLockBytesItem SfxPoolItem #define OfaStringListItem SfxStringListItem #define avmedia_MediaItem ::avmedia::MediaItem diff --git a/sd/source/core/undo/undofactory.cxx b/sd/source/core/undo/undofactory.cxx index 72ad5414e4d0..f097fdbb8865 100644 --- a/sd/source/core/undo/undofactory.cxx +++ b/sd/source/core/undo/undofactory.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/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx index 05892631c07f..552e88ff3b98 100644 --- a/sd/source/core/undo/undomanager.cxx +++ b/sd/source/core/undo/undomanager.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/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx index 8687de4d3c9f..ca73bf0efda8 100644 --- a/sd/source/core/undo/undoobjects.cxx +++ b/sd/source/core/undo/undoobjects.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 @@ -253,10 +253,10 @@ void UndoObjectSetText::Redo() // Undo for SdrObject::SetUserCall() UndoObjectUserCall::UndoObjectUserCall(SdrObject& rObject) -: SdrUndoObj(rObject) -, mpOldUserCall((SdPage*)rObject.GetUserCall()) -, mpNewUserCall(0) -, mxSdrObject( &rObject ) +: SdrUndoObj(rObject) +, mpOldUserCall((SdPage*)rObject.GetUserCall()) +, mpNewUserCall(0) +, mxSdrObject( &rObject ) { } @@ -287,11 +287,11 @@ void UndoObjectUserCall::Redo() // Undo for SdPage::InsertPresObj() and SdPage::RemovePresObj() UndoObjectPresentationKind::UndoObjectPresentationKind(SdrObject& rObject) -: SdrUndoObj(rObject) -, meOldKind(PRESOBJ_NONE) -, meNewKind(PRESOBJ_NONE) -, mxPage( rObject.GetPage() ) -, mxSdrObject( &rObject ) +: SdrUndoObj(rObject) +, meOldKind(PRESOBJ_NONE) +, meNewKind(PRESOBJ_NONE) +, mxPage( rObject.GetPage() ) +, mxSdrObject( &rObject ) { DBG_ASSERT( mxPage.is(), "sd::UndoObjectPresentationKind::UndoObjectPresentationKind(), does not work for shapes without a slide!" ); diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx index 307094a5b367..9bbb3036f487 100644 --- a/sd/source/core/undoanim.cxx +++ b/sd/source/core/undoanim.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,7 +54,7 @@ struct UndoAnimationImpl SdPage* mpPage; Reference< XAnimationNode > mxOldNode; Reference< XAnimationNode > mxNewNode; - bool mbNewNodeSet; + bool mbNewNodeSet; }; UndoAnimation::UndoAnimation( SdDrawDocument* pDoc, SdPage* pThePage ) @@ -87,7 +87,7 @@ void UndoAnimation::Undo() if( !mpImpl->mbNewNodeSet ) { if( mpImpl->mpPage->mxAnimationNode.is() ) - mpImpl->mxNewNode.set( ::sd::Clone( mpImpl->mpPage->mxAnimationNode ) ); + mpImpl->mxNewNode.set( ::sd::Clone( mpImpl->mpPage->mxAnimationNode ) ); mpImpl->mbNewNodeSet = true; } @@ -128,7 +128,7 @@ String UndoAnimation::GetComment() const struct UndoAnimationPathImpl { SdPage* mpPage; - sal_Int32 mnEffectOffset; + sal_Int32 mnEffectOffset; ::rtl::OUString msUndoPath; ::rtl::OUString msRedoPath; |