From 60b85cb402a8195565a37f227ce2844eecbc613c Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Wed, 4 Mar 2009 10:02:54 +0000 Subject: #i48179# Added support for going back one effect at a time. --- sd/source/ui/slideshow/slideshowimpl.cxx | 120 ++++++++++++++++++++++++++----- sd/source/ui/slideshow/slideshowimpl.hxx | 8 ++- 2 files changed, 107 insertions(+), 21 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 605f6d401..9699e2ffb 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -178,7 +178,9 @@ public: bool nextSlide(); bool previousSlide(); - void displayCurrentSlide( const Reference< XSlideShow >& xShow ); + void displayCurrentSlide( + const Reference< XSlideShow >& xShow, + const bool bSkipAllMainSequenceEffects); sal_Int32 getNextSlideIndex() const; sal_Int32 getPreviousSlideIndex() const; @@ -475,29 +477,58 @@ bool AnimationSlideController::previousSlide() return jumpToSlideIndex( getPreviousSlideIndex() ); } -void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow >& xShow ) +void AnimationSlideController::displayCurrentSlide( + const Reference< XSlideShow >& xShow, + const bool bSkipAllMainSequenceEffects) { const sal_Int32 nCurrentSlideNumber = getCurrentSlideNumber(); if( xShow.is() && (nCurrentSlideNumber != -1 ) ) { - Sequence< PropertyValue > aProperties; Reference< XDrawPage > xSlide; Reference< XAnimationNode > xAnimNode; - + ::std::vector aProperties; + const sal_Int32 nNextSlideNumber = getNextSlideNumber(); if( getSlideAPI( nNextSlideNumber, xSlide, xAnimNode ) ) { Sequence< Any > aValue(2); aValue[0] <<= xSlide; aValue[1] <<= xAnimNode; - aProperties.realloc(1); - aProperties[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Prefetch" ) ); - aProperties[0].Value <<= aValue; + aProperties.push_back( + PropertyValue( + OUString( RTL_CONSTASCII_USTRINGPARAM( "Prefetch" ) ), + -1, + Any(aValue), + PropertyState_DIRECT_VALUE)); + } + if (bSkipAllMainSequenceEffects) + { + // Add one property that prevents the slide transition from being + // shown (to speed up the transition to the previous slide) and + // one to show all main sequence effects so that the user can + // continue to undo effects. + aProperties.push_back( + PropertyValue( + OUString( RTL_CONSTASCII_USTRINGPARAM("SkipAllMainSequenceEffects")), + -1, + Any(sal_True), + PropertyState_DIRECT_VALUE)); + aProperties.push_back( + PropertyValue( + OUString( RTL_CONSTASCII_USTRINGPARAM("SkipSlideTransition")), + -1, + Any(sal_True), + PropertyState_DIRECT_VALUE)); } + // Convert vector into uno Sequence. + Sequence< PropertyValue > aPropertySequence (aProperties.size()); + for (int nIndex=0,nCount=aProperties.size();nIndexdisplaySlide( xSlide, xAnimNode, aProperties ); + xShow->displaySlide( xSlide, xAnimNode, aPropertySequence ); } } @@ -1239,9 +1270,12 @@ void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideSho // --------------------------------------------------------- -void SlideshowImpl::slideEnded() +void SlideshowImpl::slideEnded(const bool bReverse) { - gotoNextSlide(); + if (bReverse) + gotoPreviousSlide(true); + else + gotoNextSlide(); } // --------------------------------------------------------- @@ -1391,14 +1425,14 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( // --------------------------------------------------------- -void SlideshowImpl::displayCurrentSlide() +void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects) { stopSound(); removeShapeEvents(); if( mpSlideController.get() && mxShow.is() ) { - mpSlideController->displayCurrentSlide( mxShow ); + mpSlideController->displayCurrentSlide( mxShow, bSkipAllMainSequenceEffects ); registerShapeEvents(mpSlideController->getCurrentSlideNumber()); update(); @@ -1967,11 +2001,17 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) break; case KEY_PAGEUP: + if(rKEvt.GetKeyCode().IsMod2()) + { + gotoPreviousSlide(); + break; + } + // warning, fall through! case KEY_LEFT: case KEY_UP: case KEY_P: case KEY_BACKSPACE: - gotoPreviousSlide(); + gotoPreviousEffect(); break; case KEY_HOME: @@ -2895,6 +2935,30 @@ void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException) // -------------------------------------------------------------------- +void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException) +{ + ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + + if( mxShow.is() && mpSlideController.get() && mpShowWindow ) + { + if( mbIsPaused ) + resume(); + + const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode(); + if( (eMode == SHOWWINDOWMODE_PAUSE) || (eMode == SHOWWINDOWMODE_BLANK) ) + { + mpShowWindow->RestartShow(); + } + else + { + mxShow->previousEffect(); + update(); + } + } +} + +// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException) { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); @@ -3014,6 +3078,11 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException) // -------------------------------------------------------------------- void SAL_CALL SlideshowImpl::gotoPreviousSlide( ) throw (RuntimeException) +{ + gotoPreviousSlide(false); +} + +void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects) { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); @@ -3035,8 +3104,22 @@ void SAL_CALL SlideshowImpl::gotoPreviousSlide( ) throw (RuntimeException) } else { - if( mpSlideController->previousSlide() ) - displayCurrentSlide(); + if( mpSlideController->previousSlide()) + displayCurrentSlide(bSkipAllMainSequenceEffects); + else if (bSkipAllMainSequenceEffects) + { + // We could not go to the previous slide (probably because + // the current slide is already the first one). We still + // have to call displayCurrentSlide because the calling + // slideshow can not determine whether there is a previous + // slide or not and has already prepared for a slide change. + // This slide change has to be completed now, even when + // changing to the same slide. + // Note that in this special case we do NOT pass + // bSkipAllMainSequenceEffects because we display the same + // slide as before and do not want to show all its effects. + displayCurrentSlide(false); + } } } catch( Exception& e ) @@ -3487,19 +3570,20 @@ void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun // --------------------------------------------------------- -void SlideShowListenerProxy::slideEnded() throw (RuntimeException) +void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException) { { ::osl::MutexGuard aGuard( m_aMutex ); if( maListeners.getLength() >= 0 ) - maListeners.forEach( boost::mem_fn( &XSlideShowListener::slideEnded ) ); + maListeners.forEach( + boost::bind( &XSlideShowListener::slideEnded, _1, bReverse) ); } { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); if( mxController.is() ) - mxController->slideEnded(); + mxController->slideEnded(bReverse); } } diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 5b0900d99..bbd2529f7 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -166,7 +166,7 @@ public: virtual void SAL_CALL slideTransitionStarted() throw (css::uno::RuntimeException); virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException); virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException); - virtual void SAL_CALL slideEnded() throw (css::uno::RuntimeException); + virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException); virtual void SAL_CALL hyperLinkClicked(const ::rtl::OUString & hyperLink) throw (css::uno::RuntimeException); // css::lang::XEventListener: @@ -208,6 +208,7 @@ public: virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException); virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException); virtual void SAL_CALL gotoNextEffect( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL gotoPreviousEffect( ) throw (css::uno::RuntimeException); virtual void SAL_CALL gotoFirstSlide( ) throw (css::uno::RuntimeException); virtual void SAL_CALL gotoNextSlide( ) throw (css::uno::RuntimeException); virtual void SAL_CALL gotoPreviousSlide( ) throw (css::uno::RuntimeException); @@ -237,7 +238,7 @@ public: virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); // will be called from the SlideShowListenerProxy when this event is fired from the XSlideShow - void slideEnded(); + void slideEnded(const bool bReverse); void hyperLinkClicked(const ::rtl::OUString & hyperLink) throw (css::uno::RuntimeException); void click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent); @@ -278,7 +279,7 @@ private: void createSlideList( bool bAll, bool bStartWithActualSlide, const String& rPresSlide ); - void displayCurrentSlide(); + void displayCurrentSlide (const bool bSkipAllMainSequenceEffects = false); void displaySlideNumber( sal_Int32 nSlide ); void displaySlideIndex( sal_Int32 nIndex ); @@ -328,6 +329,7 @@ private: css::uno::Reference< css::presentation::XSlideShow > createSlideShow() const; void setAutoSaveState( bool bOn ); + void gotoPreviousSlide (const bool bSkipAllMainSequenceEffects); css::uno::Reference< css::presentation::XSlideShow > mxShow; comphelper::ImplementationReference< ::sd::SlideShowView, css::presentation::XSlideShowView > mxView; -- cgit v1.2.3 From f40fe777fe528bcec826d1ebd28d713199462093 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Thu, 5 Mar 2009 12:44:27 +0000 Subject: #i99916# Prevent infinite recursion. --- sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 989d6ae50..7ca60e03f 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -183,15 +183,15 @@ IMPL_LINK( CategoryListBox, implDoubleClickHdl, Control*, EMPTYARG ) void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt ) { + ReleaseMouse(); if( rMEvt.IsLeft() && (rMEvt.GetClicks() == 2) ) { - ReleaseMouse(); if( maDoubleClickHdl.IsSet() ) maDoubleClickHdl.Call( this ); } else { - CategoryListBox::MouseButtonUp( rMEvt ); + ListBox::MouseButtonUp( rMEvt ); } } -- cgit v1.2.3 From ff72455eadde3cb03118d20bac8dfdcd2a740921 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Fri, 17 Apr 2009 12:12:24 +0000 Subject: #i69530# End show before it is released. --- sd/source/ui/dlg/docprev.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 9c61c2fc4..40be6e1ca 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -67,7 +67,11 @@ void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage { mpObj = pObj; mnShowPage = nShowPage; - mxSlideShow.clear(); + if (mxSlideShow.is()) + { + mxSlideShow->end(); + mxSlideShow.clear(); + } updateViewSettings(); } -- cgit v1.2.3 From 071967274c1a159dccc0d48b43794fbb3860bbc4 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Mon, 27 Apr 2009 11:23:14 +0000 Subject: #i98792# Allow frequent calls to slide show update(). --- sd/source/ui/slideshow/slideshowimpl.cxx | 82 ++++++++++++++++++++++---------- sd/source/ui/slideshow/slideshowimpl.hxx | 8 ++++ 2 files changed, 64 insertions(+), 26 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index cb7a23a39..b9220838c 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -772,6 +772,9 @@ void SAL_CALL SlideshowImpl::disposing() setActiveXToolbarsVisible( sal_True ); + Application::EnableNoYieldMode(false); + Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener)); + mbDisposed = true; } @@ -1867,11 +1870,34 @@ IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG ) { mnUpdateEvent = 0; + return updateSlideShow(); +} + + + + +IMPL_LINK( SlideshowImpl, PostYieldListener, void*, EMPTYARG ) +{ + Application::EnableNoYieldMode(false); + Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener)); + if (mbDisposed) + return 0; + return updateSlideShow(); +} + + + + +sal_Int32 SlideshowImpl::updateSlideShow (void) +{ // doing some nMagic const rtl::Reference this_(this); Reference< XSlideShow > xShow( mxShow ); - if( xShow.is() ) try + if ( ! xShow.is()) + return 0; + + try { // TODO(Q3): Evaluate under various systems and setups, // whether this is really necessary. Under WinXP and Matrox @@ -1886,32 +1912,37 @@ IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG ) if( !xShow->update(fUpdate) ) fUpdate = -1.0; - if( mxShow.is() && ( fUpdate >= 0.0 ) ) + if (mxShow.is() && (fUpdate >= 0.0)) { -/* - if( fUpdate < 0.25 ) + if (::basegfx::fTools::equalZero(fUpdate)) { - mnUpdateEvent = Application::PostUserEvent(LINK(this, SlideshowImpl, updateHdl)); + // Use post yield listener for short update intervalls. + Application::EnableNoYieldMode(true); + Application::AddPostYieldListener(LINK(this, SlideshowImpl, PostYieldListener)); } else -*/ { // Avoid busy loop when the previous call to update() - // returns 0. The minimum value is small enough to allow - // high frame rates. Values larger than 0 are typically - // also larger then the small minimum value and thus are - // used to determine the frame rate. - const float MIN_UPDATE = 0.01f; // 10ms corresponds to 100 frames per second. - if( fUpdate < MIN_UPDATE ) - fUpdate = MIN_UPDATE; - else - { - const float MAX_UPDATE = 4.0f; // do not wait longer than 4 seconds for next refresh, because dilbert said so - if( fUpdate > MAX_UPDATE ) - fUpdate = MAX_UPDATE; - } - maUpdateTimer.SetTimeout( - ::std::max( 1UL, static_cast(fUpdate * 1000.0) ) ); + // returns a small positive number but not 0 (which is + // handled above). Also, make sure that calls to update() + // have a minimum frequency. + // => Allow up to 60 frames per second. Call at least once + // every 4 seconds. + const static sal_Int32 mnMaximumFrameCount (60); + const static double mnMinimumTimeout (1.0 / mnMaximumFrameCount); + const static double mnMaximumTimeout (4.0); + fUpdate = ::basegfx::clamp(fUpdate, mnMinimumTimeout, mnMaximumTimeout); + + // Make sure that the maximum frame count has not been set + // too high (only then conversion to milliseconds and long + // integer may lead to zero value.) + OSL_ASSERT(static_cast(fUpdate * 1000.0) > 0); + + Application::EnableNoYieldMode(false); + Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener)); + + // Use a timer for the asynchronous callback. + maUpdateTimer.SetTimeout(static_cast(fUpdate * 1000.0)); maUpdateTimer.Start(); } } @@ -1920,11 +1951,10 @@ IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG ) { static_cast(e); DBG_ERROR( - (OString("sd::SlideshowImpl::updateHdl(), " - "exception caught: ") + - rtl::OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 )).getStr() ); + (OString("sd::SlideshowImpl::updateSlideShow(), exception caught: ") + + rtl::OUStringToOString( + comphelper::anyToString( cppu::getCaughtException() ), + RTL_TEXTENCODING_UTF8 )).getStr() ); } return 0; } diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index b6923fe35..49dc1df6a 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -298,6 +298,7 @@ private: void setActiveXToolbarsVisible( sal_Bool bVisible ); DECL_LINK( updateHdl, Timer* ); + DECL_LINK( PostYieldListener, void* ); DECL_LINK( ReadyForNextInputHdl, Timer* ); DECL_LINK( endPresentationHdl, void* ); DECL_LINK( ContextMenuSelectHdl, Menu * ); @@ -333,6 +334,13 @@ private: void setAutoSaveState( bool bOn ); void gotoPreviousSlide (const bool bSkipAllMainSequenceEffects); + /** Called by PostYieldListener and updateHdl handlers this method is + responsible to call the slideshow update() method and, depending on + its return value, wait for a certain amount of time before another + call to update() is scheduled. + */ + sal_Int32 updateSlideShow (void); + css::uno::Reference< css::presentation::XSlideShow > mxShow; comphelper::ImplementationReference< ::sd::SlideShowView, css::presentation::XSlideShowView > mxView; css::uno::Reference< css::frame::XModel > mxModel; -- cgit v1.2.3 From f5cc46b3ab90d5749ebc6d6dd559a8bca3a2105b Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Mon, 13 Jul 2009 11:08:01 +0000 Subject: #i1601# sentence case transliteration --- sd/sdi/_drvwsh.sdi | 5 +++++ sd/sdi/outlnvsh.sdi | 5 +++++ sd/source/ui/view/drviewse.cxx | 8 +++++++- sd/source/ui/view/drviewsf.cxx | 1 + sd/source/ui/view/outlnvsh.cxx | 10 ++++++++-- sd/uiconfig/sdraw/menubar/menubar.xml | 1 + sd/uiconfig/simpress/menubar/menubar.xml | 1 + 7 files changed, 28 insertions(+), 3 deletions(-) (limited to 'sd') diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 1460c5165..d289938c0 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2181,6 +2181,11 @@ interface DrawView ExecMethod = FuSupport ; StateMethod = GetCtrlState ; ] + SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ? + [ + ExecMethod = FuSupport ; + StateMethod = GetCtrlState ; + ] SID_TRANSLITERATE_HALFWIDTH // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index c8b1b7a95..9413659d7 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -446,6 +446,11 @@ interface OutlineView ExecMethod = FuSupport ; StateMethod = GetCtrlState ; ] + SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ? + [ + ExecMethod = FuSupport ; + StateMethod = GetCtrlState ; + ] SID_TRANSLITERATE_HALFWIDTH // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index d580c4423..b7a4b9379 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -34,7 +34,9 @@ #include #include #include -#include +#include +#include + #include @@ -1388,6 +1390,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_TRANSLITERATE_UPPER: case SID_TRANSLITERATE_LOWER: + case SID_TRANSLITERATE_SENTENCE_CASE: case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: @@ -1407,6 +1410,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_TRANSLITERATE_LOWER: nType = TransliterationModules_UPPERCASE_LOWERCASE; break; + case SID_TRANSLITERATE_SENTENCE_CASE: + nType = TransliterationModulesExtra::SENTENCE_CASE; + break; case SID_TRANSLITERATE_HALFWIDTH: nType = TransliterationModules_FULLWIDTH_HALFWIDTH; break; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 8e1a0b55d..3d3fb0c44 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -256,6 +256,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) rSet.DisableItem( SID_TRANSLITERATE_UPPER ); rSet.DisableItem( SID_TRANSLITERATE_LOWER ); + rSet.DisableItem( SID_TRANSLITERATE_SENTENCE_CASE ); rSet.DisableItem( SID_TRANSLITERATE_HALFWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_FULLWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_HIRAGANA ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index dada4aa6c..da36bf60c 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -63,7 +63,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -538,6 +539,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) if( pOlView && ( (nSlot == SID_TRANSLITERATE_UPPER) || (nSlot == SID_TRANSLITERATE_LOWER) || + (nSlot == SID_TRANSLITERATE_SENTENCE_CASE) || (nSlot == SID_TRANSLITERATE_HALFWIDTH) || (nSlot == SID_TRANSLITERATE_FULLWIDTH) || (nSlot == SID_TRANSLITERATE_HIRAGANA) || @@ -671,6 +673,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_TRANSLITERATE_UPPER: case SID_TRANSLITERATE_LOWER: + case SID_TRANSLITERATE_SENTENCE_CASE: case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: @@ -690,6 +693,9 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_TRANSLITERATE_LOWER: nType = TransliterationModules_UPPERCASE_LOWERCASE; break; + case SID_TRANSLITERATE_SENTENCE_CASE: + nType = TransliterationModulesExtra::SENTENCE_CASE; + break; case SID_TRANSLITERATE_HALFWIDTH: nType = TransliterationModules_FULLWIDTH_HALFWIDTH; break; @@ -996,7 +1002,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) GetDoc()->SetChanged(TRUE); } - // Da šberladen, muss hier der Status gesetzt werden + // Da �berladen, muss hier der Status gesetzt werden if( !GetDocSh()->IsModified() ) { rSet.DisableItem( SID_SAVEDOC ); diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index e34baec0f..d9574ec48 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -185,6 +185,7 @@ + diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index ece53ad4c..578bd89af 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -203,6 +203,7 @@ + -- cgit v1.2.3 From f3a31fa3769eabe6d972283881e34eef49477bad Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Mon, 13 Jul 2009 12:48:12 +0000 Subject: undoing r273933 which was accidently commited on master m51 --- sd/sdi/_drvwsh.sdi | 5 ----- sd/sdi/outlnvsh.sdi | 5 ----- sd/source/ui/view/drviewse.cxx | 8 +------- sd/source/ui/view/drviewsf.cxx | 1 - sd/source/ui/view/outlnvsh.cxx | 10 ++-------- sd/uiconfig/sdraw/menubar/menubar.xml | 1 - sd/uiconfig/simpress/menubar/menubar.xml | 1 - 7 files changed, 3 insertions(+), 28 deletions(-) (limited to 'sd') diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index d289938c0..1460c5165 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2181,11 +2181,6 @@ interface DrawView ExecMethod = FuSupport ; StateMethod = GetCtrlState ; ] - SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ? - [ - ExecMethod = FuSupport ; - StateMethod = GetCtrlState ; - ] SID_TRANSLITERATE_HALFWIDTH // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index 9413659d7..c8b1b7a95 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -446,11 +446,6 @@ interface OutlineView ExecMethod = FuSupport ; StateMethod = GetCtrlState ; ] - SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ? - [ - ExecMethod = FuSupport ; - StateMethod = GetCtrlState ; - ] SID_TRANSLITERATE_HALFWIDTH // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index b7a4b9379..d580c4423 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -34,9 +34,7 @@ #include #include #include -#include -#include - +#include #include @@ -1390,7 +1388,6 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_TRANSLITERATE_UPPER: case SID_TRANSLITERATE_LOWER: - case SID_TRANSLITERATE_SENTENCE_CASE: case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: @@ -1410,9 +1407,6 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_TRANSLITERATE_LOWER: nType = TransliterationModules_UPPERCASE_LOWERCASE; break; - case SID_TRANSLITERATE_SENTENCE_CASE: - nType = TransliterationModulesExtra::SENTENCE_CASE; - break; case SID_TRANSLITERATE_HALFWIDTH: nType = TransliterationModules_FULLWIDTH_HALFWIDTH; break; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 3d3fb0c44..8e1a0b55d 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -256,7 +256,6 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) rSet.DisableItem( SID_TRANSLITERATE_UPPER ); rSet.DisableItem( SID_TRANSLITERATE_LOWER ); - rSet.DisableItem( SID_TRANSLITERATE_SENTENCE_CASE ); rSet.DisableItem( SID_TRANSLITERATE_HALFWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_FULLWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_HIRAGANA ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index da36bf60c..dada4aa6c 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -63,8 +63,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -539,7 +538,6 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) if( pOlView && ( (nSlot == SID_TRANSLITERATE_UPPER) || (nSlot == SID_TRANSLITERATE_LOWER) || - (nSlot == SID_TRANSLITERATE_SENTENCE_CASE) || (nSlot == SID_TRANSLITERATE_HALFWIDTH) || (nSlot == SID_TRANSLITERATE_FULLWIDTH) || (nSlot == SID_TRANSLITERATE_HIRAGANA) || @@ -673,7 +671,6 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_TRANSLITERATE_UPPER: case SID_TRANSLITERATE_LOWER: - case SID_TRANSLITERATE_SENTENCE_CASE: case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: @@ -693,9 +690,6 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_TRANSLITERATE_LOWER: nType = TransliterationModules_UPPERCASE_LOWERCASE; break; - case SID_TRANSLITERATE_SENTENCE_CASE: - nType = TransliterationModulesExtra::SENTENCE_CASE; - break; case SID_TRANSLITERATE_HALFWIDTH: nType = TransliterationModules_FULLWIDTH_HALFWIDTH; break; @@ -1002,7 +996,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) GetDoc()->SetChanged(TRUE); } - // Da �berladen, muss hier der Status gesetzt werden + // Da šberladen, muss hier der Status gesetzt werden if( !GetDocSh()->IsModified() ) { rSet.DisableItem( SID_SAVEDOC ); diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index d9574ec48..e34baec0f 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -185,7 +185,6 @@ - diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 578bd89af..ece53ad4c 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -203,7 +203,6 @@ - -- cgit v1.2.3 From c02d6d1f2e8fdc01bfa811c88fd2aaa64fe75526 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 30 Jul 2009 09:37:08 +0200 Subject: more dependencies fixed --- sd/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/prj/build.lst b/sd/prj/build.lst index 40e6ed16e..5b0308d15 100644 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -1,4 +1,4 @@ -sd sd : l10n animations svx stoc uui canvas NULL +sd sd : l10n animations svx stoc canvas NULL sd sd usr1 - all sd_mkout NULL sd sd\inc nmake - all sd_inc NULL sd sd\prj get - all sd_prj NULL -- cgit v1.2.3 From 9a37558e9107c6ce50cc1481f077b723e11ae213 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Tue, 15 Sep 2009 16:06:13 +0200 Subject: #i97509# seperated base and buffered classes for 2D and 3D, adapted aqll usages --- .../view/SlsPageObjectViewObjectContact.cxx | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 80bcca168..0c35758f3 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -256,7 +256,7 @@ namespace sd { namespace slidesorter { namespace view { // class for all derived SdPageObjectPrimitives. The SdPageObjectBasePrimitive itself // is pure virtual -class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BasePrimitive2D +class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BufDecPrimitive2D { private: // the inner range of the SdPageObject visualisation @@ -271,11 +271,11 @@ public: const basegfx::B2DRange& getPageObjectRange() const { return maRange; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; }; SdPageObjectBasePrimitive::SdPageObjectBasePrimitive(const basegfx::B2DRange& rRange) -: drawinglayer::primitive2d::BasePrimitive2D(), +: drawinglayer::primitive2d::BufDecPrimitive2D(), maRange(rRange) { } @@ -284,9 +284,9 @@ SdPageObjectBasePrimitive::~SdPageObjectBasePrimitive() { } -bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const +bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const { - if(drawinglayer::primitive2d::BasePrimitive2D::operator==(rPrimitive)) + if(drawinglayer::primitive2d::BufDecPrimitive2D::operator==(rPrimitive)) { const SdPageObjectBasePrimitive& rCompare = static_cast< const SdPageObjectBasePrimitive& >(rPrimitive); return (getPageObjectRange() == rCompare.getPageObjectRange()); @@ -306,7 +306,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -319,13 +319,13 @@ public: const BitmapEx& getBitmapEx() const { return maBitmapEx; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() }; -Primitive2DSequence SdPageObjectPageBitmapPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectPageBitmapPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // add bitmap primitive // to avoid scaling, use the Bitmap pixel size as primitive size @@ -358,7 +358,7 @@ SdPageObjectPageBitmapPrimitive::~SdPageObjectPageBitmapPrimitive() { } -bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const +bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -385,7 +385,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -399,7 +399,7 @@ public: const sal_Int32 SdPageObjectSelectPrimitive::mnSelectionIndicatorOffset(1); const sal_Int32 SdPageObjectSelectPrimitive::mnSelectionIndicatorThickness(3); -Primitive2DSequence SdPageObjectSelectPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectSelectPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { Primitive2DSequence xRetval(2); @@ -470,7 +470,7 @@ class SdPageObjectBorderPrimitive : public SdPageObjectBasePrimitive { protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -481,7 +481,7 @@ public: DeclPrimitrive2DIDBlock() }; -Primitive2DSequence SdPageObjectBorderPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectBorderPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // since old Width/Height calculations always added a single pixel value, // it is necessary to create a inner range which is one display unit less @@ -523,7 +523,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -536,7 +536,7 @@ public: const sal_Int32 SdPageObjectFocusPrimitive::mnFocusIndicatorOffset(2); -Primitive2DSequence SdPageObjectFocusPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectFocusPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { Primitive2DSequence xRetval(2); @@ -618,7 +618,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -641,7 +641,7 @@ public: bool getExcluded() const { return mbExcluded; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() @@ -666,7 +666,7 @@ const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getFadeEffectIconBitmap() c return *mpFadeEffectIconBitmap; } -Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { const xub_StrLen nTextLength(getPageName().Len()); const sal_uInt32 nCount( @@ -866,7 +866,7 @@ SdPageObjectFadeNameNumberPrimitive::~SdPageObjectFadeNameNumberPrimitive() { } -bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const +bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -1150,7 +1150,7 @@ void PageObjectViewObjectContact::ActionChanged (void) // Very simple primitive which just remembers the discrete data and applies // it at decomposition time. -class MouseOverEffectPrimitive : public drawinglayer::primitive2d::BasePrimitive2D +class MouseOverEffectPrimitive : public drawinglayer::primitive2d::BufDecPrimitive2D { private: basegfx::B2DRange maLogicRange; @@ -1159,7 +1159,7 @@ private: basegfx::BColor maRGBColor; protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createLocalDecomposition( + virtual drawinglayer::primitive2d::Primitive2DSequence createLocal2DDecomposition( const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: @@ -1168,7 +1168,7 @@ public: sal_uInt32 nDiscreteOffset, sal_uInt32 nDiscreteWidth, const basegfx::BColor& rRGBColor) - : drawinglayer::primitive2d::BasePrimitive2D(), + : drawinglayer::primitive2d::BufDecPrimitive2D(), maLogicRange(rLogicRange), mnDiscreteOffset(nDiscreteOffset), mnDiscreteWidth(nDiscreteWidth), @@ -1181,12 +1181,12 @@ public: sal_uInt32 getDiscreteWidth() const { return mnDiscreteWidth; } const basegfx::BColor& getRGBColor() const { return maRGBColor; } - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; DeclPrimitrive2DIDBlock() }; -drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createLocalDecomposition( +drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createLocal2DDecomposition( const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // get logic sizes in object coordinate system @@ -1214,9 +1214,9 @@ drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createL return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); } -bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const +bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const { - if(drawinglayer::primitive2d::BasePrimitive2D::operator==(rPrimitive)) + if(drawinglayer::primitive2d::BufDecPrimitive2D::operator==(rPrimitive)) { const MouseOverEffectPrimitive& rCompare = static_cast< const MouseOverEffectPrimitive& >(rPrimitive); -- cgit v1.2.3 From fdc110e39038428ceca82e26cd7979a3f220ac9b Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Tue, 15 Sep 2009 19:08:28 +0200 Subject: #i97509# changed base classes for primitives which need no buffering --- .../view/SlsPageObjectViewObjectContact.cxx | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 0c35758f3..5b872c8d0 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -256,7 +256,7 @@ namespace sd { namespace slidesorter { namespace view { // class for all derived SdPageObjectPrimitives. The SdPageObjectBasePrimitive itself // is pure virtual -class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BufDecPrimitive2D +class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BufferedDecompositionPrimitive2D { private: // the inner range of the SdPageObject visualisation @@ -271,11 +271,11 @@ public: const basegfx::B2DRange& getPageObjectRange() const { return maRange; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; }; SdPageObjectBasePrimitive::SdPageObjectBasePrimitive(const basegfx::B2DRange& rRange) -: drawinglayer::primitive2d::BufDecPrimitive2D(), +: drawinglayer::primitive2d::BufferedDecompositionPrimitive2D(), maRange(rRange) { } @@ -284,9 +284,9 @@ SdPageObjectBasePrimitive::~SdPageObjectBasePrimitive() { } -bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const +bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const { - if(drawinglayer::primitive2d::BufDecPrimitive2D::operator==(rPrimitive)) + if(drawinglayer::primitive2d::BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { const SdPageObjectBasePrimitive& rCompare = static_cast< const SdPageObjectBasePrimitive& >(rPrimitive); return (getPageObjectRange() == rCompare.getPageObjectRange()); @@ -319,7 +319,7 @@ public: const BitmapEx& getBitmapEx() const { return maBitmapEx; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() @@ -358,7 +358,7 @@ SdPageObjectPageBitmapPrimitive::~SdPageObjectPageBitmapPrimitive() { } -bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const +bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -641,7 +641,7 @@ public: bool getExcluded() const { return mbExcluded; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() @@ -866,7 +866,7 @@ SdPageObjectFadeNameNumberPrimitive::~SdPageObjectFadeNameNumberPrimitive() { } -bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const +bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -1150,7 +1150,7 @@ void PageObjectViewObjectContact::ActionChanged (void) // Very simple primitive which just remembers the discrete data and applies // it at decomposition time. -class MouseOverEffectPrimitive : public drawinglayer::primitive2d::BufDecPrimitive2D +class MouseOverEffectPrimitive : public drawinglayer::primitive2d::BufferedDecompositionPrimitive2D { private: basegfx::B2DRange maLogicRange; @@ -1168,7 +1168,7 @@ public: sal_uInt32 nDiscreteOffset, sal_uInt32 nDiscreteWidth, const basegfx::BColor& rRGBColor) - : drawinglayer::primitive2d::BufDecPrimitive2D(), + : drawinglayer::primitive2d::BufferedDecompositionPrimitive2D(), maLogicRange(rLogicRange), mnDiscreteOffset(nDiscreteOffset), mnDiscreteWidth(nDiscreteWidth), @@ -1181,7 +1181,7 @@ public: sal_uInt32 getDiscreteWidth() const { return mnDiscreteWidth; } const basegfx::BColor& getRGBColor() const { return maRGBColor; } - virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; DeclPrimitrive2DIDBlock() }; @@ -1214,9 +1214,9 @@ drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createL return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); } -bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const +bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const { - if(drawinglayer::primitive2d::BufDecPrimitive2D::operator==(rPrimitive)) + if(drawinglayer::primitive2d::BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { const MouseOverEffectPrimitive& rCompare = static_cast< const MouseOverEffectPrimitive& >(rPrimitive); -- cgit v1.2.3 From 650a245a560c72defc426388020f712bec8ccaf2 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Thu, 17 Sep 2009 17:20:13 +0200 Subject: #i97509# added base class for 3d primitive, re-structured group primitives, added documentation --- .../view/SlsPageObjectViewObjectContact.cxx | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 5b872c8d0..d4a375143 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -271,7 +271,7 @@ public: const basegfx::B2DRange& getPageObjectRange() const { return maRange; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; }; SdPageObjectBasePrimitive::SdPageObjectBasePrimitive(const basegfx::B2DRange& rRange) @@ -284,7 +284,7 @@ SdPageObjectBasePrimitive::~SdPageObjectBasePrimitive() { } -bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const +bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const { if(drawinglayer::primitive2d::BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { @@ -306,7 +306,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -319,13 +319,13 @@ public: const BitmapEx& getBitmapEx() const { return maBitmapEx; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() }; -Primitive2DSequence SdPageObjectPageBitmapPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectPageBitmapPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // add bitmap primitive // to avoid scaling, use the Bitmap pixel size as primitive size @@ -358,7 +358,7 @@ SdPageObjectPageBitmapPrimitive::~SdPageObjectPageBitmapPrimitive() { } -bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const +bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -385,7 +385,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -399,7 +399,7 @@ public: const sal_Int32 SdPageObjectSelectPrimitive::mnSelectionIndicatorOffset(1); const sal_Int32 SdPageObjectSelectPrimitive::mnSelectionIndicatorThickness(3); -Primitive2DSequence SdPageObjectSelectPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectSelectPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { Primitive2DSequence xRetval(2); @@ -470,7 +470,7 @@ class SdPageObjectBorderPrimitive : public SdPageObjectBasePrimitive { protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -481,7 +481,7 @@ public: DeclPrimitrive2DIDBlock() }; -Primitive2DSequence SdPageObjectBorderPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectBorderPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // since old Width/Height calculations always added a single pixel value, // it is necessary to create a inner range which is one display unit less @@ -523,7 +523,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -536,7 +536,7 @@ public: const sal_Int32 SdPageObjectFocusPrimitive::mnFocusIndicatorOffset(2); -Primitive2DSequence SdPageObjectFocusPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectFocusPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { Primitive2DSequence xRetval(2); @@ -618,7 +618,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -641,7 +641,7 @@ public: bool getExcluded() const { return mbExcluded; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() @@ -666,7 +666,7 @@ const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getFadeEffectIconBitmap() c return *mpFadeEffectIconBitmap; } -Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { const xub_StrLen nTextLength(getPageName().Len()); const sal_uInt32 nCount( @@ -866,7 +866,7 @@ SdPageObjectFadeNameNumberPrimitive::~SdPageObjectFadeNameNumberPrimitive() { } -bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const +bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -1159,7 +1159,7 @@ private: basegfx::BColor maRGBColor; protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createLocal2DDecomposition( + virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition( const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: @@ -1181,12 +1181,12 @@ public: sal_uInt32 getDiscreteWidth() const { return mnDiscreteWidth; } const basegfx::BColor& getRGBColor() const { return maRGBColor; } - virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; DeclPrimitrive2DIDBlock() }; -drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createLocal2DDecomposition( +drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::create2DDecomposition( const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // get logic sizes in object coordinate system @@ -1214,7 +1214,7 @@ drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createL return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); } -bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const +bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const { if(drawinglayer::primitive2d::BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { -- cgit v1.2.3 From 2636c920887453e26619be9783ed414b8b9b28d2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 19 Sep 2009 00:02:22 +0200 Subject: better dependencies for sdi files --- sd/sdi/ViewShellBase.sdi | 176 +++++++++++++++++++++++------------------------ sd/sdi/_docsh.sdi | 4 +- sd/sdi/docshell.sdi | 4 +- sd/sdi/grdocsh.sdi | 4 +- sd/sdi/makefile.mk | 14 +++- sd/sdi/sdgslots.sdi | 11 +-- sd/sdi/sdslots.sdi | 11 +-- sd/sdi/svxitems.sdi | 93 ------------------------- 8 files changed, 120 insertions(+), 197 deletions(-) delete mode 100644 sd/sdi/svxitems.sdi (limited to 'sd') diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index 83355d274..67d9cfb1e 100644 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,78 +89,78 @@ SfxInt32Item SwitchViewShellPane SID_SWITCH_SHELL_PANE SfxBoolItem LeftPaneImpress SID_LEFT_PANE_IMPRESS [ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Asynchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_MODIFY; ] SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW [ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Asynchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_MODIFY; ] SfxBoolItem RightPane SID_RIGHT_PANE [ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Asynchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_MODIFY; ] @@ -193,52 +193,52 @@ SfxVoidItem NotesChildWindow SID_NOTES_WINDOW SfxBoolItem NormalMultiPaneGUI SID_NORMAL_MULTI_PANE_GUI [ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Asynchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_MODIFY; ] SfxBoolItem SlideSorterMultiPaneGUI SID_SLIDE_SORTER_MULTI_PANE_GUI [ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, RecordPerSet; Asynchron; - Readonly = FALSE, + Readonly = FALSE, - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_MODIFY; ] @@ -267,7 +267,7 @@ SfxVoidItem TaskPaneShowPanel SID_TASK_PANE ( GroupId = GID_VIEW; ] -interface ViewShellBaseView : View +interface ViewShellBaseView { SID_SWITCH_SHELL [ @@ -353,26 +353,26 @@ interface ViewShellBaseView : View ExecMethod = Execute ; StateMethod = GetState ; ] - SID_INSERT_RLM + SID_INSERT_RLM [ ExecMethod = Execute ; StateMethod = GetState ; ] - SID_INSERT_LRM + SID_INSERT_LRM [ ExecMethod = Execute ; StateMethod = GetState ; ] - SID_INSERT_ZWSP + SID_INSERT_ZWSP [ ExecMethod = Execute ; StateMethod = GetState ; ] - SID_INSERT_ZWNBSP + SID_INSERT_ZWNBSP [ ExecMethod = Execute ; StateMethod = GetState ; - ] + ] SID_RESTORE_EDITING_VIEW [ ExecMethod = Execute ; @@ -380,7 +380,7 @@ interface ViewShellBaseView : View ] } -shell ViewShellBase : SfxViewShell +shell ViewShellBase { import ViewShellBaseView[Automation]; } diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi index 743488de6..6d3267aac 100644 --- a/sd/sdi/_docsh.sdi +++ b/sd/sdi/_docsh.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -interface DrawDocument : OfficeDocument +interface DrawDocument { SID_PACKNGO // ole : ?, status : ? [ diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi index 2ee927d9e..159bd0522 100644 --- a/sd/sdi/docshell.sdi +++ b/sd/sdi/docshell.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ interface ImpressDocument : DrawDocument { } -shell DrawDocShell : SfxObjectShell +shell DrawDocShell { import ImpressDocument[Automation]; } diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi index 3e9915b07..4cd3ef0c9 100644 --- a/sd/sdi/grdocsh.sdi +++ b/sd/sdi/grdocsh.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ interface GraphicDocument : DrawDocument { } -shell GraphicDocShell : SfxObjectShell +shell GraphicDocShell { import GraphicDocument[Automation]; } diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk index a442c65e8..8730d637e 100644 --- a/sd/sdi/makefile.mk +++ b/sd/sdi/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -50,6 +50,11 @@ SDI2NAME=$(TARGET2) SIDHRCNAME=SDSLOTS.HRC SVSDI1DEPEND= \ + $(SOLARINCXDIR)$/sfx2/sfx.sdi \ + $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ + $(SOLARINCXDIR)$/svx/svx.sdi \ + $(SOLARINCXDIR)$/svx/svxitems.sdi \ + $(SOLARINCXDIR)$/svx/xoitems.sdi \ sdraw.sdi \ app.sdi \ _docsh.sdi \ @@ -69,7 +74,12 @@ SVSDI1DEPEND= \ $(PRJ)$/inc$/app.hrc SVSDI2DEPEND= \ - sdraw.sdi \ + $(SOLARINCXDIR)$/sfx2/sfx.sdi \ + $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ + $(SOLARINCXDIR)$/svx/svx.sdi \ + $(SOLARINCXDIR)$/svx/svxitems.sdi \ + $(SOLARINCXDIR)$/svx/xoitems.sdi \ + sdraw.sdi \ app.sdi \ _docsh.sdi \ grdocsh.sdi \ diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi index 8b985b103..b650a467f 100644 --- a/sd/sdi/sdgslots.sdi +++ b/sd/sdi/sdgslots.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,8 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -import "svxslots.ilb" - module "2DADF501-1F00-101C-A2E4-00001B4C5CE7" "33A1C840-1F00-101C-A2E4-00001B4C5CE7" @@ -36,10 +34,15 @@ StarDraw [ HelpText( "StarDraw Application" ) SlotIdFile( "sdslots.hrc" ) -TypeLibFile( "sdgslots.tlb" ) ModulePrefix( "Sd" ) ] { + include "sfxitems.sdi" + include "sfx.sdi" + include "svxitems.sdi" + include "xoitems.sdi" + include "svx.sdi" + item UINT16 TbxImageItem; enum FadeEffect diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi index db542fd44..3a0862a17 100644 --- a/sd/sdi/sdslots.sdi +++ b/sd/sdi/sdslots.sdi @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,8 +28,6 @@ * ************************************************************************/ -import "svxslots.ilb" - module "2DADF501-1F00-101C-A2E4-00001B4C5CE7" "33A1C840-1F00-101C-A2E4-00001B4C5CE7" @@ -37,10 +35,15 @@ StarDraw [ HelpText( "StarDraw Application" ) SlotIdFile( "sdslots.hrc" ) -TypeLibFile( "sdslots.tlb" ) ModulePrefix( "Sd" ) ] { + include "sfx2/sfxitems.sdi" + include "sfx2/sfx.sdi" + include "svx/svxitems.sdi" + include "svx/xoitems.sdi" + include "svx/svx.sdi" + item UINT16 TbxImageItem; enum FadeEffect diff --git a/sd/sdi/svxitems.sdi b/sd/sdi/svxitems.sdi deleted file mode 100644 index 42d036d4e..000000000 --- a/sd/sdi/svxitems.sdi +++ /dev/null @@ -1,93 +0,0 @@ -enum SvxAdjust -{ - SVX_ADJUST_LEFT, - SVX_ADJUST_RIGHT, - SVX_ADJUST_BLOCK, - SVX_ADJUST_CENTER, - SVX_ADJUST_BLOCKLINE, - SVX_ADJUST_END -} - -item -{ - INT16 Red; - INT16 Green; - INT16 Blue; -} SvxColorItem - -item SvxAdjust SvxAdjustItem; - -item String SvxBoxInfoItem; - -item String SvxBoxItem; -item String SvxBrushItem; -item String SvxCaseMapItem; -item String SvxCharSetColorItem; -item String SvxColumnItem; -item String SvxContourItem; -item String SvxCrossedOutItem; -item String SvxDBDescMgr; -item String SvxDbTypeItem; -item String SvxEscapementItem; -item String SvxFmtBreakItem; -item String SvxFmtSplitItem; -item String SvxFontHeightItem; -item String SvxFontItem; -item String SvxFontListItem; -item String SvxHyphenZoneItem; -item String SvxInFrameItem; -item String SvxKerningItem; -item String SvxLRSpaceItem; -item String SvxLanguageItem; -item String SvxLineSpacingItem; -item String SvxMacroItem; -item String SvxNoHyphenItem; -item String SvxNoLinebreakItem; -item String SvxNumberInfoItem; -item String SvxOpaqueItem; -item String SvxOrphansItem; -item String SvxOverlineItem; -item String SvxPageItem; -item String SvxPageModelItem; -item String SvxPagePosSizeItem; -item String SvxPaperBinItem; -item String SvxParaDlgLimitsItem; -item String SvxPostItAuthorItem; -item String SvxPostItDateItem; -item String SvxPostItTextItem; -item String SvxPostureItem; -item String SvxPrintItem; -item String SvxPropSizeItem; -item String SvxProtectItem; -item String SvxPtrItem; -item String SvxRulerItem; -item String SvxSearchItem; -item String SvxSearchControllerItem; -item String SvxSearchItem; -item String SvxSetItem; -item String SvxShadowedItem; -item String SvxShadowItem; -item String SvxSizeItem; -item String SvxTabStopItem; -item String SvxULSpaceItem; -item String SvxUnderlineItem; -item String SvxWeightItem; -item String SvxWidowsItem; -item String SvxWordLineModeItem; -item String XFillAttrSetItem; -item String XFillBitmapItem; -item String XFillColorItem; -item String XFillGradientItem; -item String XFillHatchItem; -item String XFillStyleItem; -item String XLineAttrSetItem; -item String XLineColorItem; -item String XLineDashItem; -item String XLineEndItem; -item String XLineEndWidthItem; -item String XLineEndCenterItem; -item String XLineStartItem; -item String XLineStartWidthItem; -item String XLineStartCenterItem; -item String XLineStyleItem; -item String XLineWidthItem; -- cgit v1.2.3 From 1e5c5db0b574c59c11afb58f2ee15cca1891dddd Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Tue, 22 Sep 2009 18:14:05 +0200 Subject: #i97509# continued matrix tooling and adapting the usages now to all the ooo code --- sd/source/core/CustomAnimationEffect.cxx | 19 ++++-------- sd/source/ui/animations/motionpathtag.cxx | 8 ++--- sd/source/ui/func/fumorph.cxx | 18 +++++------ sd/source/ui/slideshow/slideshowviewimpl.cxx | 12 +++----- sd/source/ui/slidesorter/view/SlsViewOverlay.cxx | 5 +-- sd/source/ui/view/PrintManager.cxx | 7 +++-- sd/source/ui/view/sdview.cxx | 10 +++--- .../source/engine/shapes/viewbackgroundshape.cxx | 8 ++--- slideshow/source/engine/shapes/viewshape.cxx | 6 ++-- slideshow/source/engine/slidebitmap.cxx | 5 ++- slideshow/source/engine/tools.cxx | 8 ++--- .../source/engine/transitions/barndoorwipe.cxx | 7 ++--- .../source/engine/transitions/clippingfunctor.cxx | 14 ++++----- slideshow/source/engine/transitions/clockwipe.cxx | 5 ++- .../source/engine/transitions/combtransition.cxx | 23 ++++---------- slideshow/source/engine/transitions/fanwipe.cxx | 22 ++++++------- slideshow/source/engine/transitions/figurewipe.cxx | 6 ++-- .../source/engine/transitions/fourboxwipe.cxx | 20 ++++++------ slideshow/source/engine/transitions/iriswipe.cxx | 8 ++--- .../source/engine/transitions/pinwheelwipe.cxx | 11 ++----- slideshow/source/engine/transitions/randomwipe.cxx | 5 ++- .../source/engine/transitions/slidechangebase.cxx | 6 ++-- slideshow/source/engine/transitions/snakewipe.cxx | 36 +++++++++++++--------- slideshow/source/engine/transitions/spiralwipe.cxx | 7 ++--- slideshow/source/engine/transitions/sweepwipe.cxx | 21 ++++++++----- .../source/engine/transitions/transitiontools.cxx | 11 ++----- .../source/engine/transitions/waterfallwipe.cxx | 5 ++- slideshow/source/engine/transitions/zigzagwipe.cxx | 9 +++--- slideshow/test/demoshow.cxx | 9 ++---- 29 files changed, 149 insertions(+), 182 deletions(-) (limited to 'sd') diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index ffa177801..79ec60739 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -69,6 +69,7 @@ #include #include #include +#include #include @@ -1715,21 +1716,16 @@ void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj ) SdrObject* pObj = GetSdrObjectFromXShape( getTargetShape() ); if( pObj ) { - ::basegfx::B2DHomMatrix aTransform; - SdrPage* pPage = pObj->GetPage(); if( pPage ) { const Size aPageSize( pPage->GetSize() ); - aTransform.scale( (double)aPageSize.Width(), (double)aPageSize.Height() ); - xPolyPoly.transform( aTransform ); - aTransform.identity(); + xPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix((double)aPageSize.Width(), (double)aPageSize.Height())); } const Rectangle aBoundRect( pObj->GetCurrentBoundRect() ); const Point aCenter( aBoundRect.Center() ); - aTransform.translate( aCenter.X(), aCenter.Y() ); - xPolyPoly.transform( aTransform ); + xPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(aCenter.X(), aCenter.Y())); } } @@ -1748,17 +1744,14 @@ void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj const Rectangle aBoundRect( pObj->GetCurrentBoundRect() ); const Point aCenter( aBoundRect.Center() ); - ::basegfx::B2DHomMatrix aTransform; - aTransform.translate( -aCenter.X(), -aCenter.Y() ); - xPolyPoly.transform( aTransform ); + xPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aCenter.X(), -aCenter.Y())); SdrPage* pPage = pObj->GetPage(); if( pPage ) { - aTransform.identity(); const Size aPageSize( pPage->GetSize() ); - aTransform.scale( 1.0 / (double)aPageSize.Width(), 1.0 / (double)aPageSize.Height() ); - xPolyPoly.transform( aTransform ); + xPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix( + 1.0 / (double)aPageSize.Width(), 1.0 / (double)aPageSize.Height())); } } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 5f5ca8f94..200d11fb8 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -196,9 +197,8 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/) SdrPathObj* pPathObj = mxTag->getPathObj(); if( pPathObj ) { - basegfx::B2DHomMatrix aTrans; const Point aRef( DragStat().Ref1() ); - aTrans.translate(-aRef.X(), -aRef.Y()); + basegfx::B2DHomMatrix aTrans(basegfx::tools::createTranslateB2DHomMatrix(-aRef.X(), -aRef.Y())); aTrans.scale(double(aXFact), double(aYFact)); aTrans.translate(aRef.X(), aRef.Y()); basegfx::B2DPolyPolygon aDragPoly(pPathObj->GetPathPoly()); @@ -966,8 +966,8 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) ::com::sun::star::awt::Point aPos( mxOrigin->getPosition() ); if( (aPos.X != maOriginPos.X) || (aPos.Y != maOriginPos.Y) ) { - ::basegfx::B2DHomMatrix aTransform; - aTransform.translate( aPos.X - maOriginPos.X, aPos.Y - maOriginPos.Y ); + const basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix( + aPos.X - maOriginPos.X, aPos.Y - maOriginPos.Y)); mxPolyPoly.transform( aTransform ); mpPathObj->SetPathPoly( mxPolyPoly ); maOriginPos = aPos; diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 3148e4eae..46c18c479 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -42,13 +42,13 @@ #include #include - #include "View.hxx" #include "ViewShell.hxx" #include "Window.hxx" #include #include #include +#include #include "strings.hrc" #include "sdresid.hxx" @@ -264,9 +264,8 @@ void FuMorph::ImpEqualizePolyPointCount(::basegfx::B2DPolygon& rSmall, const ::b const ::basegfx::B2DPoint aSrcPos(aSrcSize.getCenter()); const ::basegfx::B2DRange aDstSize(::basegfx::tools::getRange(rSmall)); const ::basegfx::B2DPoint aDstPos(aDstSize.getCenter()); - ::basegfx::B2DHomMatrix aTrans; - - aTrans.translate(-aSrcPos.getX(), -aSrcPos.getY()); + + basegfx::B2DHomMatrix aTrans(basegfx::tools::createTranslateB2DHomMatrix(-aSrcPos.getX(), -aSrcPos.getY())); aTrans.scale(aDstSize.getWidth() / aSrcSize.getWidth(), aDstSize.getHeight() / aSrcSize.getHeight()); aTrans.translate(aDstPos.getX(), aDstPos.getY()); @@ -499,16 +498,15 @@ sal_Bool FuMorph::ImpMorphPolygons( for(sal_uInt16 i(0); i < nSteps; i++) { fValue += fFactor; - ::basegfx::B2DPolyPolygon* pNewPolyPoly3D = ImpCreateMorphedPolygon(rPolyPoly1, rPolyPoly2, fValue); + ::basegfx::B2DPolyPolygon* pNewPolyPoly2D = ImpCreateMorphedPolygon(rPolyPoly1, rPolyPoly2, fValue); - const ::basegfx::B2DRange aNewPolySize(::basegfx::tools::getRange(*pNewPolyPoly3D)); + const ::basegfx::B2DRange aNewPolySize(::basegfx::tools::getRange(*pNewPolyPoly2D)); const ::basegfx::B2DPoint aNewS(aNewPolySize.getCenter()); const ::basegfx::B2DPoint aRealS(aStartCenter + (aDelta * fValue)); - ::basegfx::B2DHomMatrix aTrans; const ::basegfx::B2DPoint aDiff(aRealS - aNewS); - aTrans.translate(aDiff.getX(), aDiff.getY()); - pNewPolyPoly3D->transform(aTrans); - rPolyPolyList3D.Insert(pNewPolyPoly3D, LIST_APPEND); + + pNewPolyPoly2D->transform(basegfx::tools::createTranslateB2DHomMatrix(aDiff)); + rPolyPolyList3D.Insert(pNewPolyPoly2D, LIST_APPEND); } } return TRUE; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 609059569..5f3137e91 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -38,6 +38,8 @@ #include #include +#include + #include #include @@ -384,16 +386,12 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) throw (Ru Point aOutputOffset( ( aWindowSize.Width() - aOutputSize.Width() ) >> 1, ( aWindowSize.Height() - aOutputSize.Height() ) >> 1 ); - ::basegfx::B2DHomMatrix aMatrix; - maPresentationArea = Rectangle( aOutputOffset, aOutputSize ); mrOutputWindow.SetPresentationArea( maPresentationArea ); - // scale presentation into available window rect (minus 10%) - aMatrix.scale( aOutputSize.Width(), aOutputSize.Height() ); - - // center in the window - aMatrix.translate( aOutputOffset.X(), aOutputOffset.Y() ); + // scale presentation into available window rect (minus 10%); center in the window + const basegfx::B2DHomMatrix aMatrix(basegfx::tools::createScaleTranslateB2DHomMatrix( + aOutputSize.Width(), aOutputSize.Height(), aOutputOffset.X(), aOutputOffset.Y())); geometry::AffineMatrix2D aRes; diff --git a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx index d41b5947e..1d336dca5 100644 --- a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx @@ -55,6 +55,8 @@ #include #include #include +#include + #include #include #include @@ -245,8 +247,7 @@ void SubstitutionOverlay::Clear (void) void SubstitutionOverlay::Move (const Point& rOffset) { - basegfx::B2DHomMatrix aTranslation; - aTranslation.translate(rOffset.X(), rOffset.Y()); + const basegfx::B2DHomMatrix aTranslation(basegfx::tools::createTranslateB2DHomMatrix(rOffset.X(), rOffset.Y())); maShapes.transform(aTranslation); maPosition += rOffset; diff --git a/sd/source/ui/view/PrintManager.cxx b/sd/source/ui/view/PrintManager.cxx index 633a50824..2eea996f0 100644 --- a/sd/source/ui/view/PrintManager.cxx +++ b/sd/source/ui/view/PrintManager.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include "PrintManager.hxx" @@ -1775,10 +1776,10 @@ void PrintManager::InitHandoutTemplate( PrintInfo& /*rInfo*/, USHORT nSlidesPerH aPoly.insert(0, basegfx::B2DPoint( aRect.Left(), aRect.Top() ) ); aPoly.insert(1, basegfx::B2DPoint( aRect.Right(), aRect.Top() ) ); - basegfx::B2DHomMatrix aMatrix; - aMatrix.translate( 0.0, static_cast< double >( aRect.GetHeight() / 7 ) ); - + const basegfx::B2DHomMatrix aMatrix(basegfx::tools::createTranslateB2DHomMatrix( + 0.0, static_cast< double >( aRect.GetHeight() / 7 ))); basegfx::B2DPolyPolygon aPathPoly; + for( sal_uInt16 nLine = 0; nLine < 7; nLine++ ) { aPoly.transform( aMatrix ); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 365c11df3..b6372f83b 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -99,6 +99,7 @@ #include #include #include +#include #include @@ -454,12 +455,9 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP false)); // fill text matrix - basegfx::B2DHomMatrix aTextMatrix; - - aTextMatrix.scale(aSize.getX(), aSize.getY()); - aTextMatrix.shearX(fShearX); - aTextMatrix.rotate(fRotate); - aTextMatrix.translate(fPosX, fPosY); + const basegfx::B2DHomMatrix aTextMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( + aSize.getX(), aSize.getY(), + fShearX, fRotate, fPosX, fPosY)); // create DXTextArray (can be empty one) const ::std::vector< double > aDXArray; diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index fdc67c33d..0250f867d 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -48,6 +48,7 @@ #include #include #include +#include #include @@ -120,10 +121,9 @@ namespace slideshow aLinearTransform.set( 1, 2, 0.0 ); pBitmapCanvas->setTransformation( aLinearTransform ); - ::basegfx::B2DHomMatrix aShapeTransform; - - aShapeTransform.scale( maBounds.getWidth(), maBounds.getHeight() ); - aShapeTransform.translate( maBounds.getMinX(), maBounds.getMinY() ); + const basegfx::B2DHomMatrix aShapeTransform(basegfx::tools::createScaleTranslateB2DHomMatrix( + maBounds.getWidth(), maBounds.getHeight(), + maBounds.getMinX(), maBounds.getMinY())); ::cppcanvas::RendererSharedPtr pRenderer( ::cppcanvas::VCLFactory::getInstance().createRenderer( diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 61e07ed68..76be1b9aa 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -713,9 +714,8 @@ namespace slideshow aBitmapTransform.invert(); - ::basegfx::B2DHomMatrix aTranslation; - aTranslation.translate( aTmpRect.getMinX(), - aTmpRect.getMinY() ); + const basegfx::B2DHomMatrix aTranslation(basegfx::tools::createTranslateB2DHomMatrix( + aTmpRect.getMinX(), aTmpRect.getMinY())); aBitmapTransform = aBitmapTransform * aTranslation; pBitmap->setTransformation( aBitmapTransform ); diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx index b33f90a33..56a0a2e4a 100644 --- a/slideshow/source/engine/slidebitmap.cxx +++ b/slideshow/source/engine/slidebitmap.cxx @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -78,9 +79,7 @@ namespace slideshow rendering::RenderState aRenderState; ::canvas::tools::initRenderState( aRenderState ); - ::basegfx::B2DHomMatrix aTranslation; - aTranslation.translate( maOutputPos.getX(), - maOutputPos.getY() ); + const basegfx::B2DHomMatrix aTranslation(basegfx::tools::createTranslateB2DHomMatrix(maOutputPos)); ::canvas::tools::setRenderStateTransform( aRenderState, aTranslation ); try diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index 95f09d4c2..fc6571541 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -51,6 +51,7 @@ #include #include #include +#include #include @@ -524,10 +525,9 @@ namespace slideshow { if( !pAttr ) { - ::basegfx::B2DHomMatrix aTransform; - - aTransform.scale( rShapeBounds.getWidth(), rShapeBounds.getHeight() ); - aTransform.translate( rShapeBounds.getMinX(), rShapeBounds.getMinY() ); + const basegfx::B2DHomMatrix aTransform(basegfx::tools::createScaleTranslateB2DHomMatrix( + rShapeBounds.getWidth(), rShapeBounds.getHeight(), + rShapeBounds.getMinX(), rShapeBounds.getMinY())); return aTransform; } diff --git a/slideshow/source/engine/transitions/barndoorwipe.cxx b/slideshow/source/engine/transitions/barndoorwipe.cxx index 40d2e98aa..f138807c8 100644 --- a/slideshow/source/engine/transitions/barndoorwipe.cxx +++ b/slideshow/source/engine/transitions/barndoorwipe.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include "barndoorwipe.hxx" @@ -45,8 +46,7 @@ namespace internal { if (m_doubled) t /= 2.0; - ::basegfx::B2DHomMatrix aTransform; - aTransform.translate( -0.5, -0.5 ); + basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5)); aTransform.scale( ::basegfx::pruneScaleValue(t), 1.0 ); aTransform.translate( 0.5, 0.5 ); ::basegfx::B2DPolygon poly( m_unitRect ); @@ -54,8 +54,7 @@ namespace internal { ::basegfx::B2DPolyPolygon res(poly); if (m_doubled) { - aTransform.identity(); - aTransform.translate( -0.5, -0.5 ); + aTransform = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5); aTransform.rotate( M_PI_2 ); aTransform.translate( 0.5, 0.5 ); poly.transform( aTransform ); diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx index 89ed7f22d..ab6f4e5c9 100644 --- a/slideshow/source/engine/transitions/clippingfunctor.cxx +++ b/slideshow/source/engine/transitions/clippingfunctor.cxx @@ -40,6 +40,7 @@ #include #include #include +#include namespace slideshow { @@ -134,20 +135,19 @@ namespace slideshow break; case TransitionInfo::REVERSEMETHOD_ROTATE_180: - maStaticTransformation.translate( -0.5, -0.5 ); - maStaticTransformation.rotate( M_PI ); - maStaticTransformation.translate( 0.5, 0.5 ); + maStaticTransformation = basegfx::tools::createRotateAroundPoint(0.5, 0.5, M_PI) + * maStaticTransformation; break; case TransitionInfo::REVERSEMETHOD_FLIP_X: - maStaticTransformation.scale( -1.0, 1.0 ); - maStaticTransformation.translate( 1.0, 0.0 ); + maStaticTransformation = basegfx::tools::createScaleTranslateB2DHomMatrix(-1.0, 1.0, 1.0, 0.0) + * maStaticTransformation; mbFlip = true; break; case TransitionInfo::REVERSEMETHOD_FLIP_Y: - maStaticTransformation.scale( 1.0, -1.0 ); - maStaticTransformation.translate( 0.0, 1.0 ); + maStaticTransformation = basegfx::tools::createScaleTranslateB2DHomMatrix(1.0, -1.0, 0.0, 1.0) + * maStaticTransformation; mbFlip = true; break; } diff --git a/slideshow/source/engine/transitions/clockwipe.cxx b/slideshow/source/engine/transitions/clockwipe.cxx index 2a7dd0bfd..6e9ed7dc1 100644 --- a/slideshow/source/engine/transitions/clockwipe.cxx +++ b/slideshow/source/engine/transitions/clockwipe.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include "clockwipe.hxx" @@ -66,9 +67,7 @@ namespace internal { ::basegfx::B2DPolyPolygon ClockWipe::operator () ( double t ) { - ::basegfx::B2DHomMatrix aTransform; - aTransform.scale( 0.5, 0.5 ); - aTransform.translate( 0.5, 0.5 ); + const basegfx::B2DHomMatrix aTransform(basegfx::tools::createScaleTranslateB2DHomMatrix(0.5, 0.5, 0.5, 0.5)); ::basegfx::B2DPolygon poly( calcCenteredClock(t) ); poly.transform( aTransform ); return ::basegfx::B2DPolyPolygon(poly); diff --git a/slideshow/source/engine/transitions/combtransition.cxx b/slideshow/source/engine/transitions/combtransition.cxx index 562664f21..b595a2a70 100644 --- a/slideshow/source/engine/transitions/combtransition.cxx +++ b/slideshow/source/engine/transitions/combtransition.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include @@ -70,11 +71,7 @@ basegfx::B2DPolyPolygon createClipPolygon( // rotate polygons, such that the strips are parallel to // the given direction vector const ::basegfx::B2DVector aUpVec(0.0, 1.0); - ::basegfx::B2DHomMatrix aMatrix; - - aMatrix.translate( -0.5, -0.5 ); - aMatrix.rotate( aUpVec.angle( rDirection ) ); - aMatrix.translate( 0.5, 0.5 ); + basegfx::B2DHomMatrix aMatrix(basegfx::tools::createRotateAroundPoint(0.5, 0.5, aUpVec.angle( rDirection ))); // blow up clip polygon to slide size aMatrix.scale( rSlideSize.getX(), @@ -129,7 +126,6 @@ void CombTransition::renderComb( double t, // change transformation on cloned canvas to be in // device pixel cppcanvas::CanvasSharedPtr pCanvas( pCanvas_->clone() ); - basegfx::B2DHomMatrix transform; basegfx::B2DPoint p; // TODO(Q2): Use basegfx bitmaps here @@ -156,17 +152,14 @@ void CombTransition::renderComb( double t, pLeavingBitmap->clip( aClipPolygon1 ); // don't modify bitmap object (no move!): p = basegfx::B2DPoint( pageOrigin + (t * aPushDirection) ); - transform.translate( p.getX(), p.getY() ); - pCanvas->setTransformation( transform ); + pCanvas->setTransformation(basegfx::tools::createTranslateB2DHomMatrix(p.getX(), p.getY())); pLeavingBitmap->draw( pCanvas ); // render even strips: pLeavingBitmap->clip( aClipPolygon2 ); // don't modify bitmap object (no move!): - transform.identity(); p = basegfx::B2DPoint( pageOrigin - (t * aPushDirection) ); - transform.translate( p.getX(), p.getY() ); - pCanvas->setTransformation( transform ); + pCanvas->setTransformation(basegfx::tools::createTranslateB2DHomMatrix(p.getX(), p.getY())); pLeavingBitmap->draw( pCanvas ); } @@ -176,19 +169,15 @@ void CombTransition::renderComb( double t, // render odd strips: pEnteringBitmap->clip( aClipPolygon1 ); // don't modify bitmap object (no move!): - transform.identity(); p = basegfx::B2DPoint( pageOrigin + ((t - 1.0) * aPushDirection) ); - transform.translate( p.getX(), p.getY() ); - pCanvas->setTransformation( transform ); + pCanvas->setTransformation(basegfx::tools::createTranslateB2DHomMatrix(p.getX(), p.getY())); pEnteringBitmap->draw( pCanvas ); // render even strips: pEnteringBitmap->clip( aClipPolygon2 ); // don't modify bitmap object (no move!): - transform.identity(); p = basegfx::B2DPoint( pageOrigin + ((1.0 - t) * aPushDirection) ); - transform.translate( p.getX(), p.getY() ); - pCanvas->setTransformation( transform ); + pCanvas->setTransformation(basegfx::tools::createTranslateB2DHomMatrix(p.getX(), p.getY())); pEnteringBitmap->draw( pCanvas ); } diff --git a/slideshow/source/engine/transitions/fanwipe.cxx b/slideshow/source/engine/transitions/fanwipe.cxx index c7699eeb8..cc6b57bfa 100644 --- a/slideshow/source/engine/transitions/fanwipe.cxx +++ b/slideshow/source/engine/transitions/fanwipe.cxx @@ -33,6 +33,7 @@ #include #include +#include #include "transitiontools.hxx" #include "clockwipe.hxx" #include "fanwipe.hxx" @@ -50,26 +51,21 @@ namespace internal { res.append( poly ); // flip on y-axis: - ::basegfx::B2DHomMatrix aTransform; - aTransform.scale( -1.0, 1.0 ); - poly.transform( aTransform ); + poly.transform(basegfx::tools::createScaleB2DHomMatrix(-1.0, 1.0)); poly.flip(); res.append( poly ); - aTransform.identity(); - if (m_center) { - aTransform.scale( 0.5, 0.5 ); - aTransform.translate( 0.5, 0.5 ); - res.transform( aTransform ); - + if (m_center) + { + res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(0.5, 0.5, 0.5, 0.5)); + if (! m_single) res.append( flipOnXAxis(res) ); } - else { + else + { OSL_ASSERT( ! m_fanIn ); - aTransform.scale( 0.5, 1.0 ); - aTransform.translate( 0.5, 1.0 ); - res.transform( aTransform ); + res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(0.5, 1.0, 0.5, 1.0)); } return res; } diff --git a/slideshow/source/engine/transitions/figurewipe.cxx b/slideshow/source/engine/transitions/figurewipe.cxx index accc4a888..8738b2880 100644 --- a/slideshow/source/engine/transitions/figurewipe.cxx +++ b/slideshow/source/engine/transitions/figurewipe.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include "transitiontools.hxx" #include "figurewipe.hxx" @@ -45,10 +46,7 @@ namespace internal { ::basegfx::B2DPolyPolygon FigureWipe::operator () ( double t ) { ::basegfx::B2DPolyPolygon res(m_figure); - ::basegfx::B2DHomMatrix aTransform; - aTransform.scale( t, t ); - aTransform.translate( 0.5, 0.5 ); - res.transform( aTransform ); + res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(t, t, 0.5, 0.5)); return res; } diff --git a/slideshow/source/engine/transitions/fourboxwipe.cxx b/slideshow/source/engine/transitions/fourboxwipe.cxx index 6e202cad2..b0973beb0 100644 --- a/slideshow/source/engine/transitions/fourboxwipe.cxx +++ b/slideshow/source/engine/transitions/fourboxwipe.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include "fourboxwipe.hxx" @@ -45,13 +46,15 @@ namespace internal { { ::basegfx::B2DHomMatrix aTransform; const double d = ::basegfx::pruneScaleValue( t / 2.0 ); - if (m_cornersOut) { - aTransform.translate( -0.5, -0.5 ); - aTransform.scale( d, d ); - aTransform.translate( -0.25, -0.25 ); - } else { - aTransform.scale( d, d ); - aTransform.translate( -0.5, -0.5 ); + if (m_cornersOut) + { + aTransform = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5); + aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(d, d, -0.25, -0.25) + * aTransform; + } + else + { + aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(d, d, -0.5, -0.5); } // top left: @@ -76,8 +79,7 @@ namespace internal { square4.flip(); // flip direction res.append( square4 ); - aTransform.identity(); - aTransform.translate( 0.5, 0.5 ); + aTransform = basegfx::tools::createTranslateB2DHomMatrix(0.5, 0.5); res.transform( aTransform ); return res; } diff --git a/slideshow/source/engine/transitions/iriswipe.cxx b/slideshow/source/engine/transitions/iriswipe.cxx index 9315b4ea4..cf3218fd2 100644 --- a/slideshow/source/engine/transitions/iriswipe.cxx +++ b/slideshow/source/engine/transitions/iriswipe.cxx @@ -33,6 +33,7 @@ #include #include +#include #include "iriswipe.hxx" @@ -41,11 +42,10 @@ namespace internal { ::basegfx::B2DPolyPolygon IrisWipe::operator () ( double t ) { - ::basegfx::B2DHomMatrix aTransform; - aTransform.translate( -0.5, -0.5 ); const double d = ::basegfx::pruneScaleValue(t); - aTransform.scale( d, d ); - aTransform.translate( 0.5, 0.5 ); + basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5)); + aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(d, d, 0.5, 0.5) * aTransform; + ::basegfx::B2DPolyPolygon res( m_unitRect ); res.transform( aTransform ); return res; diff --git a/slideshow/source/engine/transitions/pinwheelwipe.cxx b/slideshow/source/engine/transitions/pinwheelwipe.cxx index 5ae1d66a1..ba7bc64f3 100644 --- a/slideshow/source/engine/transitions/pinwheelwipe.cxx +++ b/slideshow/source/engine/transitions/pinwheelwipe.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include "clockwipe.hxx" #include "pinwheelwipe.hxx" @@ -43,23 +44,17 @@ namespace internal { ::basegfx::B2DPolyPolygon PinWheelWipe::operator () ( double t ) { - ::basegfx::B2DHomMatrix aTransform; ::basegfx::B2DPolygon poly( ClockWipe::calcCenteredClock( t / m_blades, 2.0 /* max edge when rotating */ ) ); ::basegfx::B2DPolyPolygon res; for ( sal_Int32 i = m_blades; i--; ) { - aTransform.identity(); - aTransform.rotate( (i * 2.0 * M_PI) / m_blades ); ::basegfx::B2DPolygon p(poly); - p.transform( aTransform ); + p.transform(basegfx::tools::createRotateB2DHomMatrix((i * 2.0 * M_PI) / m_blades)); res.append( p ); } - aTransform.identity(); - aTransform.scale( 0.5, 0.5 ); - aTransform.translate( 0.5, 0.5 ); - res.transform( aTransform ); + res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(0.5, 0.5, 0.5, 0.5)); return res; } diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx index 60ffd385f..06898b827 100644 --- a/slideshow/source/engine/transitions/randomwipe.cxx +++ b/slideshow/source/engine/transitions/randomwipe.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include "randomwipe.hxx" #include "tools.hxx" @@ -85,11 +86,9 @@ RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars ) ::basegfx::B2DPolyPolygon res; for ( sal_Int32 pos = static_cast(t * m_nElements); pos--; ) { - ::basegfx::B2DHomMatrix aTransform; ::basegfx::B2DPoint const & point = m_positions[ pos ]; - aTransform.translate( point.getX(), point.getY() ); ::basegfx::B2DPolygon poly( m_rect ); - poly.transform( aTransform ); + poly.transform(basegfx::tools::createTranslateB2DHomMatrix(point.getX(), point.getY())); res.append( poly ); } return res; diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index cc18bce71..6ff49c860 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -37,6 +37,7 @@ #include #include #include +#include #include #include "slidechangebase.hxx" @@ -179,9 +180,10 @@ void SlideChangeBase::renderBitmap( viewTransform * basegfx::B2DPoint() ); const cppcanvas::CanvasSharedPtr pDevicePixelCanvas( pCanvas->clone() ); - basegfx::B2DHomMatrix transform; + // render at output position, don't modify bitmap object (no move!): - transform.translate( pageOrigin.getX(), pageOrigin.getY() ); + const basegfx::B2DHomMatrix transform(basegfx::tools::createTranslateB2DHomMatrix( + pageOrigin.getX(), pageOrigin.getY())); pDevicePixelCanvas->setTransformation( transform ); pSlideBitmap->draw( pDevicePixelCanvas ); diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx index 28bade527..87d250a37 100644 --- a/slideshow/source/engine/transitions/snakewipe.cxx +++ b/slideshow/source/engine/transitions/snakewipe.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include "snakewipe.hxx" #include "transitiontools.hxx" @@ -121,16 +122,20 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.append( ::basegfx::B2DPoint( len + a, 0.0 ) ); poly.setClosed(true); ::basegfx::B2DHomMatrix aTransform; - if ((static_cast(sqrtArea2) & 1) == 1) { + + if ((static_cast(sqrtArea2) & 1) == 1) + { // odd line - aTransform.rotate( M_PI_2 + M_PI_4 ); - aTransform.translate( edge + m_elementEdge, 0.0 ); + aTransform = basegfx::tools::createRotateB2DHomMatrix(M_PI_2 + M_PI_4); + aTransform.translate(edge + m_elementEdge, 0.0); } - else { - aTransform.translate( -a, 0.0 ); + else + { + aTransform = basegfx::tools::createTranslateB2DHomMatrix(-a, 0.0); aTransform.rotate( -M_PI_4 ); aTransform.translate( 0.0, edge ); } + poly.transform( aTransform ); res.append(poly); } @@ -161,14 +166,17 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) poly.append( ::basegfx::B2DPoint( len + a, 0.0 ) ); poly.setClosed(true); ::basegfx::B2DHomMatrix aTransform; - if ((static_cast(sqrtArea2) & 1) == 1) { + + if ((static_cast(sqrtArea2) & 1) == 1) + { // odd line - aTransform.translate( 0.0, -height ); + aTransform = basegfx::tools::createTranslateB2DHomMatrix(0.0, -height); aTransform.rotate( M_PI_2 + M_PI_4 ); aTransform.translate( 1.0, edge ); } - else { - aTransform.rotate( -M_PI_4 ); + else + { + aTransform = basegfx::tools::createRotateB2DHomMatrix(-M_PI_4); aTransform.translate( edge, 1.0 ); } poly.transform( aTransform ); @@ -205,17 +213,16 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) ::basegfx::B2DPolyPolygon half( calcHalfDiagonalSnake( t, false /* out */ ) ); // flip on x axis and rotate 90 degrees: - ::basegfx::B2DHomMatrix aTransform; - aTransform.scale( 1.0, -1.0 ); + basegfx::B2DHomMatrix aTransform(basegfx::tools::createScaleB2DHomMatrix(1.0, -1.0)); aTransform.translate( -0.5, 0.5 ); aTransform.rotate( M_PI_2 ); aTransform.translate( 0.5, 0.5 ); half.transform( aTransform ); half.flip(); res.append( half ); + // rotate 180 degrees: - aTransform.identity(); - aTransform.translate( -0.5, -0.5 ); + aTransform = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5); aTransform.rotate( M_PI ); aTransform.translate( 0.5, 0.5 ); half.transform( aTransform ); @@ -225,8 +232,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis ) { ::basegfx::B2DPolyPolygon half( calcSnake( t / 2.0 ) ); // rotate 90 degrees: - ::basegfx::B2DHomMatrix aTransform; - aTransform.translate( -0.5, -0.5 ); + basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5)); aTransform.rotate( M_PI_2 ); aTransform.translate( 0.5, 0.5 ); half.transform( aTransform ); diff --git a/slideshow/source/engine/transitions/spiralwipe.cxx b/slideshow/source/engine/transitions/spiralwipe.cxx index 81e381abf..49b64b3f6 100644 --- a/slideshow/source/engine/transitions/spiralwipe.cxx +++ b/slideshow/source/engine/transitions/spiralwipe.cxx @@ -38,6 +38,7 @@ #include #include #include +#include namespace slideshow { @@ -57,8 +58,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) const double e = (sqrt(area) / 2.0); const sal_Int32 edge = (static_cast(e) * 2); - ::basegfx::B2DHomMatrix aTransform; - aTransform.translate( -0.5, -0.5 ); + basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5)); const double edge_ = ::basegfx::pruneScaleValue( static_cast(edge) / m_sqrtElements ); aTransform.scale( edge_, edge_ ); @@ -75,8 +75,7 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis ) const sal_Int32 alen = (len > edge1 ? edge1 : len); len -= alen; poly = createUnitRect(); - aTransform.identity(); - aTransform.scale( + aTransform = basegfx::tools::createScaleB2DHomMatrix( ::basegfx::pruneScaleValue( static_cast(alen) / m_sqrtElements ), ::basegfx::pruneScaleValue( 1.0 / m_sqrtElements ) ); aTransform.translate( diff --git a/slideshow/source/engine/transitions/sweepwipe.cxx b/slideshow/source/engine/transitions/sweepwipe.cxx index 957f2e81c..8c99facc2 100644 --- a/slideshow/source/engine/transitions/sweepwipe.cxx +++ b/slideshow/source/engine/transitions/sweepwipe.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include "clockwipe.hxx" #include "sweepwipe.hxx" #include "transitiontools.hxx" @@ -52,22 +53,26 @@ namespace internal { ::basegfx::B2DPolygon poly( ClockWipe::calcCenteredClock( 0.25 + t ) ); ::basegfx::B2DHomMatrix aTransform; - if (m_center) { - aTransform.translate( 0.5, 0.0 ); + + if (m_center) + { + aTransform = basegfx::tools::createTranslateB2DHomMatrix(0.5, 0.0); poly.transform( aTransform ); } ::basegfx::B2DPolyPolygon res(poly); - if (! m_single) { - aTransform.identity(); - if (m_oppositeVertical) { - aTransform.scale( 1.0, -1.0 ); + if (! m_single) + { + if (m_oppositeVertical) + { + aTransform = basegfx::tools::createScaleB2DHomMatrix(1.0, -1.0); aTransform.translate( 0.0, 1.0 ); poly.transform( aTransform ); poly.flip(); } - else { - aTransform.translate( -0.5, -0.5 ); + else + { + aTransform = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5); aTransform.rotate( M_PI ); aTransform.translate( 0.5, 0.5 ); poly.transform( aTransform ); diff --git a/slideshow/source/engine/transitions/transitiontools.cxx b/slideshow/source/engine/transitions/transitiontools.cxx index 19a3ed9ea..96cb9b800 100644 --- a/slideshow/source/engine/transitions/transitiontools.cxx +++ b/slideshow/source/engine/transitions/transitiontools.cxx @@ -36,6 +36,7 @@ #include #include #include +#include namespace slideshow { @@ -53,10 +54,7 @@ namespace internal { ::basegfx::B2DPolyPolygon const & polypoly ) { ::basegfx::B2DPolyPolygon res(polypoly); - ::basegfx::B2DHomMatrix aTransform; - aTransform.scale( -1.0, 1.0 ); - aTransform.translate( 1.0, 0.0 ); - res.transform( aTransform ); + res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(-1.0, 1.0, 1.0, 0.0)); res.flip(); return res; } @@ -65,10 +63,7 @@ namespace internal { ::basegfx::B2DPolyPolygon const & polypoly ) { ::basegfx::B2DPolyPolygon res(polypoly); - ::basegfx::B2DHomMatrix aTransform; - aTransform.scale( 1.0, -1.0 ); - aTransform.translate( 0.0, 1.0 ); - res.transform( aTransform ); + res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(1.0, -1.0, 0.0, 1.0)); res.flip(); return res; } diff --git a/slideshow/source/engine/transitions/waterfallwipe.cxx b/slideshow/source/engine/transitions/waterfallwipe.cxx index eae4f7663..9ddf8f8eb 100644 --- a/slideshow/source/engine/transitions/waterfallwipe.cxx +++ b/slideshow/source/engine/transitions/waterfallwipe.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include "waterfallwipe.hxx" #include "transitiontools.hxx" @@ -67,9 +68,7 @@ WaterfallWipe::WaterfallWipe( sal_Int32 nElements, bool flipOnYAxis ) ::basegfx::B2DPolyPolygon WaterfallWipe::operator () ( double t ) { ::basegfx::B2DPolygon poly( m_waterfall ); - ::basegfx::B2DHomMatrix aTransform; - aTransform.translate( 0.0, ::basegfx::pruneScaleValue( 2.0 * t ) ); - poly.transform( aTransform ); + poly.transform(basegfx::tools::createTranslateB2DHomMatrix(0.0, ::basegfx::pruneScaleValue(2.0 * t))); poly.setB2DPoint( 0, ::basegfx::B2DPoint( 0.0, -1.0 ) ); poly.setB2DPoint( poly.count()-1, ::basegfx::B2DPoint( 1.0, -1.0 ) ); diff --git a/slideshow/source/engine/transitions/zigzagwipe.cxx b/slideshow/source/engine/transitions/zigzagwipe.cxx index f0c504b6e..17d63a8b2 100644 --- a/slideshow/source/engine/transitions/zigzagwipe.cxx +++ b/slideshow/source/engine/transitions/zigzagwipe.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include "transitiontools.hxx" #include "zigzagwipe.hxx" @@ -58,10 +59,8 @@ ZigZagWipe::ZigZagWipe( sal_Int32 nZigs ) : m_zigEdge( 1.0 / nZigs ) ::basegfx::B2DPolyPolygon ZigZagWipe::operator () ( double t ) { - ::basegfx::B2DHomMatrix aTransform; - aTransform.translate( (1.0 + m_zigEdge) * t, 0.0 ); ::basegfx::B2DPolyPolygon res(m_stdZigZag); - res.transform( aTransform ); + res.transform(basegfx::tools::createTranslateB2DHomMatrix((1.0 + m_zigEdge) * t, 0.0)); return res; } @@ -70,8 +69,8 @@ ZigZagWipe::ZigZagWipe( sal_Int32 nZigs ) : m_zigEdge( 1.0 / nZigs ) ::basegfx::B2DPolyPolygon res( createUnitRect() ); ::basegfx::B2DPolygon poly( m_stdZigZag ); poly.flip(); - ::basegfx::B2DHomMatrix aTransform; - aTransform.translate( (1.0 + m_zigEdge) * (1.0 - t) / 2.0, 0.0 ); + basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix( + (1.0 + m_zigEdge) * (1.0 - t) / 2.0, 0.0)); poly.transform( aTransform ); res.append( poly ); aTransform.scale( -1.0, 1.0 ); diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index 418f08ffb..db6ee5c8b 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -100,12 +100,9 @@ public: void resize( const ::Size& rNewSize ) { maSize = rNewSize; - maTransform.identity(); - const sal_Int32 nSize( std::min( rNewSize.Width(), - rNewSize.Height() ) - 10 ); - maTransform.scale( nSize, nSize ); - maTransform.translate( (rNewSize.Width() - nSize) / 2, - (rNewSize.Height() - nSize) / 2 ); + const sal_Int32 nSize( std::min( rNewSize.Width(), rNewSize.Height() ) - 10); + maTransform = basegfx::tools::createScaleTranslateB2DHomMatrix( + nSize, nSize, (rNewSize.Width() - nSize) / 2, (rNewSize.Height() - nSize) / 2); lang::EventObject aEvent( *this ); maTransformationListeners.notifyEach( &util::XModifyListener::modified, -- cgit v1.2.3 From ee015ac87c761b1da49358637282b512b8069008 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Thu, 24 Sep 2009 14:09:17 +0200 Subject: #i105304# corrected destructors for OverlayBase derivations --- .../ui/slidesorter/inc/view/SlsViewOverlay.hxx | 3 +++ sd/source/ui/slidesorter/view/SlsViewOverlay.cxx | 31 +++++++++++++++++++--- sd/source/ui/unoidl/unopage.cxx | 17 +++++++++++- 3 files changed, 47 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx index d8cf4a97a..7a3684fd2 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx @@ -89,6 +89,7 @@ protected: OverlayManager. This registration is done on demand. */ void EnsureRegistration (void); + void RemoveRegistration(); }; @@ -147,6 +148,7 @@ class SelectionRectangleOverlay { public: SelectionRectangleOverlay (ViewOverlay& rViewOverlay); + virtual ~SelectionRectangleOverlay(); void Start (const Point& rAnchor); void Update (const Point& rSecondCorner); @@ -176,6 +178,7 @@ class InsertionIndicatorOverlay { public: InsertionIndicatorOverlay (ViewOverlay& rViewOverlay); + virtual ~InsertionIndicatorOverlay(); /** Given a position in model coordinates this method calculates the insertion marker both as an index in the document and as a rectangle diff --git a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx index 1d336dca5..cdb75248b 100644 --- a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx @@ -167,9 +167,7 @@ OverlayBase::OverlayBase (ViewOverlay& rViewOverlay) OverlayBase::~OverlayBase (void) { - OverlayManager* pOverlayManager = getOverlayManager(); - if (pOverlayManager != NULL) - pOverlayManager->remove(*this); + OSL_ENSURE(!getOverlayManager(), "Please call RemoveRegistration() in the derived class; it's too late to call it in the base class since virtual methods will be missing when called in the destructor."); } @@ -188,6 +186,16 @@ void OverlayBase::EnsureRegistration (void) +void OverlayBase::RemoveRegistration() +{ + OverlayManager* pOverlayManager = getOverlayManager(); + if (pOverlayManager != NULL) + pOverlayManager->remove(*this); +} + + + + //===== SubstitutionOverlay ================================================= SubstitutionOverlay::SubstitutionOverlay (ViewOverlay& rViewOverlay) @@ -202,6 +210,7 @@ SubstitutionOverlay::SubstitutionOverlay (ViewOverlay& rViewOverlay) SubstitutionOverlay::~SubstitutionOverlay (void) { + RemoveRegistration(); } @@ -317,6 +326,13 @@ SelectionRectangleOverlay::SelectionRectangleOverlay (ViewOverlay& rViewOverlay) +SelectionRectangleOverlay::~SelectionRectangleOverlay() +{ + RemoveRegistration(); +} + + + Rectangle SelectionRectangleOverlay::GetSelectionRectangle (void) { @@ -392,6 +408,14 @@ InsertionIndicatorOverlay::InsertionIndicatorOverlay (ViewOverlay& rViewOverlay) +InsertionIndicatorOverlay::~InsertionIndicatorOverlay() +{ + RemoveRegistration(); +} + + + + void InsertionIndicatorOverlay::SetPositionAndSize (const Rectangle& aNewBoundingBox) { EnsureRegistration(); @@ -510,6 +534,7 @@ MouseOverIndicatorOverlay::MouseOverIndicatorOverlay (ViewOverlay& rViewOverlay) MouseOverIndicatorOverlay::~MouseOverIndicatorOverlay (void) { + RemoveRegistration(); } diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index e703853ae..f29b9e30c 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -316,6 +316,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0}, { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, @@ -991,7 +992,21 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) aAny <<= (sal_Int16)( GetPage()->GetAutoLayout() ); break; case WID_PAGE_NUMBER: - aAny <<= (sal_Int16)((sal_uInt16)((GetPage()->GetPageNum()-1)>>1) + 1); + { + const sal_uInt16 nPageNumber(GetPage()->GetPageNum()); + + if(nPageNumber > 0) + { + // for all other pages calculate the number + aAny <<= (sal_Int16)((sal_uInt16)((nPageNumber-1)>>1) + 1); + } + else + { + // for pages with number 0 (Handout Master, Handout page) + // return 0 + aAny <<= (sal_Int16)0; + } + } break; case WID_PAGE_DURATION: aAny <<= (sal_Int32)(GetPage()->GetTime()); -- cgit v1.2.3 From 51507abd455c439344d890d488f8415d0792f986 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 25 Sep 2009 21:06:42 +0200 Subject: #103496#: forgot on sdi file in sd --- sd/sdi/sdgslots.sdi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi index b650a467f..db62ca5cd 100644 --- a/sd/sdi/sdgslots.sdi +++ b/sd/sdi/sdgslots.sdi @@ -37,11 +37,11 @@ SlotIdFile( "sdslots.hrc" ) ModulePrefix( "Sd" ) ] { - include "sfxitems.sdi" - include "sfx.sdi" - include "svxitems.sdi" - include "xoitems.sdi" - include "svx.sdi" + include "sfx2/sfxitems.sdi" + include "sfx2/sfx.sdi" + include "svx/svxitems.sdi" + include "svx/xoitems.sdi" + include "svx/svx.sdi" item UINT16 TbxImageItem; -- cgit v1.2.3 From 44099bcf5f531e3387b4aa6d7ee356a61b063ae7 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 28 Sep 2009 17:17:07 +0200 Subject: merge problems --- sd/sdi/makefile.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'sd') diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk index 8f55ef10e..7eb22a96c 100644 --- a/sd/sdi/makefile.mk +++ b/sd/sdi/makefile.mk @@ -72,7 +72,6 @@ SVSDI1DEPEND= \ ViewShellBase.sdi \ TaskPaneViewShell.sdi \ sdslots.hrc \ - $(SOLARINCXDIR)$/svxslots.ilb \ $(PRJ)$/inc$/app.hrc SVSDI2DEPEND= \ @@ -95,7 +94,6 @@ SVSDI2DEPEND= \ ViewShellBase.sdi \ TaskPaneViewShell.sdi \ sdslots.hrc \ - $(SOLARINCXDIR)$/svxslots.ilb \ $(PRJ)$/inc$/app.hrc # --- Targets ------------------------------------------------------- -- cgit v1.2.3 From 3e2320dde254b82c9628df99721a68afb5b740fc Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 6 Oct 2009 07:38:24 +0200 Subject: #103496#: move VCL free ConfigItems to unotools --- sd/inc/pch/precompiled_sd.hxx | 18 +- sd/source/core/CustomAnimationPreset.cxx | 24 +- sd/source/core/TransitionPreset.cxx | 16 +- sd/source/core/drawdoc.cxx | 22 +- sd/source/filter/grf/sdgrffilter.cxx | 10 +- sd/source/filter/html/buttonset.cxx | 10 +- sd/source/filter/html/htmlex.cxx | 12 +- sd/source/filter/html/pubdlg.cxx | 10 +- sd/source/filter/ppt/pptin.cxx | 8 +- sd/source/filter/sdpptwrp.cxx | 4 +- sd/source/filter/xml/sdxmlwrp.cxx | 10 +- sd/source/ui/animations/AnimationSchemesPane.cxx | 4 +- .../ui/animations/CustomAnimationCreateDialog.cxx | 22 +- sd/source/ui/animations/CustomAnimationDialog.cxx | 6 +- sd/source/ui/animations/SlideTransitionPane.cxx | 16 +- sd/source/ui/annotations/annotationmanager.cxx | 242 ++++++++++----------- sd/source/ui/annotations/annotationwindow.cxx | 54 ++--- sd/source/ui/app/sddll.cxx | 4 +- sd/source/ui/app/sddll1.cxx | 4 +- sd/source/ui/app/sdmod.cxx | 4 +- sd/source/ui/app/sdmod1.cxx | 16 +- sd/source/ui/app/sdmod2.cxx | 4 +- sd/source/ui/app/sdpopup.cxx | 6 +- sd/source/ui/dlg/dlgass.cxx | 16 +- sd/source/ui/dlg/dlgassim.cxx | 12 +- sd/source/ui/dlg/dlgfield.cxx | 4 +- sd/source/ui/dlg/tpaction.cxx | 4 +- sd/source/ui/docshell/docshel4.cxx | 16 +- sd/source/ui/func/fuinsert.cxx | 8 +- sd/source/ui/notes/EditWindow.cxx | 14 +- sd/source/ui/presenter/PresenterTextView.cxx | 46 ++-- sd/source/ui/slideshow/slideshowimpl.hxx | 16 +- sd/source/ui/slideshow/slideshowviewimpl.hxx | 34 +-- sd/source/ui/unoidl/sddetect.cxx | 4 +- sd/source/ui/view/Outliner.cxx | 6 +- sd/source/ui/view/drviews7.cxx | 2 +- sd/source/ui/view/drviewsb.cxx | 6 +- sd/source/ui/view/outlnvs2.cxx | 8 +- sd/source/ui/view/sdview3.cxx | 8 +- sd/source/ui/view/viewshe2.cxx | 8 +- sd/util/makefile.mk | 1 + 41 files changed, 370 insertions(+), 369 deletions(-) (limited to 'sd') diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index b4bfd4c95..60e3e3aa0 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -509,10 +509,10 @@ #include "svtools/filter.hxx" #include "svtools/flagitem.hxx" #include "svtools/fltcall.hxx" -#include "svtools/fltrcfg.hxx" +#include "unotools/fltrcfg.hxx" #include "svtools/globalnameitem.hxx" #include "svtools/hint.hxx" -#include "svtools/historyoptions.hxx" +#include "unotools/historyoptions.hxx" #include "svtools/htmlout.hxx" #include "svtools/imap.hxx" #include "svtools/imapcirc.hxx" @@ -526,18 +526,18 @@ #include "svtools/itemset.hxx" #include "svtools/languageoptions.hxx" #include "svtools/lckbitem.hxx" -#include "svtools/lingucfg.hxx" -#include "svtools/linguprops.hxx" +#include "unotools/lingucfg.hxx" +#include "unotools/linguprops.hxx" #include "svtools/listener.hxx" #include "svtools/lstner.hxx" #include "svtools/misccfg.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/pathoptions.hxx" #include "svtools/poolitem.hxx" #include "svtools/prgsbar.hxx" #include "svtools/printdlg.hxx" #include "svtools/ptitem.hxx" #include "svtools/rectitem.hxx" -#include "svtools/saveopt.hxx" +#include "unotools/saveopt.hxx" #include "svtools/sfxecode.hxx" #include "svtools/slstitm.hxx" #include "svtools/smplhint.hxx" @@ -557,9 +557,9 @@ #include "svtools/unoimap.hxx" #include "svtools/urihelper.hxx" #include "svtools/urlbmk.hxx" -#include "svtools/useroptions.hxx" +#include "unotools/useroptions.hxx" #include "svtools/valueset.hxx" -#include "svtools/viewoptions.hxx" +#include "unotools/viewoptions.hxx" #include "svtools/visitem.hxx" #include "svtools/whiter.hxx" #include "svtools/wmf.hxx" diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index d00e4bd79..e652ea318 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include @@ -90,7 +90,7 @@ static Reference< XNameAccess > getNodeAccess( const Reference< XMultiServiceFac aArgs[0] <<= aPropValue; xConfigAccess = Reference< XNameAccess >::query( - xConfigProvider->createInstanceWithArguments( + xConfigProvider->createInstanceWithArguments( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )), aArgs )); } @@ -149,7 +149,7 @@ CustomAnimationPreset::CustomAnimationPreset( CustomAnimationEffectPtr pEffect ) maPresetId = pEffect->getPresetId(); maProperty = pEffect->getProperty(); mnPresetClass = pEffect->getPresetClass(); - + add( pEffect ); mfDuration = pEffect->getDuration(); @@ -346,17 +346,17 @@ void CustomAnimationPresets::importEffects() uno::Reference< util::XMacroExpander > xMacroExpander; if( xContext.is() ) - xMacroExpander.set( xContext->getValueByName( + xMacroExpander.set( xContext->getValueByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))), UNO_QUERY ); Reference< XMultiServiceFactory > xConfigProvider( - xServiceFactory->createInstance( + xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))), UNO_QUERY_THROW ); // read path to transition effects files from config - Any propValue = uno::makeAny( + Any propValue = uno::makeAny( beans::PropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )), -1, uno::makeAny( OUString( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/Misc") )), @@ -446,13 +446,13 @@ void CustomAnimationPresets::importResources() return; Reference< XMultiServiceFactory > xConfigProvider( - xServiceFactory->createInstance( + xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))), UNO_QUERY ); const OUString aPropertyPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/UserInterface/Properties" ) ); implImportLabels( xConfigProvider, aPropertyPath, maPropertyNameMap ); - + const OUString aEffectsPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/UserInterface/Effects" ) ); implImportLabels( xConfigProvider, aEffectsPath, maEffectNameMap ); @@ -526,7 +526,7 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor { aEffectsList.push_back( pEffect ); } -#ifdef DEBUG +#ifdef DEBUG else { aMissedPresetIds += String(*pEffectNames); @@ -548,7 +548,7 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor DBG_ERROR( "sd::CustomAnimationPresets::importPresets(), Exception catched!" ); } -#ifdef DEBUG +#ifdef DEBUG if( aMissedPresetIds.Len() ) { ByteString aTmp( "sd::CustomAnimationPresets::importPresets(), invalid preset id!\n" ); @@ -646,7 +646,7 @@ Reference< XAnimationNode > CustomAnimationPresets::getRandomPreset( sal_Int16 n if( pCategoryList && pCategoryList->size() ) { sal_Int32 nCategory = (rand() * pCategoryList->size() / RAND_MAX); - + PresetCategoryPtr pCategory = (*pCategoryList)[nCategory]; if( pCategory.get() && pCategory->maEffects.size() ) { diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index b8147ff95..59251f62e 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include @@ -171,13 +171,13 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) uno::Reference< util::XMacroExpander > xMacroExpander; if( xContext.is() ) - xMacroExpander.set( xContext->getValueByName( + xMacroExpander.set( xContext->getValueByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))), UNO_QUERY ); // import ui strings Reference< XMultiServiceFactory > xConfigProvider( - xServiceFactory->createInstance( + xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))), UNO_QUERY_THROW ); @@ -186,7 +186,7 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) implImportLabels( xConfigProvider, aTransitionPath, aTransitionNameMape ); // read path to transition effects files from config - Any propValue = uno::makeAny( + Any propValue = uno::makeAny( beans::PropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1, uno::makeAny( OUString( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/Misc"))), @@ -213,9 +213,9 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList ) aURL = xMacroExpander->expandMacros( aMacro ); } - bRet |= importTransitionsFile( rList, - xServiceFactory, - aTransitionNameMape, + bRet |= importTransitionsFile( rList, + xServiceFactory, + aTransitionNameMape, aURL ); } diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 624fa6fc5..be45632bd 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #include #include -#include +#include #ifndef _OFA_MISCCFG_HXX #include @@ -71,16 +71,16 @@ #include #include #include -#include +#include #include #include #include #include #ifndef _SVTOOLS_PATHOPTIONS_HXX_ -#include +#include #endif -#include -#include +#include +#include #include "eetext.hxx" #include "drawdoc.hxx" @@ -233,11 +233,11 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) SvtLinguOptions aOptions; aLinguConfig.GetOptions( aOptions ); - SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, + SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN), EE_CHAR_LANGUAGE ); SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN), EE_CHAR_LANGUAGE_CJK ); - SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, + SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX), EE_CHAR_LANGUAGE_CTL ); mbOnlineSpell = aOptions.bIsSpellAuto; @@ -1087,7 +1087,7 @@ sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( const rtl::OUString& rAutho SvtUserOptions aUserOptions; maAnnotationAuthors.push_back( aUserOptions.GetFullName() ); } - + sal_uInt16 idx = 0; for( std::vector< OUString >::iterator iter( maAnnotationAuthors.begin() ); iter != maAnnotationAuthors.end(); iter++ ) { @@ -1097,12 +1097,12 @@ sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( const rtl::OUString& rAutho } idx++; } - + if( idx == maAnnotationAuthors.size() ) { maAnnotationAuthors.push_back( rAuthor ); } - + return idx; } diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 8237fb96c..d4c515e56 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ // -- #include -#include +#include #include #include #include @@ -134,7 +134,7 @@ SdGRFFilter_ImplInteractionHdl::~SdGRFFilter_ImplInteractionHdl() void SdGRFFilter_ImplInteractionHdl::handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest ) throw( com::sun::star::uno::RuntimeException ) -{ +{ if( !m_xInter.is() ) return; @@ -395,7 +395,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su Reference< XGraphicProvider > xProvider( xSM->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicProvider" ) ) ), UNO_QUERY_THROW ); Reference< XPropertySet > xShapeSet( xShape, UNO_QUERY_THROW ); - + // detect mime type of graphic OUString aMimeType; OUString sGraphicURL; @@ -481,7 +481,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su // populate filter dialog filter list and select default filter to match graphic mime type - GraphicFilter& rGF = *GetGrfFilter(); + GraphicFilter& rGF = *GetGrfFilter(); Reference xFltMgr(xFP, UNO_QUERY); OUString aDefaultFormatName; USHORT nCount = rGF.GetExportFormatCount(); diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index d5f7774c4..2671452a0 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include @@ -151,7 +151,7 @@ public: ButtonSetImpl(); int getCount() const; - + bool getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ); bool exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ); @@ -200,7 +200,7 @@ int ButtonSetImpl::getCount() const { return maButtons.size(); } - + bool ButtonSetImpl::getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ) { if( (nSet >= 0) && (nSet < static_cast(maButtons.size()))) @@ -299,7 +299,7 @@ int ButtonSet::getCount() const { return mpImpl->getCount(); } - + bool ButtonSet::getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ) { return mpImpl->getPreview( nSet, rButtons, rImage ); diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 9c9e4d609..89788283e 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include @@ -368,7 +368,7 @@ String HtmlState::SetLink( const String& aLink, const String& aTarget ) static String getParagraphStyle( SdrOutliner* pOutliner, USHORT nPara ) { SfxItemSet aParaSet( pOutliner->GetParaAttribs( nPara ) ); - + String sStyle( RTL_CONSTASCII_USTRINGPARAM("direction:") ); if( static_cast(aParaSet.GetItem( EE_PARA_WRITINGDIR ))->GetValue() == FRMDIR_HORI_RIGHT_TOP ) { @@ -688,13 +688,13 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams maExportPath = aINetURLObj.GetPartBeforeLastName(); // with trailing '/' maIndex = aINetURLObj.GetLastName(); - + mnSdPageCount = mpDoc->GetSdPageCount( PK_STANDARD ); // USHORT nHiddenSlides = 0; for( USHORT nPage = 0; nPage < mnSdPageCount; nPage++ ) { pPage = mpDoc->GetSdPage( nPage, PK_STANDARD ); - + if( mbHiddenSlides || !pPage->IsExcluded() ) { maPages.push_back( pPage ); @@ -1291,7 +1291,7 @@ String HtmlExport::CreateTextForPage( SdrOutliner* pOutliner, aStr.Append( sStyle ); aStr.AppendAscii( "\">" ); } - + if(nActDepth <= 0 && bHeadLine) { if( nActDepth == 0 ) diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 706378ac4..c0e070d5b 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ #include #include #include -#include -#include +#include +#include #include "sdresid.hxx" #include "sdattr.hxx" @@ -1645,7 +1645,7 @@ BOOL SdPublishingDlg::Load() if( !bOk ) return sal_False; } - + SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, TRUE ); SvStream* pStream = aMedium.GetInStream(); @@ -1688,7 +1688,7 @@ BOOL SdPublishingDlg::Save() aMedium.IsRemote(); SvStream* pStream = aMedium.GetOutStream(); - + if( !pStream ) return( FALSE ); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 177556708..75cae5fd9 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,11 +88,11 @@ #include "../../ui/inc/FrameView.hxx" #include "../../ui/inc/optsitem.hxx" -#include +#include #include #include #include -#include +#include #include #define MAX_USER_MOVE 2 @@ -2752,7 +2752,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( const ::rtl::OUStri MSFilterTracer aTracer( rConfigPath, pConfigData ); aTracer.StartTracing(); - + SdPPTImport* pImport = new SdPPTImport( pDocument, rDocStream, rStorage, rMedium, &aTracer ); bRet = pImport->Import(); diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 116df059a..7674b14e1 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "sdpptwrp.hxx" #include "ppt/pptin.hxx" diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 07287bdb1..8b9e4f447 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ #include #include #include -#include +#include // #80365# include necessary for XML progress bar at load time #include @@ -515,7 +515,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { MAP_LEN( "BuildId" ), 0, &::getCppuType( (OUString *)0 ), - ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; @@ -779,7 +779,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) OUString sBuildId; xInfoSet->getPropertyValue(sPropName) >>= sBuildId; - + if( xModelSetInfo.is() && xModelSetInfo->hasPropertyByName(sPropName) ) { xModelSet->setPropertyValue( sPropName, Any( sBuildId ) ); @@ -806,7 +806,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) bTransform = true; } } - else + else { // check for binary formats const SfxFilter * pFilter = mrMedium.GetFilter(); diff --git a/sd/source/ui/animations/AnimationSchemesPane.cxx b/sd/source/ui/animations/AnimationSchemesPane.cxx index 1c6a93f44..51ddad2fb 100644 --- a/sd/source/ui/animations/AnimationSchemesPane.cxx +++ b/sd/source/ui/animations/AnimationSchemesPane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #include #endif #include -#include +#include #include #include diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 7ca60e03f..b019e127f 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ #include #include #include "sdresid.hxx" -#include +#include #include #include "CustomAnimationCreateDialog.hxx" #ifndef _SD_CUSTOMANIMATIONCREATEDIALOG_HRC @@ -142,7 +142,7 @@ USHORT CategoryListBox::InsertCategory( const XubString& rStr, USHORT nPos /* = void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) { const USHORT nItem = rUDEvt.GetItemId(); - + if( ListBox::GetEntryFlags(nItem) & LISTBOX_ENTRY_FLAG_DISABLE_SELECTION ) { Rectangle aOutRect( rUDEvt.GetRect() ); @@ -196,7 +196,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt ) } // -------------------------------------------------------------------- - + class CustomAnimationCreateTabPage : public TabPage { public: @@ -376,11 +376,11 @@ void CustomAnimationCreateTabPage::onSelectEffect() nPos = 0; else if( fDuration == 3.0 ) nPos = 1; - else if( fDuration == 2.0 ) + else if( fDuration == 2.0 ) nPos = 2; - else if( fDuration == 1.0 ) + else if( fDuration == 1.0 ) nPos = 3; - else if( fDuration == 0.5 ) + else if( fDuration == 0.5 ) nPos = 4; mpCBSpeed->SelectEntryPos( nPos ); @@ -479,7 +479,7 @@ void CustomAnimationCreateTabPage::setDuration( double fDuration ) { nPos = 3; } - } + } else if( fDuration < 5.0f ) { if( fDuration < 3.0f ) @@ -541,7 +541,7 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, Custo FreeResource(); SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); - mbIsPreview = pOptions->IsPreviewNewEffects(); + mbIsPreview = pOptions->IsPreviewNewEffects(); const CustomAnimationPresets& rPresets = CustomAnimationPresets::getCustomAnimationPresets(); mpTabPages[ENTRANCE] = new CustomAnimationCreateTabPage( mpTabControl, this, ENTRANCE, rPresets.getEntrancePresets(), bHasText ); @@ -587,7 +587,7 @@ CustomAnimationCreateDialog::~CustomAnimationCreateDialog() storePosition(); SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); - pOptions->SetPreviewNewEffects( getCurrentPage()->getIsPreview() ); + pOptions->SetPreviewNewEffects( getCurrentPage()->getIsPreview() ); delete mpTabPages[ENTRANCE]; delete mpTabPages[EMPHASIS]; @@ -609,7 +609,7 @@ CustomAnimationCreateTabPage* CustomAnimationCreateDialog::getCurrentPage() cons case RID_TP_CUSTOMANIMATION_EMPHASIS: return mpTabPages[EMPHASIS]; case RID_TP_CUSTOMANIMATION_EXIT: return mpTabPages[EXIT]; case RID_TP_CUSTOMANIMATION_MISCEFFECTS:return mpTabPages[MISCEFFECTS]; - //case RID_TP_CUSTOMANIMATION_MOTIONPATH: + //case RID_TP_CUSTOMANIMATION_MOTIONPATH: default: return mpTabPages[MOTIONPATH]; } diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 2f4ba4f6f..f6ffa5499 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include #endif -#include +#include #include #include #include @@ -1863,7 +1863,7 @@ void CustomAnimationEffectTabPage::onSoundPreview() if( nPos >= 2 ) try { const OUString aSoundURL( *(String*)maSoundList.GetObject( nPos-2 ) ); - mxPlayer.set( avmedia::MediaWindow::createPlayer( aSoundURL ), uno::UNO_QUERY_THROW ); + mxPlayer.set( avmedia::MediaWindow::createPlayer( aSoundURL ), uno::UNO_QUERY_THROW ); mxPlayer->start(); } catch( uno::Exception& e ) diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index a63f5278a..ff5257eef 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ #include #endif #include -#include +#include #include #include #include "DrawViewShell.hxx" @@ -205,7 +205,7 @@ struct TransitionEffect { TransitionEffect aOtherEffect( rPage ); mbEffectAmbiguous = mbEffectAmbiguous || aOtherEffect.mbEffectAmbiguous - || (mnType != aOtherEffect.mnType) + || (mnType != aOtherEffect.mnType) || (mnSubType != aOtherEffect.mnSubType) || (mbDirection != aOtherEffect.mbDirection) || (mnFadeColor != aOtherEffect.mnFadeColor); @@ -477,14 +477,14 @@ SlideTransitionPane::SlideTransitionPane( { // use no resource ids from here on FreeResource(); - + // use bold font for group headings (same font for all fixed lines): Font font( maFL_APPLY_TRANSITION.GetFont() ); font.SetWeight( WEIGHT_BOLD ); maFL_APPLY_TRANSITION.SetFont( font ); maFL_MODIFY_TRANSITION.SetFont( font ); maFL_ADVANCE_SLIDE.SetFont( font ); - + if( pDoc ) mxModel.set( pDoc->getUnoModel(), uno::UNO_QUERY ); // TODO: get correct view @@ -874,7 +874,7 @@ void SlideTransitionPane::updateControls() } SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); - maCB_AUTO_PREVIEW.Check( pOptions->IsPreviewTransitions() == sal_True ); + maCB_AUTO_PREVIEW.Check( pOptions->IsPreviewTransitions() == sal_True ); mbUpdatingControls = false; @@ -1069,7 +1069,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co aResult.mbSoundAmbiguous = false; } else - { + { aResult.maSound = lcl_getSoundFileURL( maSoundList, maLB_SOUND ); aResult.mbSoundAmbiguous = false; maCurrentSoundFile = aResult.maSound; @@ -1272,7 +1272,7 @@ IMPL_LINK( SlideTransitionPane, LoopSoundBoxChecked, void *, EMPTYARG ) IMPL_LINK( SlideTransitionPane, AutoPreviewClicked, void *, EMPTYARG ) { SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); - pOptions->SetPreviewTransitions( maCB_AUTO_PREVIEW.IsChecked() ? sal_True : sal_False ); + pOptions->SetPreviewTransitions( maCB_AUTO_PREVIEW.IsChecked() ? sal_True : sal_False ); return 0; } diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index e9880f9d7..61c121fbc 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,9 +47,9 @@ #include #include -#include +#include #include -#include +#include #include #include @@ -154,12 +154,12 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) } com::sun::star::util::DateTime getCurrentDateTime() -{ +{ TimeValue osltime; osl_getSystemTime( &osltime ); oslDateTime osldt; osl_getDateTimeFromTimeValue( &osltime, &osldt ); - return com::sun::star::util::DateTime( 0, osldt.Seconds, osldt.Minutes, osldt.Hours, osldt.Day, osldt.Month, osldt.Year ); + return com::sun::star::util::DateTime( 0, osldt.Seconds, osldt.Minutes, osldt.Hours, osldt.Day, osldt.Month, osldt.Year ); } OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotation ) @@ -170,7 +170,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio const LocaleDataWrapper& rLocalData = SvtSysLocale().GetLocaleData(); com::sun::star::util::DateTime aDateTime( xAnnotation->getDateTime() ); - + Date aDate = Date( aDateTime.Day, aDateTime.Month, aDateTime.Year ); if (aDate==Date()) sRet = sRet + String(SdResId(STR_ANNOTATION_TODAY)); @@ -180,8 +180,8 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio else if (aDate.IsValid() ) sRet = sRet + rLocalData.getDate(aDate); - - Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.HundredthSeconds ); + + Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.HundredthSeconds ); if(aTime.GetTime() != 0) sRet = sRet + rtl::OUString::createFromAscii(" ") + rLocalData.getTime( aTime,false ); } @@ -199,7 +199,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase ) { SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()); if( pOptions ) - mbShowAnnotations = pOptions->IsPreviewTransitions() == sal_True; + mbShowAnnotations = pOptions->IsPreviewTransitions() == sal_True; } // -------------------------------------------------------------------- @@ -209,7 +209,7 @@ void AnnotationManagerImpl::init() // get current controller and initialize listeners try { - addListener(); + addListener(); mxView = Reference< XDrawView >::query(mrBase.GetController()); } catch( Exception& e ) @@ -226,7 +226,7 @@ void AnnotationManagerImpl::init() } catch( Exception& ) { - } + } } // -------------------------------------------------------------------- @@ -242,7 +242,7 @@ void SAL_CALL AnnotationManagerImpl::disposing () } catch( Exception& ) { - } + } removeListener(); DisposeTags(); @@ -258,7 +258,7 @@ void SAL_CALL AnnotationManagerImpl::disposing () } // -------------------------------------------------------------------- - + // XEventListener void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) { @@ -291,7 +291,7 @@ void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq ) case SID_PREVIOUS_POSTIT: case SID_NEXT_POSTIT: SelectNextAnnotation( rReq.GetSlot() == SID_NEXT_POSTIT ); - break; + break; case SID_REPLYTO_POSTIT: ExecuteReplyToAnnotation( rReq ); break; @@ -301,7 +301,7 @@ void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq ) SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()); if( pOptions ) - pOptions->SetShowComments( mbShowAnnotations ? sal_True : sal_False ); + pOptions->SetShowComments( mbShowAnnotations ? sal_True : sal_False ); UpdateTags(); break; @@ -313,7 +313,7 @@ void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq ) void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest& /*rReq*/) { - InsertAnnotation(); + InsertAnnotation(); } // -------------------------------------------------------------------- @@ -321,7 +321,7 @@ void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest& /*rReq*/) void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) { const SfxItemSet* pArgs = rReq.GetArgs(); - + switch( rReq.GetSlot() ) { case SID_DELETEALL_POSTIT: @@ -338,12 +338,12 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) } } break; - case SID_DELETE_POSTIT: - { + case SID_DELETE_POSTIT: + { Reference< XAnnotation > xAnnotation; if( rReq.GetSlot() == SID_DELETE_POSTIT ) - { + { if( pArgs ) { const SfxPoolItem* pPoolItem = NULL; @@ -351,10 +351,10 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) ( ( const SfxUnoAnyItem* ) pPoolItem )->GetValue() >>= xAnnotation; } } - - if( !xAnnotation.is() ) + + if( !xAnnotation.is() ) GetSelectedAnnotation( xAnnotation ); - + DeleteAnnotation( xAnnotation ); } break; @@ -372,23 +372,23 @@ void AnnotationManagerImpl::InsertAnnotation() { if( mpDoc->IsUndoEnabled() ) mpDoc->BegUndo( String( SdResId( STR_ANNOTATION_UNDO_INSERT ) ) ); - + // find free space for new annotation int y = 0, x = 0; - + AnnotationVector aAnnotations( pPage->getAnnotations() ); if( !aAnnotations.empty() ) - { + { const int page_width = pPage->GetSize().Width(); const int width = 1000; const int height = 800; Rectangle aTagRect; - + while( true ) - { + { Rectangle aNewRect( x, y, x + width - 1, y + height - 1 ); bool bFree = true; - + for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) { RealPoint2D aPoint( (*iter)->getPosition() ); @@ -396,14 +396,14 @@ void AnnotationManagerImpl::InsertAnnotation() aTagRect.nTop = sal::static_int_cast< long >( aPoint.Y * 100.0 ); aTagRect.nRight = aTagRect.nLeft + width - 1; aTagRect.nBottom = aTagRect.nTop + height - 1; - + if( aNewRect.IsOver( aTagRect ) ) { bFree = false; break; } } - + if( bFree == false) { x += width; @@ -411,32 +411,32 @@ void AnnotationManagerImpl::InsertAnnotation() { x = 0; y += height; - } + } } else { break; } } - } - + } + Reference< XAnnotation > xAnnotation; pPage->createAnnotation( xAnnotation ); - + // set current author to new annotation SvtUserOptions aUserOptions; xAnnotation->setAuthor( aUserOptions.GetFullName() ); - + // set current time to new annotation xAnnotation->setDateTime( getCurrentDateTime() ); - + // set position RealPoint2D aPos( ((double)x) / 100.0, ((double)y) / 100.0 ); xAnnotation->setPosition( aPos ); if( mpDoc->IsUndoEnabled() ) mpDoc->EndUndo(); - + UpdateTags(true); SelectAnnotation( xAnnotation, true ); } @@ -460,7 +460,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) if( pTextApi ) { std::auto_ptr< ::Outliner > pOutliner( new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT) ); - + mpDoc->SetCalcFieldValueHdl( pOutliner.get() ); pOutliner->SetUpdateMode( TRUE ); @@ -468,7 +468,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) OUString sAuthor( xAnnotation->getAuthor() ); if( sAuthor.getLength() == 0 ) sAuthor = String( SdResId( STR_ANNOTATION_NOAUTHOR ) ); - + aStr.SearchAndReplaceAscii("%1", sAuthor); aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM(" (") ) ); @@ -481,32 +481,32 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) sQuote = String( RTL_CONSTASCII_USTRINGPARAM( "..." ) ); aStr.Append( sQuote ); aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM("\"\n") ) ); - + USHORT nParaCount = aStr.GetTokenCount( '\n' ); for( USHORT nPara = 0; nPara < nParaCount; nPara++ ) pOutliner->Insert( aStr.GetToken( nPara, '\n' ), LIST_APPEND, -1 ); - + if( pOutliner->GetParagraphCount() > 1 ) { SfxItemSet aAnswerSet( pOutliner->GetEmptyItemSet() ); - aAnswerSet.Put(SvxPostureItem(ITALIC_NORMAL,EE_CHAR_ITALIC)); - + aAnswerSet.Put(SvxPostureItem(ITALIC_NORMAL,EE_CHAR_ITALIC)); + ESelection aSel; aSel.nEndPara = (USHORT)pOutliner->GetParagraphCount()-2; aSel.nEndPos = pOutliner->GetText( pOutliner->GetParagraph( aSel.nEndPara ) ).Len(); - + pOutliner->QuickSetAttribs( aAnswerSet, aSel ); } - + std::auto_ptr< OutlinerParaObject > pOPO( pOutliner->CreateParaObject() ); pTextApi->SetText( *pOPO.get() ); - + SvtUserOptions aUserOptions; - xAnnotation->setAuthor( aUserOptions.GetFullName() ); + xAnnotation->setAuthor( aUserOptions.GetFullName() ); // set current time to reply xAnnotation->setDateTime( getCurrentDateTime() ); - + UpdateTags(true); SelectAnnotation( xAnnotation, true ); } @@ -515,7 +515,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) // -------------------------------------------------------------------- void AnnotationManagerImpl::DeleteAnnotation( Reference< XAnnotation > xAnnotation ) -{ +{ SdPage* pPage = GetCurrentPage(); if( xAnnotation.is() && pPage ) @@ -541,9 +541,9 @@ void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const rtl::OUString& sAut do { pPage = GetNextPage( pPage, true ); - + if( pPage && !pPage->getAnnotations().empty() ) - { + { AnnotationVector aAnnotations( pPage->getAnnotations() ); for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) { @@ -571,14 +571,14 @@ void AnnotationManagerImpl::DeleteAllAnnotations() do { pPage = GetNextPage( pPage, true ); - + if( pPage && !pPage->getAnnotations().empty() ) - { + { AnnotationVector aAnnotations( pPage->getAnnotations() ); for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) { - pPage->removeAnnotation( (*iter) ); + pPage->removeAnnotation( (*iter) ); } } } @@ -595,31 +595,31 @@ void AnnotationManagerImpl::DeleteAllAnnotations() void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet) { SdPage* pCurrentPage = GetCurrentPage(); - + const bool bReadOnly = mrBase.GetDocShell()->IsReadOnly(); const bool bWrongPageKind = (pCurrentPage == 0) || (pCurrentPage->GetPageKind() != PK_STANDARD); - + const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() ); if( bReadOnly || bWrongPageKind || (nCurrentODFVersion != SvtSaveOptions::ODFVER_LATEST) ) - rSet.DisableItem( SID_INSERT_POSTIT ); + rSet.DisableItem( SID_INSERT_POSTIT ); rSet.Put(SfxBoolItem(SID_SHOW_POSTIT, mbShowAnnotations)); - + Reference< XAnnotation > xAnnotation; GetSelectedAnnotation( xAnnotation ); - + if( !xAnnotation.is() || bReadOnly ) - rSet.DisableItem( SID_DELETE_POSTIT ); + rSet.DisableItem( SID_DELETE_POSTIT ); SdPage* pPage = 0; - + bool bHasAnnotations = false; do { pPage = GetNextPage( pPage, true ); - - if( pPage && !pPage->getAnnotations().empty() ) + + if( pPage && !pPage->getAnnotations().empty() ) bHasAnnotations = true; } while( pPage && !bHasAnnotations ); @@ -627,7 +627,7 @@ void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet) if( !bHasAnnotations || bReadOnly ) { rSet.DisableItem( SID_DELETEALL_POSTIT ); - } + } if( bWrongPageKind || !bHasAnnotations ) { @@ -673,7 +673,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) } } else - { + { if( xCurrent.is() ) { for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ ) @@ -692,7 +692,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) } } else if( !aAnnotations.empty() ) - { + { AnnotationVector::iterator iter( aAnnotations.end() ); SelectAnnotation( *(--iter) ); return; @@ -705,8 +705,8 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) do { pPage = GetNextPage( pPage, bForeward ); - - if( pPage && !pPage->getAnnotations().empty() ) + + if( pPage && !pPage->getAnnotations().empty() ) { // switch to next/previous slide with annotations ::boost::shared_ptr pDrawViewShell(::boost::dynamic_pointer_cast(mrBase.GetMainViewShell())); @@ -714,17 +714,17 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) { pDrawViewShell->ChangeEditMode(pPage->IsMasterPage() ? EM_MASTERPAGE : EM_PAGE, FALSE); pDrawViewShell->SwitchPage((pPage->GetPageNum() - 1) >> 1); - + SfxDispatcher* pDispatcher = getDispatcher( mrBase ); if( pDispatcher ) pDispatcher->Execute( bForeward ? SID_NEXT_POSTIT : SID_PREVIOUS_POSTIT ); - + return; - } + } } } while( pPage ); - + // The question text depends on the search direction. bool bImpress = mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS; sal_uInt16 nStringId; @@ -769,14 +769,14 @@ void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag ) // -------------------------------------------------------------------- void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit /* = FALSE */ ) -{ +{ mxSelectedAnnotation = xAnnotation; - + for( AnnotationTagVector::iterator iter( maTagVector.begin() ); iter != maTagVector.end(); iter++ ) { if( (*iter)->GetAnnotation() == xAnnotation ) { - SmartTagReference xTag( (*iter).get() ); + SmartTagReference xTag( (*iter).get() ); mrBase.GetMainViewShell()->GetView()->getSmartTags().select( xTag ); (*iter)->OpenPopup( bEdit ); break; @@ -800,8 +800,8 @@ void AnnotationManagerImpl::invalidateSlots() pBindings->Invalidate( SID_DELETE_POSTIT ); pBindings->Invalidate( SID_DELETEALL_POSTIT ); pBindings->Invalidate( SID_PREVIOUS_POSTIT ); - pBindings->Invalidate( SID_NEXT_POSTIT ); - pBindings->Invalidate( SID_UNDO ); + pBindings->Invalidate( SID_NEXT_POSTIT ); + pBindings->Invalidate( SID_UNDO ); pBindings->Invalidate( SID_REDO ); } } @@ -817,9 +817,9 @@ void AnnotationManagerImpl::onSelectionChanged() if( xPage != mxCurrentPage ) { mxCurrentPage = xPage; - + UpdateTags(true); - } + } } catch( Exception& ) { @@ -833,7 +833,7 @@ void AnnotationManagerImpl::UpdateTags( bool bSynchron ) { if( mnUpdateTagsEvent ) Application::RemoveUserEvent( mnUpdateTagsEvent ); - + UpdateTagsHdl(0); } else @@ -847,15 +847,15 @@ IMPL_LINK(AnnotationManagerImpl,UpdateTagsHdl, void *, EMPTYARG) { mnUpdateTagsEvent = 0; DisposeTags(); - + if( mbShowAnnotations ) CreateTags(); - + if( mrBase.GetDrawView() ) - static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles(); + static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles(); invalidateSlots(); - + return 0; } @@ -868,7 +868,7 @@ void AnnotationManagerImpl::CreateTags() maFont = Application::GetSettings().GetStyleSettings().GetAppFont(); rtl::Reference< AnnotationTag > xSelectedTag; - + Reference< XAnnotationEnumeration > xEnum( mxCurrentPage->createAnnotationEnumeration() ); while( xEnum->hasMoreElements() ) { @@ -876,16 +876,16 @@ void AnnotationManagerImpl::CreateTags() Color aColor( GetColorLight( mpDoc->GetAnnotationAuthorIndex( xAnnotation->getAuthor() ) ) ); rtl::Reference< AnnotationTag > xTag( new AnnotationTag( *this, *mrBase.GetMainViewShell()->GetView(), xAnnotation, aColor, nIndex++, maFont ) ); maTagVector.push_back(xTag); - + if( xAnnotation == mxSelectedAnnotation ) { xSelectedTag = xTag; } } - + if( xSelectedTag.is() ) { - SmartTagReference xTag( xSelectedTag.get() ); + SmartTagReference xTag( xSelectedTag.get() ); mrBase.GetMainViewShell()->GetView()->getSmartTags().select( xTag ); } else @@ -912,7 +912,7 @@ void AnnotationManagerImpl::DisposeTags() (*iter++)->Dispose(); } while( iter != maTagVector.end() ); - + maTagVector.clear(); } } @@ -970,19 +970,19 @@ OUString AnnotationManagerImpl::GetHelpText( ::com::sun::star::uno::Reference< : { OUString sAuthor( xAnnotation->getAuthor() ); if( sAuthor.getLength() != 0 ) - { + { sRet += sAuthor; } sRet += OUString( RTL_CONSTASCII_USTRINGPARAM( " [" ) ); - + sRet += getAnnotationDateTimeString( xAnnotation ); sRet += OUString( RTL_CONSTASCII_USTRINGPARAM( "]\n" ) ); - + Reference< XText > xText( xAnnotation->getTextRange() ); if( xText.is() ) sRet += xText->getString(); } - + return sRet; } @@ -992,29 +992,29 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation SfxDispatcher* pDispatcher( getDispatcher( mrBase ) ); if( !pDispatcher ) return; - + const bool bReadOnly = mrBase.GetDocShell()->IsReadOnly(); - + AnnotationWindow* pAnnotationWindow = bButtonMenu ? 0 : dynamic_cast< AnnotationWindow* >( pParent ); - + if( bReadOnly && !pAnnotationWindow ) return; - + std::auto_ptr< PopupMenu > pMenu( new PopupMenu( SdResId( pAnnotationWindow ? RID_ANNOTATION_CONTEXTMENU : RID_ANNOTATION_TAG_CONTEXTMENU ) ) ); SvtUserOptions aUserOptions; - OUString sCurrentAuthor( aUserOptions.GetFullName() ); + OUString sCurrentAuthor( aUserOptions.GetFullName() ); OUString sAuthor( xAnnotation->getAuthor() ); - + String aStr( pMenu->GetItemText( SID_DELETEALLBYAUTHOR_POSTIT ) ), aReplace( sAuthor ); if( aReplace.Len() == 0 ) aReplace = String( SdResId( STR_ANNOTATION_NOAUTHOR ) ); aStr.SearchAndReplaceAscii("%1", aReplace); pMenu->SetItemText( SID_DELETEALLBYAUTHOR_POSTIT, aStr ); pMenu->EnableItem( SID_REPLYTO_POSTIT, (sAuthor != sCurrentAuthor) && !bReadOnly ); - pMenu->EnableItem( SID_DELETE_POSTIT, (xAnnotation.is() && !bReadOnly) ? TRUE : FALSE ); - pMenu->EnableItem( SID_DELETEALLBYAUTHOR_POSTIT, !bReadOnly ); - pMenu->EnableItem( SID_DELETEALL_POSTIT, !bReadOnly ); + pMenu->EnableItem( SID_DELETE_POSTIT, (xAnnotation.is() && !bReadOnly) ? TRUE : FALSE ); + pMenu->EnableItem( SID_DELETEALLBYAUTHOR_POSTIT, !bReadOnly ); + pMenu->EnableItem( SID_DELETEALL_POSTIT, !bReadOnly ); if( pAnnotationWindow ) { @@ -1029,18 +1029,18 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation else { SfxItemSet aSet(pAnnotationWindow->getView()->GetAttribs()); - + if ( aSet.GetItemState( EE_CHAR_WEIGHT ) == SFX_ITEM_ON ) { if( ((const SvxWeightItem&)aSet.Get( EE_CHAR_WEIGHT )).GetWeight() == WEIGHT_BOLD ) pMenu->CheckItem( SID_ATTR_CHAR_WEIGHT ); } - + if ( aSet.GetItemState( EE_CHAR_ITALIC ) == SFX_ITEM_ON ) { if( ((const SvxPostureItem&)aSet.Get( EE_CHAR_ITALIC )).GetPosture() != ITALIC_NONE ) pMenu->CheckItem( SID_ATTR_CHAR_POSTURE ); - + } if ( aSet.GetItemState( EE_CHAR_UNDERLINE ) == SFX_ITEM_ON ) { @@ -1056,12 +1056,12 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pAnnotationWindow ) ); pMenu->EnableItem( SID_PASTE, aDataHelper.GetFormatCount() != 0 ); } - + pMenu->EnableItem( SID_COPY, pAnnotationWindow->getView()->HasSelection() ); } USHORT nId = 0; - + // set slot images Reference< ::com::sun::star::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface() ); if( xFrame.is() ) @@ -1069,12 +1069,12 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); for( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) { - nId = pMenu->GetItemId( nPos ); + nId = pMenu->GetItemId( nPos ); if( pMenu->IsItemEnabled( nId ) ) { OUString sSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); sSlotURL += OUString::valueOf( sal_Int32( nId )); - + Image aImage( GetImage( xFrame, sSlotURL, false, bHighContrast ) ); if( !!aImage ) pMenu->SetItemImage( nId, aImage ); @@ -1105,10 +1105,10 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation } case SID_DELETEALL_POSTIT: pDispatcher->Execute( SID_DELETEALL_POSTIT ); - break; + break; case SID_COPY: case SID_PASTE: - case SID_ATTR_CHAR_WEIGHT: + case SID_ATTR_CHAR_WEIGHT: case SID_ATTR_CHAR_POSTURE: case SID_ATTR_CHAR_UNDERLINE: case SID_ATTR_CHAR_STRIKEOUT: @@ -1169,14 +1169,14 @@ SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForeward ) { if( pPage == 0 ) return bForeward ? GetFirstPage() : GetLastPage(); - + sal_uInt16 nPageNum = (pPage->GetPageNum() - 1) >> 1; // first all non master pages if( !pPage->IsMasterPage() ) { if( bForeward ) - { + { if( nPageNum >= mpDoc->GetSdPageCount(PK_STANDARD)-1 ) { // we reached end of draw pages, start with master pages (skip handout master for draw) @@ -1188,15 +1188,15 @@ SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForeward ) { if( nPageNum == 0 ) return 0; // we are already on the first draw page, finished - - nPageNum--; + + nPageNum--; } return mpDoc->GetSdPage(nPageNum, PK_STANDARD); } else { if( bForeward ) - { + { if( nPageNum >= mpDoc->GetMasterSdPageCount(PK_STANDARD)-1 ) { return 0; // we reached the end, there is nothing more to see here @@ -1209,12 +1209,12 @@ SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForeward ) { // we reached beginning of master pages, start with end if pages return mpDoc->GetSdPage( mpDoc->GetSdPageCount(PK_STANDARD)-1, PK_STANDARD ); - } - - nPageNum--; + } + + nPageNum--; } return static_cast< SdPage* >( mpDoc->GetMasterPage(nPageNum) ); - } + } } SdPage* AnnotationManagerImpl::GetFirstPage() diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 17ba21aa8..3a9d9ca1d 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -58,8 +58,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -174,8 +174,8 @@ void AnnotationTextWindow::KeyInput( const KeyEvent& rKeyEvt ) if ( !( (nKey == KEY_Z || nKey == KEY_Y) && rKeyCode.IsMod1()) ) { bool bIsProtected = mpAnnotationWindow->IsProtected(); - if (!bIsProtected || (bIsProtected && !mpAnnotationWindow->Engine()->GetEditEngine().DoesKeyChangeText(rKeyEvt)) ) - + if (!bIsProtected || (bIsProtected && !mpAnnotationWindow->Engine()->GetEditEngine().DoesKeyChangeText(rKeyEvt)) ) + bDone = mpOutlinerView->PostKeyEvent( rKeyEvt ); } if (bDone) @@ -194,7 +194,7 @@ void AnnotationTextWindow::MouseMove( const MouseEvent& rMEvt ) if ( mpOutlinerView ) { mpOutlinerView->MouseMove( rMEvt ); - SetPointer( mpOutlinerView->GetPointer( rMEvt.GetPosPixel() ) ); + SetPointer( mpOutlinerView->GetPointer( rMEvt.GetPosPixel() ) ); } } @@ -215,7 +215,7 @@ void AnnotationTextWindow::MouseButtonUp( const MouseEvent& rMEvt ) void AnnotationTextWindow::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) - { + { mpAnnotationWindow->Command(rCEvt); } else @@ -265,7 +265,7 @@ Selection AnnotationTextWindow::GetSurroundingTextSelection() const if( mpOutlinerView->HasSelection() ) return Selection( 0, mpOutlinerView->GetSelected().Len() ); else - { + { ESelection aSelection = mpOutlinerView->GetEditView().GetSelection(); return Selection( aSelection.nStartPos, aSelection.nEndPos ); } @@ -405,7 +405,7 @@ void AnnotationWindow::Rescale() //aMode.SetScaleX( aMode.GetScaleX() * Fraction( 8, 10 ) ); //aMode.SetScaleY( aMode.GetScaleY() * Fraction( 8, 10 ) ); mpOutliner->SetRefMapMode( aMode ); - SetMapMode( aMode ); + SetMapMode( aMode ); mpTextWindow->SetMapMode( aMode ); if ( mpMeta ) { @@ -414,7 +414,7 @@ void AnnotationWindow::Rescale() nHeight = nHeight * aMode.GetScaleY().GetNumerator() / aMode.GetScaleY().GetDenominator(); aFont.SetHeight( nHeight ); mpMeta->SetControlFont( aFont ); - } + } } void AnnotationWindow::DoResize() @@ -441,7 +441,7 @@ void AnnotationWindow::DoResize() mpMeta->SetPosSizePixel(0,aHeight,GetSizePixel().Width(),POSTIT_META_HEIGHT); else mpMeta->SetPosSizePixel(0,aHeight,GetSizePixel().Width()-METABUTTON_AREA_WIDTH,POSTIT_META_HEIGHT); - + mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ; mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) ); if (!mpVScrollbar->IsVisible()) @@ -454,7 +454,7 @@ void AnnotationWindow::DoResize() mpVScrollbar->SetLineSize( mpOutliner->GetTextHeight() / 10 ); SetScrollbar(); mpVScrollbar->SetRange( Range(0, mpOutliner->GetTextHeight())); - + Point aPos( mpMeta->GetPosPixel()); Point aBase( aPos.X() + aPos.X() + GetSizePixel().Width(), aPos.Y() ); Point aLeft = PixelToLogic( Point( aBase.X() - (METABUTTON_WIDTH+5), aBase.Y()+17 ) ); @@ -470,7 +470,7 @@ void AnnotationWindow::DoResize() aPos.X()+GetSizePixel().Width()-(METABUTTON_WIDTH+10), aPos.Y()+5 ), Size( METABUTTON_WIDTH, METABUTTON_HEIGHT ) ) ); - + } void AnnotationWindow::SetSizePixel( const Size& rNewSize ) @@ -578,7 +578,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio mxAnnotation = xAnnotation; SetColor(); - + SvtUserOptions aUserOptions; mbProtected = aUserOptions.GetFullName() != xAnnotation->getAuthor(); @@ -590,7 +590,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio std::auto_ptr< OutlinerParaObject > pOPO( pTextApi->CreateText() ); Engine()->SetText( *pOPO.get() ); } - + Engine()->SetModifyHdl( LINK( this, AnnotationWindow, ModifyHdl ) ); Engine()->ClearModifyFlag(); Engine()->GetUndoManager().Clear(); @@ -599,12 +599,12 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio OUString sMeta( xAnnotation->getAuthor() ); OUString sDateTime( getAnnotationDateTimeString(xAnnotation) ); - + if( sDateTime.getLength() != 0 ) { if( sMeta.getLength() != 0 ) sMeta += OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ) ); - + sMeta += sDateTime; } mpMeta->SetText(sMeta); @@ -617,7 +617,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio void AnnotationWindow::SetColor() { sal_uInt16 nAuthorIdx = mpDoc->GetAnnotationAuthorIndex( mxAnnotation->getAuthor() ); - + maColor = mrManager.GetColor( nAuthorIdx ); maColorDark = mrManager.GetColorDark( nAuthorIdx ); maColorLight = mrManager.GetColorLight( nAuthorIdx ); @@ -666,11 +666,11 @@ void AnnotationWindow::Deactivate() DeleteAnnotation( xAnnotation ); } else -*/ +*/ { // write changed text back to annotation if ( Engine()->IsModified() ) - { + { TextApiObject* pTextApi = getTextApiObject( xAnnotation ); if( pTextApi ) @@ -689,15 +689,15 @@ void AnnotationWindow::Deactivate() if( mpDoc->IsUndoEnabled() ) mpDoc->EndUndo(); - + DocView()->GetDocSh()->SetModified(sal_True); } - - } + + } } Engine()->ClearModifyFlag(); } - + Engine()->GetUndoManager().Clear(); } @@ -782,7 +782,7 @@ void AnnotationWindow::MouseButtonDown( const MouseEvent& rMEvt ) void AnnotationWindow::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) - { + { mrManager.ExecuteAnnotationContextMenu( mxAnnotation, this, Rectangle(rCEvt.GetMousePosPixel(),Size(1,1)) ); } else @@ -811,7 +811,7 @@ void AnnotationWindow::ExecuteSlot( USHORT nSID ) DoResize(); } else - { + { SfxItemSet aEditAttr(getView()->GetAttribs()); SfxItemSet aNewAttr(mpOutliner->GetEmptyItemSet()); @@ -822,7 +822,7 @@ void AnnotationWindow::ExecuteSlot( USHORT nSID ) FontWeight eFW = ( (const SvxWeightItem&) aEditAttr.Get( EE_CHAR_WEIGHT ) ).GetWeight(); aNewAttr.Put( SvxWeightItem( eFW == WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL, EE_CHAR_WEIGHT ) ); } - break; + break; case SID_ATTR_CHAR_POSTURE: { FontItalic eFI = ( (const SvxPostureItem&) aEditAttr.Get( EE_CHAR_ITALIC ) ).GetPosture(); @@ -843,7 +843,7 @@ void AnnotationWindow::ExecuteSlot( USHORT nSID ) break; } getView()->SetAttribs( aNewAttr ); - } + } } } diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index a6513a1a1..028079a84 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include #include -#include +#include #ifndef _FM_FMOBJFAC_HXX #include #endif diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx index bc8ff01e4..6b525a0b3 100644 --- a/sd/source/ui/app/sddll1.cxx +++ b/sd/source/ui/app/sddll1.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" -#include +#include #include "sddll.hxx" #include "diactrl.hxx" #include "tbx_ww.hxx" diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index a51c1c9f1..c31d8a46e 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include +#include #include #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index b837633a0..6ba253a83 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "framework/FrameworkHelper.hxx" #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "app.hrc" #include "glob.hrc" @@ -334,12 +334,12 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest) pHelper->RequestView( FrameworkHelper::msOutlineViewURL, FrameworkHelper::msCenterPaneURL); - + pHelper->RunOnResourceActivation( FrameworkHelper::CreateResourceId( FrameworkHelper::msOutlineViewURL, FrameworkHelper::msCenterPaneURL), - OutlineToImpressFinalizer(*pBase, *pDoc, *pBytes)); + OutlineToImpressFinalizer(*pBase, *pDoc, *pBytes)); } } } @@ -750,7 +750,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) pViewFrame->GetDispatcher()->Execute(SID_MODIFYPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aIsChangedItem, &eAutoLayout, 0L); } - + // clear document info using namespace ::com::sun::star; uno::Reference xDPS( @@ -1023,7 +1023,7 @@ OutlineToImpressFinalizer::OutlineToImpressFinalizer ( break; case ERRCODE_IO_PENDING: break; - + default: bLoop = false; nReadByteCount = 0; @@ -1062,7 +1062,7 @@ void OutlineToImpressFinalizer::operator() (bool) { /* sd::OutlineViewPageChangesGuard aGuard( pView ); - + // Remove the first empty pages USHORT nPageCount = mrDocument.GetPageCount(); mrDocument.RemovePage( --nPageCount ); // notes page diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 75d5dcbbb..060a85342 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index be9fbb0e7..06279ffef 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "strings.hrc" #include "sdpopup.hxx" @@ -294,7 +294,7 @@ SvxFieldData* SdFieldPopup::GetField() if( pDocSh ) { SvxExtFileField aFileField( *pFileField ); - + String aName; if( pDocSh->HasName() ) aName = pDocSh->GetMedium()->GetName(); diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index d20b57cde..959d7ca1d 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include #include #include @@ -142,7 +142,7 @@ public: void SetClickHdl (const Link& rLink); bool IsEnabled (void); void Enable (bool bEnable); - + private: PushButton maNextButton1; PushButton maNextButton2; @@ -907,7 +907,7 @@ void AssistentDlgImpl::TemplateScanDone ( TemplateDir* pDir = *I; if (pDir == NULL) continue; - + // HACK! presnt directory is always initially selected. // We have to look at the first entry to get a URL. if (pDir->maEntries.size() > 0) @@ -932,7 +932,7 @@ void AssistentDlgImpl::TemplateScanDone ( TemplateDir* pDir = *I; if (pDir == NULL) continue; - + // HACK! layout directory is always initially selected. // We have to look at the first entry to get a URL. if (pDir->maEntries.size() > 0) @@ -973,11 +973,11 @@ void AssistentDlgImpl::SetStartType( StartType eType ) mpPage1TemplateLB->Show(eType == ST_TEMPLATE); mpPage1OpenLB->Show(eType == ST_OPEN); mpPage1OpenPB->Show(eType == ST_OPEN); - + if (eType == ST_OPEN) maFinishButton.SetText(maOpenStr); else - maFinishButton.SetText(maCreateStr); + maFinishButton.SetText(maCreateStr); } StartType AssistentDlgImpl::GetStartType() @@ -2027,7 +2027,7 @@ void NextButton::ForceFocusEventBroadcast (void) maNextButton2.Hide(); } } - + diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index f2181c45c..cd8c6129c 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #endif #include #include -#include +#include #include "sdpage.hxx" #include "Outliner.hxx" @@ -47,8 +47,8 @@ #include "dlgassim.hxx" SdPageListControl::SdPageListControl( - ::Window* pParent, - const ResId& rResId ) + ::Window* pParent, + const ResId& rResId ) : SvTreeListBox(pParent, rResId) { // Tree-ListBox mit Linien versehen @@ -320,7 +320,7 @@ void TemplateCache::Load() aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( "template.sod" ) ) ); SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, TRUE ); // Download SvStream* pStream = aMedium.GetInStream(); - + if( !pStream ) return; @@ -364,7 +364,7 @@ void TemplateCache::Save() aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( "template.sod" ) ) ); SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, FALSE ); // Download SvStream* pStream = aMedium.GetInStream(); - + if( !pStream ) return; diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index c9cd19ed2..9880c0e9d 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include "strings.hrc" #include "dlgfield.hrc" diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 3e4788cb3..d43c07ab4 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 1ab413281..a497a451d 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,11 +63,11 @@ #include "unomodel.hxx" #endif -#include +#include #include #include #include -#include +#include #include #include #include @@ -783,14 +783,14 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark) { SdPage* pPage = pDrawViewShell->GetActualPage(); nPageNumber = pPage->GetPageNum(); - nPageNumber = nPageNumber > 2 ? nPageNumber - 2 : SDRPAGE_NOTFOUND; + nPageNumber = nPageNumber > 2 ? nPageNumber - 2 : SDRPAGE_NOTFOUND; } else if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "nextslide" ) ) ) ) { SdPage* pPage = pDrawViewShell->GetActualPage(); nPageNumber = pPage->GetPageNum() + 2; if ( nPageNumber >= mpDoc->GetPageCount() ) - nPageNumber = SDRPAGE_NOTFOUND; + nPageNumber = SDRPAGE_NOTFOUND; } } } @@ -837,7 +837,7 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark) ::rtl::OUString sViewURL; switch (eNewPageKind) { - case PK_STANDARD: + case PK_STANDARD: sViewURL = FrameworkHelper::msImpressViewURL; break; case PK_NOTES: @@ -915,11 +915,11 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark) } } } - + SfxBindings& rBindings = (pDrawViewShell->GetViewFrame()!=NULL ? pDrawViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings(); - + rBindings.Invalidate(SID_NAVIGATOR_STATE, TRUE, FALSE); rBindings.Invalidate(SID_NAVIGATOR_PAGENAME); } diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 13adb0199..9a3803598 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include @@ -526,7 +526,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { // the default size will be set later } - + aSize =Size( aSz.Width, aSz.Height ); aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) ); @@ -644,7 +644,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { //HMHmpView->HideMarkHdl(); pObj->SetLogicRect(aRect); - + if ( nAspect != embed::Aspects::MSOLE_ICON ) { Size aTmp = OutputDevice::LogicToLogic( aRect.GetSize(), MAP_100TH_MM, aMapUnit ); diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index 90e3f3a3c..0f496a336 100755 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,8 +45,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -189,10 +189,10 @@ EditEngine* EditWindow::CreateEditEngine (void) rFntDta.nFontType, nLang, DEFAULTFONT_FLAGS_ONLYONE); mpEditEngineItemPool->SetPoolDefaultItem( SvxFontItem( - aFont.GetFamily(), + aFont.GetFamily(), aFont.GetName(), - aFont.GetStyleName(), - aFont.GetPitch(), + aFont.GetStyleName(), + aFont.GetPitch(), aFont.GetCharSet(), rFntDta.nFontInfoId)); } @@ -216,7 +216,7 @@ EditEngine* EditWindow::CreateEditEngine (void) UniString::CreateFromAscii("XXXX")))); pEditEngine->SetControlWord( - (pEditEngine->GetControlWord() + (pEditEngine->GetControlWord() | EE_CNTRL_AUTOINDENTING) & (~EE_CNTRL_UNDOATTRIBS) & (~EE_CNTRL_PASTESPECIAL)); diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 1ec20a11f..2fc424526 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -106,7 +106,7 @@ public: const OUString msTopPropertyName; const OUString msTopRelativePropertyName; const OUString msTotalHeightPropertyName; - + Implementation (void); ~Implementation (void); @@ -397,10 +397,10 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) rFntDta.nFontType, nLang, DEFAULTFONT_FLAGS_ONLYONE); mpEditEngineItemPool->SetPoolDefaultItem( SvxFontItem( - aFont.GetFamily(), + aFont.GetFamily(), aFont.GetName(), - aFont.GetStyleName(), - aFont.GetPitch(), + aFont.GetStyleName(), + aFont.GetPitch(), aFont.GetCharSet(), rFntDta.nFontInfoId)); } @@ -414,7 +414,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) UniString::CreateFromAscii("XXXX")))); pEditEngine->SetControlWord( - (pEditEngine->GetControlWord() + (pEditEngine->GetControlWord() | EE_CNTRL_AUTOINDENTING) & (~EE_CNTRL_UNDOATTRIBS) & (~EE_CNTRL_PASTESPECIAL)); @@ -512,23 +512,23 @@ void PresenterTextView::Implementation::SetFontDescriptor ( CheckTop(); mnTotalHeight = -1; } - - - - + + + + sal_Int32 PresenterTextView::Implementation::GetTop (void) const { return mnTop; } - - - - + + + + void PresenterTextView::Implementation::SetTop (const sal_Int32 nTop) { if (nTop == mnTop) return; - + mnTop = nTop; mxBitmap = NULL; CheckTop(); @@ -571,7 +571,7 @@ sal_Int32 PresenterTextView::Implementation::ParseDistance (const OUString& rsDi else if (rsDistance.endsWithAsciiL("l", 1)) { const sal_Int32 nLines (rsDistance.copy(0,rsDistance.getLength()-1).toInt32()); - // Take the height of the first line as the height of every line. + // Take the height of the first line as the height of every line. const sal_uInt32 nFirstLineHeight (mpEditEngine->GetLineHeight(0,0)); nDistance = nFirstLineHeight * nLines; } @@ -597,13 +597,13 @@ Reference PresenterTextView::Implementation::GetBitmap (void mpOutputDevice->SetFillColor(); mpOutputDevice->SetBackground(Wallpaper()); mpOutputDevice->Erase(); - + MapMode aMapMode (mpOutputDevice->GetMapMode()); aMapMode.SetOrigin(Point(0,0)); mpOutputDevice->SetMapMode(aMapMode); const Rectangle aWindowBox (Point(0,0), maSize); mpOutputDevice->DrawRect(aWindowBox); - + mpEditEngine->Clear(); mpEditEngine->SetText(msText); mpEditEngine->SetPaperSize(maSize); @@ -646,13 +646,13 @@ void PresenterTextView::Implementation::CheckTop (void) mnTotalHeight = mpEditEngine->GetTextHeight(); if (mpEditEngine!=NULL && mnTop >= mnTotalHeight) mnTop = mnTotalHeight - mpEditEngine->GetLineHeight(0,0); - + if (mnTotalHeight < maSize.Height()) mnTop = 0; - + if (mnTotalHeight - mnTop < maSize.Height()) mnTop = mnTotalHeight - maSize.Height(); - + if (mnTop < 0) mnTop = 0; } diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index f904d1195..b0cc579ad 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,8 +62,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -264,7 +264,7 @@ private: // internal bool startShow( PresentationSettingsEx* pPresSettings ); - bool startPreview( + bool startPreview( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode, ::Window* pParent ); @@ -314,7 +314,7 @@ private: long getRestoreSlide() const { return mnRestoreSlide; } private: - bool startShowImpl( + bool startShowImpl( const css::uno::Sequence< css::beans::PropertyValue >& aProperties ); SfxViewFrame* getViewFrame() const; @@ -348,9 +348,9 @@ private: ::Window* mpParentWindow; ShowWindow* mpShowWindow; PushButton* mpTimeButton; - + boost::shared_ptr< AnimationSlideController > mpSlideController; - + long mnRestoreSlide; Point maSlideOrigin; Point maPopupMousePos; @@ -383,7 +383,7 @@ private: /// used in updateHdl to prevent recursive calls sal_Int32 mnEntryCounter; - + sal_Int32 mnLastSlideNumber; WrappedShapeEventImplMap maShapeEventMap; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index f04bac24a..667a601e9 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -115,7 +115,7 @@ struct WrappedMouseMotionEvent : public ::com::sun::star::lang::EventObject }; /////////////////////////////////////////////////////////////////////// -// SlideShowViewListeners +// SlideShowViewListeners /////////////////////////////////////////////////////////////////////// typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > > ViewListenerVector; @@ -134,10 +134,10 @@ protected: ::osl::Mutex& mrMutex; }; -typedef ::std::auto_ptr< SlideShowViewListeners > SlideShowViewListenersPtr; +typedef ::std::auto_ptr< SlideShowViewListeners > SlideShowViewListenersPtr; /////////////////////////////////////////////////////////////////////// -// SlideShowViewPaintListeners +// SlideShowViewPaintListeners /////////////////////////////////////////////////////////////////////// typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XPaintListener, @@ -151,10 +151,10 @@ public: protected: virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rListener, const ::com::sun::star::awt::PaintEvent& rEvent ) throw( ::com::sun::star::uno::Exception ); }; -typedef ::std::auto_ptr< SlideShowViewPaintListeners > SlideShowViewPaintListenersPtr; +typedef ::std::auto_ptr< SlideShowViewPaintListeners > SlideShowViewPaintListenersPtr; /////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseListeners +// SlideShowViewMouseListeners /////////////////////////////////////////////////////////////////////// typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseListener, WrappedMouseEvent > SlideShowViewMouseListeners_Base; @@ -169,11 +169,11 @@ protected: const WrappedMouseEvent& rEvent ) throw( ::com::sun::star::uno::Exception ); }; -typedef ::std::auto_ptr< SlideShowViewMouseListeners > SlideShowViewMouseListenersPtr; +typedef ::std::auto_ptr< SlideShowViewMouseListeners > SlideShowViewMouseListenersPtr; /////////////////////////////////////////////////////////////////////// -// SlideShowViewMouseMotionListeners +// SlideShowViewMouseMotionListeners /////////////////////////////////////////////////////////////////////// typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseMotionListener, @@ -188,7 +188,7 @@ protected: virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rListener, const WrappedMouseMotionEvent& rEvent ) throw( ::com::sun::star::uno::Exception ); }; -typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners > SlideShowViewMouseMotionListenersPtr; +typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners > SlideShowViewMouseMotionListenersPtr; /////////////////////////////////////////////////////////////////////// @@ -203,13 +203,13 @@ typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::presentation::XSlide ::com::sun::star::awt::XMouseListener, ::com::sun::star::awt::XMouseMotionListener > SlideShowView_Base; -class SlideShowView : public ::comphelper::OBaseMutex, +class SlideShowView : public ::comphelper::OBaseMutex, public SlideShowView_Base { -public: - SlideShowView( ShowWindow& rOutputWindow, - SdDrawDocument* pDoc, - AnimationMode eAnimationMode, +public: + SlideShowView( ShowWindow& rOutputWindow, + SdDrawDocument* pDoc, + AnimationMode eAnimationMode, SlideshowImpl* pSlideShow, bool bFullScreen ); @@ -249,7 +249,7 @@ public: virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - + // XMouseMotionListener implementation virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 7e082a514..60968fa9a 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 8a67904c1..78f83d44f 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -56,8 +56,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -1303,7 +1303,7 @@ void Outliner::SetViewMode (PageKind ePageKind) // Outliner code. framework::FrameworkHelper::Instance(rBase)->RequestSynchronousUpdate(); SetViewShell(rBase.GetMainViewShell()); - + // Switching to another view shell has intermediatly called // EndSpelling(). A PrepareSpelling() is pending, so call that now. PrepareSpelling(); diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index c4864e51d..e744d9e35 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index af83e39f1..fc910d17c 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include "app.hrc" #include "strings.hrc" @@ -252,7 +252,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) String aLayerTitle( pLayer->GetTitle() ); String aLayerDesc( pLayer->GetDescription() ); - + String aOldLayerName( aLayerName ); String aOldLayerTitle( aLayerTitle ); String aOldLayerDesc( aLayerDesc ); diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index f807a67b0..f90d2025b 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #include #include #include "optsitem.hxx" -#include +#include #include #include "Outliner.hxx" @@ -254,7 +254,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) if( xPresentation.is() ) { if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) ) - xPresentation->start(); + xPresentation->start(); else xPresentation->rehearseTimings(); } @@ -548,7 +548,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) pOldFldItem->GetField()->ISA( SvxExtTimeField ) || pOldFldItem->GetField()->ISA( SvxExtFileField ) || pOldFldItem->GetField()->ISA( SvxAuthorField ) || - pOldFldItem->GetField()->ISA( SvxPageField ) || + pOldFldItem->GetField()->ISA( SvxPageField ) || pOldFldItem->GetField()->ISA( SvxPagesField )) ) { // Feld selektieren, so dass es beim Insert geloescht wird diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 84dbf3d0f..446b59075 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include #include #include -#include +#include #ifndef _EDITDATA_HXX #include #endif @@ -1485,9 +1485,9 @@ bool View::PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, ULONG nPaste xComponent->dispose(); xComponent.clear(); - + delete pModel; - + return bRet; } diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index cefbf1cb2..e75c84283 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ #include #include #include -#include +#include #ifndef _SVX_DIALOGS_HRC #include #endif @@ -452,7 +452,7 @@ void ViewShell::SetZoomRect(const Rectangle& rZoomRect) mpContentWindow->UpdateMapOrigin(); // #i74769# see above - mpContentWindow->Invalidate(INVALIDATE_CHILDREN); + mpContentWindow->Invalidate(INVALIDATE_CHILDREN); } Size aVisSizePixel = GetActiveWindow()->GetOutputSizePixel(); @@ -800,7 +800,7 @@ BOOL ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) { if( GetView() ) bReturn = GetView()->getSmartTags().RequestHelp(rHEvt); - + if(!bReturn && HasCurrentFunction()) { bReturn = GetCurrentFunction()->RequestHelp(rHEvt); diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index cf9a51609..e530511ee 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -171,6 +171,7 @@ SHL2STDLIBS= \ $(VCLLIB) \ $(SOTLIB) \ $(TOOLSLIB) \ + $(UNOTOOLSLIB) \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ -- cgit v1.2.3 From db95a78fb993e2fd7ec33d741ef9a1fe21a3bd76 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Oct 2009 00:05:16 +0200 Subject: #i103496#: split svtools; improve ConfitItems --- sd/inc/helpids.h | 2 +- sd/inc/pch/precompiled_sd.hxx | 68 +++++++++++----------- sd/inc/sdattr.hxx | 6 +- sd/inc/sdmod.hxx | 2 +- sd/inc/sdundo.hxx | 2 +- sd/inc/stlfamily.hxx | 2 +- sd/inc/stlsheet.hxx | 2 +- sd/inc/undo/undomanager.hxx | 2 +- sd/source/core/anminfo.cxx | 4 +- sd/source/core/drawdoc.cxx | 8 +-- sd/source/core/drawdoc2.cxx | 2 +- sd/source/core/drawdoc3.cxx | 4 +- sd/source/core/drawdoc4.cxx | 4 +- sd/source/core/sdpage.cxx | 2 +- sd/source/core/sdpage2.cxx | 4 +- sd/source/core/stlfamily.cxx | 2 +- sd/source/core/stlpool.cxx | 8 +-- sd/source/core/stlsheet.cxx | 4 +- sd/source/core/typemap.cxx | 12 ++-- sd/source/filter/cgm/sdcgmfilter.cxx | 2 +- sd/source/filter/eppt/epptso.cxx | 2 +- sd/source/filter/html/htmlex.cxx | 6 +- sd/source/filter/html/htmlex.hxx | 2 +- sd/source/filter/html/pubdlg.cxx | 10 ++-- sd/source/filter/ppt/pptin.cxx | 8 +-- sd/source/filter/sdfilter.cxx | 2 +- sd/source/filter/xml/sdtransform.cxx | 8 +-- sd/source/filter/xml/sdxmlwrp.cxx | 4 +- sd/source/ui/annotations/annotationmanager.cxx | 6 +- sd/source/ui/annotations/annotationwindow.cxx | 6 +- sd/source/ui/app/optsitem.cxx | 6 +- sd/source/ui/app/res_bmp.src | 2 +- sd/source/ui/app/sdmod.cxx | 6 +- sd/source/ui/app/sdmod1.cxx | 2 +- sd/source/ui/app/sdmod2.cxx | 8 +-- sd/source/ui/app/sdpopup.cxx | 2 +- sd/source/ui/app/sdxfer.cxx | 4 +- sd/source/ui/app/tbxww.cxx | 2 +- sd/source/ui/app/tmplctrl.cxx | 4 +- sd/source/ui/dlg/LayerDialogContent.cxx | 2 +- sd/source/ui/dlg/animobjs.cxx | 2 +- sd/source/ui/dlg/celltempl.cxx | 4 +- sd/source/ui/dlg/dlgass.cxx | 4 +- sd/source/ui/dlg/dlgassim.hxx | 2 +- sd/source/ui/dlg/dlgchar.cxx | 2 +- sd/source/ui/dlg/dlgfield.cxx | 4 +- sd/source/ui/dlg/dlgolbul.cxx | 6 +- sd/source/ui/dlg/dlgpage.cxx | 4 +- sd/source/ui/dlg/dlgsnap.cxx | 4 +- sd/source/ui/dlg/gluectrl.cxx | 2 +- sd/source/ui/dlg/layeroptionsdlg.cxx | 2 +- sd/source/ui/dlg/morphdlg.cxx | 4 +- sd/source/ui/dlg/navigatr.cxx | 6 +- sd/source/ui/dlg/paragr.cxx | 6 +- sd/source/ui/dlg/present.cxx | 2 +- sd/source/ui/dlg/prltempl.cxx | 6 +- sd/source/ui/dlg/prntopts.cxx | 2 +- sd/source/ui/dlg/sdpreslt.cxx | 2 +- sd/source/ui/dlg/sdtreelb.cxx | 2 +- sd/source/ui/dlg/tabtempl.cxx | 6 +- sd/source/ui/dlg/tpaction.cxx | 4 +- sd/source/ui/dlg/tpoption.cxx | 2 +- sd/source/ui/dlg/unchss.cxx | 6 +- sd/source/ui/docshell/docshel3.cxx | 2 +- sd/source/ui/docshell/docshel4.cxx | 6 +- sd/source/ui/docshell/docshell.cxx | 12 ++-- sd/source/ui/docshell/formatclipboard.cxx | 4 +- sd/source/ui/framework/tools/FrameworkHelper.cxx | 2 +- sd/source/ui/func/bulmaper.cxx | 4 +- sd/source/ui/func/fuarea.cxx | 4 +- sd/source/ui/func/fubullet.cxx | 6 +- sd/source/ui/func/fucon3d.cxx | 2 +- sd/source/ui/func/fuconarc.cxx | 4 +- sd/source/ui/func/fuconbez.cxx | 4 +- sd/source/ui/func/fuconcs.cxx | 6 +- sd/source/ui/func/fuconrec.cxx | 4 +- sd/source/ui/func/fuconstr.cxx | 2 +- sd/source/ui/func/fuconuno.cxx | 4 +- sd/source/ui/func/fudraw.cxx | 2 +- sd/source/ui/func/fuediglu.cxx | 2 +- sd/source/ui/func/fuhhconv.cxx | 2 +- sd/source/ui/func/fuinsert.cxx | 6 +- sd/source/ui/func/fuinsfil.cxx | 4 +- sd/source/ui/func/fuline.cxx | 4 +- sd/source/ui/func/fuoaprms.cxx | 2 +- sd/source/ui/func/fuolbull.cxx | 4 +- sd/source/ui/func/fupage.cxx | 8 +-- sd/source/ui/func/fupoor.cxx | 2 +- sd/source/ui/func/fuprlout.cxx | 4 +- sd/source/ui/func/fuprobjs.cxx | 4 +- sd/source/ui/func/fusel.cxx | 8 +-- sd/source/ui/func/fusldlg.cxx | 2 +- sd/source/ui/func/fusnapln.cxx | 2 +- sd/source/ui/func/futempl.cxx | 2 +- sd/source/ui/func/futext.cxx | 6 +- sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 4 +- sd/source/ui/inc/EventMultiplexer.hxx | 2 +- sd/source/ui/inc/FormShellManager.hxx | 2 +- sd/source/ui/inc/PreviewRenderer.hxx | 2 +- sd/source/ui/inc/ViewShellHint.hxx | 2 +- sd/source/ui/inc/WindowUpdater.hxx | 8 +-- sd/source/ui/inc/diactrl.hxx | 2 +- sd/source/ui/inc/docprev.hxx | 2 +- sd/source/ui/inc/formatclipboard.hxx | 2 +- sd/source/ui/inc/fuconuno.hxx | 2 +- sd/source/ui/inc/fuformatpaintbrush.hxx | 2 +- sd/source/ui/inc/optsitem.hxx | 1 + sd/source/ui/inc/sdtreelb.hxx | 2 +- sd/source/ui/inc/sdxfer.hxx | 2 +- sd/source/ui/inc/unomodel.hxx | 2 +- sd/source/ui/notes/EditWindow.cxx | 2 +- sd/source/ui/presenter/PresenterTextView.cxx | 4 +- sd/source/ui/slideshow/showwin.cxx | 2 +- sd/source/ui/slideshow/slideshow.cxx | 2 +- sd/source/ui/slideshow/slideshowimpl.cxx | 4 +- .../ui/slidesorter/controller/SlsListener.hxx | 2 +- .../ui/slidesorter/controller/SlsSlotManager.cxx | 8 +-- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 6 +- sd/source/ui/table/TableDesignPane.cxx | 2 +- sd/source/ui/table/tablefunction.cxx | 4 +- sd/source/ui/table/tableobjectbar.cxx | 4 +- sd/source/ui/toolpanel/LayoutMenu.cxx | 2 +- sd/source/ui/toolpanel/TitleBar.cxx | 2 +- .../ui/toolpanel/controls/MasterPageContainer.cxx | 4 +- .../ui/toolpanel/controls/MasterPageObserver.cxx | 2 +- .../ui/toolpanel/controls/MasterPagesSelector.cxx | 8 +-- sd/source/ui/unoidl/sddetect.cxx | 6 +- sd/source/ui/unoidl/unoobj.cxx | 4 +- sd/source/ui/unoidl/unopage.cxx | 4 +- sd/source/ui/unoidl/unopage.hxx | 2 +- sd/source/ui/unoidl/unopback.cxx | 2 +- sd/source/ui/view/GraphicObjectBar.cxx | 6 +- sd/source/ui/view/MediaObjectBar.cxx | 4 +- sd/source/ui/view/PrintManager.cxx | 12 ++-- sd/source/ui/view/ToolBarManager.cxx | 2 +- sd/source/ui/view/ViewShellBase.cxx | 2 +- sd/source/ui/view/ViewShellImplementation.cxx | 2 +- sd/source/ui/view/WindowUpdater.cxx | 54 ++++++++--------- sd/source/ui/view/drawview.cxx | 8 +-- sd/source/ui/view/drbezob.cxx | 4 +- sd/source/ui/view/drtxtob.cxx | 10 ++-- sd/source/ui/view/drtxtob1.cxx | 10 ++-- sd/source/ui/view/drviews2.cxx | 2 +- sd/source/ui/view/drviews3.cxx | 12 ++-- sd/source/ui/view/drviews4.cxx | 2 +- sd/source/ui/view/drviews7.cxx | 14 ++--- sd/source/ui/view/drviews9.cxx | 6 +- sd/source/ui/view/drviewsa.cxx | 6 +- sd/source/ui/view/drviewsc.cxx | 2 +- sd/source/ui/view/drviewsd.cxx | 6 +- sd/source/ui/view/drviewse.cxx | 10 ++-- sd/source/ui/view/drviewsf.cxx | 8 +-- sd/source/ui/view/drviewsh.cxx | 4 +- sd/source/ui/view/drviewsi.cxx | 2 +- sd/source/ui/view/drviewsj.cxx | 2 +- sd/source/ui/view/outlnvs2.cxx | 2 +- sd/source/ui/view/outlnvsh.cxx | 6 +- sd/source/ui/view/outlview.cxx | 6 +- sd/source/ui/view/sdruler.cxx | 2 +- sd/source/ui/view/sdview2.cxx | 4 +- sd/source/ui/view/sdview3.cxx | 4 +- sd/source/ui/view/sdview4.cxx | 2 +- sd/source/ui/view/viewshe3.cxx | 7 +-- sd/source/ui/view/viewshel.cxx | 4 +- 164 files changed, 392 insertions(+), 396 deletions(-) (limited to 'sd') diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index d3cdac904..9753be76d 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -28,7 +28,7 @@ * ************************************************************************/ #ifndef _SOLAR_HRC -#include +#include #endif #define HID_SD_PRINT_OPTIONS (HID_SD_START + 0) diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 60e3e3aa0..1c236c9b2 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -495,23 +495,23 @@ #include "sot/storinfo.hxx" #include "svtools/FilterConfigItem.hxx" -#include "svtools/aeitem.hxx" -#include "svtools/brdcst.hxx" +#include "svl/aeitem.hxx" +#include "svl/brdcst.hxx" #include "svtools/colorcfg.hxx" #include "svtools/colrdlg.hxx" #include "svtools/controldims.hrc" -#include "svtools/ctloptions.hxx" +#include "svl/ctloptions.hxx" #include "svtools/ctrlbox.hxx" #include "svtools/ctrltool.hxx" #include "svtools/ehdl.hxx" -#include "svtools/eitem.hxx" +#include "svl/eitem.hxx" #include "svtools/filedlg.hxx" #include "svtools/filter.hxx" -#include "svtools/flagitem.hxx" +#include "svl/flagitem.hxx" #include "svtools/fltcall.hxx" #include "unotools/fltrcfg.hxx" -#include "svtools/globalnameitem.hxx" -#include "svtools/hint.hxx" +#include "svl/globalnameitem.hxx" +#include "svl/hint.hxx" #include "unotools/historyoptions.hxx" #include "svtools/htmlout.hxx" #include "svtools/imap.hxx" @@ -519,51 +519,51 @@ #include "svtools/imapobj.hxx" #include "svtools/imappoly.hxx" #include "svtools/imaprect.hxx" -#include "svtools/inethist.hxx" -#include "svtools/intitem.hxx" -#include "svtools/itemiter.hxx" -#include "svtools/itempool.hxx" -#include "svtools/itemset.hxx" -#include "svtools/languageoptions.hxx" -#include "svtools/lckbitem.hxx" +#include "svl/inethist.hxx" +#include "svl/intitem.hxx" +#include "svl/itemiter.hxx" +#include "svl/itempool.hxx" +#include "svl/itemset.hxx" +#include "svl/languageoptions.hxx" +#include "svl/lckbitem.hxx" #include "unotools/lingucfg.hxx" #include "unotools/linguprops.hxx" -#include "svtools/listener.hxx" -#include "svtools/lstner.hxx" -#include "svtools/misccfg.hxx" +#include "svl/listener.hxx" +#include "svl/lstner.hxx" +#include "unotools/misccfg.hxx" #include "unotools/pathoptions.hxx" -#include "svtools/poolitem.hxx" +#include "svl/poolitem.hxx" #include "svtools/prgsbar.hxx" #include "svtools/printdlg.hxx" -#include "svtools/ptitem.hxx" -#include "svtools/rectitem.hxx" +#include "svl/ptitem.hxx" +#include "svl/rectitem.hxx" #include "unotools/saveopt.hxx" #include "svtools/sfxecode.hxx" -#include "svtools/slstitm.hxx" -#include "svtools/smplhint.hxx" +#include "svl/slstitm.hxx" +#include "svl/smplhint.hxx" #include "svtools/soerr.hxx" -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #include "svtools/sores.hxx" #include "svtools/stdctrl.hxx" -#include "svtools/stritem.hxx" -#include "svtools/style.hrc" -#include "svtools/style.hxx" +#include "svl/stritem.hxx" +#include "svl/style.hrc" +#include "svl/style.hxx" #include "svtools/svmedit.hxx" -#include "svtools/svstdarr.hxx" -#include "svtools/syslocale.hxx" +#include "svl/svstdarr.hxx" +#include "unotools/syslocale.hxx" #include "svtools/tabbar.hxx" #include "svtools/treelist.hxx" -#include "svtools/undo.hxx" +#include "svl/undo.hxx" #include "svtools/unoimap.hxx" -#include "svtools/urihelper.hxx" -#include "svtools/urlbmk.hxx" +#include "svl/urihelper.hxx" +#include "svl/urlbmk.hxx" #include "unotools/useroptions.hxx" #include "svtools/valueset.hxx" #include "unotools/viewoptions.hxx" -#include "svtools/visitem.hxx" -#include "svtools/whiter.hxx" +#include "svl/visitem.hxx" +#include "svl/whiter.hxx" #include "svtools/wmf.hxx" -#include "svtools/zforlist.hxx" +#include "svl/zforlist.hxx" #include "svx/SpellDialogChildWindow.hxx" diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 99dca4806..bebeb1fac 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -32,9 +32,9 @@ #define _SDATTR_HXX #include -#include -#include -#include +#include +#include +#include #include #ifndef _SDATTR_HRC diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 1a365234f..1c9d0719a 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -42,7 +42,7 @@ #include #include #include "sddllapi.h" -#include +#include #include #include #include diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx index f964d608f..bad50041b 100644 --- a/sd/inc/sdundo.hxx +++ b/sd/inc/sdundo.hxx @@ -31,7 +31,7 @@ #ifndef _SD_SDUNDO_HXX #define _SD_SDUNDO_HXX -#include +#include #include "sddllapi.h" class SdDrawDocument; diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx index a9f12e7e6..19796f7c5 100644 --- a/sd/inc/stlfamily.hxx +++ b/sd/inc/stlfamily.hxx @@ -46,7 +46,7 @@ #include -#include +#include #include diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index c2caf0cc7..d3bd9a143 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -44,7 +44,7 @@ #include #include -#include +#include #include diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index ce5a78fa1..ddb9b91cb 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -32,7 +32,7 @@ #define _SD_UNDOMANAGER_HXX #include "misc/scopelock.hxx" -#include +#include namespace sd { diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index 45d7a9dc1..d3c8ae37b 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" #include -#include +#include #include "svx/xtable.hxx" #include -#include +#include #include #include diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index be45632bd..b2931d54f 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -44,9 +44,6 @@ #include -#ifndef _OFA_MISCCFG_HXX -#include -#endif #include #include #include @@ -57,14 +54,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include @@ -262,7 +259,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) } // DefTab und SpellOptions setzen - //OfaMiscCfg* pOfaMiscCfg = SFX_APP()->GetMiscConfig(); // Jetzt am Modul (SD) USHORT nDefTab = pOptions->GetDefTab(); SetDefaultTabulator( nDefTab ); diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 81b302024..258b9a1fc 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 2fe1f33dd..b4c4388f2 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -44,13 +44,13 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 823848d06..4ee0e7976 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -102,7 +102,7 @@ #include #include #include -#include +#include #include #include #include @@ -119,7 +119,7 @@ #include "shapelist.hxx" #include #include -#include +#include using ::rtl::OUString; using namespace ::com::sun::star; diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index e5355c20a..5afc0ef8a 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #ifndef _SVX_SRIPTTYPEITEM_HXX diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index bfa87d633..ad59908aa 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -60,7 +60,7 @@ // #90477# #include -#include +#include using namespace ::sd; using namespace ::com::sun::star; diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index 10258dbb9..574c3d806 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -37,7 +37,7 @@ #include #include -#include +#include #include diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 6efb3558d..ddeec77e0 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -42,14 +42,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #ifndef _SVX_EMPHITEM_HXX @@ -64,7 +64,7 @@ #include #include #include -#include +#include #define _SDR_POSITIVE #define _SDR_ITEMS @@ -78,7 +78,7 @@ #include "sdmod.hxx" #include "sdpage.hxx" #include "helpids.h" -#include +#include using ::rtl::OUString; using namespace ::com::sun::star::uno; diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 93a078312..ce756e65a 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -46,8 +46,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 80d1fc559..ca07fcdfd 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -43,13 +43,13 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -96,9 +96,9 @@ #include // #UndoRedo# -#include +#include -#include +#include #define CharSetItem SfxUInt16Item @@ -129,8 +129,8 @@ #define OfaStringListItem SfxStringListItem #define avmedia_MediaItem ::avmedia::MediaItem #include -#include -#include +#include +#include #include diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index fdc1f3066..336c86fa6 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 3c4cf0318..456118f8a 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -46,7 +46,7 @@ #include #include #include -#include +#include //#ifndef _SVX_XIT_HXX //#include //#endif diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 89788283e..2ae4e480c 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include @@ -75,9 +75,9 @@ #include #include #include -#include +#include #define _SVSTDARR_USHORTS -#include +#include //#ifndef _SVDETC_HXX //#include //#endif diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 6ec482189..6ba1a54b6 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "resltn.hxx" // enum PublishingResolution #include #include diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index c0e070d5b..9cbbaaedb 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -44,14 +44,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 75cae5fd9..8bbc25e08 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include @@ -44,11 +44,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -75,7 +75,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index 9e6860fc3..41519557c 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "../ui/inc/DrawDocShell.hxx" #include "../ui/inc/strings.hrc" diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index ed2040d72..bd6c36efd 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -32,10 +32,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 8b9e4f447..b59ab0cd8 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -70,8 +70,8 @@ #include // #80365# include necessary for XML progress bar at load time -#include -#include +#include +#include #include #include "sderror.hxx" diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 61c121fbc..3d60f15f4 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -45,10 +45,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 3a9d9ca1d..7964ec1f6 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -57,11 +57,11 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 7a905a588..0f97c9319 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -36,7 +36,7 @@ #ifndef _SV_SALBTYPE_HRC //autogen #include #endif -#include +#include #include "app.hxx" #include "optsitem.hxx" @@ -74,6 +74,10 @@ void SdOptionsItem::Commit() mrParent.Commit( *this ); }; +void SdOptionsItem::Notify( const com::sun::star::uno::Sequence& ) +{} + + // ----------------------------------------------------------------------------- Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames ) diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index 8ba709db6..da5d31551 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -29,7 +29,7 @@ ************************************************************************/ #include -#include +#include #include "glob.hrc" #include "res_bmp.hrc" diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index c31d8a46e..7f4795ae2 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" #include -#include +#include #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include #endif @@ -39,14 +39,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 6ba253a83..c6c4026af 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include +#include #include #include #include diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 060a85342..e3279781a 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -33,9 +33,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -85,7 +85,7 @@ #include "sdabstdlg.hxx" #include "tpoption.hrc" #include "prntopts.hrc" -#include +#include /** retrieves the page that is currently painted. This will only be the master page if the current drawn view only shows the master page*/ diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 06279ffef..d370dfd45 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 5142539f0..d3918a877 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -49,13 +49,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include //#ifndef _SVDETC_HXX //autogen diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 63021a95e..7435c6232 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #ifndef _SFX_IMAGEMGR_HXX #include diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index a51ae3863..8714b3754 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include #include #include "tmplctrl.hxx" diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index e93594c78..41ffbec37 100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 8a51c44e1..be91d661d 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx index 0c695fd23..e0508faa8 100644 --- a/sd/source/ui/dlg/celltempl.cxx +++ b/sd/source/ui/dlg/celltempl.cxx @@ -35,8 +35,8 @@ #undef SD_DLLIMPLEMENTATION #endif -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 959d7ca1d..d377270b4 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "DrawDocShell.hxx" #include #include diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index ed1f4e423..d6234ff98 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include +#include #include "drawdoc.hxx" #include #include diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index 5f11b83cf..5775578a0 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -44,7 +44,7 @@ #include "sdresid.hxx" #include "dlg_char.hxx" #include -#include +#include /************************************************************************* |* diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 9880c0e9d..d7703e943 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -40,10 +40,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index db24d3fa6..c96de9a95 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -48,11 +48,11 @@ #include #include -#include +#include #include #include "View.hxx" #include -#include +#include #include #ifndef _SD_SDRESID_HXX @@ -64,7 +64,7 @@ #include "bulmaper.hxx" #include "DrawDocShell.hxx" #include -#include +#include namespace sd { diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index b49d06d32..2b45bb6ed 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -35,7 +35,7 @@ #undef SD_DLLIMPLEMENTATION #endif -#include +#include #ifndef _SVX_DIALOGS_HRC #include #endif @@ -48,7 +48,7 @@ #include "dlgpage.hxx" #include "DrawDocShell.hxx" -#include +#include #include #include diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index b4dd3ca83..d49028304 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include #include "dlgsnap.hrc" #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 66c180190..ce73239ad 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx index 8421651c0..e2c1f74e0 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.cxx +++ b/sd/source/ui/dlg/layeroptionsdlg.cxx @@ -34,7 +34,7 @@ #ifdef SD_DLLIMPLEMENTATION #undef SD_DLLIMPLEMENTATION #endif -#include +#include #include "strings.hrc" #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index d4e298436..079a514eb 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -47,8 +47,8 @@ #include #include #include -#include -#include +#include +#include namespace sd { diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index f3df24122..37439cc6e 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -36,11 +36,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index e82aa2dff..f608ba592 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 349fb7871..ec059e771 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include "sdattr.hxx" #include "present.hxx" diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 5234db760..311a41d1a 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "DrawDocShell.hxx" #include "glob.hrc" @@ -59,7 +59,7 @@ #include "enumdlg.hrc" //#include "enumdlg.hxx" #include "bulmaper.hxx" -#include +#include #include #include #include "drawdoc.hxx" diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index b3b697273..6c0801374 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -42,7 +42,7 @@ #include "sdresid.hxx" #include "prntopts.hxx" #include "app.hrc" -#include +#include #include // STATIC DATA ----------------------------------------------------------- diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index b6eb7023c..ae71c3619 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -36,7 +36,7 @@ #endif -#include +#include #include #include diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 79b5fb8cd..48fcfe792 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 4d08c991d..147661ea6 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -40,18 +40,18 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include -#include +#include #include #include "DrawDocShell.hxx" diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index d43c07ab4..8041cfcae 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include #include @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include "View.hxx" diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 73f7710b5..e57c8ab79 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -58,7 +58,7 @@ #include "tpoption.hxx" #include "strings.hrc" #include "app.hrc" -#include +#include #include #define DLGWIN this->GetParent()->GetParent() diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index 6c40d4239..59d2ed4e4 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -32,9 +32,9 @@ #include "precompiled_sd.hxx" -#include -#include -#include +#include +#include +#include #include #include "unchss.hxx" diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 814800c8b..b25c8e5fc 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -51,7 +51,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index a497a451d..1c4c3ea23 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -41,8 +41,8 @@ #endif #include #include -#include -#include +#include +#include #include #include #include @@ -50,7 +50,7 @@ #include #endif #include -#include +#include #include #include #ifndef _SFX_ECODE_HXX //autogen diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 1ecfaa6ab..1b209dbb4 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -44,8 +44,8 @@ #include #include #include -#include -#include +#include +#include #include #ifndef _SFX_DOCFILE_HXX //autogen #include @@ -55,16 +55,16 @@ #include #include #include -#include -#include +#include +#include #include #include #ifndef _SO_CLSIDS_HXX #include #endif #include -#include -#include +#include +#include #include diff --git a/sd/source/ui/docshell/formatclipboard.cxx b/sd/source/ui/docshell/formatclipboard.cxx index 0bc6d6fcd..0c0e702af 100644 --- a/sd/source/ui/docshell/formatclipboard.cxx +++ b/sd/source/ui/docshell/formatclipboard.cxx @@ -35,10 +35,10 @@ #include // header for class SfxItemIter -#include +#include // header for class SfxStyleSheet -#include +#include /*-------------------------------------------------------------------- --------------------------------------------------------------------*/ diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 69fddfe16..fcc2ddc7c 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -45,7 +45,7 @@ #include "app.hrc" #include #include -#include +#include #include #include diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index aae1dec75..4c4dc4fc0 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -54,8 +54,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index 43642cff7..3909a404c 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index d9b35052d..c158b8159 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -38,7 +38,7 @@ #include #endif #include -#include +#include #include #include "OutlineViewShell.hxx" #include "DrawViewShell.hxx" @@ -49,8 +49,8 @@ #include #include #include -#include -#include +#include +#include #ifdef IRIX #include diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index afecd4b42..638b14d97 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index e36e81ed2..6044b86fd 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 52d224386..38cfe90d3 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -34,9 +34,9 @@ #include #include "fuconbez.hxx" -#include +#include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 979c16bbf..dabef14c9 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -40,7 +40,7 @@ #include #include "app.hrc" -#include +#include #include #include #include @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include @@ -73,7 +73,7 @@ // #109583# #include #include -#include +#include #include #include "sdresid.hxx" diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 07a538264..eec0319c2 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -40,7 +40,7 @@ #include #include "app.hrc" -#include +#include #include #include #include @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 6072ec814..499550b21 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -34,7 +34,7 @@ #include "fuconstr.hxx" #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 8ffc4e50f..ceeba1da0 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -32,11 +32,11 @@ #include "precompiled_sd.hxx" #include "fuconuno.hxx" -#include +#include #include #include #include -#include +#include #include diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index a313fd874..65acaa1d1 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -76,7 +76,7 @@ #include "sdresid.hxx" #include "drawview.hxx" #include "fusel.hxx" -#include +#include #include #include "slideshow.hxx" #include diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index f54949de4..8db5ab6ae 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" #include "fuediglu.hxx" -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 5005aac45..a8cb5a023 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 9a3803598..3c28fa9bf 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -44,12 +44,12 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 7cc086083..588dc6e65 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -38,7 +38,7 @@ #ifndef _EDITENG_HXX #include #endif -#include +#include #include #include #include @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index 641f04441..3feaddba1 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index db7550726..4a0705c1d 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -46,7 +46,7 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include +#include #include "svx/xtable.hxx" #include "strings.hrc" diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index bdaa99855..d77b01d6a 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -34,11 +34,11 @@ #include "fuolbull.hxx" #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 31de19e34..5368a66a9 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -40,14 +40,14 @@ #include #include -#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif #include -#include +#include #include -#include +#include #include #ifndef _SVX_SVDORECT_HXX #include @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 777af1142..6fa1c7ee7 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -35,7 +35,7 @@ #include "fupoor.hxx" #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 5ff569609..d1cf9e94d 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -35,8 +35,8 @@ #include "fuprlout.hxx" #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 94ce4a410..3162871f8 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -36,9 +36,9 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include +#include #include -#include +#include #include "app.hrc" diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 0c6ca10c2..7bf64f622 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -40,15 +40,15 @@ #include #include "drawview.hxx" #include -#include +#include #include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 67c178399..549252df8 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -33,7 +33,7 @@ #include "fusldlg.hxx" -#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index ca271774f..941999ebe 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" #include "fusnapln.hxx" -#include +#include #include #include diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 08f8281c0..e81d98569 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -42,7 +42,7 @@ #include #include // fuer SID_OBJECT_SELECT #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index cb1e38e3a..45bfeffa0 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -39,14 +39,14 @@ #include #include #include -#include -#include +#include +#include #include #ifndef _SVDOGROUP_HXX //autogen #include #endif #include -#include +#include #include #include #include diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index ce4ba45f5..1c31132b3 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx index 9ba6cc036..04daa9895 100644 --- a/sd/source/ui/inc/EventMultiplexer.hxx +++ b/sd/source/ui/inc/EventMultiplexer.hxx @@ -31,7 +31,7 @@ #ifndef SD_TOOLS_EVENT_MULTIPLEXER_HXX #define SD_TOOLS_EVENT_MULTIPLEXER_HXX -#include +#include #include #include diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index d1c99cff4..be432055a 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include class VclWindowEvent; class FmFormShell; diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index 346707739..15ecbb04d 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -34,7 +34,7 @@ #include "drawview.hxx" #include #include -#include +#include #include diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index d6d67c805..8fdf227f4 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -31,7 +31,7 @@ #ifndef SD_VIEW_SHELL_HINT_HXX #define SD_VIEW_SHELL_HINT_HXX -#include +#include namespace sd { diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 9482d7b5a..c8b467b68 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -31,8 +31,8 @@ #ifndef SD_OUTPUT_DEVICE_UPDATER_HXX #define SD_OUTPUT_DEVICE_UPDATER_HXX -#include -#include +#include +#include #include "sddllapi.h" #ifndef INCLUDED_VECTOR @@ -65,7 +65,7 @@ class ViewShell; this document is reformatted when the monitored option changes.

*/ class SD_DLLPUBLIC WindowUpdater - : public SfxListener + : public utl::ConfigurationListener { public: explicit WindowUpdater (void); @@ -116,7 +116,7 @@ public: /** Callback that waits for notifications of a SvtCTLOptions object. */ - virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster*, sal_uInt32 nHint); private: /// Options to monitor for changes. diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 4e0252bed..67567f7cb 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -32,7 +32,7 @@ #define _SD_DIACTRL_HXX #include "dlgctrls.hxx" -#include +#include #include #include #include diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index e1379ffa7..d137677dd 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -37,7 +37,7 @@ #include -#include +#include #include #include "fadedef.h" #include "sddllapi.h" diff --git a/sd/source/ui/inc/formatclipboard.hxx b/sd/source/ui/inc/formatclipboard.hxx index 02583faaa..9d62d6798 100644 --- a/sd/source/ui/inc/formatclipboard.hxx +++ b/sd/source/ui/inc/formatclipboard.hxx @@ -33,7 +33,7 @@ #include "View.hxx" // header for class SfxItemSet -#include +#include //----------------------------------------------------------------------------- /** This class acts as data container and execution class for the format paintbrush feature in draw and impress. diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index f3199dfbf..fb4a9512e 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -31,7 +31,7 @@ #ifndef SD_FU_CONSTRUCT_UNO_CONTROL_HXX #define SD_FU_CONSTRUCT_UNO_CONTROL_HXX -#include +#include #include "fuconstr.hxx" namespace sd { diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 5685ce6fd..427133043 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -34,7 +34,7 @@ #include "fupoor.hxx" // header for class SfxItemSet -#include +#include namespace sd { diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index ed8fd7ff6..b5e463241 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -85,6 +85,7 @@ public: virtual ~SdOptionsItem(); virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index be671dadb..17847c492 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -40,7 +40,7 @@ #include "sddllapi.h" #include #include -#include +#include #include #include "sdxfer.hxx" diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index f3d8e7b9d..11ff9b726 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include // ------------------ // - SdTransferable - diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 317cbe083..de9491568 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -52,7 +52,7 @@ #include -#include +#include #include #include diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index 0f496a336..4a7d91e87 100755 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -41,7 +41,7 @@ #include #include #include "sdresid.hxx" -#include +#include #include #include #include diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 2fc424526..8890c608f 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 1310e0497..10b81ce51 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -35,7 +35,7 @@ #include "showwindow.hxx" -#include +#include #include diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 78a6c6df4..6da2950a9 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 6bbb771a1..e0f2c3dd5 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -46,8 +46,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 204b31223..0cffec5f1 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index a55e8a5c9..75fa4a4fd 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -88,10 +88,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index f067e879d..fb75dc576 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -60,7 +60,7 @@ #include "sdresid.hxx" #include "glob.hrc" -#include +#include #include #include #include @@ -72,10 +72,10 @@ #include #include #include -#include +#include #ifndef _SFXITEMPOOL_HXX -#include +#include #endif using namespace std; diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 0b6cb9a89..c9bd00418 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -50,7 +50,7 @@ #include //#include -#include +#include #include #include diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index e5a278e40..8d5921dee 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -57,12 +57,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "framework/FrameworkHelper.hxx" #include "app.hrc" diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 2707d019d..b82444da0 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -39,8 +39,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 7b479e102..73e12ef31 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -61,7 +61,7 @@ #include #include "sdresid.hxx" #include -#include +#include #include #include "taskpane/TitledControl.hxx" #include diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index 85c8d0ee7..c32176cc4 100644 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index 72ce4d505..72e363df0 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx @@ -60,8 +60,8 @@ #include "DrawDocShell.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" -#include -#include +#include +#include #include "sdresid.hxx" #include "tools/TimerBasedTaskExecution.hxx" #include "pres.hxx" diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 399604ab3..5d59853c8 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index 21bf17de2..3cb8d6072 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -62,12 +62,12 @@ #include "drawview.hxx" #endif #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include #include @@ -76,7 +76,7 @@ #include "stlpool.hxx" #include "unmovss.hxx" #include -#include +#include using namespace ::sd::toolpanel::controls; #define MasterPagesSelector diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 60968fa9a..a59b63a3d 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -63,10 +63,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 7a88d6261..a350f21cf 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -40,8 +40,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 8a8880d39..33e8ab75c 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -54,7 +54,7 @@ #ifndef _SVX_SVXIDS_HRC #include #endif -#include +#include #include #include #include @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index c5bf5b213..24cdd842a 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -39,7 +39,7 @@ #include #include -#include +#include #ifndef _SVX_UNOPAGE_HXX #include diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index d30ba6898..d7b9da0ca 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 49a9f3640..9edd046ea 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index 77f403987..984f392d5 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/view/PrintManager.cxx b/sd/source/ui/view/PrintManager.cxx index fc232c867..b22c30f47 100644 --- a/sd/source/ui/view/PrintManager.cxx +++ b/sd/source/ui/view/PrintManager.cxx @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include "WindowUpdater.hxx" @@ -71,7 +71,7 @@ #include "printdlg.hrc" #include "prntopts.hrc" #include "app.hrc" -#include +#include #include #include #include "printdialog.hxx" @@ -368,7 +368,7 @@ USHORT PrintManager::Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* p if( pPrintOpts ) { - SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig(); + ::utl::MiscCfg aMisc; if( pPrintOpts->GetOptionsPrint().IsDate() ) { @@ -398,9 +398,9 @@ USHORT PrintManager::Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* p ePageKind = PK_NOTES; } - pPrintOpts->GetOptionsPrint().SetWarningPrinter( pMisc->IsNotFoundWarning() ); - pPrintOpts->GetOptionsPrint().SetWarningSize( pMisc->IsPaperSizeWarning() ); - pPrintOpts->GetOptionsPrint().SetWarningOrientation( pMisc->IsPaperOrientationWarning() ); + pPrintOpts->GetOptionsPrint().SetWarningPrinter( aMisc.IsNotFoundWarning() ); + pPrintOpts->GetOptionsPrint().SetWarningSize( aMisc.IsPaperSizeWarning() ); + pPrintOpts->GetOptionsPrint().SetWarningOrientation( aMisc.IsPaperOrientationWarning() ); UINT16 nQuality = pPrintOpts->GetOptionsPrint().GetOutputQuality(); ULONG nMode = DRAWMODE_DEFAULT; diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index f4727b711..82b32c3ea 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 56dbac92e..67319a8cf 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -83,7 +83,7 @@ #include #include #include -#include +#include #include #include "fubullet.hxx" diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 4b870f432..90269fb89 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 47174560d..ffd57b414 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -42,7 +42,7 @@ #endif #include #include -#include +#include #include @@ -52,7 +52,7 @@ WindowUpdater::WindowUpdater (void) : mpViewShell (NULL), mpDocument (NULL) { - StartListening (maCTLOptions); + maCTLOptions.AddListener(this); } @@ -60,7 +60,7 @@ WindowUpdater::WindowUpdater (void) WindowUpdater::~WindowUpdater (void) throw () { - EndListening (maCTLOptions); + maCTLOptions.RemoveListener(this); } @@ -163,33 +163,29 @@ void WindowUpdater::UpdateWindow (OutputDevice* pDevice) const -void WindowUpdater::Notify (SfxBroadcaster&, const SfxHint& rHint) +void WindowUpdater::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { - const SfxSimpleHint& rSimpleHint = static_cast(rHint); - if (rSimpleHint.GetId() == SFX_HINT_CTL_SETTINGS_CHANGED) - { - // #110094#-7 - // Clear the master page cache so that master pages will be redrawn. - //if (mpViewShell != NULL) - //{ - // SdView* pView = mpViewShell->GetView(); - // if (pView != NULL) - // pView->ReleaseMasterPagePaintCache (); - //} - // Set the current state at all registered output devices. - tWindowList::iterator aWindowIterator (maWindowList.begin()); - while (aWindowIterator != maWindowList.end()) - Update (*aWindowIterator++); - - // Reformat the document for the modified state to take effect. - if (mpDocument != NULL) - mpDocument->ReformatAllTextObjects(); - - // Invalidate the windows to make the modified state visible. - aWindowIterator = maWindowList.begin(); - while (aWindowIterator != maWindowList.end()) - (*aWindowIterator++)->Invalidate(); - } + // #110094#-7 + // Clear the master page cache so that master pages will be redrawn. + //if (mpViewShell != NULL) + //{ + // SdView* pView = mpViewShell->GetView(); + // if (pView != NULL) + // pView->ReleaseMasterPagePaintCache (); + //} + // Set the current state at all registered output devices. + tWindowList::iterator aWindowIterator (maWindowList.begin()); + while (aWindowIterator != maWindowList.end()) + Update (*aWindowIterator++); + + // Reformat the document for the modified state to take effect. + if (mpDocument != NULL) + mpDocument->ReformatAllTextObjects(); + + // Invalidate the windows to make the modified state visible. + aWindowIterator = maWindowList.begin(); + while (aWindowIterator != maWindowList.end()) + (*aWindowIterator++)->Invalidate(); } diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 118ca66bd..22ba1d0b2 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -36,7 +36,7 @@ #endif #include #include -#include +#include #include #ifndef _VIEW3D_HXX //autogen #include @@ -48,12 +48,12 @@ #include #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index 4797fd0c8..32ef899ff 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -39,10 +39,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 9dafcd8bc..9fdf6a2b4 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -39,14 +39,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 3873169af..55dfee47d 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -46,9 +46,9 @@ #endif #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -65,14 +65,14 @@ #include #include #include -#include +#include #ifndef _SVX_SRIPTTYPEITEM_HXX //autogen #include #endif #include #include #include -#include +#include #include "app.hrc" diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 187f021f9..82ee1a0e5 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 0c5d28410..a409412a2 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -51,13 +51,13 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 4521b3397..fd02e5ee9 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -35,7 +35,7 @@ #include "DrawViewShell.hxx" #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index e744d9e35..1ff817f8a 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -46,11 +46,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -58,11 +58,11 @@ #include // #UndoRedo# -#include +#include #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 57064c6a7..c74253d9b 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -47,10 +47,10 @@ #ifndef _SFX_DISPATCH_HXX //autogen #include #endif -#include +#include #include #include -#include +#include #ifndef _SVXIDS_HXX #include #endif @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index c766e94e0..be5e3a079 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -42,14 +42,14 @@ #include #endif #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #ifndef _SVX_DIALOGS_HRC #include diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index edd3eea82..0f923150c 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -53,7 +53,7 @@ #endif #include #include -#include +#include #include #include #include "stlsheet.hxx" diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index de5b21a19..a71a6287d 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -36,10 +36,10 @@ #ifndef _SVXIDS_HRC #include #endif -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index d580c4423..19e0bbed9 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -40,10 +40,10 @@ #include "undo/undomanager.hxx" #include -#include +#include #include #include -#include +#include #include #include #include @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include #include @@ -64,11 +64,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 8e1a0b55d..7b0fb0677 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -47,9 +47,9 @@ #include #endif #include -#include -#include -#include +#include +#include +#include #include #ifndef _BINDING_HXX //autogen #include @@ -63,7 +63,7 @@ #include #include #include -#include +#include #ifndef SD_FRAME_VIEW #include "FrameView.hxx" diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index a1b87c98e..8d44a19fe 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -32,8 +32,8 @@ #include "precompiled_sd.hxx" #include "DrawViewShell.hxx" -#include -#include +#include +#include #include #ifndef _SVXIDS_HRC #include diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 30f1f6b62..e99afae6b 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -34,7 +34,7 @@ #include "DrawViewShell.hxx" #include #include "sdattr.hxx" -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index 8d71d70c0..6647d924b 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -33,7 +33,7 @@ #include "DrawViewShell.hxx" #include -#include +#include #ifndef _SVXIDS_HRC //autogen #include #endif diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index f90d2025b..7599e0d6a 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #ifndef _ZOOMITEM_HXX //autogen #include #endif diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 7619c5816..7c6fdd43e 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -55,9 +55,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 79419148b..479c125a7 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -46,11 +46,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 0c9f44a37..b84a91b90 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" #include "Ruler.hxx" -#include +#include #include #ifndef _SVXIDS_HXX //autogen #include diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 9040f5148..c579c3c11 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -52,8 +52,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 446b59075..3cb2140f4 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -40,7 +40,7 @@ #ifndef _EDITDATA_HXX #include #endif -#include +#include #include #include #include @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #ifndef _FM_FMMODEL_HXX #include diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index bcc7b6450..1f237837c 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 03276941e..7f0a63ee1 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -59,11 +59,10 @@ #include #include #include -#include #include #include -#include -#include +#include +#include #include #include #include @@ -92,7 +91,7 @@ #include #endif #include -#include +#include #include using namespace ::com::sun::star; diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 9974f5829..f68c1cba9 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -48,7 +48,7 @@ #ifndef _SCRBAR_HXX //autogen #include #endif -#include +#include #include #ifndef _SVXIDS_HXX #include @@ -90,7 +90,7 @@ #include // #96090# -#include +#include #include #include "SpellDialogChildWindow.hxx" -- cgit v1.2.3 From 8176d961391f82763fffce461f3d7ac881919a94 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Fri, 16 Oct 2009 15:00:36 +0000 Subject: #i105958# Fixed throw part of declaration of getAccessibleChild(). --- sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 8 +------- sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 11 +---------- sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 4 +++- sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 4 ++-- 4 files changed, 7 insertions(+), 20 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 387241b61..b7810a674 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -39,17 +39,11 @@ #include #include #include -#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLEEVENTID_HPP_ #include -#endif #include -#ifndef _COM_SUN_STAR_LANG_XMULSTISERVICEFACTORY_HPP_ #include -#endif #include -#ifndef _SFXFRAME_HXX #include -#endif #include @@ -279,7 +273,7 @@ sal_Int32 SAL_CALL Reference SAL_CALL AccessibleDocumentViewBase::getAccessibleChild (sal_Int32 nIndex) - throw (uno::RuntimeException) + throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { ThrowIfDisposed (); diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 13e7dfd4f..3f1d526ca 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -40,20 +40,11 @@ #include #include #include -#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLEEVENTID_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLESTATETYPE_HPP_ #include -#endif -#include -#ifndef _COM_SUN_STAR_LANG_XMULSTISERVICEFACTORY_HPP_ #include -#endif #include -#ifndef _SFXFRAME_HXX #include -#endif #include @@ -243,7 +234,7 @@ sal_Int32 SAL_CALL uno::Reference SAL_CALL AccessibleDrawDocumentView::getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException) + throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { ThrowIfDisposed (); diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index db7f030c3..8c28dec0a 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -42,6 +42,7 @@ #include #include #include +#include #include namespace sd { @@ -159,7 +160,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, + ::com::sun::star::lang::IndexOutOfBoundsException); //===== XAccessibleComponent ============================================ diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index c6404c2c0..bba70ad71 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -33,7 +33,6 @@ #include "AccessibleDocumentViewBase.hxx" - namespace accessibility { @@ -78,7 +77,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, + ::com::sun::star::lang::IndexOutOfBoundsException); //===== lang::XEventListener ============================================ -- cgit v1.2.3 From fdb8d3463845ee08b6021ae3413a966b7b1270e3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Oct 2009 13:22:39 +0200 Subject: #i103496#: move some fontsubstitution stuff from vcl to unotools to get xmloff vcl free --- sd/inc/pch/precompiled_sd.hxx | 2 +- sd/source/filter/eppt/eppt.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 1c236c9b2..8250e050b 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -862,7 +862,7 @@ #include "vcl/field.hxx" #include "vcl/fixed.hxx" #include "vcl/font.hxx" -#include "vcl/fontcvt.hxx" +#include "unotools/fontcvt.hxx" #include "vcl/gdimtf.hxx" #include "vcl/gfxlink.hxx" #include "vcl/gradient.hxx" diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index ed84604e9..21a1c3365 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include "pptexanimations.hxx" #include -- cgit v1.2.3 From b3ac98c1721724610941b747ce746ec3a7014be6 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Tue, 20 Oct 2009 11:13:10 +0000 Subject: #i105895# Prevent old view shell from being deleted too early. --- sd/source/ui/view/Outliner.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sd') diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 8a67904c1..0d3813019 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -334,6 +334,9 @@ void Outliner::EndSpelling (void) { if (mbViewShellValid) { + // Keep old view shell alive until we release the outliner view. + ::boost::shared_ptr pOldViewShell (mpViewShell); + ViewShellBase* pBase = PTR_CAST(ViewShellBase,SfxViewShell::Current()); if (pBase != NULL) mpViewShell = pBase->GetMainViewShell(); -- cgit v1.2.3 From c1c224778cd5bf8d74b0bf45d0cd70fcc8ad35a4 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 23 Oct 2009 11:21:03 +0000 Subject: #i57928# reworked formatpaintbrush feature to support more shapes and text selection --- sd/sdi/_drvwsh.sdi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index bdb512acf..58a6115a4 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2226,7 +2226,7 @@ interface DrawView SID_FORMATPAINTBRUSH // [ - ExecMethod = FuTemporary ; + ExecMethod = FuPermanent ; StateMethod = GetMenuState ; ] -- cgit v1.2.3 From 367b1a6aec6c09a3eeae328ecedc184440db45ee Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 23 Oct 2009 11:25:33 +0000 Subject: #i57928# reworked formatpaintbrush feature to support more shapes and text selection --- sd/source/ui/docshell/docshell.cxx | 6 - sd/source/ui/docshell/formatclipboard.cxx | 237 ----------------------------- sd/source/ui/docshell/makefile.mk | 1 - sd/source/ui/func/fuformatpaintbrush.cxx | 242 +++++++++++++++++++++++------- sd/source/ui/inc/DrawDocShell.hxx | 4 - sd/source/ui/inc/ViewShellBase.hxx | 4 + sd/source/ui/inc/formatclipboard.hxx | 64 -------- sd/source/ui/inc/fuformatpaintbrush.hxx | 29 ++-- sd/source/ui/view/ViewShellBase.cxx | 53 +++++++ sd/source/ui/view/drviews6.cxx | 33 ---- sd/source/ui/view/drviews7.cxx | 16 +- sd/source/ui/view/drviewse.cxx | 27 +++- 12 files changed, 291 insertions(+), 425 deletions(-) delete mode 100644 sd/source/ui/docshell/formatclipboard.cxx delete mode 100644 sd/source/ui/inc/formatclipboard.hxx (limited to 'sd') diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 1ecfaa6ab..e25f3c180 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -92,7 +92,6 @@ #include "FrameView.hxx" #endif #include "unomodel.hxx" -#include "formatclipboard.hxx" #include "undo/undomanager.hxx" #include "undo/undofactory.hxx" #include "OutlineView.hxx" @@ -169,7 +168,6 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode, BOOL bDataObject, DocumentType eDocumentType,BOOL bScriptSupport) : SfxObjectShell( eMode == SFX_CREATE_MODE_INTERNAL ? SFX_CREATE_MODE_EMBEDDED : eMode), - mpFormatClipboard(new SdFormatClipboard()), mpDoc(NULL), mpUndoManager(NULL), mpPrinter(NULL), @@ -196,7 +194,6 @@ DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode, BOOL bDataObject, DocumentType eDocumentType) : SfxObjectShell(eMode == SFX_CREATE_MODE_INTERNAL ? SFX_CREATE_MODE_EMBEDDED : eMode), - mpFormatClipboard(new SdFormatClipboard()), mpDoc(pDoc), mpUndoManager(NULL), mpPrinter(NULL), @@ -235,9 +232,6 @@ DrawDocShell::~DrawDocShell() mpDoc->SetSdrUndoManager( 0 ); delete mpUndoManager; - if(mpFormatClipboard) - delete mpFormatClipboard; - if (mbOwnPrinter) delete mpPrinter; diff --git a/sd/source/ui/docshell/formatclipboard.cxx b/sd/source/ui/docshell/formatclipboard.cxx deleted file mode 100644 index 0bc6d6fcd..000000000 --- a/sd/source/ui/docshell/formatclipboard.cxx +++ /dev/null @@ -1,237 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: formatclipboard.cxx,v $ - * $Revision: 1.10 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" - -#include "formatclipboard.hxx" -#include - -// header for class SfxItemIter -#include - -// header for class SfxStyleSheet -#include - -/*-------------------------------------------------------------------- - --------------------------------------------------------------------*/ - -SdFormatClipboard::SdFormatClipboard() - : m_pItemSet(0) - , m_bPersistentCopy(false) - , m_nType_Inventor(0) - , m_nType_Identifier(0) -{ -} -SdFormatClipboard::~SdFormatClipboard() -{ - if(m_pItemSet) - delete m_pItemSet; -} - -bool SdFormatClipboard::HasContent() const -{ - return m_pItemSet!=0; -} - -bool SdFormatClipboard::CanCopyThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const -{ - if( nObjectInventor != SdrInventor && nObjectInventor != E3dInventor ) - return false; - switch(nObjectIdentifier) - { - case OBJ_NONE: - case OBJ_GRUP: - return false; - case OBJ_LINE: - case OBJ_RECT: - case OBJ_CIRC: - case OBJ_SECT: - case OBJ_CARC: - case OBJ_CCUT: - case OBJ_POLY: - case OBJ_PLIN: - case OBJ_PATHLINE: - case OBJ_PATHFILL: - case OBJ_FREELINE: - case OBJ_FREEFILL: - case OBJ_SPLNLINE: - case OBJ_SPLNFILL: - case OBJ_TEXT: - case OBJ_TEXTEXT: - case OBJ_TITLETEXT: - return true; - case OBJ_OUTLINETEXT: - case OBJ_GRAF: - case OBJ_OLE2: - case OBJ_EDGE: - case OBJ_CAPTION: - return false; - case OBJ_PATHPOLY: - case OBJ_PATHPLIN: - return true; - case OBJ_PAGE: - case OBJ_MEASURE: - case OBJ_DUMMY: - case OBJ_FRAME: - case OBJ_UNO: - return false; - case OBJ_CUSTOMSHAPE: - return true; - default: - return false; - } -} - -bool SdFormatClipboard::HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const -{ - if( !HasContent() ) - return false; - if( !CanCopyThisType( nObjectInventor, nObjectIdentifier ) ) - return false; - return true; -} - -void SdFormatClipboard::Copy( ::sd::View& rDrawView, bool bPersistentCopy ) -{ - this->Erase(); - m_bPersistentCopy = bPersistentCopy; - - const SdrMarkList& rMarkList = rDrawView.GetMarkedObjectList(); - if( rMarkList.GetMarkCount() >= 1 ) - { - BOOL bOnlyHardAttr = FALSE; - m_pItemSet = new SfxItemSet( rDrawView.GetAttrFromMarked(bOnlyHardAttr) ); - - SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - m_nType_Inventor = pObj->GetObjInventor(); - m_nType_Identifier = pObj->GetObjIdentifier(); - } -} - -void SdFormatClipboard::Paste( ::sd::View& rDrawView, bool, bool ) -{ - if( !rDrawView.AreObjectsMarked() ) - { - if(!m_bPersistentCopy) - this->Erase(); - return; - } - - SdrObject* pObj = 0; - - bool bWrongTargetType = false; - { - const SdrMarkList& rMarkList = rDrawView.GetMarkedObjectList(); - if( rMarkList.GetMarkCount() != 1 ) - bWrongTargetType = true; - else - { - pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - if( pObj && pObj->GetStyleSheet() ) - bWrongTargetType = !this->HasContentForThisType( pObj->GetObjInventor(), pObj->GetObjIdentifier() ); - } - } - if( bWrongTargetType ) - { - if(!m_bPersistentCopy) - this->Erase(); - return; - } - if(m_pItemSet) - { - //modify source itemset - { - boost::shared_ptr< SfxItemSet > pTargetSet; - - if( pObj->GetStyleSheet() ) - { - pTargetSet.reset( new SfxItemSet( pObj->GetStyleSheet()->GetItemSet() ) ); - } - else - { - SdrModel* pModel = pObj->GetModel(); - if( pModel ) - { - pTargetSet.reset( new SfxItemSet( pModel->GetItemPool() ) ); - } - } - - if( pTargetSet.get() ) - { - USHORT nWhich=0; - SfxItemState nSourceState; - SfxItemState nTargetState; - const SfxPoolItem* pSourceItem=0; - const SfxPoolItem* pTargetItem=0; - SfxItemIter aSourceIter(*m_pItemSet); - pSourceItem = aSourceIter.FirstItem(); - while( pSourceItem!=NULL ) - { - if (!IsInvalidItem(pSourceItem)) - { - nWhich = pSourceItem->Which(); - if(nWhich) - { - nSourceState = m_pItemSet->GetItemState( nWhich ); - nTargetState = pTargetSet->GetItemState( nWhich ); - pTargetItem = pTargetSet->GetItem( nWhich ); - - if(!pTargetItem) - m_pItemSet->ClearItem(nWhich); - else if( (*pSourceItem) == (*pTargetItem) ) - { - //do not set items which have the same content in source and target - m_pItemSet->ClearItem(nWhich); - } - } - } - pSourceItem = aSourceIter.NextItem(); - }//end while - } - } - BOOL bReplaceAll = TRUE; - rDrawView.SetAttrToMarked(*m_pItemSet, bReplaceAll); - } - if(!m_bPersistentCopy) - this->Erase(); -} - -void SdFormatClipboard::Erase() -{ - if(m_pItemSet) - { - delete m_pItemSet; - m_pItemSet = 0; - } - m_nType_Inventor=0; - m_nType_Identifier=0; - m_bPersistentCopy = false; -} diff --git a/sd/source/ui/docshell/makefile.mk b/sd/source/ui/docshell/makefile.mk index f9e34eb03..d33faaf69 100644 --- a/sd/source/ui/docshell/makefile.mk +++ b/sd/source/ui/docshell/makefile.mk @@ -47,7 +47,6 @@ AUTOSEG=true # --- Files -------------------------------------------------------- SLOFILES = \ - $(SLO)$/formatclipboard.obj \ $(SLO)$/docshell.obj \ $(SLO)$/docshel2.obj \ $(SLO)$/docshel3.obj \ diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index ba757a302..4437bb4e1 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -31,19 +31,30 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include + #define _SD_DLL // fuer SD_MOD() #include "sdmod.hxx" #include "fuformatpaintbrush.hxx" -#include "formatclipboard.hxx" -#include "View.hxx" -#include "ViewShell.hxx" +#include "DrawView.hxx" #include "DrawDocShell.hxx" -// header for class SfxBindings -#include -/* -#include -*/ +#include "DrawViewShell.hxx" +#include "FrameView.hxx" +#include "drawdoc.hxx" +#include "Outliner.hxx" +#include "ViewShellBase.hxx" #ifndef SD_WINDOW_SHELL_HXX #include "Window.hxx" @@ -51,66 +62,142 @@ namespace sd { -TYPEINIT1( FuFormatPaintBrush, FuPoor ); +TYPEINIT1( FuFormatPaintBrush, FuText ); -FuFormatPaintBrush::FuFormatPaintBrush( - ViewShell* pViewSh - , ::sd::Window* pWin - , ::sd::View* pView - , SdDrawDocument* pDoc - , SfxRequest& rReq ) - : FuPoor(pViewSh, pWin, pView, pDoc, rReq) +FuFormatPaintBrush::FuFormatPaintBrush( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) +: FuText(pViewSh, pWin, pView, pDoc, rReq) +, mbPermanent( false ) { } FunctionReference FuFormatPaintBrush::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) { FunctionReference xFunc( new FuFormatPaintBrush( pViewSh, pWin, pView, pDoc, rReq ) ); + xFunc->DoExecute( rReq ); return xFunc; } +void FuFormatPaintBrush::DoExecute( SfxRequest& rReq ) +{ + const SfxItemSet *pArgs = rReq.GetArgs(); + if( pArgs && pArgs->Count() >= 1 ) + { + mbPermanent = static_cast(((SfxBoolItem &)pArgs->Get(SID_FORMATPAINTBRUSH)).GetValue()); + } + + if( mpView ) + { + mpView->TakeFormatPaintBrush( mpItemSet ); + } +} + +void FuFormatPaintBrush::implcancel() +{ + if( mpViewShell && mpViewShell->GetViewFrame() ) + { + SfxViewFrame* pViewFrame = mpViewShell->GetViewFrame(); + pViewFrame->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); + pViewFrame->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON); + } +} + +static void unmarkimpl( SdrView* pView ) +{ + pView->SdrEndTextEdit(); + pView->UnMarkAll(); +} + BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) { if(mpView&&mpWindow) { - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); - BOOL bToggle = FALSE; - mpView->UnMarkAll(); - mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, FALSE); + + BOOL bTextEdit = FALSE; + SdrViewEvent aVEvt; + SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + + if( (eHit == SDRHIT_TEXTEDIT) || (eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != NULL ) )) + { + SdrObject* pPickObj=0; + SdrPageView* pPV=0; + USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pPickObj, pPV, SDRSEARCH_PICKMARKABLE); + + if( (pPickObj != 0) && !pPickObj->IsEmptyPresObj() ) + { + // if we text hit another shape than the one currently selected, unselect the old one now + const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); + if( rMarkList.GetMarkCount() >= 1 ) + { + if( rMarkList.GetMarkCount() == 1 ) + { + if( rMarkList.GetMark(0)->GetMarkedSdrObj() != pPickObj ) + { + + // if current selected shape is not that of the hit text edit, deselect it + unmarkimpl( mpView ); + } + } + else + { + // more than one shape selected, deselect all of them + unmarkimpl( mpView ); + } + } + MouseEvent aMEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), 0 ); + return FuText::MouseButtonDown(aMEvt); + } + else + { + unmarkimpl( mpView ); + + } + } + else + { + unmarkimpl( mpView ); + + if( aVEvt.pObj && !aVEvt.pObj->IsEmptyPresObj() ) + { + USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + BOOL bToggle = FALSE; + mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, FALSE); + return TRUE; + } + } } return FALSE; } BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) { - SdFormatClipboard* pFormatClipboard = 0; - if(mpViewShell) - pFormatClipboard = mpViewShell->GetDocSh()->mpFormatClipboard; - if(mpView&&mpWindow&&pFormatClipboard&&pFormatClipboard->HasContent()) + BOOL bReturn = FALSE; + if( mpWindow && mpView ) { - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); - SdrObject* pObj=0; - SdrPageView* pPV=0; - BOOL bOverMarkableObject = mpView->PickObj( - mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) - ,nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE); - - if(bOverMarkableObject && pFormatClipboard->HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) ) + if ( mpView->IsTextEdit() ) + { + bReturn = FuText::MouseMove( rMEvt ); mpWindow->SetPointer(Pointer(POINTER_FILL)); + } else - mpWindow->SetPointer(Pointer(POINTER_ARROW)); + { + USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + SdrObject* pObj=0; + SdrPageView* pPV=0; + BOOL bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE); + + if(bOverMarkableObject && HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) && !pObj->IsEmptyPresObj() ) + mpWindow->SetPointer(Pointer(POINTER_FILL)); + else + mpWindow->SetPointer(Pointer(POINTER_ARROW)); + } } - else - mpWindow->SetPointer(Pointer(POINTER_ARROW)); - return FALSE; + return bReturn; } BOOL FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) { - SdFormatClipboard* pFormatClipboard = 0; - if(mpViewShell) - pFormatClipboard = mpViewShell->GetDocSh()->mpFormatClipboard; - if( pFormatClipboard && mpView && mpView->AreObjectsMarked() ) + if( mpItemSet.get() && mpView && mpView->AreObjectsMarked() ) { bool bNoCharacterFormats = false; bool bNoParagraphFormats = false; @@ -120,28 +207,29 @@ BOOL FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) else if( rMEvt.GetModifier() & KEY_MOD1 ) bNoParagraphFormats = true; } - pFormatClipboard->Paste( *mpView, bNoCharacterFormats, bNoParagraphFormats ); + + OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); + if( pOLV ) + pOLV->MouseButtonUp(rMEvt); + + Paste( bNoCharacterFormats, bNoParagraphFormats ); if(mpViewShell) mpViewShell->GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); + + if( mbPermanent ) + return TRUE; } - if(mpViewShell && pFormatClipboard && !pFormatClipboard->HasContent() ) - mpViewShell->Cancel(); + + implcancel(); return TRUE; } BOOL FuFormatPaintBrush::KeyInput(const KeyEvent& rKEvt) { - if( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE && mpViewShell ) + if( (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) && mpViewShell ) { - SdFormatClipboard* pFormatClipboard = mpViewShell->GetDocSh()->mpFormatClipboard; - if(pFormatClipboard) - { - pFormatClipboard->Erase(); - mpViewShell->GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); - mpViewShell->Cancel(); - - return TRUE; - } + implcancel(); + return TRUE; } return FuPoor::KeyInput(rKEvt); } @@ -153,4 +241,52 @@ void FuFormatPaintBrush::Activate() void FuFormatPaintBrush::Deactivate() { } + +bool FuFormatPaintBrush::HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const +{ + if( mpItemSet.get() == 0 ) + return false; + if( !mpView || (!mpView->SupportsFormatPaintbrush( nObjectInventor, nObjectIdentifier) ) ) + return false; + return true; +} + +void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphFormats ) +{ + const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); + if(mpItemSet.get() && (rMarkList.GetMarkCount() == 1) ) + { + SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); + + if( mpDoc->IsUndoEnabled() ) + { + String sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" ) ) ) ); + mpDoc->BegUndo( sLabel ); + mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,FALSE,TRUE)); + } + + mpView->ApplyFormatPaintBrush( *mpItemSet.get(), bNoCharacterFormats, bNoParagraphFormats ); + + if( mpDoc->IsUndoEnabled() ) + { + mpDoc->EndUndo(); + } + } +} + +/* static */ void FuFormatPaintBrush::GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet ) +{ + const SdrMarkList& rMarkList = rDrawViewShell.GetDrawView()->GetMarkedObjectList(); + const ULONG nMarkCount = rMarkList.GetMarkCount(); + + if( nMarkCount == 1 ) + { + SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); + if( pObj && rDrawViewShell.GetDrawView()->SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier()) ) + return; + } + rSet.DisableItem( SID_FORMATPAINTBRUSH ); +} + + } // end of namespace sd diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 43099ef56..ccea601a2 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -52,7 +52,6 @@ class SfxPrinter; struct SdrDocumentStreamInfo; struct SpellCallbackInfo; class AbstractSvxNameDialog; -class SdFormatClipboard; namespace sd { @@ -209,9 +208,6 @@ public: void ClearUndoBuffer(); -public: - SdFormatClipboard* mpFormatClipboard; - protected: SdDrawDocument* mpDoc; diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 2fc8268f7..9d724bbcd 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -259,6 +259,10 @@ public: CustomHandleManager& getCustomHandleManager() const; + /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration + and not cached, so do not use it excessive (f.e. in status updates) */ + ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const; + protected: osl::Mutex maMutex; diff --git a/sd/source/ui/inc/formatclipboard.hxx b/sd/source/ui/inc/formatclipboard.hxx deleted file mode 100644 index 02583faaa..000000000 --- a/sd/source/ui/inc/formatclipboard.hxx +++ /dev/null @@ -1,64 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: formatclipboard.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SDFORMATCLIPBOARD_HXX -#define _SDFORMATCLIPBOARD_HXX - -#include "View.hxx" -// header for class SfxItemSet -#include - -//----------------------------------------------------------------------------- -/** This class acts as data container and execution class for the format paintbrush feature in draw and impress. -*/ - -class SdFormatClipboard -{ -public: - SdFormatClipboard(); - virtual ~SdFormatClipboard(); - - bool HasContent() const; - bool CanCopyThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const; - bool HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const; - - void Copy( ::sd::View& rDrawView, bool bPersistentCopy=false ); - void Paste( ::sd::View& rDrawView - , bool bNoCharacterFormats=false, bool bNoParagraphFormats=false ); - void Erase(); - -private: - SfxItemSet* m_pItemSet; - bool m_bPersistentCopy; - UINT32 m_nType_Inventor; - UINT16 m_nType_Identifier; -}; - -#endif diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 5685ce6fd..6b8f07426 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -31,15 +31,19 @@ #ifndef SD_FU_FORMATPAINTBRUSH_HXX #define SD_FU_FORMATPAINTBRUSH_HXX -#include "fupoor.hxx" +#include "futext.hxx" // header for class SfxItemSet #include +#include + +class SfxItemSet; namespace sd { -class FuFormatPaintBrush - : public FuPoor +class DrawViewShell; + +class FuFormatPaintBrush : public FuText { public: TYPEINFO(); @@ -54,14 +58,21 @@ public: virtual void Activate(); virtual void Deactivate(); + static void GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet ); + static bool CanCopyThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ); + private: - FuFormatPaintBrush ( - ViewShell* pViewSh, - ::sd::Window* pWin, - ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq); + FuFormatPaintBrush ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); + void DoExecute( SfxRequest& rReq ); + + bool HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const; + void Paste( bool, bool ); + + void implcancel(); + + ::boost::shared_ptr mpItemSet; + bool mbPermanent; }; } // end of namespace sd diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 56dbac92e..f5ad2a2c0 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -31,6 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" +#include + +#include +#include +#include +#include + #include "ViewShellBase.hxx" #include #include "EventMultiplexer.hxx" @@ -94,6 +101,11 @@ using namespace sd; using ::sd::framework::FrameworkHelper; using ::rtl::OUString; +using namespace com::sun::star::uno; +using namespace com::sun::star::frame; +using namespace com::sun::star::container; +using namespace com::sun::star::lang; +using namespace com::sun::star::beans; namespace { @@ -1210,6 +1222,47 @@ CustomHandleManager& ViewShellBase::getCustomHandleManager() const return *mpImpl->mpCustomHandleManager.get(); } +::rtl::OUString ViewShellBase::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const +{ + ::rtl::OUString aLabel; + + if ( aCmdURL.getLength() > 0 ) try + { + Reference< XMultiServiceFactory > xServiceManager( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); + + Reference< XModuleManager > xModuleManager( xServiceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager") ) ), UNO_QUERY_THROW ); + Reference< XInterface > xIfac( GetMainViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY_THROW ); + + ::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) ); + + if( aModuleIdentifier.getLength() > 0 ) + { + Reference< XNameAccess > xNameAccess( xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.UICommandDescription" ) ) ), UNO_QUERY ); + if( xNameAccess.is() ) + { + Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW ); + Sequence< PropertyValue > aPropSeq; + if( m_xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq ) + { + for( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) + { + if( aPropSeq[i].Name.equalsAscii( "Name" )) + { + aPropSeq[i].Value >>= aLabel; + break; + } + } + } + } + } + } + catch ( Exception& ) + { + } + + return aLabel; +} + //===== ViewShellBase::Implementation ========================================= diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 5f8e75d2d..e8bd90493 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -81,12 +81,8 @@ #include "fusumry.hxx" #include "fucushow.hxx" #include "drawview.hxx" -#ifndef SD_FRAME_VIEW #include "FrameView.hxx" -#endif #include "Window.hxx" -#include "fuformatpaintbrush.hxx" -#include "formatclipboard.hxx" #include "DrawDocShell.hxx" #include "TaskPaneViewShell.hxx" #include "framework/FrameworkHelper.hxx" @@ -501,35 +497,6 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq) USHORT nSId = rReq.GetSlot(); switch( nSId ) { - case SID_FORMATPAINTBRUSH: - { - SdFormatClipboard* pFormatClipboard = GetDocSh()->mpFormatClipboard; - if(pFormatClipboard) - { - if( pFormatClipboard->HasContent() ) - { - pFormatClipboard->Erase(); - GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); - Cancel(); - rReq.Ignore (); - } - else - { - bool bPersistentCopy = false; - const SfxItemSet *pArgs = rReq.GetArgs(); - if( pArgs && pArgs->Count() >= 1 ) - { - bPersistentCopy = static_cast(((SfxBoolItem &)pArgs->Get( - SID_FORMATPAINTBRUSH)).GetValue()); - } - - pFormatClipboard->Copy( *mpDrawView, bPersistentCopy ); - SetCurrentFunction( FuFormatPaintBrush::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); - GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); - } - } - } - break; case SID_FONTWORK: { if ( rReq.GetArgs() ) diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index c4864e51d..1fc2f2076 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -87,7 +87,6 @@ #include "zoomlist.hxx" #include "slideshow.hxx" #include "drawview.hxx" -#include "formatclipboard.hxx" #include "ViewShellBase.hxx" #include "ViewShellManager.hxx" #include "LayerTabBar.hxx" @@ -95,6 +94,7 @@ #include "Window.hxx" #include "fuediglu.hxx" #include "fubullet.hxx" +#include "fuformatpaintbrush.hxx" using ::rtl::OUString; using namespace ::com::sun::star; @@ -249,19 +249,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) const ULONG nMarkCount = rMarkList.GetMarkCount(); //format paintbrush - { - SdFormatClipboard* pFormatClipboard = GetDocSh()->mpFormatClipboard; - bool bHasContent = pFormatClipboard && pFormatClipboard->HasContent(); - rSet.Put(SfxBoolItem(SID_FORMATPAINTBRUSH,bHasContent)); - if( ( nMarkCount!=1 && !bHasContent ) || mpDrawView->IsTextEdit() ) - rSet.DisableItem( SID_FORMATPAINTBRUSH ); - if( !bHasContent && nMarkCount==1 ) - { - SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - if( !pFormatClipboard->CanCopyThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) ) - rSet.DisableItem( SID_FORMATPAINTBRUSH ); - } - } + FuFormatPaintBrush::GetMenuState( *this, rSet ); // Stati der SfxChild-Windows (Animator, Fontwork etc.) SetChildWindowState( rSet ); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index d580c4423..291e48a03 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -106,7 +106,7 @@ #include "anminfo.hxx" #include "optsitem.hxx" #include "Window.hxx" - +#include "fuformatpaintbrush.hxx" using ::rtl::OUString; using namespace ::com::sun::star; @@ -203,13 +203,22 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) if(HasCurrentFunction()) { - if(GetOldFunction() == GetCurrentFunction()) + if( (nSId == SID_FORMATPAINTBRUSH) && (GetCurrentFunction()->GetSlotID() == SID_TEXTEDIT) ) + { + // save text edit mode for format paintbrush! + SetOldFunction( GetCurrentFunction() ); + } + else { - SetOldFunction(0); + if(GetOldFunction() == GetCurrentFunction()) + { + SetOldFunction(0); + } } if ( nSId != SID_TEXTEDIT && nSId != SID_ATTR_CHAR && nSId != SID_TEXT_FITTOSIZE && nSId != SID_ATTR_CHAR_VERTICAL && nSId != SID_TEXT_FITTOSIZE_VERTICAL && + nSId != SID_FORMATPAINTBRUSH && mpDrawView->IsTextEdit() ) { mpDrawView->SdrEndTextEdit(); @@ -526,8 +535,18 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) } break; + case SID_FORMATPAINTBRUSH: + { + SetCurrentFunction( FuFormatPaintBrush::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); + rReq.Done(); + SfxBindings& rBind = GetViewFrame()->GetBindings(); + rBind.Invalidate( nSId ); + rBind.Update( nSId ); + break; + } + default: - break; + break; } if(HasOldFunction()) -- cgit v1.2.3 From c36d68179767a46c05cbb1207864832dd7b337fc Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Fri, 23 Oct 2009 13:35:52 +0000 Subject: #i88371# allow format paintbrush to format empty presentation object --- sd/source/ui/func/fuformatpaintbrush.cxx | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 4437bb4e1..45289eb03 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -111,7 +111,6 @@ BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) { if(mpView&&mpWindow) { - BOOL bTextEdit = FALSE; SdrViewEvent aVEvt; SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); @@ -147,23 +146,19 @@ BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) MouseEvent aMEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), 0 ); return FuText::MouseButtonDown(aMEvt); } - else - { - unmarkimpl( mpView ); - } + if( aVEvt.pObj == 0 ) + aVEvt.pObj = pPickObj; } - else - { - unmarkimpl( mpView ); - - if( aVEvt.pObj && !aVEvt.pObj->IsEmptyPresObj() ) - { - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); - BOOL bToggle = FALSE; - mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, FALSE); - return TRUE; - } + + unmarkimpl( mpView ); + + if( aVEvt.pObj ) + { + USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + BOOL bToggle = FALSE; + mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, FALSE); + return TRUE; } } return FALSE; @@ -186,7 +181,7 @@ BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) SdrPageView* pPV=0; BOOL bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE); - if(bOverMarkableObject && HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) && !pObj->IsEmptyPresObj() ) + if(bOverMarkableObject && HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) ) mpWindow->SetPointer(Pointer(POINTER_FILL)); else mpWindow->SetPointer(Pointer(POINTER_ARROW)); -- cgit v1.2.3 From 863aafcbb495f4255c1fb1373aae6de1c58d3a41 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 27 Oct 2009 15:01:25 +0000 Subject: CWS-TOOLING: integrate CWS impress178 2009-10-16 19:54:41 +0200 sj r276995 : removed warning 2009-10-16 17:46:12 +0200 sj r276993 : #i103757# applied patch (fixed crash if model changes) 2009-10-16 16:06:07 +0200 sj r276985 : CWS-TOOLING: rebase CWS impress178 to branches/OOO320@276942 (milestone: OOO320:m2) 2009-10-08 13:51:23 +0200 sj r276790 : #i105654# fixed closing of line geometry 2009-10-07 17:26:56 +0200 sj r276762 : #i105606# fixed object shadow 2009-10-07 17:25:39 +0200 sj r276761 : minor improvements 2009-10-07 11:48:26 +0200 af r276745 : #i103047# Prevent context menu of LayoutMenu from being shown when user clicks on background. 2009-10-07 11:33:59 +0200 af r276743 : #i99866# Set position of the design control manually. 2009-10-06 17:18:23 +0200 sj r276721 : minor improvements 2009-10-05 18:34:23 +0200 sj r276692 : #105606# fixed fontsize problem 2009-10-05 17:26:21 +0200 af r276691 : #i105354# Never process more than one request in a row. 2009-10-02 13:24:25 +0200 af r276639 : #i94242# Taking insertion position of slide sorter correctly into account. 2009-10-01 13:46:47 +0200 aw r276602 : #i102224# some Polygon/PolyPolygon usages in SVMConverter ignored the possible curve status of tools::Polygon; added at least an AdaptiveSubdivide 2009-10-01 12:33:56 +0200 aw r276588 : #i102224# ImplWritePolyPolygon killed the curve information at the PolyPolygon by NOT copying the flags 2009-09-30 17:48:56 +0200 aw r276567 : #i102224# removed GetSimple() from Polygon and PolyPolygon, replaced completely with AdaptiveSubdivide 2009-09-30 15:45:46 +0200 aw r276559 : #i102048# secured primitive creation for dimension lines with linestyle none 2009-09-30 14:56:41 +0200 af r276556 : #i105471# Reordered statements in ~SdModule. 2009-09-30 14:47:12 +0200 aw r276555 : #i105373# corrected curve ignoring places in MetaFile export --- sd/source/filter/eppt/eppt.cxx | 119 +-------------------- sd/source/filter/eppt/eppt.hxx | 1 - sd/source/filter/eppt/epptso.cxx | 47 ++++---- sd/source/ui/app/sdmod.cxx | 12 ++- .../ui/slidesorter/cache/SlsQueueProcessor.cxx | 24 ++--- .../ui/slidesorter/controller/SlsSlotManager.cxx | 8 ++ sd/source/ui/table/TableDesignPane.cxx | 4 + sd/source/ui/toolpanel/LayoutMenu.cxx | 9 +- 8 files changed, 60 insertions(+), 164 deletions(-) (limited to 'sd') diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 4f29f503b..132739513 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -222,8 +222,6 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage, } if ( !ImplCreateMainNotes() ) return; - maTextRuleList.First(); // rewind list, so we can get the current or next entry without - // searching, all entrys are sorted# for ( i = 0; i < mnPages; i++ ) { if ( !ImplCreateSlide( i ) ) @@ -274,8 +272,6 @@ PPTWriter::~PPTWriter() while( aStyleSheetIter < maStyleSheetList.end() ) delete *aStyleSheetIter++; - for ( pPtr = maTextRuleList.First(); pPtr; pPtr = maTextRuleList.Next() ) - delete (TextRuleEntry*)pPtr; for ( pPtr = maSlideNameList.First(); pPtr; pPtr = maSlideNameList.Next() ) delete (::rtl::OUString*)pPtr; for ( pPtr = maHyperlink.First(); pPtr; pPtr = maHyperlink.Next() ) @@ -560,22 +556,12 @@ sal_Bool PPTWriter::ImplCreateDocument() mpPptEscherEx->OpenContainer( EPP_SlideListWithText ); // Animation info fuer die Slides - sal_uInt32 nShapes; - sal_Bool bOtherThanPlaceHolders; - for ( i = 0; i < mnPages; i++ ) { - sal_uInt32 nPOffset, nPObjects; - sal_Bool bOutliner, bTitle; - - bOtherThanPlaceHolders = bOutliner = bTitle = FALSE; - nPObjects = 0; - mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom ); mpPptEscherEx->InsertPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, mpStrm->Tell() ); - *mpStrm << (sal_uInt32)0; // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY ) - nPOffset = mpStrm->Tell(); - *mpStrm << (sal_uInt32)0 // flags - only bit 3 used, if set then slide contains shapes other than placeholders + *mpStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY ) + << (sal_uInt32)4 // flags - only bit 3 used, if set then slide contains shapes other than placeholders << (INT32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects << (INT32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example << (sal_uInt32)0; // reserved, usualy 0 @@ -584,8 +570,6 @@ sal_Bool PPTWriter::ImplCreateDocument() return FALSE; ImplSetCurrentStyleSheet( ImplGetMasterIndex( NORMAL ) ); - const PHLayout& rLayout = ImplGetLayout( mXPagePropSet ); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > aXName( mXDrawPage, ::com::sun::star::uno::UNO_QUERY ); @@ -597,113 +581,16 @@ sal_Bool PPTWriter::ImplCreateDocument() } else maSlideNameList.Insert( new ::rtl::OUString(), LIST_APPEND ); - - nShapes = mXShapes->getCount(); - - sal_Bool bSecOutl = FALSE; - if ( nShapes && ( rLayout.bTitlePossible || rLayout.bOutlinerPossible ) ) - { - for ( sal_uInt32 nIndex = 0; nIndex < nShapes; nIndex++ ) - { - if ( !ImplGetShapeByIndex( nIndex ) ) - continue; - - if ( mbPresObj && ( ( mType == "presentation.Outliner" ) || ( mType == "presentation.Subtitle" ) ) ) - { - if ( bOutliner == FALSE ) - { - bOutliner = TRUE; - mnTextStyle = EPP_TEXTSTYLE_BODY; - sal_uInt32 nTextType = EPP_TEXTTYPE_Body; - if ( bSecOutl ) - nTextType = EPP_TEXTTYPE_HalfBody; - else if ( mType == "presentation.Subtitle" ) - nTextType = EPP_TEXTTYPE_CenterBody; - - TextRuleEntry* pRule = new TextRuleEntry( i ); - SvMemoryStream aExtBu( 0x200, 0x200 ); - if ( !mbEmptyPresObj ) - ImplGetText(); - ImplWriteTextStyleAtom( *mpStrm, nTextType, nPObjects, pRule, aExtBu, NULL ); - ImplWriteExtParaHeader( aExtBu, nPObjects++, nTextType, i + 0x100 ); - maTextRuleList.Insert( (void*)pRule, LIST_APPEND ); - if ( rLayout.bSecOutlinerPossible ) - { - if ( ( nIndex + 1 ) < nShapes ) - { - if ( ImplGetShapeByIndex( nIndex + 1 ) && mType == "presentation.Outliner" ) - { - bSecOutl = TRUE; - TextRuleEntry* pTempRule = new TextRuleEntry( i ); - SvMemoryStream aTmpStrm( 0x200, 0x200 ); - if ( !mbEmptyPresObj ) - ImplGetText(); - ImplWriteTextStyleAtom( *mpStrm, nTextType, nPObjects, pTempRule, aTmpStrm, NULL ); - ImplWriteExtParaHeader( aTmpStrm, nPObjects++, nTextType, i + 0x100 ); - maTextRuleList.Insert( (void*)pTempRule, LIST_APPEND ); - } - } - } - } - } - else if ( rLayout.bTitlePossible && ( mType == "presentation.TitleText" ) ) - { - if ( bTitle == FALSE ) - { - bTitle = TRUE; - mnTextStyle = EPP_TEXTSTYLE_TITLE; - TextRuleEntry* pRule = new TextRuleEntry( i ); - SvMemoryStream aExtBu( 0x200, 0x200 ); - if ( !mbEmptyPresObj ) - ImplGetText(); - ImplWriteTextStyleAtom( *mpStrm, EPP_TEXTTYPE_Title, nPObjects, pRule, aExtBu, NULL ); - ImplWriteExtParaHeader( aExtBu, nPObjects++, EPP_TEXTTYPE_Title, i + 0x100 ); - maTextRuleList.Insert( (void*)pRule, LIST_APPEND ); - } - } - else - { - if ( mbEmptyPresObj ) - nPObjects++; - else - bOtherThanPlaceHolders = TRUE; // muss noch auf background und leeren Title/outliner geprueft werden !!! - } - if ( bOutliner && bTitle && bOtherThanPlaceHolders ) - break; - } - } - if ( nPObjects ) - { - sal_uInt32 nOldPos = mpStrm->Tell(); - mpStrm->Seek( nPOffset ); - *mpStrm << (sal_uInt32)( ( bOtherThanPlaceHolders ) ? 4 : 0 ); - *mpStrm << nPObjects; - mpStrm->Seek( nOldPos ); - } } mpPptEscherEx->CloseContainer(); // EPP_SlideListWithText mpPptEscherEx->OpenContainer( EPP_SlideListWithText, 2 ); // Animation info fuer die notes for( i = 0; i < mnPages; i++ ) { - if ( !ImplGetPageByIndex( i, NOTICE ) ) - return FALSE; - - nShapes = mXShapes->getCount(); - - bOtherThanPlaceHolders = FALSE; - if ( nShapes ) - { - for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == FALSE ); nIndex++ ) - { - if ( ImplGetShapeByIndex( nIndex ) && ( mType != "drawing.Page" ) ) - bOtherThanPlaceHolders = TRUE; - } - } mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom ); mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTES_PERSIST_KEY | i, mpStrm->Tell() ); *mpStrm << (sal_uInt32)0 - << (sal_uInt32)( ( bOtherThanPlaceHolders ) ? 4 : 0 ) + << (sal_uInt32)4 << (INT32)0 << (INT32)i + 0x100 << (sal_uInt32)0; diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index ed84604e9..9693394b7 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -756,7 +756,6 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide sal_uInt32 mnShapeMasterTitle; sal_uInt32 mnShapeMasterBody; - List maTextRuleList; // TextRuleEntry's List maHyperlink; FontCollection maFontCollection; diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 3c4cf0318..25e967121 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -4239,6 +4239,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a sal_Bool bAdditionalText = FALSE; + sal_Bool bSecOutl = FALSE; + sal_uInt32 nPObjects = 0; + SvMemoryStream* pClientTextBox = NULL; SvMemoryStream* pClientData = NULL; @@ -5341,32 +5344,32 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( !pClientTextBox ) pClientTextBox = new SvMemoryStream( 0x200, 0x200 ); - *pClientTextBox << (sal_uInt32)( EPP_OutlineTextRefAtom << 16 ) << (sal_uInt32)4 - << nPlacementID; - if ( mbEmptyPresObj == FALSE ) { if ( ( ePageType == NORMAL ) && ( bMasterPage == FALSE ) ) - { // try to allocate the textruleratom - TextRuleEntry* pTextRule = (TextRuleEntry*)maTextRuleList.GetCurObject(); - while ( pTextRule ) + { + sal_uInt32 nTextType = EPP_TEXTTYPE_Body; + if ( mnTextStyle == EPP_TEXTSTYLE_BODY ) + { + if ( bSecOutl ) + nTextType = EPP_TEXTTYPE_HalfBody; + else if ( mType == "presentation.Subtitle" ) + nTextType = EPP_TEXTTYPE_CenterBody; + bSecOutl = sal_True; + } + else + nTextType = EPP_TEXTTYPE_Title; + + TextRuleEntry aTextRule( nPageNumber ); + SvMemoryStream aExtBu( 0x200, 0x200 ); + ImplGetText(); + ImplWriteTextStyleAtom( *pClientTextBox, nTextType, nPObjects, &aTextRule, aExtBu, NULL ); + ImplWriteExtParaHeader( aExtBu, nPObjects++, nTextType, nPageNumber + 0x100 ); + SvMemoryStream* pOut = aTextRule.pOut; + if ( pOut ) { - int nRulePage = pTextRule->nPageNumber; - if ( nRulePage > nPageNumber ) - break; - else if ( nRulePage < nPageNumber ) - pTextRule = (TextRuleEntry*)maTextRuleList.Next(); - else - { - SvMemoryStream* pOut = pTextRule->pOut; - if ( pOut ) - { - pClientTextBox->Write( pOut->GetData(), pOut->Tell() ); - delete pOut, pTextRule->pOut = NULL; - } - maTextRuleList.Next(); - break; - } + pClientTextBox->Write( pOut->GetData(), pOut->Tell() ); + delete pOut, aTextRule.pOut = NULL; } } } diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index a51c1c9f1..ac8bf1e7f 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -131,11 +131,6 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) SdModule::~SdModule() { - // Mark the module in the global AppData structure as deleted. - SdModule** ppShellPointer = (SdModule**)GetAppData(SHL_DRAW); - if (ppShellPointer != NULL) - (*ppShellPointer) = NULL; - delete pSearchItem; if( pNumberFormatter ) @@ -152,6 +147,13 @@ SdModule::~SdModule() } } + mpResourceContainer.reset(); + + // Mark the module in the global AppData structure as deleted. + SdModule** ppShellPointer = (SdModule**)GetAppData(SHL_DRAW); + if (ppShellPointer != NULL) + (*ppShellPointer) = NULL; + delete mpErrorHdl; delete static_cast< VirtualDevice* >( mpVirtualRefDevice ); } diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 8a5380913..1c478af40 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -160,12 +160,13 @@ IMPL_LINK(QueueProcessor, ProcessRequestHdl, Timer*, EMPTYARG) void QueueProcessor::ProcessRequests (void) { OSL_ASSERT(mpCacheContext.get()!=NULL); - - while ( ! mrQueue.IsEmpty() && ! mbIsPaused) - { - if ( ! mpCacheContext->IsIdle()) - break; + // Never process more than one request at a time in order to prevent the + // lock up of the edit view. + if ( ! mrQueue.IsEmpty() + && ! mbIsPaused + && mpCacheContext->IsIdle()) + { CacheKey aKey = NULL; RequestPriorityClass ePriorityClass (NOT_VISIBLE); { @@ -182,25 +183,12 @@ void QueueProcessor::ProcessRequests (void) if (aKey != NULL) ProcessOneRequest(aKey, ePriorityClass); - - // Requests of lower priority are processed one at a time. - { - ::osl::MutexGuard aGuard (mrQueue.GetMutex()); - if ( ! mrQueue.IsEmpty()) - if (mrQueue.GetFrontPriorityClass() > 0) - break; - } } // Schedule the processing of the next element(s). { ::osl::MutexGuard aGuard (mrQueue.GetMutex()); if ( ! mrQueue.IsEmpty()) - /* - if (bIsShowingFullScreenShow) - Start(mnTimeBetweenRequestsWhenNotIdle); - else - */ Start(mrQueue.GetFrontPriorityClass()); } } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index a55e8a5c9..51b59de6b 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -1085,6 +1085,14 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) rSelector.SelectPage (nInsertionIndex); } + // Is there a stored insertion position? + else if (mrSlideSorter.GetController().GetSelectionManager()->GetInsertionPosition() >= 0) + { + nInsertionIndex + = mrSlideSorter.GetController().GetSelectionManager()->GetInsertionPosition() - 1; + rSelector.SelectPage(nInsertionIndex); + } + // Select the last page when there is at least one page. else if (rSelector.GetPageCount() > 0) { diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 0b6cb9a89..c8d7c6c76 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -457,6 +457,10 @@ void TableDesignPane::updateLayout() Point aPos( pValueSet->GetPosPixel() ); + // The following line may look like a no-op but without it the + // control is placed off-screen when RTL is active. + pValueSet->SetPosPixel(pValueSet->GetPosPixel()); + // shift show options section down const long nOptionsPos = aPos.Y() + aValueSetSize.Height(); for( sal_Int32 nId = FL_STYLE_OPTIONS; nId <= CB_BANDED_COLUMNS; ++nId ) diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 7b479e102..9a5dbe4ac 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -917,8 +917,13 @@ void LayoutMenu::Command (const CommandEvent& rEvent) if (GetShellManager() != NULL) GetShellManager()->MoveToTop(this); if (rEvent.IsMouseEvent()) - mrBase.GetViewFrame()->GetDispatcher()->ExecutePopup( - SdResId(RID_TASKPANE_LAYOUTMENU_POPUP)); + { + // Do not show the context menu when the mouse was not + // pressed over an item. + if (GetItemId(rEvent.GetMousePosPixel()) > 0) + mrBase.GetViewFrame()->GetDispatcher()->ExecutePopup( + SdResId(RID_TASKPANE_LAYOUTMENU_POPUP)); + } else { // When the command event was not caused by a mouse -- cgit v1.2.3 From 55ac0ffc6849b4126980dfc1aa084b996bcd7183 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 27 Oct 2009 16:52:56 +0000 Subject: fixed unix errors --- sd/source/ui/func/fuformatpaintbrush.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 45289eb03..71caf08d8 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -48,7 +48,7 @@ #include "sdmod.hxx" #include "fuformatpaintbrush.hxx" -#include "DrawView.hxx" +#include "drawview.hxx" #include "DrawDocShell.hxx" #include "DrawViewShell.hxx" #include "FrameView.hxx" @@ -111,7 +111,6 @@ BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) { if(mpView&&mpWindow) { - BOOL bTextEdit = FALSE; SdrViewEvent aVEvt; SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); -- cgit v1.2.3 From a2b55a91fd959e804de17a4c908f59347c7eb1e5 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 28 Oct 2009 16:04:53 +0000 Subject: #i106369# only hide placeholder on master page not all text shapes --- sd/source/core/sdpage.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 75bb8df9a..3459c5f22 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2883,7 +2883,7 @@ bool SdPage::checkVisibility( } } } // check for placeholders on master - else if( 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; -- cgit v1.2.3 From 64885925777dfc81ed6a5280040a6520fcb33247 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 31 Oct 2009 00:29:04 +0100 Subject: #i106421#: move msfilter to filter --- sd/source/filter/eppt/eppt.cxx | 40 +++++++++++++++++++++++++++++-- sd/source/filter/eppt/eppt.hxx | 2 +- sd/source/filter/eppt/escherex.hxx | 2 +- sd/source/filter/eppt/pptexanimations.hxx | 2 +- sd/source/filter/ppt/pptatom.hxx | 1 + sd/source/filter/ppt/pptin.cxx | 2 +- sd/source/filter/ppt/pptin.hxx | 4 ++-- sd/source/filter/ppt/pptinanimations.hxx | 4 +--- sd/source/filter/sdpptwrp.cxx | 38 ++++++++--------------------- sd/source/ui/docshell/docshel4.cxx | 2 +- sd/util/makefile.mk | 2 +- sd/util/sdfilt.map | 2 +- 12 files changed, 59 insertions(+), 42 deletions(-) (limited to 'sd') diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 4f29f503b..9ecbf52c4 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -58,10 +58,11 @@ #include #include #include -#include +#include #include #include -#include +#include +#include #include #include @@ -2580,3 +2581,38 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI ExportPPT( SvStorageRef& rS return bStatus; } +extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) +{ + SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) ); + SvxImportMSVBasic aMSVBas( rDocShell, *xDest, FALSE, FALSE ); + aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); + + SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); + if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) + { + SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); + if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) + { + SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) ); + if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) + { + UINT32 nLen = xTemp->GetSize(); + if ( nLen ) + { + char* pTemp = new char[ nLen ]; + if ( pTemp ) + { + xTemp->Seek( STREAM_SEEK_TO_BEGIN ); + xTemp->Read( pTemp, nLen ); + pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ ); + pBas->ObjectOwnsMemory( TRUE ); + return TRUE; + } + } + } + } + } + + return FALSE; +} + diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 21a1c3365..f9beb767c 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -85,7 +85,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx index c466b915b..66b50b882 100644 --- a/sd/source/filter/eppt/escherex.hxx +++ b/sd/source/filter/eppt/escherex.hxx @@ -30,7 +30,7 @@ #ifndef _PptEscherEX_HXX #define _PptEscherEX_HXX -#include +#include // --------------------------------------------------------------------------------------------- // Werte fuer den ULONG im PPT_PST_TextHeaderAtom diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index 726d148a8..216aadc8d 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -38,7 +38,7 @@ #include "../ppt/pptanimations.hxx" #endif #include -#include +#include #ifdef DBG_ANIM_LOG #include diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index 81cb7870c..eca7a0e19 100644 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx @@ -32,6 +32,7 @@ #define _PPTATOM_HXX_ #include +#include class SvStream; diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 3f2cb401a..a073196ae 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index fd851c394..58aecf103 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -31,11 +31,11 @@ #ifndef _SD_PPTIN_HXX #define _SD_PPTIN_HXX -#include +#include #include #include #include -#include +#include #include #include diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index ef319c41b..1440f6df2 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -34,15 +34,13 @@ #include #include -#ifndef _SD_PPTANIMATIONS_HXX #include "pptanimations.hxx" -#endif #include #ifdef DBG_ANIM_LOG #include #endif -#include +#include #include diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 7674b14e1..cb4c2cbe5 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -43,7 +43,7 @@ #include "ppt/pptin.hxx" #include "drawdoc.hxx" #include -#include +#include // -------------- // - Namespaces - @@ -54,7 +54,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; - typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&, Reference< XModel > &, Reference< XStatusIndicator > &, @@ -63,6 +62,8 @@ typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&, typedef sal_Bool ( SAL_CALL *ImportPPT )( const ::rtl::OUString&, Sequence< PropertyValue >*, SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& ); +typedef BOOL ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& ); + // --------------- // - SdPPTFilter - // --------------- @@ -188,32 +189,13 @@ void SdPPTFilter::PreSaveBasic() SvtFilterOptions* pFilterOptions = SvtFilterOptions::Get(); if( pFilterOptions && pFilterOptions->IsLoadPPointBasicStorage() ) { - SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) ); - SvxImportMSVBasic aMSVBas( (SfxObjectShell&) mrDocShell, *xDest, FALSE, FALSE ); - aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); - - SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); - if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) + ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); + if( pLibrary ) { - SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); - if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) + SaveVBA pSaveVBA= reinterpret_cast(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("SaveVBA") )); + if( pSaveVBA ) { - SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) ); - if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) - { - UINT32 nLen = xTemp->GetSize(); - if ( nLen ) - { - char* pTemp = new char[ nLen ]; - if ( pTemp ) - { - xTemp->Seek( STREAM_SEEK_TO_BEGIN ); - xTemp->Read( pTemp, nLen ); - pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ ); - pBas->ObjectOwnsMemory( TRUE ); - } - } - } + pSaveVBA( (SfxObjectShell&) mrDocShell, pBas ); } } } diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 1c4c3ea23..058a1f4ae 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -66,7 +66,7 @@ #include #include #include -#include +//#include #include #include #include diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index e530511ee..6b1e6ebf1 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -250,7 +250,7 @@ DEF5NAME=$(SHL5TARGET) SHL5STDLIBS = $(ISDLIB) \ $(SVXCORELIB) \ - $(SVXMSFILTERLIB) \ + $(MSFILTERLIB) \ $(SFX2LIB) \ $(SVTOOLLIB) \ $(SOTLIB) \ diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map index ac6b782f3..622133934 100644 --- a/sd/util/sdfilt.map +++ b/sd/util/sdfilt.map @@ -2,7 +2,7 @@ PPTEXPORTER_1_0 { global: ExportPPT; ImportPPT; - + SaveVBA; local: *; }; -- cgit v1.2.3 From 2ec63285e27006f0fb04387fa9e637beb6944199 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 2 Nov 2009 20:49:14 +0100 Subject: #i106421#: create new cui resource file --- sd/source/ui/docshell/docshel2.cxx | 2 +- sd/source/ui/func/fuarea.cxx | 1 - sd/source/ui/func/fuline.cxx | 2 +- sd/source/ui/func/fulinend.cxx | 2 +- sd/source/ui/func/fuscale.cxx | 7 +++---- sd/source/ui/func/futransf.cxx | 4 ++-- sd/source/ui/func/futxtatt.cxx | 2 +- sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2 +- sd/source/ui/view/drviews2.cxx | 2 +- sd/source/ui/view/drviewsc.cxx | 4 ++-- sd/source/ui/view/sdview2.cxx | 2 +- 11 files changed, 14 insertions(+), 16 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 43ec814ea..bd6313315 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -374,7 +374,7 @@ BOOL DrawDocShell::CheckPageName (::Window* pWin, String& rName ) { String aDesc( SdResId( STR_WARN_PAGE_EXISTS ) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc, RID_SVXDLG_NAME ) : 0; + AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc ) : 0; if( aNameDlg ) { aNameDlg->SetEditHelpId( HID_SD_NAMEDIALOG_PAGE ); diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index 3909a404c..acd4b292a 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -85,7 +85,6 @@ void FuArea::DoExecute( SfxRequest& rReq ) AbstractSvxAreaTabDialog * pDlg = pFact ? pFact->CreateSvxAreaTabDialog( NULL, &aNewAttr, mpDoc, - RID_SVXDLG_AREA, mpView) : 0; if( pDlg && (pDlg->Execute() == RET_OK) ) { diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index 3feaddba1..fb3b70f99 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -98,7 +98,7 @@ void FuLine::DoExecute( SfxRequest& rReq ) mpView->GetAttributes( *pNewAttr ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SfxAbstractTabDialog * pDlg = pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr,mpDoc,RID_SVXDLG_LINE,pObj,bHasMarked) : 0; + SfxAbstractTabDialog * pDlg = pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr,mpDoc,pObj,bHasMarked) : 0; if( pDlg && (pDlg->Execute() == RET_OK) ) { mpView->SetAttributes (*(pDlg->GetOutputItemSet ())); diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index 2244fe72c..3f901a4c3 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -140,7 +140,7 @@ void FuLineEnd::DoExecute( SfxRequest& ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc, RID_SVXDLG_NAME ) : 0; + AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc ) : 0; if( pDlg ) { diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index 4ec3b7a71..e15e4ac88 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -139,7 +139,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - pDlg = pFact->CreateSvxZoomDialog(NULL, aNewAttr, RID_SVXDLG_ZOOM); + pDlg = pFact->CreateSvxZoomDialog(NULL, aNewAttr); } if( pDlg ) @@ -169,12 +169,11 @@ void FuScale::DoExecute( SfxRequest& rReq ) delete pDlg; - // SvxZoomType eZT = ((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetType (); - switch (((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetType ()) + switch (((const SvxZoomItem &) aArgs.Get (SID_ATTR_ZOOM)).GetType ()) { case SVX_ZOOM_PERCENT: { - nValue = ((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetValue (); + nValue = ((const SvxZoomItem &) aArgs.Get (SID_ATTR_ZOOM)).GetValue (); mpViewShell->SetZoom( nValue ); diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 15c13e62c..32726db55 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -94,7 +94,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { - std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView, RID_SVXDLG_CAPTION ) ); + std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) ); const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange ); @@ -114,7 +114,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet,mpView, RID_SVXDLG_TRANSFORM) ); + std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet, mpView ) ); if( pDlg.get() && (pDlg->Execute() == RET_OK) ) { rReq.Done( *( pDlg->GetOutputItemSet() ) ); diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx index b1ee91552..7f48aed7d 100644 --- a/sd/source/ui/func/futxtatt.cxx +++ b/sd/source/ui/func/futxtatt.cxx @@ -79,7 +79,7 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq ) if( !pArgs ) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, RID_SVXDLG_TEXT, mpView ); + SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView ); USHORT nResult = pDlg->Execute(); diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 75fa4a4fd..d11b3f217 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -905,7 +905,7 @@ void SlotManager::RenameSlide (void) DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( mrSlideSorter.GetActiveWindow(), - aPageName, aDescr, RID_SVXDLG_NAME); + aPageName, aDescr); DBG_ASSERT(aNameDlg, "Dialogdiet fail!"); aNameDlg->SetText( aTitle ); aNameDlg->SetCheckNameHdl( LINK( this, SlotManager, RenameSlideHdl ), true ); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 82ee1a0e5..521e51a58 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -467,7 +467,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); - AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr, RID_SVXDLG_NAME ); + AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr ); DBG_ASSERT(aNameDlg, "Dialogdiet fail!"); aNameDlg->SetText( aTitle ); aNameDlg->SetCheckNameHdl( LINK( this, DrawViewShell, RenameSlideHdl ), true ); diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 0f923150c..c590d891a 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -127,7 +127,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); - AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName, RID_SVXDLG_OBJECT_NAME); + AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName); OSL_ENSURE(pDlg, "Dialogdiet fail!"); pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl)); @@ -162,7 +162,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); - AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription, RID_SVXDLG_OBJECT_TITLE_DESC); + AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription); OSL_ENSURE(pDlg, "Dialogdiet fail!"); if(RET_OK == pDlg->Execute()) diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index c579c3c11..a01e6ee5c 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -963,7 +963,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n String aTitle( SdResId( STR_TITLE_NAMEGROUP ) ); String aDesc( SdResId( STR_DESC_NAMEGROUP ) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), *pNewName, aDesc, RID_SVXDLG_NAME ) : 0; + AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), *pNewName, aDesc ) : 0; if( pDlg ) { pDlg->SetEditHelpId( HID_SD_NAMEDIALOG_OBJECT ); -- cgit v1.2.3 From 08b6f684814f69c48d1bb0e97034a0f265b678e0 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Tue, 3 Nov 2009 18:12:19 +0100 Subject: #i104678# use high contrast mode setting instead of IsDark (paradigm shift begun with issue i35482) --- sd/source/ui/app/tbxww.cxx | 2 +- sd/source/ui/dlg/PaneDockingWindow.cxx | 2 +- sd/source/ui/dlg/animobjs.cxx | 4 ++-- sd/source/ui/dlg/navigatr.cxx | 2 +- sd/source/ui/toolpanel/LayoutMenu.cxx | 4 ++-- sd/source/ui/toolpanel/TitleToolBox.cxx | 2 +- sd/source/ui/unoidl/unopage.cxx | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 63021a95e..b1e5d4391 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -311,7 +311,7 @@ void SdTbxControl::StateChanged( USHORT nSId, Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages(), - GetToolBox().GetDisplayBackground().GetColor().IsDark() ); + GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() ); // !-Operator prueft, ob Image nicht vorhanden ist if( !!aImage ) diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 6f1ae1df2..d4ebe02ae 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -263,7 +263,7 @@ void PaneDockingWindow::InitializeTitleToolBox (void) Image aImage = Image (aBitmap, Color (COL_LIGHTMAGENTA)); Image aImageHC = Image (aBitmapHC, Color (BMP_COLOR_HIGHCONTRAST)); mpTitleToolBox->InsertItem (1, - GetSettings().GetStyleSettings().GetMenuBarColor().IsDark() + GetSettings().GetStyleSettings().GetHighContrastMode() ? aImageHC : aImage); mpTitleToolBox->ShowItem (1); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 8a51c44e1..9a2c8cd88 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -138,7 +138,7 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt ) { const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) ); - SetDrawMode( GetDisplayBackground().GetColor().IsDark() + SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR ); } @@ -601,7 +601,7 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) aVD.SetOutputSize( aObjSize ); const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); aVD.SetBackground( Wallpaper( rStyles.GetFieldColor() ) ); - aVD.SetDrawMode( GetDisplayBackground().GetColor().IsDark() + aVD.SetDrawMode( rStyles.GetHighContrastMode() ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR ); aVD.Erase(); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index f3df24122..2ccba3b87 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -863,7 +863,7 @@ void SdNavigatorWin::SetDragImage() void SdNavigatorWin::ApplyImageList() { - const bool bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0; + const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); maToolbox.SetImageList( bHighContrast ? maImageListH : maImageList ); diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 7b479e102..1a7eacd9e 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -63,7 +63,7 @@ #include #include #include -#include "taskpane/TitledControl.hxx" +#include "taskpane/TitledControl.hxx" #include #include #include @@ -808,7 +808,7 @@ SfxRequest LayoutMenu::CreateRequest ( void LayoutMenu::Fill (void) { - const bool bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0; + const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); SvtLanguageOptions aLanguageOptions; sal_Bool bVertical = aLanguageOptions.IsVerticalTextEnabled(); SdDrawDocument* pDocument = mrBase.GetDocument(); diff --git a/sd/source/ui/toolpanel/TitleToolBox.cxx b/sd/source/ui/toolpanel/TitleToolBox.cxx index 2c2c40f56..75704cb96 100644 --- a/sd/source/ui/toolpanel/TitleToolBox.cxx +++ b/sd/source/ui/toolpanel/TitleToolBox.cxx @@ -77,7 +77,7 @@ void TitleToolBox::AddItem (ToolBoxId aId) case TBID_DOCUMENT_CLOSE: InsertItem (TBID_DOCUMENT_CLOSE, - GetSettings().GetStyleSettings().GetMenuBarColor().IsDark() + GetSettings().GetStyleSettings().GetHighContrastMode() ? maImageHC : maImage, 0 ); break; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 8a8880d39..a74449fbe 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1014,7 +1014,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) } case WID_PAGE_LDBITMAP: { - BOOL bHC = Application::GetSettings().GetStyleSettings().GetWindowColor().IsDark(); + BOOL bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); Reference< awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap( BitmapEx( SdResId( bHC ? BMP_PAGE_H : BMP_PAGE ) ) ) ); aAny <<= xBitmap; -- cgit v1.2.3 From d18b7a6a3eef8afb7d0b0b24638692aac188b223 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 4 Nov 2009 21:54:56 +0100 Subject: #i196421#: some problems with pch on Windows --- sd/inc/pch/precompiled_sd.hxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 8250e050b..360f32e88 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -1,4 +1,5 @@ -/************************************************************************* +/************************************************************************cherex + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -596,7 +597,7 @@ #include "svx/editund2.hxx" #include "svx/editview.hxx" #include "svx/eeitem.hxx" -#include "svx/escherex.hxx" +#include "filter/msfilter/escherex.hxx" #include "svx/escpitem.hxx" #include "svx/extrusionbar.hxx" #include "svx/f3dchild.hxx" @@ -640,8 +641,8 @@ #include "svx/lspcitem.hxx" #include "svx/modctrl.hxx" #include "svx/msdffdef.hxx" -#include "svx/msocximex.hxx" -#include "svx/msoleexp.hxx" +#include "filter/msfilter/msocximex.hxx" +#include "filter/msfilter/msoleexp.hxx" #include "svx/numitem.hxx" #include "svx/obj3d.hxx" #include "svx/objfac3d.hxx" @@ -724,7 +725,7 @@ #include "svx/svxfont.hxx" #include "svx/svxgrahicitem.hxx" #include "svx/svxids.hrc" -#include "svx/svxmsbas.hxx" +#include "filter/msfilter/svxmsbas.hxx" #include "svx/sxciaitm.hxx" #include "svx/sxekitm.hxx" #include "svx/sxelditm.hxx" -- cgit v1.2.3 From 8fc0b3b863ea0cf68a92b0a722117888dcf6ec9e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 5 Nov 2009 09:52:12 +0100 Subject: forgot to add filter to build.lst of apps using msfilter --- sd/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 sd/prj/build.lst (limited to 'sd') diff --git a/sd/prj/build.lst b/sd/prj/build.lst old mode 100644 new mode 100755 index 00150a570..bc8bf923f --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -1,4 +1,4 @@ -sd sd : l10n animations svx stoc canvas NULL +sd sd : filter l10n animations svx stoc canvas NULL sd sd usr1 - all sd_mkout NULL sd sd\inc nmake - all sd_inc NULL sd sd\prj get - all sd_prj NULL -- cgit v1.2.3 From c91a3d6530075a782adada46db7aa1715d150cb9 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 5 Nov 2009 13:16:50 +0000 Subject: #i57928# force quick text edit mode during format paintbrush --- sd/source/ui/func/fuformatpaintbrush.cxx | 12 ++++++++++++ sd/source/ui/inc/fuformatpaintbrush.hxx | 1 + 2 files changed, 13 insertions(+) (limited to 'sd') diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 71caf08d8..407ae69da 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -67,6 +67,7 @@ TYPEINIT1( FuFormatPaintBrush, FuText ); FuFormatPaintBrush::FuFormatPaintBrush( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuText(pViewSh, pWin, pView, pDoc, rReq) , mbPermanent( false ) +, mbOldIsQuickTextEditMode( true ) { } @@ -230,10 +231,21 @@ BOOL FuFormatPaintBrush::KeyInput(const KeyEvent& rKEvt) void FuFormatPaintBrush::Activate() { + mbOldIsQuickTextEditMode = mpViewShell->GetFrameView()->IsQuickEdit(); + if( !mbOldIsQuickTextEditMode ) + { + mpViewShell->GetFrameView()->SetQuickEdit(TRUE); + mpView->SetQuickTextEditMode(TRUE); + } } void FuFormatPaintBrush::Deactivate() { + if( !mbOldIsQuickTextEditMode ) + { + mpViewShell->GetFrameView()->SetQuickEdit(FALSE); + mpView->SetQuickTextEditMode(FALSE); + } } bool FuFormatPaintBrush::HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 6b8f07426..2a8923f17 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -73,6 +73,7 @@ private: ::boost::shared_ptr mpItemSet; bool mbPermanent; + bool mbOldIsQuickTextEditMode; }; } // end of namespace sd -- cgit v1.2.3 From f07b88f64c493cc886fb1697941b217d98b8cb40 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 10 Nov 2009 15:17:30 +0000 Subject: #i106678# remove unnecessary scaling as it causes only trouble --- sd/source/core/sdpage.cxx | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 75bb8df9a..04b373163 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2049,40 +2049,6 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR pObj->NbcMove(aVec); } - Rectangle aBoundRect = pObj->GetCurrentBoundRect(); - - if (!aBorderRect.IsInside(aBoundRect)) - { - /********************************************************** - * Objekt liegt nicht vollstaendig innerhalb der Raender - * -> Position korrigieren - **********************************************************/ - Point aOldPos(aBoundRect.TopLeft()); - aNewPos = aOldPos; - - // Position links oben ggf. korrigieren - aNewPos.X() = Max(aNewPos.X(), aBorderRect.Left()); - aNewPos.Y() = Max(aNewPos.Y(), aBorderRect.Top()); - aVec = Size(aNewPos.X() - aOldPos.X(), aNewPos.Y() - aOldPos.Y()); - - if (aVec.Height() != 0 || aVec.Width() != 0) - { - pObj->NbcMove(aVec); - } - - // Position rechts unten ggf. korrigieren - aOldPos = aBoundRect.BottomRight(); - aNewPos = aOldPos; - aNewPos.X() = Min(aNewPos.X(), aBorderRect.Right()); - aNewPos.Y() = Min(aNewPos.Y(), aBorderRect.Bottom()); - aVec = Size(aNewPos.X() - aOldPos.X(), aNewPos.Y() - aOldPos.Y()); - - if (aVec.Height() != 0 || aVec.Width() != 0) - { - pObj->NbcMove(aVec); - } - } - pObj->SetChanged(); pObj->BroadcastObjectChange(); } -- cgit v1.2.3 From bf7b77ca18b94d8f256e4c12ee9e65d10f66cfb5 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Thu, 12 Nov 2009 11:26:43 +0100 Subject: aw078 #i106541# commited in-between stable version with already advanced metafile decomposition for security reasons --- sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx | 8 ++++---- sd/source/ui/view/sdview.cxx | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index afa2bcf07..a7def24c5 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -728,8 +728,8 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c // get font attributes basegfx::B2DVector aTextSizeAttribute; - const drawinglayer::primitive2d::FontAttributes aFontAttributes( - drawinglayer::primitive2d::getFontAttributesFromVclFont( + const drawinglayer::attribute::FontAttribute aFontAttribute( + drawinglayer::primitive2d::getFontAttributeFromVclFont( aTextSizeAttribute, getPageNameFont(), false, @@ -835,7 +835,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c 0, aPageName.Len(), aDXArray, - aFontAttributes, + aFontAttribute, aLocale, aFontColor)); } @@ -876,7 +876,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c 0, nNumberLen, aDXArray, - aFontAttributes, + aFontAttribute, aLocale, aFontColor)); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 477fbb900..7eea7f8fb 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -448,8 +448,8 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP aVclFont.SetHeight( 500 ); - const drawinglayer::primitive2d::FontAttributes aFontAttributes( - drawinglayer::primitive2d::getFontAttributesFromVclFont( + const drawinglayer::attribute::FontAttribute aFontAttribute( + drawinglayer::primitive2d::getFontAttributeFromVclFont( aTextSizeAttribute, aVclFont, false, @@ -476,7 +476,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP 0, nTextLength, aDXArray, - aFontAttributes, + aFontAttribute, aLocale, aFontColor)); drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xRef); -- cgit v1.2.3 From 1bb41f8d8241fffdf8941aa89fd82cb3becf9149 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 13 Nov 2009 11:04:06 +0100 Subject: sb116: #i106845# removed obsolete IRIX port --- sd/source/helper/simplereferencecomponent.cxx | 2 +- sd/source/ui/func/fubullet.cxx | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index f714625ea..be8bd986e 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -135,7 +135,7 @@ void SimpleReferenceComponent::operator delete(void * pPtr, ) SAL_THROW(()) { -#if defined WNT || (defined IRIX && !defined GCC) +#if defined WNT ::operator delete(pPtr); // WNT lacks a global nothrow operator delete... #else // WNT ::operator delete(pPtr, rNothrow); diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index d9b35052d..c7c7f1d45 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -52,9 +52,6 @@ #include #include -#ifdef IRIX -#include -#endif #include #include #include "drawview.hxx" -- cgit v1.2.3 From e5b13518889809e46b9379bca16d449bacd06633 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Fri, 20 Nov 2009 12:42:09 +0000 Subject: #i107049# Do not scroll focus indicator into view when slide sorter is focused. --- .../controller/SlideSorterController.cxx | 2 +- .../ui/slidesorter/controller/SlsFocusManager.cxx | 31 +++++++++++++--------- .../slidesorter/inc/controller/SlsFocusManager.hxx | 12 +++++++-- 3 files changed, 29 insertions(+), 16 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index c8355752c..26b66e698 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -604,7 +604,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) case VCLEVENT_WINDOW_GETFOCUS: if (pActiveWindow != NULL && pWindow == pActiveWindow) - GetFocusManager().ShowFocus(); + GetFocusManager().ShowFocus(false); break; case VCLEVENT_WINDOW_LOSEFOCUS: diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 9cb8c7d38..7e834de12 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -133,17 +133,17 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) } if (mbPageIsFocused) - ShowFocusIndicator(GetFocusedPageDescriptor()); + ShowFocusIndicator(GetFocusedPageDescriptor(), true); } } -void FocusManager::ShowFocus (void) +void FocusManager::ShowFocus (const bool bScrollToFocus) { mbPageIsFocused = true; - ShowFocusIndicator(GetFocusedPageDescriptor()); + ShowFocusIndicator(GetFocusedPageDescriptor(), bScrollToFocus); } @@ -254,20 +254,25 @@ void FocusManager::HideFocusIndicator (const model::SharedPageDescriptor& rpDesc -void FocusManager::ShowFocusIndicator (const model::SharedPageDescriptor& rpDescriptor) +void FocusManager::ShowFocusIndicator ( + const model::SharedPageDescriptor& rpDescriptor, + const bool bScrollToFocus) { if (rpDescriptor.get() != NULL) { rpDescriptor->SetFocus (); - - // Scroll the focused page object into the visible area and repaint - // it, so that the focus indicator becomes visible. - view::SlideSorterView& rView (mrSlideSorter.GetView()); - mrSlideSorter.GetController().GetSelectionManager()->MakeRectangleVisible ( - rView.GetPageBoundingBox ( - GetFocusedPageDescriptor(), - view::SlideSorterView::CS_MODEL, - view::SlideSorterView::BBT_INFO)); + + if (bScrollToFocus) + { + // Scroll the focused page object into the visible area and repaint + // it, so that the focus indicator becomes visible. + view::SlideSorterView& rView (mrSlideSorter.GetView()); + mrSlideSorter.GetController().GetSelectionManager()->MakeRectangleVisible ( + rView.GetPageBoundingBox ( + GetFocusedPageDescriptor(), + view::SlideSorterView::CS_MODEL, + view::SlideSorterView::BBT_INFO)); + } mrSlideSorter.GetView().RequestRepaint (rpDescriptor); NotifyFocusChangeListeners(); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index acc60b525..626fd500f 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -87,8 +87,11 @@ public: void MoveFocus (FocusMoveDirection eDirection); /** Show the focus indicator of the current slide. + @param bScrollToFocus + When (the default) then the view is scrolled so that the + focus rectangle lies inside its visible area. */ - void ShowFocus (void); + void ShowFocus (const bool bScrollToFocus = true); /** Hide the focus indicator. */ @@ -215,8 +218,13 @@ private: made visible. @param pDescriptor When NULL is given then the call is ignored. + @param bScrollToFocus + When (the default) then the view is scrolled so that the + focus rectangle lies inside its visible area. */ - void ShowFocusIndicator (const model::SharedPageDescriptor& rpDescriptor); + void ShowFocusIndicator ( + const model::SharedPageDescriptor& rpDescriptor, + const bool bScrollToFocus); /** Call all currently registered listeners that a focus change has happended. The focus may be hidden or shown or moved from one page -- cgit v1.2.3 From 9ea6065c8e4060e7770e6499a04a822157db4aa0 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Mon, 23 Nov 2009 16:27:16 +0100 Subject: #i105146# fixed mainly by not setting a page to visualize at the SdrPageObj's for handout page --- sd/source/core/sdpage.cxx | 24 +++++++--------------- .../view/SlsPageObjectViewObjectContact.cxx | 14 ++++++++----- sd/source/ui/view/drviews1.cxx | 18 ++++------------ 3 files changed, 20 insertions(+), 36 deletions(-) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 75bb8df9a..bb7afd0f9 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -302,8 +302,9 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec case PRESOBJ_HANDOUT: { //Erste Standardseite am SdrPageObj vermerken - SdrPage* pFirstPage = ( (SdDrawDocument*) pModel )->GetSdPage(0, PK_STANDARD); - pSdrObj = new SdrPageObj( pFirstPage ); + // #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); } break; @@ -745,28 +746,17 @@ void SdPage::CreateTitleAndLayout(BOOL bInit, BOOL bCreate ) CalculateHandoutAreas( *static_cast< SdDrawDocument* >(GetModel() ), pMasterPage->GetAutoLayout(), false, aAreas ); const bool bSkip = pMasterPage->GetAutoLayout() == AUTOLAYOUT_HANDOUT3; - - sal_uInt16 nPage = 0; std::vector< Rectangle >::iterator iter( aAreas.begin() ); + while( iter != aAreas.end() ) { SdrPageObj* pPageObj = static_cast(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, FALSE, (*iter++), TRUE) ); - - const sal_uInt16 nDestinationPageNum(2 * nPage + 1); - - if(nDestinationPageNum < pModel->GetPageCount()) - { - pPageObj->SetReferencedPage(pModel->GetPage(nDestinationPageNum)); - } - else - { - pPageObj->SetReferencedPage(0L); - } + // #i105146# We want no content to be displayed for PK_HANDOUT, + // so just never set a page as content + pPageObj->SetReferencedPage(0L); if( bSkip && iter != aAreas.end() ) iter++; - - nPage++; } } diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index a7def24c5..bdbdbca8b 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -1191,12 +1191,16 @@ void PageObjectViewObjectContact::ActionChanged (void) // Even when we are called from destructor we still have to invalide // the preview bitmap in the cache. const SdrPage* pPage = GetPage(); - SdDrawDocument* pDocument = dynamic_cast(pPage->GetModel()); - if (mpCache!=NULL && pPage!=NULL && pDocument!=NULL) + + if(pPage) { - cache::PageCacheManager::Instance()->InvalidatePreviewBitmap( - pDocument->getUnoModel(), - GetPage()); + SdDrawDocument* pDocument = dynamic_cast(pPage->GetModel()); + if (mpCache!=NULL && pPage!=NULL && pDocument!=NULL) + { + cache::PageCacheManager::Instance()->InvalidatePreviewBitmap( + pDocument->getUnoModel(), + pPage); + } } // call parent diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index ec8bf518a..f9e7b8e05 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -1196,25 +1196,15 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) { // set pages for all available handout presentation objects sd::ShapeList& rShapeList = pMaster->GetPresentationShapeList(); - - sal_uInt16 nPgNum = 0; SdrObject* pObj = 0; + while( (pObj = rShapeList.getNextShape(pObj)) != 0 ) { if( pMaster->GetPresObjKind(pObj) == PRESOBJ_HANDOUT ) { - const sal_uInt16 nDestinationPageNum(2 * nPgNum + 1); - - if(nDestinationPageNum < GetDoc()->GetPageCount()) - { - static_cast(pObj)->SetReferencedPage(GetDoc()->GetPage(nDestinationPageNum)); - } - else - { - static_cast(pObj)->SetReferencedPage(0L); - } - - nPgNum++; + // #i105146# We want no content to be displayed for PK_HANDOUT, + // so just never set a page as content + static_cast(pObj)->SetReferencedPage(0); } } } -- cgit v1.2.3 From 8211ed668becade2766f5a5506c57c2334047bff Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 25 Nov 2009 16:04:16 +0000 Subject: fixed typo --- sd/source/ui/annotations/annotationmanager.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 019081922..9bd153151 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -199,7 +199,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase ) { SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()); if( pOptions ) - mbShowAnnotations = pOptions->IsPreviewTransitions() == sal_True; + mbShowAnnotations = pOptions->IsShowComments() == TRUE; } // -------------------------------------------------------------------- -- cgit v1.2.3 From d6621f9b0918a9d02f5d075be7098a2676220df9 Mon Sep 17 00:00:00 2001 From: Vladimir Glazunov Date: Tue, 1 Dec 2009 08:45:04 +0100 Subject: #i10000# fix for lik-error on Windows --- sd/source/ui/dlg/ins_paste.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sd') diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx index 979d16532..ac0f09d68 100644 --- a/sd/source/ui/dlg/ins_paste.cxx +++ b/sd/source/ui/dlg/ins_paste.cxx @@ -31,6 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" +#ifdef SD_DLLIMPLEMENTATION +#undef SD_DLLIMPLEMENTATION +#endif + #include "ins_paste.hrc" #include "ins_paste.hxx" -- cgit v1.2.3 From dc5722a2758d1245f956e925495a61e94278b952 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 8 Dec 2009 15:18:29 +0100 Subject: some more fixes after resync --- sd/source/ui/func/fuformatpaintbrush.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 407ae69da..f9ed2c0de 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include -- cgit v1.2.3