diff options
Diffstat (limited to 'sdext/source/presenter')
79 files changed, 710 insertions, 710 deletions
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 02bd3c6b46b1..60791edc3583 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,14 +109,14 @@ public: const sal_Int16 nEventId, const cssu::Any& rOldValue, const cssu::Any& rNewValue); - + void UpdateStateSet (void); - + //----- XAccessible ------------------------------------------------------- virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL - getAccessibleContext (void) + getAccessibleContext (void) throw (cssu::RuntimeException); @@ -132,7 +132,7 @@ public: virtual cssu::Reference< cssa::XAccessible> SAL_CALL getAccessibleParent (void) throw (cssu::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (cssu::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole (void) @@ -156,48 +156,48 @@ public: throw (cssu::RuntimeException, cssa::IllegalAccessibleComponentStateException); - + //----- XAccessibleComponent -------------------------------------------- virtual sal_Bool SAL_CALL containsPoint ( - const css::awt::Point& aPoint) + const css::awt::Point& aPoint) throw (cssu::RuntimeException); - virtual cssu::Reference<cssa::XAccessible> SAL_CALL + virtual cssu::Reference<cssa::XAccessible> SAL_CALL getAccessibleAtPoint ( - const css::awt::Point& aPoint) + const css::awt::Point& aPoint) throw (cssu::RuntimeException); virtual css::awt::Rectangle SAL_CALL getBounds (void) throw (cssu::RuntimeException); - virtual css::awt::Point SAL_CALL getLocation (void) + virtual css::awt::Point SAL_CALL getLocation (void) throw (cssu::RuntimeException); - virtual css::awt::Point SAL_CALL getLocationOnScreen (void) + virtual css::awt::Point SAL_CALL getLocationOnScreen (void) throw (cssu::RuntimeException); - virtual css::awt::Size SAL_CALL getSize (void) + virtual css::awt::Size SAL_CALL getSize (void) throw (cssu::RuntimeException); - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus (void) throw (cssu::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (cssu::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (cssu::RuntimeException); //----- XAccessibleEventBroadcaster -------------------------------------- virtual void SAL_CALL addEventListener ( - const cssu::Reference<cssa::XAccessibleEventListener>& rxListener) + const cssu::Reference<cssa::XAccessibleEventListener>& rxListener) throw (cssu::RuntimeException); - virtual void SAL_CALL removeEventListener ( - const cssu::Reference<cssa::XAccessibleEventListener>& rxListener) + virtual void SAL_CALL removeEventListener ( + const cssu::Reference<cssa::XAccessibleEventListener>& rxListener) throw (cssu::RuntimeException); using PresenterAccessibleObjectInterfaceBase::addEventListener; @@ -234,14 +234,14 @@ protected: bool mbIsFocused; cssu::Reference<cssa::XAccessible> mxParentAccessible; ::std::vector<rtl::Reference<AccessibleObject> > maChildren; - ::std::vector<Reference<XAccessibleEventListener> > maListeners; + ::std::vector<Reference<XAccessibleEventListener> > maListeners; virtual awt::Point GetRelativeLocation (void); virtual awt::Size GetSize (void); virtual awt::Point GetAbsoluteParentLocation (void); virtual bool GetWindowState (const sal_Int16 nType) const; - + void UpdateState (const sal_Int16 aState, const bool bValue); sal_Bool IsDisposed (void) const; @@ -369,74 +369,74 @@ public: getAccessibleRelationSet (void) throw (cssu::RuntimeException); - + //----- XAccessibleText --------------------------------------------------- - + virtual sal_Int32 SAL_CALL getCaretPosition (void) throw (cssu::RuntimeException); - + virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException); - + virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException); - + virtual cssu::Sequence<css::beans::PropertyValue> SAL_CALL getCharacterAttributes ( ::sal_Int32 nIndex, const cssu::Sequence<rtl::OUString>& rRequestedAttributes) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); - + virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); - + virtual sal_Int32 SAL_CALL getCharacterCount (void) throw (cssu::RuntimeException); - + virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) throw (cssu::RuntimeException); - + virtual ::rtl::OUString SAL_CALL getSelectedText (void) throw (cssu::RuntimeException); - + virtual sal_Int32 SAL_CALL getSelectionStart (void) throw (cssu::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionEnd (void) throw (cssu::RuntimeException); - + virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); virtual ::rtl::OUString SAL_CALL getText (void) throw (cssu::RuntimeException); - + virtual ::rtl::OUString SAL_CALL getTextRange ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); - + virtual cssa::TextSegment SAL_CALL getTextAtIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, cssu::RuntimeException); - + virtual cssa::TextSegment SAL_CALL getTextBeforeIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, cssu::RuntimeException); - + virtual cssa::TextSegment SAL_CALL getTextBehindIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, cssu::RuntimeException); - + virtual ::sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); @@ -505,7 +505,7 @@ public: aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String")) >>= sName; } - + rtl::Reference<PresenterAccessible::AccessibleObject> pObject ( new PresenterAccessible::AccessibleObject( aLocale, @@ -531,7 +531,7 @@ public: const css::lang::Locale aLocale, const sal_Int16 nRole, const ::rtl::OUString& rsName); - + static rtl::Reference<PresenterAccessible::AccessibleObject> Create ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, @@ -539,7 +539,7 @@ public: const Reference<awt::XWindow>& rxContentWindow, const Reference<awt::XWindow>& rxBorderWindow, const ::boost::shared_ptr<PresenterTextView>& rpTextView); - + void SetTextView (const ::boost::shared_ptr<PresenterTextView>& rpTextView); virtual void SetWindow ( @@ -626,11 +626,11 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane if ( ! mpPresenterController.is()) return pPreviewPane; - + rtl::Reference<PresenterPaneContainer> pContainer (mpPresenterController->GetPaneContainer()); if ( ! pContainer.is()) return pPreviewPane; - + pPreviewPane = pContainer->FindPaneURL(PresenterPaneFactory::msCurrentSlidePreviewPaneURL); Reference<drawing::framework::XPane> xPreviewPane; if (pPreviewPane) @@ -669,7 +669,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (void) Reference<drawing::framework::XPane> xPreviewPane; if (pPreviewPane) xPreviewPane = pPreviewPane->mxPane.get(); - + // Get the notes pane. PresenterPaneContainer::SharedPaneDescriptor pNotesPane( pPaneContainer->FindPaneURL(PresenterPaneFactory::msNotesPaneURL)); @@ -809,7 +809,7 @@ void SAL_CALL PresenterAccessible::disposing (void) if (mxMainPane.is()) mxMainPane->setAccessible(NULL); } - + mpAccessiblePreview = NULL; mpAccessibleNotes = NULL; mpAccessibleConsole = NULL; @@ -820,7 +820,7 @@ void SAL_CALL PresenterAccessible::disposing (void) //----- XAccessible ----------------------------------------------------------- -Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext (void) +Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext (void) throw (cssu::RuntimeException) { if ( ! mpAccessibleConsole.is()) @@ -857,7 +857,7 @@ void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEve OSL_TRACE("PresenterAccessible::focusGained at %x and window %x\r", this, mxMainWindow.get()); #endif - + AccessibleFocusManager::Instance()->FocusObject(mpAccessibleConsole); } @@ -872,7 +872,7 @@ void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent #ifdef VERBOSE OSL_TRACE("PresenterAccessible::focusLost at %x\r", this); #endif - + AccessibleFocusManager::Instance()->FocusObject(NULL); } @@ -957,7 +957,7 @@ void PresenterAccessible::AccessibleObject::SetWindow ( { mxContentWindow->removeWindowListener(this); } - + mxContentWindow = xContentWindow; mxBorderWindow = Reference<awt::XWindow2>(rxBorderWindow, UNO_QUERY); @@ -994,7 +994,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::disposing (void) //----- XAccessible ------------------------------------------------------- Reference<XAccessibleContext> SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleContext (void) + PresenterAccessible::AccessibleObject::getAccessibleContext (void) throw (RuntimeException) { ThrowIfDisposed(); @@ -1013,7 +1013,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCoun ThrowIfDisposed(); const sal_Int32 nChildCount (maChildren.size()); - + return nChildCount; } @@ -1065,7 +1065,7 @@ sal_Int32 SAL_CALL return nIndex; } } - + return 0; } @@ -1154,7 +1154,7 @@ lang::Locale SAL_CALL //----- XAccessibleComponent ------------------------------------------------ sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint ( - const awt::Point& rPoint) + const awt::Point& rPoint) throw (RuntimeException) { ThrowIfDisposed(); @@ -1174,7 +1174,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint ( -Reference<XAccessible> SAL_CALL +Reference<XAccessible> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleAtPoint (const awt::Point& rPoint) throw (RuntimeException) { @@ -1196,14 +1196,14 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void) const awt::Point aLocation (GetRelativeLocation()); const awt::Size aSize (GetSize()); - + return awt::Rectangle (aLocation.X, aLocation.Y, aSize.Width, aSize.Height); } -awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void) +awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void) throw (RuntimeException) { ThrowIfDisposed(); @@ -1216,7 +1216,7 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void) -awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (void) +awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (void) throw (RuntimeException) { ThrowIfDisposed(); @@ -1226,13 +1226,13 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen ( return awt::Point( aRelativeLocation.X + aParentLocationOnScreen.X, - aRelativeLocation.Y + aParentLocationOnScreen.Y); + aRelativeLocation.Y + aParentLocationOnScreen.Y); } -awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void) +awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void) throw (RuntimeException) { ThrowIfDisposed(); @@ -1245,7 +1245,7 @@ awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void) -void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void) +void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void) throw (RuntimeException) { ThrowIfDisposed(); @@ -1258,7 +1258,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void) -sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void) throw (RuntimeException) { ThrowIfDisposed(); @@ -1269,11 +1269,11 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void) -sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void) throw (RuntimeException) { ThrowIfDisposed(); - + return 0x00000000; } @@ -1283,7 +1283,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void) //----- XAccessibleEventBroadcaster ------------------------------------------- void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener ( - const Reference<XAccessibleEventListener>& rxListener) + const Reference<XAccessibleEventListener>& rxListener) throw (RuntimeException) { if (rxListener.is()) @@ -1305,8 +1305,8 @@ void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener ( -void SAL_CALL PresenterAccessible::AccessibleObject::removeEventListener ( - const Reference<XAccessibleEventListener>& rxListener) +void SAL_CALL PresenterAccessible::AccessibleObject::removeEventListener ( + const Reference<XAccessibleEventListener>& rxListener) throw (RuntimeException) { ThrowIfDisposed(); @@ -1399,7 +1399,7 @@ bool PresenterAccessible::AccessibleObject::GetWindowState (const sal_Int16 nTyp case AccessibleStateType::FOCUSABLE: return true; - + case AccessibleStateType::FOCUSED: return mbIsFocused; @@ -1797,7 +1797,7 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16 //===== PresenterAccessible::AccessibleParagraph ============================== - + PresenterAccessible::AccessibleParagraph::AccessibleParagraph ( const lang::Locale aLocale, const sal_Int16 nRole, @@ -1839,7 +1839,7 @@ Reference<XAccessibleRelationSet> SAL_CALL pSet->AddRelation( AccessibleRelationType::CONTENT_FLOWS_FROM, xParentContext->getAccessibleChild(mnParagraphIndex-1)); - + if (mnParagraphIndex<xParentContext->getAccessibleChildCount()-1) pSet->AddRelation( AccessibleRelationType::CONTENT_FLOWS_TO, @@ -1966,7 +1966,7 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBo return aCharacterBox; } - + @@ -1981,7 +1981,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount ( return nCount; } - + @@ -1997,7 +1997,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( return nIndex; } - + @@ -2008,7 +2008,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( return getTextRange(getSelectionStart(), getSelectionEnd()); } - + @@ -2030,7 +2030,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (vo return getCaretPosition(); } - + @@ -2056,7 +2056,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( ::rtl::OUString sText; if (mpParagraph) sText = mpParagraph->GetText(); - + return sText; } @@ -2218,7 +2218,7 @@ bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 n case AccessibleStateType::ACTIVE: return true; - + default: return AccessibleObject::GetWindowState(nType); } @@ -2239,7 +2239,7 @@ AccessibleNotes::AccessibleNotes ( mpTextView() { } - + @@ -2275,7 +2275,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create ( - + void AccessibleNotes::SetTextView ( const ::boost::shared_ptr<PresenterTextView>& rpTextView) { @@ -2289,7 +2289,7 @@ void AccessibleNotes::SetTextView ( mpTextView->SetTextChangeBroadcaster( ::boost::function<void(void)>()); } - + mpTextView = rpTextView; if (mpTextView) @@ -2371,7 +2371,7 @@ void AccessibleNotes::NotifyCaretChange ( AccessibleFocusManager::Instance()->FocusObject( nNewParagraphIndex >= 0 ? maChildren[nNewParagraphIndex] - : this); + : this); if (nOldParagraphIndex != nNewParagraphIndex) { diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 16e19abc1695..f6f2aafafd61 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ public: void SetAccessibleParent (const cssu::Reference<cssa::XAccessible>& rxAccessibleParent); void UpdateAccessibilityHierarchy (void); - + void NotifyCurrentSlideChange ( const sal_Int32 nCurrentSlideIndex, const sal_Int32 nSlideCount); @@ -96,7 +96,7 @@ public: //----- XAccessible ------------------------------------------------------- virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL - getAccessibleContext (void) + getAccessibleContext (void) throw (cssu::RuntimeException); @@ -108,7 +108,7 @@ public: virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) throw (cssu::RuntimeException); - + //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) @@ -120,7 +120,7 @@ public: virtual void SAL_CALL initialize (const cssu::Sequence<cssu::Any>& rArguments) throw (cssu::RuntimeException); - + class AccessibleObject; class AccessibleParagraph; diff --git a/sdext/source/presenter/PresenterAnimation.cxx b/sdext/source/presenter/PresenterAnimation.cxx index 0be27e813b38..2fcf0a75d901 100644 --- a/sdext/source/presenter/PresenterAnimation.cxx +++ b/sdext/source/presenter/PresenterAnimation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sdext/source/presenter/PresenterAnimation.hxx b/sdext/source/presenter/PresenterAnimation.hxx index 76d102a20758..36c0cb0e02d3 100644 --- a/sdext/source/presenter/PresenterAnimation.hxx +++ b/sdext/source/presenter/PresenterAnimation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sdext/source/presenter/PresenterAnimator.cxx b/sdext/source/presenter/PresenterAnimator.cxx index d16528f658e3..557fbf671afd 100644 --- a/sdext/source/presenter/PresenterAnimator.cxx +++ b/sdext/source/presenter/PresenterAnimator.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,11 +80,11 @@ void PresenterAnimator::Process (void) ::osl::MutexGuard aGuard (m_aMutex); mnNextTime = 0; - + const sal_uInt64 nCurrentTime (GetCurrentTime()); ActivateAnimations(nCurrentTime); - + while ( ! maActiveAnimations.empty()) { sal_uInt64 nRequestedTime (maActiveAnimations.begin()->first); @@ -92,9 +92,9 @@ void PresenterAnimator::Process (void) if (nRequestedTime > nCurrentTime) break; - + maActiveAnimations.erase(maActiveAnimations.begin()); - + const double nTotalDuration (double(pAnimation->GetEndTime() - pAnimation->GetStartTime())); double nProgress (nTotalDuration > 0 ? (nCurrentTime - pAnimation->GetStartTime()) / nTotalDuration : 1); if (nProgress <= 0) @@ -105,7 +105,7 @@ void PresenterAnimator::Process (void) OSL_TRACE("running animation step at %f (requested was %f) %f\n", nCurrentTime/1e6, nRequestedTime/1e6, nProgress); pAnimation->Run(nProgress, nCurrentTime); - + if (nCurrentTime < pAnimation->GetEndTime()) maActiveAnimations.insert( AnimationList::value_type( diff --git a/sdext/source/presenter/PresenterAnimator.hxx b/sdext/source/presenter/PresenterAnimator.hxx index 073592b69947..7c14256f55a2 100644 --- a/sdext/source/presenter/PresenterAnimator.hxx +++ b/sdext/source/presenter/PresenterAnimator.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 1422ac3509dc..ed452c7df904 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ PresenterBitmapContainer::PresenterBitmapContainer ( mxPresenterHelper(rxPresenterHelper) { Initialize(rxComponentContext); - + // Get access to the configuration. PresenterConfigurationAccess aConfiguration ( rxComponentContext, @@ -174,7 +174,7 @@ void PresenterBitmapContainer::LoadBitmaps ( if ( ! rxBitmapList.is()) return; - + try { // Load all button bitmaps. @@ -370,7 +370,7 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (void) mxMaskBitmap() { } - + @@ -430,19 +430,19 @@ css::uno::Reference<css::rendering::XBitmap> case Normal: default: return mxNormalBitmap; - + case MouseOver: if (mxMouseOverBitmap.is()) return mxMouseOverBitmap; else if (bMissingDefaultsToNormal) return mxNormalBitmap; - + case ButtonDown: if (mxButtonDownBitmap.is()) return mxButtonDownBitmap; else if (bMissingDefaultsToNormal) return mxNormalBitmap; - + case Disabled: if (mxDisabledBitmap.is()) return mxDisabledBitmap; diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index 500899992605..ca2c1666ef35 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ public: public: BitmapDescriptor (void); BitmapDescriptor (const ::boost::shared_ptr<BitmapDescriptor>& rpDefault); - + enum Mode {Normal, MouseOver, ButtonDown, Disabled, Mask}; css::uno::Reference<css::rendering::XBitmap> GetNormalBitmap (void) const; css::uno::Reference<css::rendering::XBitmap> GetBitmap ( diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 055689e7d550..3f56aa3eee38 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -212,7 +212,7 @@ void PresenterButton::SetCenter (const css::geometry::RealPoint2D& rLocation) maButtonSize.Width, maButtonSize.Height, awt::PosSize::POSSIZE); - + Invalidate(); } else @@ -267,7 +267,7 @@ css::geometry::IntegerSize2D PresenterButton::GetSize (void) //----- XWindowListener ------------------------------------------------------- - + void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException) { @@ -278,7 +278,7 @@ void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEven - + void SAL_CALL PresenterButton::windowMoved (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException) { @@ -324,7 +324,7 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent) xBitmap = mxNormalBitmap; if ( ! xBitmap.is()) return; - + rendering::ViewState aViewState( geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL); @@ -344,7 +344,7 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent) - + //----- XMouseListener -------------------------------------------------------- void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent) @@ -404,7 +404,7 @@ void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent) //----- XMouseMotionListener -------------------------------------------------- - + void SAL_CALL PresenterButton::mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException) { @@ -491,7 +491,7 @@ void PresenterButton::RenderButton ( PresenterCanvasHelper::SetDeviceColor(aRenderState, rpFont->mnColor); aRenderState.AffineTransform.m02 = (rSize.Width - aTextBBox.X2 + aTextBBox.X1)/2; aRenderState.AffineTransform.m12 = (rSize.Height - aTextBBox.Y2 + aTextBBox.Y1)/2 - aTextBBox.Y1; - + rxCanvas->drawText( aContext, rpFont->mxFont, diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index b952a9bfa77c..b421b729802b 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,10 +86,10 @@ public: css::geometry::IntegerSize2D GetSize (void); // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -105,7 +105,7 @@ public: virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) throw (css::uno::RuntimeException); - + // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) @@ -122,10 +122,10 @@ public: // XMouseMotionListener - + virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); @@ -176,7 +176,7 @@ private: static css::uno::Reference<css::beans::XPropertySet> GetConfigurationProperties ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const ::rtl::OUString& rsConfgurationName); - + void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx index f783b381a6e4..8060cc291053 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.cxx +++ b/sdext/source/presenter/PresenterCanvasHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ void PresenterCanvasHelper::PaintRectangle ( if ( ! rxCanvas.is() || ! rxCanvas->getDevice().is()) return; - + // Create a clip polypolygon that has the content box as hole. ::std::vector<awt::Rectangle> aRectangles; aRectangles.reserve(2); @@ -184,7 +184,7 @@ void PresenterCanvasHelper::PaintTiledBitmap ( / aBitmapSize.Width) * aBitmapSize.Width; const sal_Int32 nBottom = ((rRepaintBox.Y + rRepaintBox.Height - 1 + aBitmapSize.Height - 1) / aBitmapSize.Height) * aBitmapSize.Height; - + for (sal_Int32 nY=nTop; nY<=nBottom; nY+=aBitmapSize.Height) for (sal_Int32 nX=nLeft; nX<=nRight; nX+=aBitmapSize.Width) { @@ -234,7 +234,7 @@ void PresenterCanvasHelper::PaintBitmap ( rendering::RenderState aRenderState (rDefaultRenderState); aRenderState.AffineTransform = geometry::AffineMatrix2D(1,0, rLocation.X, 0,1,rLocation.Y); aRenderState.Clip = rxPolygon; - + rxCanvas->drawBitmap( rxBitmap, aViewState, @@ -266,7 +266,7 @@ void PresenterCanvasHelper::PaintColor ( // Setup the rendering state to use the given color. rendering::RenderState aRenderState (rDefaultRenderState); SetDeviceColor(aRenderState, nColor); - + rxCanvas->fillPolyPolygon( rxPolygon, aViewState, @@ -281,7 +281,7 @@ void PresenterCanvasHelper::SetDeviceColor( const util::Color aColor) { // Other component counts then 4 (RGBA) are not accepted (anymore). - + OSL_ASSERT(rRenderState.DeviceColor.getLength() == 4); if (rRenderState.DeviceColor.getLength() == 4) { diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx index 58dde30788e6..b1d39e222fc7 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.hxx +++ b/sdext/source/presenter/PresenterCanvasHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ class PresenterCanvasHelper public: PresenterCanvasHelper (void); ~PresenterCanvasHelper (void); - + void Paint ( const SharedBitmapDescriptor& rpBitmap, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, diff --git a/sdext/source/presenter/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx index d220941843b4..8fdb852f69fb 100644 --- a/sdext/source/presenter/PresenterClock.cxx +++ b/sdext/source/presenter/PresenterClock.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -153,7 +153,7 @@ namespace { static const double mnRelativeSecondHandLength; static const double mnRelativeSecondHandLength2; static const double mnRelativeSecondHandWidth; - + void PaintAngledLine ( const double nAngle, const double nInnerRadius, @@ -296,7 +296,7 @@ PresenterClock::PresenterClock ( mbIsShowSeconds(true) { SetMode(mnMode); - + maViewState.AffineTransform = geometry::AffineMatrix2D(1,0,0, 0,1,0); maRenderState.AffineTransform = geometry::AffineMatrix2D(1,0,0, 0,1,0); maRenderState.DeviceColor = Sequence<double>(4); @@ -487,7 +487,7 @@ void SAL_CALL PresenterClock::mouseReleased (const css::awt::MouseEvent& rEvent) { (void)rEvent; } - + @@ -496,7 +496,7 @@ void SAL_CALL PresenterClock::mouseEntered (const css::awt::MouseEvent& rEvent) { (void)rEvent; } - + @@ -565,10 +565,10 @@ void PresenterClock::Paint (const awt::Rectangle& rUpdateBox) { if (mbIsResizePending) Resize(); - + Reference<rendering::XPolyPolygon2D> xUpdatePolygon ( PresenterGeometryHelper::CreatePolygon(rUpdateBox, mxCanvas->getDevice())); - + Clear(xUpdatePolygon); if (mpClockPainter.get() != NULL) @@ -580,7 +580,7 @@ void PresenterClock::Paint (const awt::Rectangle& rUpdateBox) mnMinute, mnSecond, mbIsShowSeconds); - + if (mpClockPainter2.get() != NULL) mpClockPainter2->Paint( mxCanvas, @@ -596,7 +596,7 @@ void PresenterClock::Paint (const awt::Rectangle& rUpdateBox) { (void)e; } - + // Make the back buffer visible. Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); if (xSpriteCanvas.is()) @@ -947,7 +947,7 @@ void AnalogBitmapPainter::Paint ( (void)rBackgroundColor; (void)nSecond; (void)bShowSeconds; - + if ( ! rxCanvas.is()) return; @@ -1123,7 +1123,7 @@ void AnalogBitmapPainter::LoadBitmaps ( const Reference<rendering::XCanvas>& rxCanvas) { (void)rConfiguration; - + // Get base path to bitmaps. Reference<deployment::XPackageInformationProvider> xInformationProvider ( mxComponentContext->getValueByName(OUString::createFromAscii( @@ -1150,7 +1150,7 @@ void AnalogBitmapPainter::LoadBitmaps ( if ( ! xBitmapLoader.is()) return; - + // Iterate over all entries in the bitmap list and load the bitmaps. Reference<container::XNameAccess> xBitmaps ( rxClockTheme->getByName(OUString::createFromAscii("Bitmaps")), @@ -1188,14 +1188,14 @@ void AnalogBitmapPainter::LoadBitmap ( pDescriptor = &maHourHand; else if (rsKey == OUString::createFromAscii("MinuteHand")) pDescriptor = &maMinuteHand; - + if (pDescriptor == NULL) return; - + OUString sFileName; if ( ! (rValues[0] >>= sFileName)) return; - + rValues[1] >>= pDescriptor->maOffset.X; rValues[2] >>= pDescriptor->maOffset.Y; @@ -1277,12 +1277,12 @@ void DigitalDefaultPainter::Paint ( { (void)rBackgroundColor; (void)rRenderState; - + if ( ! mxFont.is()) CreateFont(rxCanvas,bIsShowSeconds); if ( ! mxFont.is()) return; - + OUString sText; if (mbIs24HourFormat) @@ -1322,7 +1322,7 @@ void DigitalDefaultPainter::Paint ( return; } } - + rendering::StringContext aContext ( sText, 0, @@ -1400,7 +1400,7 @@ void DigitalDefaultPainter::CreateFont ( sTimeTemplate, 0, sTimeTemplate.getLength()); - + // When the font size is adapted to the window size (as large as // possible without overlapping) then that is done in a four step // process: @@ -1428,7 +1428,7 @@ void DigitalDefaultPainter::CreateFont ( aContext, rendering::TextDirection::WEAK_LEFT_TO_RIGHT, 0)); - + if ( ! xLayout.is()) break; diff --git a/sdext/source/presenter/PresenterClock.hxx b/sdext/source/presenter/PresenterClock.hxx index 352663309b75..169f4cf11ecb 100644 --- a/sdext/source/presenter/PresenterClock.hxx +++ b/sdext/source/presenter/PresenterClock.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ public: // lang::XEventListener - virtual void SAL_CALL + virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); @@ -105,7 +105,7 @@ public: // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -126,13 +126,13 @@ public: virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + // XResourceId @@ -158,7 +158,7 @@ private: class Timer; Timer* mpTimer; ::boost::scoped_ptr<Painter> mpClockPainter; - /** + /** This is used for debugging to show one clock atop another to compare the output of the painters. */ diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index 6fd91438d64e..b4dc2d909025 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ static OUString gsBasePath; } } } - + return gsBasePath; } @@ -98,13 +98,13 @@ static struct ImplementationEntry gServiceEntries[] = PresenterProtocolHandler::Create, PresenterProtocolHandler::getImplementationName_static, PresenterProtocolHandler::getSupportedServiceNames_static, - createSingleComponentFactory, &g_moduleCount.modCnt, 0 + createSingleComponentFactory, &g_moduleCount.modCnt, 0 }, { PresenterScreenJob::Create, PresenterScreenJob::getImplementationName_static, PresenterScreenJob::getSupportedServiceNames_static, - createSingleComponentFactory, 0, 0 + createSingleComponentFactory, 0, 0 }, { 0, 0, 0, 0, 0, 0 } }; diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx index 4334d53f081d..518465976399 100644 --- a/sdext/source/presenter/PresenterComponent.hxx +++ b/sdext/source/presenter/PresenterComponent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index acba65b233a9..005a4888e95e 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,20 +62,20 @@ PresenterConfigurationAccess::PresenterConfigurationAccess ( Sequence<Any> aCreationArguments(3); aCreationArguments[0] = makeAny(beans::PropertyValue( A2S("nodepath"), - 0, - makeAny(rsRootName), + 0, + makeAny(rsRootName), beans::PropertyState_DIRECT_VALUE)); aCreationArguments[1] = makeAny(beans::PropertyValue( A2S("depth"), - 0, + 0, makeAny((sal_Int32)-1), beans::PropertyState_DIRECT_VALUE)); aCreationArguments[2] = makeAny(beans::PropertyValue( A2S("lazywrite"), - 0, + 0, makeAny(true), beans::PropertyState_DIRECT_VALUE)); - + OUString sAccessService; if (eMode == READ_ONLY) sAccessService = A2S("com.sun.star.configuration.ConfigurationAccess"); @@ -165,11 +165,11 @@ bool PresenterConfigurationAccess::GoToChild (const Predicate& rPredicate) { if ( ! IsValid()) return false; - + maNode = Find(Reference<container::XNameAccess>(maNode,UNO_QUERY), rPredicate); if (Reference<XInterface>(maNode, UNO_QUERY).is()) return true; - + mxRoot = NULL; return false; } @@ -214,7 +214,7 @@ Any PresenterConfigurationAccess::GetConfigurationNode ( ::rtl::OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), ::rtl::OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } - + return Any(); } diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx index 81f1130e696b..3a8d872777d4 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.hxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -143,7 +143,7 @@ public: const ::rtl::OUString&, const ::css::uno::Reference<css::beans::XPropertySet>&) > PropertySetProcessor; - /** Execute a functor for all elements of the given container. + /** Execute a functor for all elements of the given container. @param rxContainer The container is a XNameAccess to a list of the configuration. This can be a node returned by GetConfigurationNode(). @@ -187,7 +187,7 @@ public: const ::rtl::OUString& rsValue, const ::rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertySet>& rxNode); - + /** This method wraps a call to getPropertyValue() and returns an empty Any instead of throwing an exception when the property does not exist. diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 2dbe9cde966f..f11dba1300b0 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -225,7 +225,7 @@ PresenterController::~PresenterController (void) void PresenterController::disposing (void) { maInstances.erase(mxController->getFrame()); - + if (mxMainWindow.is()) { mxMainWindow->removeKeyListener(this); @@ -242,7 +242,7 @@ void PresenterController::disposing (void) mpWindowManager = NULL; if (xWindowManagerComponent.is()) xWindowManagerComponent->dispose(); - + if (mxController.is()) { Reference<frame::XFrame> xFrame (mxController->getFrame()); @@ -294,7 +294,7 @@ void PresenterController::UpdateCurrentSlide (const sal_Int32 nOffset) GetSlides(nOffset); UpdatePaneTitles(); UpdateViews(); - + // Update the accessibility object. if (IsAccessibilityActive()) { @@ -409,7 +409,7 @@ void PresenterController::UpdatePaneTitles (void) for (iPane=mpPaneContainer->maPanes.begin(); iPane!=mpPaneContainer->maPanes.end(); ++iPane) { OSL_ASSERT((*iPane).get() != NULL); - + OUString sTemplate (IsAccessibilityActive() ? (*iPane)->msAccessibleTitleTemplate : (*iPane)->msTitleTemplate); @@ -652,7 +652,7 @@ void PresenterController::DispatchUnoCommand (const OUString& rsCommand) const util::URL aURL; aURL.Complete = rsCommand; - mxUrlTransformer->parseStrict(aURL); + mxUrlTransformer->parseStrict(aURL); Reference<frame::XDispatch> xDispatch (GetDispatch(aURL)); if ( ! xDispatch.is()) @@ -668,7 +668,7 @@ Reference<css::frame::XDispatch> PresenterController::GetDispatch (const util::U { if ( ! mxController.is()) return NULL; - + Reference<frame::XDispatchProvider> xDispatchProvider (mxController->getFrame(), UNO_QUERY); if ( ! xDispatchProvider.is()) return NULL; @@ -824,7 +824,7 @@ void SAL_CALL PresenterController::notifyConfigurationChange ( sal_Int32 nType (0); if ( ! (rEvent.UserData >>= nType)) return; - + switch (nType) { case ResourceActivationEventType: @@ -841,7 +841,7 @@ void SAL_CALL PresenterController::notifyConfigurationChange ( { PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( mpPaneContainer->FindPaneId(xPane->getResourceId())); - + // When there is a call out anchor location set then tell the // window about it. if (pDescriptor->mbHasCalloutAnchor) @@ -1195,7 +1195,7 @@ void SAL_CALL PresenterController::mouseReleased (const css::awt::MouseEvent& rE { (void)rEvent; } - + @@ -1204,7 +1204,7 @@ void SAL_CALL PresenterController::mouseEntered (const css::awt::MouseEvent& rEv { (void)rEvent; } - + @@ -1218,7 +1218,7 @@ void SAL_CALL PresenterController::mouseExited (const css::awt::MouseEvent& rEve //----- XMouseMotionListener -------------------------------------------------- - + void SAL_CALL PresenterController::mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException) { @@ -1298,7 +1298,7 @@ void PresenterController::LoadTheme (const Reference<XPane>& rxPane) double PresenterController::GetSlideAspectRatio (void) const { double nSlideAspectRatio (28.0/21.0); - + try { if (mxController.is()) diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index b0fe117a47b0..06795bc9f64b 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -169,7 +169,7 @@ public: const css::frame::FrameActionEvent& rEvent) throw (com::sun::star::uno::RuntimeException); - + // XKeyListener virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) @@ -193,16 +193,16 @@ public: virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); // XMouseMotionListener - + virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); @@ -238,7 +238,7 @@ private: css::uno::Reference<css::util::XURLTransformer> mxUrlTransformer; ::rtl::Reference<PresenterAccessible> mpAccessibleObject; bool mbIsAccessibilityActive; - + void InitializePresenterScreen (void); void InitializeSlideShowView (const css::uno::Reference<css::uno::XInterface>& rxView); void GetSlides (const sal_Int32 nOffset); @@ -258,7 +258,7 @@ private: The modifier bit field as provided by the key up event. */ void HandleNumericKeyPress (const sal_Int32 nKey, const sal_Int32 nModifiers); - + void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx index 90e55b219390..c471fa223ab3 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index fc9a5fe18b7a..94c4cf3085c2 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index 3142d7606fb2..0e6819d288c3 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ PresenterFrameworkObserver::PresenterFrameworkObserver ( { if ( ! mxConfigurationController.is()) throw lang::IllegalArgumentException(); - + if (mxConfigurationController->hasPendingRequests()) { if (rsEventName.getLength() > 0) @@ -171,7 +171,7 @@ void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rE { if ( ! rEvent.Source.is()) return; - + if (rEvent.Source == mxConfigurationController) { mxConfigurationController = NULL; @@ -188,7 +188,7 @@ void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange ( throw (RuntimeException) { bool bDispose(false); - + Action aAction (maAction); Predicate aPredicate (maPredicate); if (rEvent.Type.equals(A2S("ConfigurationUpdateEnd"))) diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index 422055830d6e..3c59a800e3f6 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ public: static void RunOnUpdateEnd ( const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController, const Action& rAction); - + virtual void SAL_CALL disposing (void); virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); @@ -108,7 +108,7 @@ private: virtual ~PresenterFrameworkObserver (void); void Shutdown (void); - + /** Predicate that returns true when the specified resource is active with respect to the given configuration controller. */ diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx b/sdext/source/presenter/PresenterGeometryHelper.cxx index 2fdc0ea004ea..4d00b9cd14ab 100644 --- a/sdext/source/presenter/PresenterGeometryHelper.cxx +++ b/sdext/source/presenter/PresenterGeometryHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,7 +128,7 @@ geometry::RealRectangle2D PresenterGeometryHelper::ConvertRectangle ( - + awt::Rectangle PresenterGeometryHelper::TranslateRectangle ( const css::awt::Rectangle& rBox, const sal_Int32 nXOffset, @@ -136,7 +136,7 @@ awt::Rectangle PresenterGeometryHelper::TranslateRectangle ( { return awt::Rectangle(rBox.X + nXOffset, rBox.Y + nYOffset, rBox.Width, rBox.Height); } - + @@ -208,7 +208,7 @@ awt::Rectangle PresenterGeometryHelper::Union ( return rBox2; else if (rBox2.Width<=0 || rBox2.Height<=0) return rBox1; - + const sal_Int32 nLeft (::std::min(rBox1.X, rBox2.X)); const sal_Int32 nTop (::std::min(rBox1.Y, rBox2.Y)); const sal_Int32 nRight (::std::max(Right(rBox1), Right(rBox2))); @@ -320,7 +320,7 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon( aPoints[nIndex][2] = geometry::RealPoint2D(rBox.X+rBox.Width, rBox.Y+rBox.Height); aPoints[nIndex][3] = geometry::RealPoint2D(rBox.X+rBox.Width, rBox.Y); } - + Reference<rendering::XLinePolyPolygon2D> xPolygon ( rxDevice->createCompatibleLinePolyPolygon(aPoints)); Reference<rendering::XPolyPolygon2D> xRectangle (xPolygon, UNO_QUERY); diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx b/sdext/source/presenter/PresenterGeometryHelper.hxx index b5901a68fd8d..3ed7c6f6b1d5 100644 --- a/sdext/source/presenter/PresenterGeometryHelper.hxx +++ b/sdext/source/presenter/PresenterGeometryHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,12 +69,12 @@ public: // static css::awt::Size ConvertSize ( // const css::geometry::RealSize2D& rSize); - + static css::awt::Rectangle TranslateRectangle ( const css::awt::Rectangle& rBox, const sal_Int32 nXOffset, const sal_Int32 nYOffset); - + static css::awt::Rectangle Intersection ( const css::awt::Rectangle& rBox1, const css::awt::Rectangle& rBox2); diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index efab952846b7..8b9c84807caf 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -161,7 +161,7 @@ PresenterHelpView::PresenterHelpView ( mxWindow = mxPane->getWindow(); ProvideCanvas(); - + mxWindow->addWindowListener(this); mxWindow->addPaintListener(this); Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY); @@ -251,7 +251,7 @@ void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObjec //----- XWindowListener ------------------------------------------------------- - + void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent) throw (uno::RuntimeException) { @@ -332,7 +332,7 @@ void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox) Sequence<double>(4), rendering::CompositeOperation::SOURCE); PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont->mnColor); - + mxCanvas->drawLine( geometry::RealPoint2D(aWindowBox.Width/2, gnVerticalBorder), geometry::RealPoint2D(aWindowBox.Width/2, mnSeparatorY - gnVerticalBorder), @@ -427,7 +427,7 @@ void PresenterHelpView::CheckFontSize (void) { if (mpFont.get() == NULL) return; - + const awt::Rectangle aWindowBox (mxWindow->getPosSize()); if (aWindowBox.Width<=0 || aWindowBox.Height<=0) return; @@ -454,7 +454,7 @@ void PresenterHelpView::CheckFontSize (void) // too much space below the help text. return; } - + // Font is too large. Make it smaller. // Use a simple linear transformation to calculate initial guess of @@ -469,7 +469,7 @@ void PresenterHelpView::CheckFontSize (void) mpFont->mnSize = nFontSizeGuess; mpFont->mxFont = NULL; mpFont->PrepareFont(mxCanvas); - + // Reformat blocks. for (iBlock=mpTextContainer->begin(); iBlock!=iBlockEnd; ++iBlock) (*iBlock)->Update(mpFont->mxFont, mnMaximalWidth); @@ -480,7 +480,7 @@ void PresenterHelpView::CheckFontSize (void) mpFont->mnSize = nBestSize; mpFont->mxFont = NULL; mpFont->PrepareFont(mxCanvas); - + // Reformat blocks. for (TextContainer::iterator iBlock (mpTextContainer->begin()), @@ -556,7 +556,7 @@ void PresenterHelpView::Resize (void) CheckFontSize(); } } - + @@ -653,7 +653,7 @@ double LineDescriptorList::Paint( { if ( ! rxCanvas.is()) return 0; - + double nY (rBBox.Y1); vector<LineDescriptor>::const_iterator iLine (mpLineDescriptors->begin()); vector<LineDescriptor>::const_iterator iEnd (mpLineDescriptors->end()); diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 2d5e0efdcfc2..dca6ded59049 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace css = ::com::sun::star; namespace { - typedef cppu::WeakComponentImplHelper3< + typedef cppu::WeakComponentImplHelper3< css::drawing::framework::XView, css::awt::XWindowListener, css::awt::XPaintListener @@ -71,13 +71,13 @@ public: // lang::XEventListener - virtual void SAL_CALL + virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -131,7 +131,7 @@ private: time. */ void CheckFontSize (void); - + /** This method throws a DisposedException when the object has already been disposed. */ diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index 9e7001de426d..5f005c6b01a2 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowContr const Reference<frame::XController>& rxController) { Reference<presentation::XSlideShowController> xSlideShowController; - + if( rxController.is() ) try { Reference<XPresentationSupplier> xPS ( rxController->getModel(), UNO_QUERY_THROW); diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx index 75f4cbdd9f0c..54c6d7b8db54 100644 --- a/sdext/source/presenter/PresenterHelper.hxx +++ b/sdext/source/presenter/PresenterHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 9cbf93543ef5..a7cbc5e8e607 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,7 +108,7 @@ PresenterNotesView::PresenterNotesView ( rxComponentContext, mxCanvas, mpPresenterController->GetPaintManager()->GetInvalidator(mxParentWindow))); - + const OUString sResourceURL (mxViewId->getResourceURL()); mpFont.reset(new PresenterTheme::FontDescriptor( rpPresenterController->GetViewFont(sResourceURL))); @@ -199,7 +199,7 @@ void SAL_CALL PresenterNotesView::disposing (void) if (xComponent.is()) xComponent->dispose(); } - + // Create the tool bar. mpScrollBar = NULL; @@ -221,7 +221,7 @@ void PresenterNotesView::CreateToolBar ( rpPresenterController->GetPresenterHelper()); if ( ! xPresenterHelper.is()) return; - + // Create a new window as container of the tool bar. mxToolBarWindow = xPresenterHelper->createWindow( mxParentWindow, @@ -266,7 +266,7 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP sal_Int32 nCount (xIndexAccess->getCount()); for (sal_Int32 nIndex=0; nIndex<nCount; ++nIndex) { - + Reference<lang::XServiceName> xServiceName ( xIndexAccess->getByIndex(nIndex), UNO_QUERY); if (xServiceName.is() @@ -306,7 +306,7 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP mpScrollBar->SetThumbPosition(0, false); UpdateScrollBar(); } - + Invalidate(); } } @@ -327,7 +327,7 @@ void SAL_CALL PresenterNotesView::disposing (const lang::EventObject& rEventObje //----- XWindowListener ------------------------------------------------------- - + void SAL_CALL PresenterNotesView::windowResized (const awt::WindowEvent& rEvent) throw (RuntimeException) { @@ -374,7 +374,7 @@ void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent) if ( ! mbIsPresenterViewActive) return; - + ::osl::MutexGuard aSolarGuard (::osl::Mutex::getGlobalMutex()); Paint(rEvent.UpdateRect); } @@ -496,7 +496,7 @@ void PresenterNotesView::Layout (void) { if ( ! mxParentWindow.is()) return; - + awt::Rectangle aWindowBox (mxParentWindow->getPosSize()); geometry::RealRectangle2D aNewTextBoundingBox (0,0,aWindowBox.Width, aWindowBox.Height); @@ -549,7 +549,7 @@ void PresenterNotesView::Layout (void) aNewTextBoundingBox.Y2)); if ( ! bShowVerticalScrollbar) mpScrollBar->SetThumbPosition(0, false); - + UpdateScrollBar(); } @@ -605,7 +605,7 @@ void PresenterNotesView::Paint (const awt::Rectangle& rUpdateBox) void PresenterNotesView::PaintToolBar (const awt::Rectangle& rUpdateBox) { awt::Rectangle aWindowBox (mxParentWindow->getPosSize()); - + rendering::ViewState aViewState ( geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL); @@ -625,7 +625,7 @@ void PresenterNotesView::PaintToolBar (const awt::Rectangle& rUpdateBox) awt::Rectangle(0,sal_Int32(maTextBoundingBox.Y2),aWindowBox.Width,aWindowBox.Height), awt::Rectangle()); } - + // Paint the horizontal separator. OSL_ASSERT(mxViewId.is()); PresenterCanvasHelper::SetDeviceColor(aRenderState, maSeparatorColor); @@ -647,7 +647,7 @@ void PresenterNotesView::PaintText (const awt::Rectangle& rUpdateBox) if (aBox.Width <= 0 || aBox.Height <= 0) return; - + rendering::ViewState aViewState ( geometry::AffineMatrix2D(1,0,0, 0,1,0), PresenterGeometryHelper::CreatePolygon(aBox, mxCanvas->getDevice())); diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index 282f86465dc6..b0c313ffc9bb 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace css = ::com::sun::star; namespace { - typedef cppu::WeakComponentImplHelper5< + typedef cppu::WeakComponentImplHelper5< css::awt::XWindowListener, css::awt::XPaintListener, css::drawing::framework::XView, @@ -99,16 +99,16 @@ public: ::boost::shared_ptr<PresenterTextView> GetTextView (void) const; - + // lang::XEventListener - virtual void SAL_CALL + virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -127,7 +127,7 @@ public: virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) throw (css::uno::RuntimeException); - + // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) @@ -136,7 +136,7 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (com::sun::star::uno::RuntimeException); - + // XDrawView virtual void SAL_CALL setCurrentPage ( @@ -146,7 +146,7 @@ public: virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) throw (css::uno::RuntimeException); - + // XKeyListener virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) @@ -172,7 +172,7 @@ private: double mnTop; PresenterTheme::SharedFontDescriptor mpFont; ::boost::shared_ptr<PresenterTextView> mpTextView; - + void CreateToolBar ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController); diff --git a/sdext/source/presenter/PresenterPaintManager.cxx b/sdext/source/presenter/PresenterPaintManager.cxx index e934130d9ec2..643db9fa6559 100644 --- a/sdext/source/presenter/PresenterPaintManager.cxx +++ b/sdext/source/presenter/PresenterPaintManager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ void PresenterPaintManager::Invalidate ( sal_Int16 nInvalidateMode (awt::InvalidateStyle::CHILDREN); if (bSynchronous) nInvalidateMode |= awt::InvalidateStyle::UPDATE; - + PresenterPaneContainer::SharedPaneDescriptor pDescriptor( mpPaneContainer->FindContentWindow(rxWindow)); if (pDescriptor.get()==NULL || ! pDescriptor->mbIsOpaque) @@ -129,7 +129,7 @@ void PresenterPaintManager::Invalidate ( sal_Int16 nInvalidateMode (awt::InvalidateStyle::CHILDREN); if (bSynchronous) nInvalidateMode |= awt::InvalidateStyle::UPDATE; - + PresenterPaneContainer::SharedPaneDescriptor pDescriptor( mpPaneContainer->FindContentWindow(rxWindow)); if (pDescriptor.get()==NULL || ! pDescriptor->mbIsOpaque) diff --git a/sdext/source/presenter/PresenterPaintManager.hxx b/sdext/source/presenter/PresenterPaintManager.hxx index 421edbeb171b..379788847d2d 100644 --- a/sdext/source/presenter/PresenterPaintManager.hxx +++ b/sdext/source/presenter/PresenterPaintManager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 65380f40b790..c47ee2fce5dd 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,7 +103,7 @@ void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent) PresenterPaneBase::windowResized(rEvent); Invalidate(maBoundingBox); - + LayoutContextWindow(); ToTop(); @@ -193,7 +193,7 @@ void PresenterPane::CreateCanvases ( return; if ( ! rxParentCanvas.is()) return; - + mxBorderCanvas = mxPresenterHelper->createSharedCanvas( rxParentCanvas, rxParentWindow, diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index 303bb0c6f5ed..456ead7c2ce5 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); - + // XPane css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void) @@ -77,9 +77,9 @@ public: css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void) throw (css::uno::RuntimeException); - + // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -98,7 +98,7 @@ public: virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) throw (css::uno::RuntimeException); - + private: /** Store the bounding box so that when the window is resized or moved we still know the old position and size. diff --git a/sdext/source/presenter/PresenterPaneAnimator.cxx b/sdext/source/presenter/PresenterPaneAnimator.cxx index ecf7989bf5b2..fe4ad2046552 100644 --- a/sdext/source/presenter/PresenterPaneAnimator.cxx +++ b/sdext/source/presenter/PresenterPaneAnimator.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ namespace { const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId); void RestoreFrozenWindows (void); void FreezePanes (const Reference<rendering::XSpriteCanvas>& rxCanvas); - + protected: ::rtl::Reference<PresenterController> mpPresenterController; ::rtl::Reference<PresenterPaneContainer> mpPaneContainer; @@ -92,7 +92,7 @@ namespace { bool mbDoAnimation; EndActions maShowEndActions; EndActions maHideEndActions; - + void DeactivatePanes (void); void ResizePane ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, @@ -111,9 +111,9 @@ namespace { const bool bAnimate, const EndActions& rShowEndActions, const EndActions& rEndEndActions); - + virtual ~UnfoldInCenterAnimator (void); - + virtual void ShowPane (void); virtual void HidePane (void); @@ -137,10 +137,10 @@ namespace { const EndActions& rShowEndActions, const EndActions& rEndEndActions); virtual ~MoveInFromBottomAnimator (void); - + virtual void ShowPane (void); virtual void HidePane (void); - + private: ::boost::shared_ptr<PresenterSprite> maNewPaneSprite; geometry::RealRectangle2D maCenterPaneBox; @@ -165,10 +165,10 @@ namespace { const EndActions& rShowEndActions, const EndActions& rEndEndActions); virtual ~TransparentOverlayAnimator (void); - + virtual void ShowPane (void); virtual void HidePane (void); - + private: PresenterSprite maBackgroundSprite; void CreateBackgroundSprite (void); @@ -227,7 +227,7 @@ namespace { awt::Rectangle maOriginalBoundingBox; css::geometry::RealRectangle2D maCurrentBoundingBox; ::boost::shared_ptr<PresenterSprite> mpSubstitution; - + }; typedef ::boost::shared_ptr<PaneGroup> SharedPaneGroup; @@ -388,7 +388,7 @@ void PresenterPaneAnimatorBase::DeactivatePanes (void) (*iGroup)->DeactivatePanes(); (*iGroup)->HidePanes(); } - + mpWindowManager->Update(); } @@ -512,9 +512,9 @@ void UnfoldInCenterAnimator::ShowPane (void) // Create two pane groups that will be moved together. One contains the // notes view, the other group contains all other panes. SetupPaneGroups(); - + // Setup the places where the two pane groups are moved to. - maCenterPaneBox + maCenterPaneBox = MovePanesAway(geometry::RealRectangle2D(0,200,aWindowBox.Width, aWindowBox.Height-200)); // Setup the final size of the new pane so that it fits into the space @@ -583,7 +583,7 @@ void UnfoldInCenterAnimator::ShowPane (void) nY0, maCenterPaneBox.Y1, _1)); - + // Call updateScreen after each animation step. if (xCanvas.is()) pMultiAnimation->AddAnimation( @@ -610,14 +610,14 @@ void UnfoldInCenterAnimator::ShowPane (void) void UnfoldInCenterAnimator::HidePane (void) { OSL_ASSERT(mpWindowManager.get()!=NULL); - + Reference<awt::XWindow> xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY); if ( ! xParentWindow.is()) return; DeactivatePanes(); DeactivatePane(mxCenterPaneId); - + ::boost::shared_ptr<PresenterAnimator> pAnimator (mpPresenterController->GetAnimator()); const awt::Rectangle aWindowBox (xParentWindow->getPosSize()); const rendering::ViewState aViewState ( @@ -628,7 +628,7 @@ void UnfoldInCenterAnimator::HidePane (void) NULL, Sequence<double>(4), rendering::CompositeOperation::SOURCE); - + // Animate the uppder and lower window bitmaps. Reference<rendering::XSpriteCanvas> xSpriteCanvas (mpWindowManager->GetParentCanvas(), UNO_QUERY); ::boost::shared_ptr<MultiAnimation> pMultiAnimation (new MultiAnimation(mbDoAnimation ? 500 : 1)); @@ -645,7 +645,7 @@ void UnfoldInCenterAnimator::HidePane (void) GetLocation((*iGroup)->GetCurrentBoundingBox()), GetLocation((*iGroup)->GetOriginalBoundingBox()))); } - + // Animate the new center pane to collapse. const double nY0 ((maPaneGroups[0]->GetOriginalBoundingBox().Y2 + maPaneGroups[1]->GetOriginalBoundingBox().Y1) / 2); @@ -672,7 +672,7 @@ void UnfoldInCenterAnimator::HidePane (void) EndActions::const_iterator iAction; for (iAction=maHideEndActions.begin(); iAction!=maHideEndActions.end(); ++iAction) pMultiAnimation->AddEndCallback(*iAction); - + pAnimator->AddAnimation(SharedPresenterAnimation(pMultiAnimation)); } @@ -710,7 +710,7 @@ geometry::RealRectangle2D UnfoldInCenterAnimator::MovePanesAway ( { SharedPaneGroup aUpperPanes = maPaneGroups[0]; SharedPaneGroup aLowerPanes = maPaneGroups[1]; - + // Move upper pane group out of the way. const double nTop (rFreeCenterArea.Y1); const double nUpperVerticalOffset (nTop - aUpperPanes->GetOriginalBoundingBox().Y2); @@ -797,7 +797,7 @@ void MoveInFromBottomAnimator::ShowPane (void) geometry::RealPoint2D aStartLocation (maCenterPaneBox.X1, aWindowBox.Height); geometry::RealPoint2D aEndLocation (maCenterPaneBox.X1, maCenterPaneBox.Y1); - + // Get the sprite of the new pane, make it visible and move it to the // start location. PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( @@ -806,7 +806,7 @@ void MoveInFromBottomAnimator::ShowPane (void) { if (pDescriptor->mxBorderWindow.is()) pDescriptor->mxBorderWindow->setVisible(sal_True); - + maNewPaneSprite = pDescriptor->maSpriteProvider(); if (maNewPaneSprite.get() != NULL) { @@ -833,7 +833,7 @@ void MoveInFromBottomAnimator::ShowPane (void) void MoveInFromBottomAnimator::HidePane (void) { OSL_ASSERT(mpWindowManager.get()!=NULL); - + Reference<awt::XWindow> xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY); if ( ! xParentWindow.is()) return; @@ -846,13 +846,13 @@ void MoveInFromBottomAnimator::HidePane (void) DeactivatePane(mxCenterPaneId); SharedPaneGroup aPanes (maPaneGroups[0]); - + aPanes->ShowPanes(); ::boost::shared_ptr<MultiAnimation> pMultiAnimation ( new MultiAnimation(mbDoAnimation ? 500 : 0)); awt::Rectangle aWindowBox (xParentWindow->getPosSize()); - + // Animate the new center pane to collapse. pMultiAnimation->AddAnimation( ::boost::bind( @@ -872,7 +872,7 @@ void MoveInFromBottomAnimator::HidePane (void) EndActions::const_iterator iAction; for (iAction=maHideEndActions.begin(); iAction!=maHideEndActions.end(); ++iAction) pMultiAnimation->AddEndCallback(*iAction); - + ::boost::shared_ptr<PresenterAnimator> pAnimator (mpPresenterController->GetAnimator()); pAnimator->AddAnimation(SharedPresenterAnimation(pMultiAnimation)); } @@ -979,7 +979,7 @@ void TransparentOverlayAnimator::ShowPane (void) pAllPanes->DeactivatePanes(); mpWindowManager->Update(); } - + PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( mpPaneContainer->FindPaneId(mxCenterPaneId)); if (pDescriptor.get() != NULL) @@ -1039,7 +1039,7 @@ void TransparentOverlayAnimator::CreateBackgroundSprite (void) Sequence<double>(4), rendering::CompositeOperation::SOURCE); PresenterCanvasHelper::SetDeviceColor(aRenderState, util::Color(0x80808080)); - + Reference<rendering::XPolyPolygon2D> xPolygon ( PresenterGeometryHelper::CreatePolygon(aWindowBox, xCanvas->getDevice())); if (xPolygon.is()) @@ -1113,7 +1113,7 @@ void PaneGroup::CreateSubstitution (const Reference<rendering::XSpriteCanvas>& r NULL, Sequence<double>(4), rendering::CompositeOperation::SOURCE); - + Reference<rendering::XCanvas> xSpriteCanvas (mpSubstitution->GetCanvas()); if (xSpriteCanvas.is()) xSpriteCanvas->drawBitmap(xBackgroundBitmap, aViewState, aRenderState); @@ -1324,7 +1324,7 @@ template<typename T> const T aFinalValue) { const double nQ (1 - nP); - + rSetter(T(nQ * aInitialValue + nP * aFinalValue)); } @@ -1343,7 +1343,7 @@ void SpriteTransform( const double nP) { OSL_ASSERT(rpPaintManager.get()!=NULL); - + PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( rpPaneContainer->FindPaneId(rxPaneId)); if (pDescriptor.get() != NULL @@ -1364,7 +1364,7 @@ void SpriteTransform( sal::static_int_cast<sal_Int32>(pSprite->GetLocation().Y), sal::static_int_cast<sal_Int32>(pSprite->GetSize().Width), sal::static_int_cast<sal_Int32>(pSprite->GetSize().Height))); - + const double nYScale (bAppear ? nP : 1-nP); pSprite->Transform(geometry::AffineMatrix2D( 1, 0, 0, diff --git a/sdext/source/presenter/PresenterPaneAnimator.hxx b/sdext/source/presenter/PresenterPaneAnimator.hxx index 1e044b4a647b..9ab5dc6d69a2 100644 --- a/sdext/source/presenter/PresenterPaneAnimator.hxx +++ b/sdext/source/presenter/PresenterPaneAnimator.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index 4003c79e4bb9..1b22381fd6b7 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,10 +131,10 @@ void PresenterPaneBase::disposing (void) void PresenterPaneBase::SetTitle (const OUString& rsTitle) { msTitle = rsTitle; - + OSL_ASSERT(mpPresenterController.get()!=NULL); OSL_ASSERT(mpPresenterController->GetPaintManager().get()!=NULL); - + mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow); } @@ -254,7 +254,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) static_cast<XWeak*>(this), 2); } - + if ( ! (rArguments[3] >>= msTitle)) { throw lang::IllegalArgumentException( @@ -281,13 +281,13 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) } CreateWindows(mxParentWindow, bIsWindowVisibleOnCreation); - + if (mxBorderWindow.is()) { mxBorderWindow->addWindowListener(this); mxBorderWindow->addPaintListener(this); } - + CreateCanvases(mxParentWindow, xParentCanvas); // Raise new windows. @@ -398,7 +398,7 @@ void PresenterPaneBase::CreateWindows ( { if (mxPresenterHelper.is() && rxParentWindow.is()) { - + mxBorderWindow = mxPresenterHelper->createWindow( rxParentWindow, sal_False, @@ -483,7 +483,7 @@ void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox) awt::Rectangle aLocalBorderBox (0,0, aBorderBox.Width, aBorderBox.Height); PaintBorderBackground(aLocalBorderBox, rUpdateBox); - + if (mbHasCallout) mxBorderPainter->paintBorderWithCallout( mxPaneId->getResourceURL(), diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index 16ea4e515299..1b64eae2a747 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,11 +96,11 @@ public: ::boost::shared_ptr<PresenterTextView> GetTextViewForTitle (void); // XInitialization - + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException); - + // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) @@ -109,9 +109,9 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (com::sun::star::uno::RuntimeException); - + // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 8b8be6fb072c..af3e124c2a64 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -220,25 +220,25 @@ PresenterPaneBorderManager::BorderElement case mnTop | mnLeft: return TopLeft; - + case mnTop | mnRight: return TopRight; - + case mnTop | mnHorizontalCenter: return Top; - + case mnBottom | mnLeft: return BottomLeft; - + case mnBottom | mnRight: return BottomRight; - + case mnBottom | mnHorizontalCenter: return Bottom; - + case mnVerticalCenter | mnLeft: return Left; - + case mnVerticalCenter | mnRight: return Right; } @@ -360,12 +360,12 @@ void SAL_CALL PresenterPaneBorderManager::mouseExited (const css::awt::MouseEven mxOuterDragWindow = NULL; mxInnerDragWindow = NULL; } - + //----- XMouseMotionListener -------------------------------------------------- - + void SAL_CALL PresenterPaneBorderManager::mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException) { @@ -408,7 +408,7 @@ void SAL_CALL PresenterPaneBorderManager::mouseMoved (const css::awt::MouseEvent case PresenterPaneBorderManager::Bottom: mnPointerType = awt::SystemPointer::WINDOW_SSIZE; break; - + case PresenterPaneBorderManager::Content: case PresenterPaneBorderManager::Outside: default: @@ -451,7 +451,7 @@ void SAL_CALL PresenterPaneBorderManager::mouseDragged (const css::awt::MouseEve const sal_Int32 nOldRight = aOldBox.X + aOldBox.Width; const sal_Int32 nOldBottom = aOldBox.Y + aOldBox.Height; - + awt::Rectangle aBox (aOldBox); sal_Int32 nRight = aBox.X + aBox.Width; sal_Int32 nBottom = aBox.Y + aBox.Height; @@ -487,7 +487,7 @@ void SAL_CALL PresenterPaneBorderManager::mouseDragged (const css::awt::MouseEve break; default: break; } - + aBox.Width = nRight - aBox.X; aBox.Height = nBottom - aBox.Y; if (aBox.Width > 20 diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx index b9b25f330cfa..cb73ebee39d6 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.hxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -94,11 +94,11 @@ public: // XInitialization - + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException); - + // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) @@ -106,28 +106,28 @@ public: virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + // XMouseMotionListener - + virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); - + private: enum BorderElement { Top, TopLeft, TopRight, Left, Right, BottomLeft, BottomRight, Bottom, Content, Outside }; diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 0765ffef4c97..0f36a42d3ce6 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ namespace { drawing::framework::BorderType eBorderType) const; const Reference<rendering::XCanvasFont> GetFont ( const Reference<rendering::XCanvas>& rxCanvas) const; - + SharedBitmapDescriptor mpTopLeft; SharedBitmapDescriptor mpTop; SharedBitmapDescriptor mpTopRight; @@ -125,7 +125,7 @@ public: const Reference<XComponentContext>& rxContext, const ::boost::shared_ptr<PresenterTheme>& rpTheme); ~Renderer (void); - + void SetCanvas (const Reference<rendering::XCanvas>& rxCanvas); void PaintBorder ( const OUString& rsTitle, @@ -146,7 +146,7 @@ public: ::boost::shared_ptr<RendererPaneStyle> GetRendererPaneStyle (const OUString& rsResourceURL); void SetCalloutAnchor ( const awt::Point& rCalloutAnchor); - + private: ::boost::shared_ptr<PresenterTheme> mpTheme; typedef ::std::map<OUString, ::boost::shared_ptr<RendererPaneStyle> > RendererPaneStyleContainer; @@ -157,7 +157,7 @@ private: Reference<rendering::XPolyPolygon2D> mxViewStateClip; bool mbHasCallout; awt::Point maCalloutAnchor; - + void PaintBitmap( const awt::Rectangle& rBox, const awt::Rectangle& rUpdateBox, @@ -174,7 +174,7 @@ private: // ===== PresenterPaneBorderPainter =========================================== - + PresenterPaneBorderPainter::PresenterPaneBorderPainter ( const Reference<XComponentContext>& rxContext) : PresenterPaneBorderPainterInterfaceBase(m_aMutex), @@ -203,7 +203,7 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder ( throw(css::uno::RuntimeException) { ThrowIfDisposed(); - + ProvideTheme(); return AddBorder(rsPaneBorderStyleName, rRectangle, eBorderType); @@ -219,7 +219,7 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder ( throw(css::uno::RuntimeException) { ThrowIfDisposed(); - + ProvideTheme(); return RemoveBorder(rsPaneBorderStyleName, rRectangle, eBorderType); @@ -247,7 +247,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorder ( return; } ProvideTheme(rxCanvas); - + if (mpRenderer.get() != NULL) { mpRenderer->SetCanvas(rxCanvas); @@ -286,7 +286,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( return; } ProvideTheme(rxCanvas); - + if (mpRenderer.get() != NULL) { mpRenderer->SetCanvas(rxCanvas); @@ -337,7 +337,7 @@ awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset ( bool PresenterPaneBorderPainter::ProvideTheme (const Reference<rendering::XCanvas>& rxCanvas) { bool bModified (false); - + if ( ! mxContext.is()) return false; @@ -512,12 +512,12 @@ void PresenterPaneBorderPainter::Renderer::PaintBorder ( { if ( ! mxCanvas.is()) return; - + // Create the outer and inner border of the, ahm, border. ::boost::shared_ptr<RendererPaneStyle> pStyle (GetRendererPaneStyle(rsPaneURL)); if (pStyle.get() == NULL) return; - + awt::Rectangle aOuterBox (rBBox); awt::Rectangle aCenterBox ( pStyle->RemoveBorder(aOuterBox, drawing::framework::BorderType_OUTER_BORDER)); @@ -594,14 +594,14 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle ( { if ( ! mxCanvas.is()) return; - + if (rsTitle.getLength() == 0) return; Reference<rendering::XCanvasFont> xFont (rpStyle->GetFont(mxCanvas)); if ( ! xFont.is()) return; - + rendering::StringContext aContext ( rsTitle, 0, @@ -636,7 +636,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle ( } nX += rpStyle->mnFontXOffset; nY += rpStyle->mnFontYOffset; - + if (rUpdateBox.X >= nX+nTextWidth || rUpdateBox.Y >= nY+nTextHeight || rUpdateBox.X+rUpdateBox.Width <= nX @@ -644,13 +644,13 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle ( { return; } - + rendering::RenderState aRenderState( geometry::AffineMatrix2D(1,0,nX, 0,1,nY), NULL, Sequence<double>(4), rendering::CompositeOperation::SOURCE); - + if (bPaintBackground) { PresenterCanvasHelper::SetDeviceColor(aRenderState, util::Color(0x00ffffff)); @@ -700,7 +700,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle ( const OUString sStyleName (mpTheme->GetStyleName(rsResourceURL)); if (sStyleName.getLength() > 0) sPaneStyleName = sStyleName; - + // Create a new pane style object and initialize it with bitmaps. ::boost::shared_ptr<RendererPaneStyle> pStyle ( new RendererPaneStyle(mpTheme,sPaneStyleName)); @@ -738,7 +738,7 @@ void PresenterPaneBorderPainter::Renderer::PaintBitmap( const SharedBitmapDescriptor& rpBackgroundBitmap) { (void)rpBackgroundBitmap; - + bool bUseCanvas (mxCanvas.is()); if ( ! bUseCanvas) return; @@ -870,7 +870,7 @@ void PresenterPaneBorderPainter::Renderer::SetupClipping ( mxViewStateClip->setFillRule(rendering::FillRule_EVEN_ODD); } maViewState.Clip = mxViewStateClip; -} +} @@ -951,7 +951,7 @@ RendererPaneStyle::RendererPaneStyle ( mpBottomRight = GetBitmap(rpTheme, rsStyleName, A2S("BottomRight")); mpBottomCallout = GetBitmap(rpTheme, rsStyleName, A2S("BottomCallout")); mpBackground = GetBitmap(rpTheme, OUString(), A2S("Background")); - + // Get font description. mpFont = rpTheme->GetFont(rsStyleName); @@ -993,7 +993,7 @@ RendererPaneStyle::RendererPaneStyle ( { OSL_ASSERT(false); } - + UpdateBorderSizes(); } } diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index 0084d567e478..14286546ac62 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ public: class Renderer; // XPaneBorderPainter - + virtual css::awt::Rectangle SAL_CALL addBorder ( const rtl::OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, @@ -126,7 +126,7 @@ public: const css::awt::Rectangle& rRepaintArea, const rtl::OUString& rsTitle) throw(css::uno::RuntimeException); - + virtual void SAL_CALL paintBorderWithCallout ( const rtl::OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index e9b5cbb95622..98e95d7f560e 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -160,7 +160,7 @@ PresenterPaneContainer::SharedPaneDescriptor pDescriptor->mxPaneId = xPaneId; pDescriptor->mxPane = rxPane; pDescriptor->mxPane->SetTitle(pDescriptor->msTitle); - + // When there is a call out anchor location set then tell the // window about it. if (pDescriptor->mbHasCalloutAnchor) @@ -187,7 +187,7 @@ PresenterPaneContainer::SharedPaneDescriptor OUString sPaneURL; if (rxPaneId.is()) sPaneURL = rxPaneId->getResourceURL(); - + SharedPaneDescriptor pDescriptor (FindPaneURL(sPaneURL)); if (pDescriptor.get() != NULL) { @@ -207,7 +207,7 @@ PresenterPaneContainer::SharedPaneDescriptor const SharedBitmapDescriptor& rpViewBackground) { SharedPaneDescriptor pDescriptor; - + if (rxView.is()) { OUString sPaneURL; @@ -229,7 +229,7 @@ PresenterPaneContainer::SharedPaneDescriptor { if ( ! pDescriptor->maViewInitialization.empty()) pDescriptor->maViewInitialization(rxView); - + // Activate or deactivate the pane/view. if ( ! pDescriptor->maActivator.empty()) pDescriptor->maActivator(pDescriptor->mbIsActive); @@ -272,7 +272,7 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::RemoveView (const Reference<XView>& rxView) { SharedPaneDescriptor pDescriptor; - + if (rxView.is()) { OUString sPaneURL; @@ -407,7 +407,7 @@ void PresenterPaneContainer::ToTop (const SharedPaneDescriptor& rpDescriptor) OSL_ASSERT(iPane!=iEnd); if (iPane == iEnd) return; - + if (mxPresenterHelper.is()) mxPresenterHelper->toTop(rpDescriptor->mxBorderWindow); diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index 3c837ffc8a9b..c016b390c1bb 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ public: virtual ~PresenterPaneContainer (void); virtual void SAL_CALL disposing (void); - + typedef ::boost::function1<void, const css::uno::Reference<css::drawing::framework::XView>&> ViewInitializationFunction; @@ -140,7 +140,7 @@ public: SharedPaneDescriptor StoreBorderWindow( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, const css::uno::Reference<css::awt::XWindow>& rxBorderWindow); - + SharedPaneDescriptor StoreView ( const css::uno::Reference<css::drawing::framework::XView>& rxView, const SharedBitmapDescriptor& rpViewBackground); @@ -150,7 +150,7 @@ public: SharedPaneDescriptor RemoveView ( const css::uno::Reference<css::drawing::framework::XView>& rxView); - + void CreateBorderWindow (PaneDescriptor& rDescriptor); /** Find the pane whose border window is identical to the given border @@ -179,7 +179,7 @@ public: ::rtl::OUString GetPaneURLForViewURL (const ::rtl::OUString& rsViewURL); void ToTop (const SharedPaneDescriptor& rpDescriptor); - + // XEventListener diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 4763893698df..bd6c7c4e0894 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,7 +149,7 @@ void SAL_CALL PresenterPaneFactory::disposing (void) if (xCC.is()) xCC->removeResourceFactoryForReference(this); mxConfigurationControllerWeak = WeakReference<XConfigurationController>(); - + // Dispose the panes in the cache. if (mpResourceCache.get() != NULL) { @@ -169,7 +169,7 @@ void SAL_CALL PresenterPaneFactory::disposing (void) //----- XPaneFactory ---------------------------------------------------------- - + Reference<XResource> SAL_CALL PresenterPaneFactory::createResource ( const Reference<XResourceId>& rxPaneId) throw (RuntimeException, IllegalArgumentException, WrappedTargetException) @@ -260,11 +260,11 @@ Reference<XResource> PresenterPaneFactory::CreatePane ( { if ( ! rxPaneId.is()) return NULL; - + Reference<XConfigurationController> xCC (mxConfigurationControllerWeak); if ( ! xCC.is()) return NULL; - + Reference<XComponentContext> xContext (mxComponentContextWeak); if ( ! xContext.is()) return NULL; @@ -329,7 +329,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane ( UNO_QUERY); aArguments[5] <<= bIsSpritePane ? false : true; xPane->initialize(aArguments); - + // Store pane and canvases and windows in container. ::rtl::Reference<PresenterPaneContainer> pContainer ( mpPresenterController->GetPaneContainer()); diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 136d47ec645b..6e381fd6c106 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace { /** The PresenerPaneFactory provides a fixed set of panes. - + In order to make the presener screen more easily extendable in the future the set of supported panes could be made extendable on demand. */ @@ -95,7 +95,7 @@ public: throw (css::uno::RuntimeException); // XResourceFactory - + virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( const ::com::sun::star::uno::Reference< @@ -122,7 +122,7 @@ private: const ::rtl::Reference<PresenterController>& rpPresenterController); void Register (const css::uno::Reference<css::frame::XController>& rxController); - + css::uno::Reference<css::drawing::framework::XResource> CreatePane ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, const ::rtl::OUString& rsTitle); diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 7c4829ac81fd..0b87adfec200 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -174,7 +174,7 @@ namespace { }; } // end of anonymous namespace - + namespace { typedef ::cppu::WeakComponentImplHelper2 < @@ -213,24 +213,24 @@ public: const css::uno::Reference<css::frame::XStatusListener>& rxListener, const css::util::URL& rURL) throw(css::uno::RuntimeException); - + virtual void SAL_CALL removeStatusListener ( const css::uno::Reference<css::frame::XStatusListener>& rxListener, const css::util::URL& rURL) throw(css::uno::RuntimeException); - + // document::XEventListener virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) throw(css::uno::RuntimeException); - + // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException); - + private: OUString msURLPath; ::boost::scoped_ptr<Command> mpCommand; @@ -243,7 +243,7 @@ private: const OUString& rsURLPath, const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~Dispatch (void); - + void ThrowIfDisposed (void) const throw (css::lang::DisposedException); }; @@ -384,7 +384,7 @@ void PresenterProtocolHandler::ThrowIfDisposed (void) const - + //===== PresenterProtocolHandler::Dispatch ==================================== Reference<frame::XDispatch> PresenterProtocolHandler::Dispatch::Create ( @@ -476,12 +476,12 @@ Command* PresenterProtocolHandler::Dispatch::CreateCommand ( if (rsURLPath == A2S("ShowNotes")) return new SetNotesViewCommand(true, rpPresenterController); break; - + case sal_Char('S'): if (rsURLPath == A2S("ShowSlideSorter")) return new SetSlideSorterCommand(true, rpPresenterController); break; - + case sal_Char('H'): if (rsURLPath == A2S("ShowHelp")) return new SetHelpViewCommand(true, rpPresenterController); @@ -572,7 +572,7 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::addStatusListener( else throw RuntimeException(); } - + @@ -614,7 +614,7 @@ void PresenterProtocolHandler::Dispatch::ThrowIfDisposed (void) const - + //----- document::XEventListener ---------------------------------------------- void SAL_CALL PresenterProtocolHandler::Dispatch::notifyEvent ( @@ -962,7 +962,7 @@ NotesFontSizeCommand::NotesFontSizeCommand( { if (mpPresenterController.get() == NULL) return NULL; - + PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( mpPresenterController->GetPaneContainer()->FindViewURL( PresenterViewFactory::msNotesViewURL)); diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index b4b35c8fe666..4ddb244c4994 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,12 +71,12 @@ public: // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); - + // XDispatchProvider virtual css::uno::Reference<css::frame::XDispatch > SAL_CALL @@ -91,7 +91,7 @@ public: const css::uno::Sequence< css::frame::DispatchDescriptor>& rDescriptors) throw(css::uno::RuntimeException); - + private: class Dispatch; ::rtl::Reference<PresenterController> mpPresenterController; diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 951c4610b8be..89f8fd3a3da6 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,11 +88,11 @@ namespace { virtual void SAL_CALL disposing (void); // document::XEventListener - + virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException); // XEventListener - + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); private: @@ -251,7 +251,7 @@ void SAL_CALL PresenterScreenListener::disposing (void) xDocBroadcaster->removeEventListener( Reference<document::XEventListener>( static_cast<document::XEventListener*>(this), UNO_QUERY)); - + if (mpPresenterScreen.is()) { mpPresenterScreen->RequestShutdownPresenterScreen(); @@ -263,7 +263,7 @@ void SAL_CALL PresenterScreenListener::disposing (void) // document::XEventListener - + void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException) { ThrowIfDisposed(); @@ -287,12 +287,12 @@ void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventOb // XEventListener - + void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException) { (void)rEvent; - + if (mpPresenterScreen.is()) { mpPresenterScreen->RequestShutdownPresenterScreen(); @@ -510,7 +510,7 @@ sal_Int32 PresenterScreen::GetScreenNumber ( UNO_QUERY); if ( ! xDisplayProperties.is()) return -1; - + if (nDisplayNumber > 0) { nScreenNumber = nDisplayNumber - 1; @@ -523,7 +523,7 @@ sal_Int32 PresenterScreen::GetScreenNumber ( if (nDisplayNumber <= 0 && xDisplayProperties.is()) xDisplayProperties->getPropertyValue(A2S("DefaultDisplay")) >>= nScreenNumber; } - + // We still have to determine the number of screens to decide // whether the presenter screen may be shown at all. Reference<container::XIndexAccess> xIndexAccess (xDisplayProperties, UNO_QUERY); @@ -572,7 +572,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId ( const sal_Int32 nScreenNumber(GetScreenNumber(rxPresentation)); if (nScreenNumber < 0) return NULL; - + // Setup the resource id of the full screen background pane so that // it is displayed on another screen than the presentation. sal_Int32 nPresenterScreenNumber (1); @@ -585,7 +585,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId ( case 1: nPresenterScreenNumber = 0; break; - + default: // When the full screen presentation is displayed on a screen // other than 0 or 1 then place the presenter on the first @@ -593,7 +593,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId ( nPresenterScreenNumber = 0; break; } - + return ResourceId::create( Reference<XComponentContext>(mxContextWeak), PresenterHelper::msFullScreenPaneURL @@ -639,7 +639,7 @@ void PresenterScreen::ShutdownPresenterScreen (void) if (xViewFactoryComponent.is()) xViewFactoryComponent->dispose(); mxViewFactory = NULL; - + Reference<lang::XComponent> xPaneFactoryComponent (mxPaneFactory, UNO_QUERY); if (xPaneFactoryComponent.is()) xPaneFactoryComponent->dispose(); @@ -713,7 +713,7 @@ void PresenterScreen::SetupConfiguration ( } catch (RuntimeException&) { - } + } } @@ -770,7 +770,7 @@ void PresenterScreen::ProcessLayout ( } catch (RuntimeException&) { - } + } } @@ -799,7 +799,7 @@ void PresenterScreen::ProcessViewDescriptions ( catch (RuntimeException&) { OSL_ASSERT(false); - } + } } diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 7096c9f72fe6..457a2ba2b51e 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,13 +86,13 @@ public: virtual void SAL_CALL disposing (void); // XJob - + virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence<css::beans::NamedValue >& Arguments) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException); - + private: PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~PresenterScreenJob (void); @@ -139,9 +139,9 @@ public: // XEventListener - + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); - + private: css::uno::Reference<css::frame::XModel2 > mxModel; css::uno::Reference<css::frame::XController> mxController; @@ -210,7 +210,7 @@ private: */ void ProcessViewDescriptions ( PresenterConfigurationAccess& rConfiguration); - + /** Called by ProcessViewDescriptions for a single entry. */ void ProcessViewDescription ( diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 5786ccba2a2f..95361d0f6ed3 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -171,14 +171,14 @@ PresenterScrollBar::~PresenterScrollBar (void) void SAL_CALL PresenterScrollBar::disposing (void) { mpMousePressRepeater->Dispose(); - + if (mxWindow.is()) { mxWindow->removeWindowListener(this); mxWindow->removePaintListener(this); mxWindow->removeMouseListener(this); mxWindow->removeMouseMotionListener(this); - + Reference<lang::XComponent> xComponent (mxWindow, UNO_QUERY); mxWindow = NULL; if (xComponent.is()) @@ -323,7 +323,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx { mxCanvas = rxCanvas; if (mxCanvas.is()) - { + { if (mpBitmaps.get()==NULL) { if (mpSharedBitmaps.expired()) @@ -422,7 +422,7 @@ void PresenterScrollBar::Paint ( //----- XWindowListener ------------------------------------------------------- - + void SAL_CALL PresenterScrollBar::windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException) { @@ -432,7 +432,7 @@ void SAL_CALL PresenterScrollBar::windowResized (const css::awt::WindowEvent& rE - + void SAL_CALL PresenterScrollBar::windowMoved (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException) { @@ -481,7 +481,7 @@ void SAL_CALL PresenterScrollBar::windowPaint (const css::awt::PaintEvent& rEven - + //----- XMouseListener -------------------------------------------------------- void SAL_CALL PresenterScrollBar::mousePressed (const css::awt::MouseEvent& rEvent) @@ -541,7 +541,7 @@ void SAL_CALL PresenterScrollBar::mouseExited (const css::awt::MouseEvent& rEven //----- XMouseMotionListener -------------------------------------------------- - + void SAL_CALL PresenterScrollBar::mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException) { @@ -568,7 +568,7 @@ void SAL_CALL PresenterScrollBar::mouseDragged (const css::awt::MouseEvent& rEve return; mpMousePressRepeater->Stop(); - + if (mxPresenterHelper.is()) mxPresenterHelper->captureMouse(mxWindow); @@ -653,7 +653,7 @@ void PresenterScrollBar::PaintBitmap( aBox.Y2 += aWindowBox.Y; Reference<rendering::XBitmap> xBitmap (GetBitmap(eArea,rpBitmaps)); - + if (xBitmap.is()) { Reference<rendering::XPolyPolygon2D> xClipPolygon ( @@ -661,11 +661,11 @@ void PresenterScrollBar::PaintBitmap( PresenterGeometryHelper::Intersection(rUpdateBox, PresenterGeometryHelper::ConvertRectangle(aBox)), mxCanvas->getDevice())); - + const rendering::ViewState aViewState ( geometry::AffineMatrix2D(1,0,0, 0,1,0), xClipPolygon); - + const geometry::IntegerSize2D aBitmapSize (xBitmap->getSize()); rendering::RenderState aRenderState ( geometry::AffineMatrix2D( @@ -698,7 +698,7 @@ void PresenterScrollBar::NotifyThumbPositionChange (void) catch (Exception&) { } - + mbIsNotificationActive = false; } } @@ -709,7 +709,7 @@ void PresenterScrollBar::NotifyThumbPositionChange (void) PresenterScrollBar::Area PresenterScrollBar::GetArea (const double nX, const double nY) const { const geometry::RealPoint2D aPoint(nX, nY); - + if (PresenterGeometryHelper::IsInside(GetRectangle(Pager), aPoint)) { if (PresenterGeometryHelper::IsInside(GetRectangle(Thumb), aPoint)) @@ -883,7 +883,7 @@ void PresenterVerticalScrollBar::UpdateBorders (void) { const awt::Rectangle aWindowBox (mxWindow->getPosSize()); double nBottom = aWindowBox.Height; - + if (mpNextButtonDescriptor.get() != NULL) { Reference<rendering::XBitmap> xBitmap (mpNextButtonDescriptor->GetNormalBitmap()); @@ -912,7 +912,7 @@ void PresenterVerticalScrollBar::UpdateBorders (void) if (mnTotalSize < 1) { maBox[Thumb] = maBox[Pager]; - + // Set up the enabled/disabled states. maEnabledState[PrevButton] = false; maEnabledState[PagerUp] = false; @@ -926,7 +926,7 @@ void PresenterVerticalScrollBar::UpdateBorders (void) const double nThumbPosition = ::std::min(::std::max(0.0,mnThumbPosition), mnTotalSize - nThumbSize); maBox[Thumb] = geometry::RealRectangle2D( 0, nThumbPosition / mnTotalSize * nPagerHeight, - aWindowBox.Width, + aWindowBox.Width, (nThumbPosition+nThumbSize) / mnTotalSize * nPagerHeight); // Set up the enabled/disabled states. @@ -1106,7 +1106,7 @@ void PresenterHorizontalScrollBar::UpdateBorders (void) const awt::Rectangle aWindowBox (mxWindow->getPosSize()); double nRight = aWindowBox.Width; const double nGap (2); - + if (mpNextButtonDescriptor.get() != NULL) { Reference<rendering::XBitmap> xBitmap (mpNextButtonDescriptor->GetNormalBitmap()); @@ -1129,14 +1129,14 @@ void PresenterHorizontalScrollBar::UpdateBorders (void) nRight -= aSize.Width + nGap; } } - + const double nPagerWidth (nRight); maBox[Pager] = geometry::RealRectangle2D( 0,0, nRight, aWindowBox.Height); if (mnTotalSize == 0) { maBox[Thumb] = maBox[Pager]; - + // Set up the enabled/disabled states. maEnabledState[PrevButton] = false; maEnabledState[PagerUp] = false; @@ -1302,7 +1302,7 @@ void PresenterScrollBar::MousePressRepeater::SetMouseArea(const PresenterScrollB void PresenterScrollBar::MousePressRepeater::Callback (const TimeValue& rCurrentTime) { (void)rCurrentTime; - + if (mpScrollBar.get() == NULL) { Stop(); @@ -1323,7 +1323,7 @@ void PresenterScrollBar::MousePressRepeater::Execute (void) case PrevButton: mpScrollBar->SetThumbPosition(nThumbPosition - mpScrollBar->GetLineHeight(), true); break; - + case NextButton: mpScrollBar->SetThumbPosition(nThumbPosition + mpScrollBar->GetLineHeight(), true); break; diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index bd2462387078..b0b0567efab3 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -113,21 +113,21 @@ public: move the thumb to a valid position. */ void CheckValues (void); - + /** On some occasions it is necessary to trigger the painting of a scrollbar from the outside. */ virtual void Paint ( const css::awt::Rectangle& rUpdateBox, bool bNoClip = false); - + virtual sal_Int32 GetSize (void) const = 0; // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -143,7 +143,7 @@ public: virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) throw (css::uno::RuntimeException); - + // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) @@ -160,10 +160,10 @@ public: // XMouseMotionListener - + virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); @@ -172,7 +172,7 @@ public: virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); - + enum Area { Total, Pager, Thumb, PagerUp, PagerDown, PrevButton, NextButton, None, __AreaCount__ = None }; @@ -204,7 +204,7 @@ protected: SharedBitmapDescriptor mpThumbCenterDescriptor; SharedBitmapDescriptor mpThumbEndDescriptor; bool maEnabledState[__AreaCount__]; - + virtual css::geometry::RealRectangle2D GetRectangle (const Area eArea) const; virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const = 0; virtual void UpdateDragAnchor (const double nDragDistance) = 0; diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 3954a5ff1ed8..5556324ab48a 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,10 +95,10 @@ PresenterSlidePreview::PresenterSlidePreview ( Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY); if (xPeer.is()) xPeer->setBackground(util::Color(0xff000000)); - + mxWindow->setVisible(sal_True); } - + if (mpPresenterController.get() != NULL) mnSlideAspectRatio = mpPresenterController->GetSlideAspectRatio(); @@ -393,7 +393,7 @@ void PresenterSlidePreview::Resize (void) { const awt::Rectangle aWindowBox (mxWindow->getPosSize()); const awt::Size aNewPreviewSize (mxPreviewRenderer->calculatePreviewSize( - mnSlideAspectRatio, + mnSlideAspectRatio, awt::Size(aWindowBox.Width, aWindowBox.Height))); const geometry::IntegerSize2D aPreviewSize (mxPreview->getSize()); if (aNewPreviewSize.Width==aPreviewSize.Width diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index 57b9f9794b95..f38f2e7a5ee2 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ public: throw (com::sun::star::uno::RuntimeException); // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -110,7 +110,7 @@ public: virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) throw (css::uno::RuntimeException); - + // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index e63f22b5a84a..643978957a38 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ #include <com/sun/star/rendering/TextDirection.hpp> #include <com/sun/star/rendering/TexturingMode.hpp> #include <osl/mutex.hxx> - + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; @@ -139,7 +139,7 @@ void PresenterSlideShowView::LateInit (void) mxWindow->addPaintListener(this); mxWindow->addWindowListener(this); } - + // The window does not have to paint a background. We do // that ourself. Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY); @@ -152,7 +152,7 @@ void PresenterSlideShowView::LateInit (void) mxViewWindow = CreateViewWindow(mxWindow); mxViewCanvas = CreateViewCanvas(mxViewWindow); - + if (mxViewWindow.is()) { // Register listeners at window. @@ -214,12 +214,12 @@ void PresenterSlideShowView::disposing (void) // Tell all listeners that we are disposed. lang::EventObject aEvent; aEvent.Source = static_cast<XWeak*>(this); - + ::cppu::OInterfaceContainerHelper* pIterator = maBroadcaster.getContainer(getCppuType((Reference<lang::XEventListener>*)NULL)); if (pIterator != NULL) pIterator->disposeAndClear(aEvent); - + // Do this for // XPaintListener, XModifyListener,XMouseListener,XMouseMotionListener,XWindowListener? @@ -687,7 +687,7 @@ void SAL_CALL PresenterSlideShowView::mouseExited (const awt::MouseEvent& rEvent //----- XMouseMotionListener -------------------------------------------------- - + void SAL_CALL PresenterSlideShowView::mouseDragged (const awt::MouseEvent& rEvent) throw (RuntimeException) { @@ -768,7 +768,7 @@ void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEv //----- XView ----------------------------------------------------------------- - + Reference<XResourceId> SAL_CALL PresenterSlideShowView::getResourceId (void) throw(RuntimeException) { @@ -1069,7 +1069,7 @@ void PresenterSlideShowView::Resize (void) { pIterator->notifyEach(&util::XModifyListener::modified, aEvent); } - + // Due to constant aspect ratio resizing may lead a preview that changes // its position but not its size. This invalidates the back buffer and // we have to enforce a complete repaint. diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index bb91fb5e136c..494c76cf5c4c 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ namespace css = ::com::sun::star; namespace sdext { namespace presenter { namespace { - typedef cppu::WeakComponentImplHelper7< + typedef cppu::WeakComponentImplHelper7< css::presentation::XSlideShowView, css::awt::XPaintListener, css::awt::XMouseListener, @@ -89,101 +89,101 @@ public: // CachablePresenterView virtual void ReleaseView (void); - - + + // XSlideShowView - + virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL clear (void) throw (css::uno::RuntimeException); - + virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener) throw (css::uno::RuntimeException); - + virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener) throw (css::uno::RuntimeException); - + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener) throw (css::uno::RuntimeException); - + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener) throw (css::uno::RuntimeException); - + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener) throw (css::uno::RuntimeException); - + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener) throw (css::uno::RuntimeException); - + virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener) throw (css::uno::RuntimeException); - + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setMouseCursor(::sal_Int16 nPointerShape) throw (css::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea( ) throw (::com::sun::star::uno::RuntimeException); - + // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); - + // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) throw (css::uno::RuntimeException); - + // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + // XMouseMotionListener - + virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -198,7 +198,7 @@ public: // XView - + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) throw(css::uno::RuntimeException); @@ -216,11 +216,11 @@ public: virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) throw (css::uno::RuntimeException); - + // CachablePresenterView - + virtual void ActivatePresenterView (void); - + virtual void DeactivatePresenterView (void); private: @@ -275,7 +275,7 @@ private: void PaintOuterWindow (const css::awt::Rectangle& rRepaintBox); void PaintInnerWindow (const css::awt::PaintEvent& rEvent); void PaintEndSlide (const css::awt::Rectangle& rRepaintBox); - + /** The slide show relies on the back buffer of the canvas not being modified. With a shared canvas there are times when that can not be guaranteed. diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 0f65c9331a1c..44a9a2ef6305 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -144,7 +144,7 @@ public: sal_Int32 mnLastVisibleColumn; sal_Int32 mnFirstVisibleRow; sal_Int32 mnLastVisibleRow; - + private: Orientation meOrientation; ::rtl::Reference<PresenterScrollBar> mpHorizontalScrollBar; @@ -334,7 +334,7 @@ PresenterSlideSorter::PresenterSlideSorter ( // Set the orientation. const bool bIsVertical (true); - + // Create the scroll bar. if (bIsVertical) mpVerticalScrollBar = ::rtl::Reference<PresenterScrollBar>( @@ -371,7 +371,7 @@ PresenterSlideSorter::PresenterSlideSorter ( Layout::Vertical, mpHorizontalScrollBar, mpVerticalScrollBar)); - + // Create the preview cache. mxPreviewCache = Reference<drawing::XSlidePreviewCache>( xFactory->createInstanceWithContext( @@ -392,7 +392,7 @@ PresenterSlideSorter::PresenterSlideSorter ( mpPresenterController->GetTheme(), mxWindow, mpPresenterController->GetPaintManager())); - + // Listen for changes of the current slide. Reference<beans::XPropertySet> xControllerProperties (rxController, UNO_QUERY_THROW); xControllerProperties->addPropertyChangeListener( @@ -467,7 +467,7 @@ void SAL_CALL PresenterSlideSorter::disposing (void) if (mxPreviewCache.is()) { mxPreviewCache->removePreviewCreationNotifyListener(this); - + Reference<XComponent> xComponent (mxPreviewCache, UNO_QUERY); mxPreviewCache = NULL; if (xComponent.is()) @@ -525,7 +525,7 @@ void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventOb //----- XWindowListener ------------------------------------------------------- - + void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEvent) throw (uno::RuntimeException) { @@ -653,7 +653,7 @@ void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEv //----- XMouseMotionListener -------------------------------------------------- - + void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException) { @@ -724,13 +724,13 @@ void SAL_CALL PresenterSlideSorter::propertyChange ( //----- XSlidePreviewCacheListener -------------------------------------------- - + void SAL_CALL PresenterSlideSorter::notifyPreviewCreation ( sal_Int32 nSlideIndex) throw(css::uno::RuntimeException) { OSL_ASSERT(mpLayout.get()!=NULL); - + awt::Rectangle aBBox (mpLayout->GetBoundingBox(nSlideIndex)); mpPresenterController->GetPaintManager()->Invalidate(mxWindow, aBBox, true); } @@ -744,7 +744,7 @@ void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDr throw (RuntimeException) { (void)rxSlide; - + ThrowIfDisposed(); ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); @@ -860,7 +860,7 @@ geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars ( Reference<container::XIndexAccess> xSlides (mxSlideShowController, UNO_QUERY_THROW); if (xSlides.is()) bIsScrollBarNeeded = mpLayout->IsScrollBarNeeded(xSlides->getCount()); - + if (mpLayout->GetOrientation() == Layout::Vertical) { if (mpVerticalScrollBar.get() != NULL) @@ -900,7 +900,7 @@ geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars ( rUpperBox.X2, rUpperBox.Y2)); mpHorizontalScrollBar->SetVisible(true); - + // Reduce area covered by the scroll bar from the available // space. return geometry::RealRectangle2D( @@ -974,7 +974,7 @@ void PresenterSlideSorter::ClearBackground ( double PresenterSlideSorter::GetSlideAspectRatio (void) const { double nSlideAspectRatio (28.0/21.0); - + try { Reference<container::XIndexAccess> xSlides(mxSlideShowController, UNO_QUERY_THROW); @@ -1152,7 +1152,7 @@ void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox) geometry::RealPoint2D(mxWindow->getPosSize().Width, mnSeparatorY), rendering::ViewState(geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL), aRenderState); - + // Paint the slides. if ( ! PresenterGeometryHelper::AreRectanglesDisjoint( rUpdateBox, @@ -1286,7 +1286,7 @@ void PresenterSlideSorter::Layout::Update ( const double nSlideAspectRatio) { maBoundingBox = rBoundingBox; - + mnHorizontalBorder = gnHorizontalBorder; mnVerticalBorder = gnVerticalBorder; @@ -1296,7 +1296,7 @@ void PresenterSlideSorter::Layout::Update ( return; double nPreviewWidth; - + // Determine column count, preview width, and horizontal gap (borders // are half the gap). Try to use the preferred values. Try more to // stay in the valid intervalls. This last constraint may be not @@ -1404,7 +1404,7 @@ void PresenterSlideSorter::Layout::SetupVisibleArea (void) mnFirstVisibleColumn = 0; mnFirstVisibleRow = ::std::max(sal_Int32(0), GetRow(aPoint)); } - + aPoint = GetLocalPosition(geometry::RealPoint2D( maBoundingBox.X2, maBoundingBox.Y2)); if (meOrientation == Horizontal) { @@ -1527,7 +1527,7 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetPoint ( { sal_Int32 nColumn (GetColumn(nSlideIndex)); sal_Int32 nRow (GetRow(nSlideIndex)); - + geometry::RealPoint2D aPosition ( mnHorizontalBorder + nColumn*(maPreviewSize.Width+mnHorizontalGap), mnVerticalBorder + nRow*(maPreviewSize.Height+mnVerticalGap)); @@ -1657,7 +1657,7 @@ void PresenterSlideSorter::Layout::UpdateScrollBars (void) nTotalColumnCount = mnColumnCount; nTotalRowCount = sal_Int32(ceil(double(mnSlideCount) / double(mnColumnCount))); } - + if (mpHorizontalScrollBar.get() != NULL) { mpHorizontalScrollBar->SetTotalSize( @@ -1679,7 +1679,7 @@ void PresenterSlideSorter::Layout::UpdateScrollBars (void) mpVerticalScrollBar->SetLineHeight(maPreviewSize.Height); } - + // No place yet for the vertical scroll bar. } @@ -1771,7 +1771,7 @@ void PresenterSlideSorter::MouseOverManager::Paint ( { if (nSlideIndex != mnSlideIndex) return; - + if (mxCanvas != rxCanvas) SetCanvas(rxCanvas); if (rxCanvas != NULL) @@ -1825,7 +1825,7 @@ void PresenterSlideSorter::MouseOverManager::SetSlide ( maSlideBoundingBox = rBox; mnSlideIndex = nSlideIndex; - + if (nSlideIndex >= 0) { if (mxSlides.get() != NULL) @@ -1871,18 +1871,18 @@ Reference<rendering::XBitmap> PresenterSlideSorter::MouseOverManager::CreateBitm // bitmaps that are used to paints its background. The width is defined // by the text. geometry::IntegerSize2D aLabelSize (CalculateLabelSize(sText)); - + // Create a new bitmap that will contain the complete label. Reference<rendering::XBitmap> xBitmap ( mxCanvas->getDevice()->createCompatibleAlphaBitmap(aLabelSize)); if ( ! xBitmap.is()) return NULL; - + Reference<rendering::XBitmapCanvas> xBitmapCanvas (xBitmap, UNO_QUERY); if ( ! xBitmapCanvas.is()) return NULL; - + // Paint the background. PaintButtonBackground(xBitmapCanvas, aLabelSize); @@ -1902,7 +1902,7 @@ Reference<rendering::XBitmap> PresenterSlideSorter::MouseOverManager::CreateBitm const rendering::ViewState aViewState( geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL); - + rendering::RenderState aRenderState ( geometry::AffineMatrix2D(1,0,nXOffset, 0,1,nYOffset), NULL, @@ -1999,7 +1999,7 @@ geometry::IntegerSize2D PresenterSlideSorter::MouseOverManager::CalculateLabelSi // Width is specified by text width and maximal width. const geometry::RealSize2D aTextSize ( PresenterCanvasHelper::GetTextSize(mpFont->mxFont, rsText)); - + const sal_Int32 nWidth (round(aTextSize.Width + 2*gnHorizontalLabelPadding)); return geometry::IntegerSize2D(nWidth, nHeight); @@ -2016,11 +2016,11 @@ void PresenterSlideSorter::MouseOverManager::PaintButtonBackground ( Reference<rendering::XBitmap> xLeftLabelBitmap; if (mpLeftLabelBitmap.get() != NULL) xLeftLabelBitmap = mpLeftLabelBitmap->GetNormalBitmap(); - + Reference<rendering::XBitmap> xCenterLabelBitmap; if (mpCenterLabelBitmap.get() != NULL) xCenterLabelBitmap = mpCenterLabelBitmap->GetNormalBitmap(); - + Reference<rendering::XBitmap> xRightLabelBitmap; if (mpRightLabelBitmap.get() != NULL) xRightLabelBitmap = mpRightLabelBitmap->GetNormalBitmap(); diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index e3e6ebe8c031..01a28eb3a362 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,16 +87,16 @@ public: void SetActiveState (const bool bIsActive); - + // lang::XEventListener - virtual void SAL_CALL + virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -132,10 +132,10 @@ public: // XMouseMotionListener - + virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); @@ -155,9 +155,9 @@ public: const css::beans::PropertyChangeEvent& rEvent) throw(css::uno::RuntimeException); - + // XSlidePreviewCacheListener - + virtual void SAL_CALL notifyPreviewCreation ( sal_Int32 nSlideIndex) throw(css::uno::RuntimeException); diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx index 467fb5830dd5..09d5cb018285 100644 --- a/sdext/source/presenter/PresenterSprite.cxx +++ b/sdext/source/presenter/PresenterSprite.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx index e6be8e46ebad..cc266e9682c8 100644 --- a/sdext/source/presenter/PresenterSprite.hxx +++ b/sdext/source/presenter/PresenterSprite.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ public: */ void SetFactory ( const ::css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory); - + ::css::uno::Reference<css::rendering::XCanvas> GetCanvas (void); void Show (void); @@ -66,19 +66,19 @@ public: void SetPriority (const double nPriority); double GetPriority (void) const; - + void Resize (const css::geometry::RealSize2D& rSize); css::geometry::RealSize2D GetSize (void) const; - + void MoveTo (const css::geometry::RealPoint2D& rLocation); css::geometry::RealPoint2D GetLocation (void) const; - + void Transform (const css::geometry::AffineMatrix2D& rTransform); css::geometry::AffineMatrix2D GetTransform (void) const; void SetAlpha (const double nAlpha); double GetAlpha (void) const; - + void Update (void); private: diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index 1f8ebdbbc35e..6f9216c6c529 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -251,7 +251,7 @@ void PresenterSpritePane::CreateCanvases ( const awt::Rectangle aBorderBox (mxBorderWindow->getPosSize()); mpSprite->Resize(geometry::RealSize2D(aBorderBox.Width, aBorderBox.Height)); } - + UpdateCanvases(); } diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 468f531f5e87..4056928daa65 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ public: using css::lang::XEventListener::disposing; ::boost::shared_ptr<PresenterSprite> GetSprite (void); - + static ::rtl::OUString getImplementationName_static (void); static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( @@ -80,7 +80,7 @@ public: SAL_THROW((css::uno::Exception)); void ShowTransparentBorder (void); - + // XPane virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void) @@ -89,9 +89,9 @@ public: virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void) throw (css::uno::RuntimeException); - + // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -110,7 +110,7 @@ public: virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) throw (css::uno::RuntimeException); - + private: css::uno::Reference<css::awt::XWindow> mxParentWindow; css::uno::Reference<css::rendering::XSpriteCanvas> mxParentCanvas; diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index bf2de798a72e..7b177bd266b6 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -173,7 +173,7 @@ void PresenterTextView::SetText (const Reference<text::XText>& rxText) Reference<container::XEnumerationAccess> xParagraphAccess (rxText, UNO_QUERY); if ( ! xParagraphAccess.is()) return; - + Reference<container::XEnumeration> xParagraphs ( xParagraphAccess->createEnumeration() , UNO_QUERY); if ( ! xParagraphs.is()) @@ -248,7 +248,7 @@ void PresenterTextView::SetTextChangeBroadcaster ( void PresenterTextView::SetLocation (const css::geometry::RealPoint2D& rLocation) { maLocation = rLocation; - + for (::std::vector<SharedPresenterTextParagraph>::iterator iParagraph(maParagraphs.begin()), iEnd(maParagraphs.end()); @@ -344,7 +344,7 @@ void PresenterTextView::MoveCaret ( case AccessibleTextType::CHARACTER: nCharacterIndex += nDistance; break; - + case AccessibleTextType::WORD: { sal_Int32 nRemainingDistance (nDistance); @@ -376,7 +376,7 @@ void PresenterTextView::MoveCaret ( else { nRemainingDistance -= nDelta; - + // Move caret one character to the end of // the previous or the start of the next paragraph. pParagraph = GetParagraph(nParagraphIndex); @@ -778,7 +778,7 @@ void PresenterTextParagraph::Format ( mnVerticalOffset = nY; maWordBoundaries.clear(); maWordBoundaries.push_back(0); - + const rendering::FontMetrics aMetrics (rpFont->mxFont->getFontMetrics()); mnAscent = aMetrics.Ascent; mnDescent = aMetrics.Descent; @@ -801,7 +801,7 @@ void PresenterTextParagraph::Format ( if (aWordBoundary.endPos>aWordBoundary.startPos) AddWord(nWidth, aCurrentLine, aWordBoundary.endPos, rpFont); - + if (aWordBoundary.startPos<0 || aWordBoundary.endPos<0) break; if (nPosition >= aWordBoundary.endPos) @@ -831,7 +831,7 @@ sal_Int32 PresenterTextParagraph::GetWordBoundary( else return GetCharacterCount(); } - + sal_Int32 nIndex (0); for (sal_Int32 nCount (maWordBoundaries.size()); nIndex<nCount; ++nIndex) { @@ -922,7 +922,7 @@ void PresenterTextParagraph::AddWord ( nLineStart = rCurrentLine.startPos; nLineEnd = rCurrentLine.endPos; } - + const ::rtl::OUString sLineCandidate ( msParagraphText.copy(nLineStart, nWordBoundary-nLineStart)); @@ -1077,7 +1077,7 @@ TextSegment PresenterTextParagraph::GetTextSegment ( if (mxBreakIterator.is()) return GetWordTextSegment(nOffset, nIndex); break; - + case AccessibleTextType::LINE: { for (::std::vector<Line>::const_iterator diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index d8bf260443c1..6805d4c96564 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ public: const ::boost::function<void(const css::awt::Rectangle&)>& rInvalidator); ~PresenterTextCaret (void); - + void ShowCaret (void); void HideCaret (void); @@ -67,7 +67,7 @@ public: void SetPosition ( const sal_Int32 nParagraphIndex, const sal_Int32 nCharacterIndex); - + bool IsVisible (void) const; /** Set a (possibly empty) functor that broadcasts changes of the caret @@ -193,7 +193,7 @@ private: double mnBaseLine; double mnWidth; cssu::Sequence<css::geometry::RealRectangle2D> maCellBoxes; - + sal_Int32 GetLength (void) const; void ProvideLayoutedLine ( const ::rtl::OUString& rsParagraphText, @@ -223,7 +223,7 @@ private: /// the whole text. sal_Int32 mnCharacterOffset; ::std::vector<Cell> maCells; - + void AddWord ( const double nWidth, css::i18n::Boundary& rCurrentLine, @@ -259,11 +259,11 @@ public: void SetText (const css::uno::Reference<css::text::XText>& rxText); void SetText (const ::rtl::OUString& rsText); void SetTextChangeBroadcaster (const ::boost::function<void(void)>& rBroadcaster); - + void SetLocation (const css::geometry::RealPoint2D& rLocation); void SetSize (const css::geometry::RealSize2D& rSize); double GetTotalTextHeight (void); - + void SetFont (const PresenterTheme::SharedFontDescriptor& rpFont); void SetOffset ( @@ -281,7 +281,7 @@ public: void MoveCaret ( const sal_Int32 nDistance, const sal_Int16 nTextType); - + void Paint (const css::awt::Rectangle& rUpdateBox); SharedPresenterTextCaret GetCaret (void) const; diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 0777d147cff9..c052e8212cc5 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,12 +61,12 @@ class BorderSize { public: const static sal_Int32 mnInvalidValue = -10000; - + BorderSize (void) : mnLeft(mnInvalidValue), mnTop(mnInvalidValue), mnRight(mnInvalidValue), mnBottom(mnInvalidValue) {} - + sal_Int32 mnLeft; sal_Int32 mnTop; sal_Int32 mnRight; @@ -585,7 +585,7 @@ PresenterTheme::SharedFontDescriptor PresenterTheme::GetFont ( Theme::FontContainer::const_iterator iFont (pTheme->maFontContainer.find(rsStyleName)); if (iFont != pTheme->maFontContainer.end()) return iFont->second; - + pTheme = pTheme->mpParentTheme; } } @@ -649,7 +649,7 @@ bool PresenterTheme::FontDescriptor::PrepareFont ( const double nCellSize (GetCellSizeForDesignSize(rxCanvas, mnSize)); mxFont = CreateFont(rxCanvas, nCellSize); - + return mxFont.is(); } @@ -767,7 +767,7 @@ void PresenterTheme::Theme::Read ( { rReadContext.SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier); } - + // Background. mpBackground = PresenterBitmapContainer::LoadBitmap( mxThemeRoot, @@ -782,7 +782,7 @@ void PresenterTheme::Theme::Read ( // Pane styles. maPaneStyles.Read(rReadContext, mxThemeRoot); - + // View styles. maViewStyles.Read(rReadContext, mxThemeRoot); @@ -895,7 +895,7 @@ PresenterTheme::SharedFontDescriptor ReadContext::ReadFont ( { if ( ! rxNode.is()) return PresenterTheme::SharedFontDescriptor(); - + try { Reference<container::XHierarchicalNameAccess> xFont ( @@ -1080,7 +1080,7 @@ void PaneStyleContainer::ProcessPaneStyle( return; ::boost::shared_ptr<PaneStyle> pStyle (new PaneStyle()); - + rValues[0] >>= pStyle->msStyleName; OUString sParentStyleName; @@ -1222,7 +1222,7 @@ void ViewStyleContainer::Read ( const Reference<container::XHierarchicalNameAccess>& rxThemeRoot) { (void)rReadContext; - + Reference<container::XNameAccess> xViewStyleList ( PresenterConfigurationAccess::GetConfigurationNode( rxThemeRoot, @@ -1245,7 +1245,7 @@ void ViewStyleContainer::ProcessViewStyle( const Reference<beans::XPropertySet>& rxProperties) { ::boost::shared_ptr<ViewStyle> pStyle (new ViewStyle()); - + PresenterConfigurationAccess::GetProperty(rxProperties, A2S("StyleName")) >>= pStyle->msStyleName; @@ -1285,7 +1285,7 @@ void ViewStyleContainer::ProcessViewStyle( SharedBitmapDescriptor())); if (pBackground.get() != NULL && pBackground->GetNormalBitmap().is()) pStyle->mpBackground = pBackground; - + push_back(pStyle); } diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index e76cabcf28d0..b2b6aad9cf10 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ namespace sdext { namespace presenter { For the offset of the bitmap you can call Point aOffset = getPropertyValue(sStyleName + "_TopLeftOffset"); - + This is work in progress. */ class PresenterTheme @@ -94,7 +94,7 @@ public: public: explicit FontDescriptor (void); explicit FontDescriptor (const ::boost::shared_ptr<FontDescriptor>& rpDescriptor); - + ::rtl::OUString msFamilyName; ::rtl::OUString msStyleName; sal_Int32 mnSize; @@ -121,7 +121,7 @@ public: SharedBitmapDescriptor GetBitmap ( const ::rtl::OUString& rsStyleName, const ::rtl::OUString& rsBitmapName) const; - + SharedBitmapDescriptor GetBitmap ( const ::rtl::OUString& rsBitmapName) const; diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 8841d8234bd4..646c751d4674 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,10 +91,10 @@ public: const PresenterTimer::Task& rTask, const TimeValue& rDueTime, const sal_Int64 nRepeatIntervall); - + void ScheduleTask (const SharedTimerTask& rpTask); void CancelTask (const sal_Int32 nTaskId); - + static bool GetCurrentTime (TimeValue& rCurrentTime); static sal_Int64 GetTimeDifference ( const TimeValue& rTargetTime, @@ -123,7 +123,7 @@ private: virtual ~TimerScheduler (void); class Deleter {public: void operator () (TimerScheduler* pScheduler) { delete pScheduler; } }; friend class Deleter; - + virtual void SAL_CALL run (void); virtual void SAL_CALL onTerminated (void); }; @@ -141,7 +141,7 @@ sal_Int32 PresenterTimer::ScheduleSingleTaskRelative ( const Task& rTask, const sal_Int64 nDelay) { - return ScheduleRepeatedTask(rTask, nDelay, 0); + return ScheduleRepeatedTask(rTask, nDelay, 0); } @@ -267,7 +267,7 @@ void TimerScheduler::ScheduleTask (const SharedTimerTask& rpTask) osl::MutexGuard aGuard (maTaskContainerMutex); maScheduledTasks.insert(rpTask); - + if ( ! mbIsRunning) { mbIsRunning = true; @@ -337,7 +337,7 @@ void SAL_CALL TimerScheduler::run (void) sal_Int64 nDifference = 0; { ::osl::MutexGuard aGuard (maTaskContainerMutex); - + // There are no more scheduled task. Leave this loop, function and // live of the TimerScheduler. if (maScheduledTasks.empty()) @@ -352,7 +352,7 @@ void SAL_CALL TimerScheduler::run (void) maScheduledTasks.erase(maScheduledTasks.begin()); } } - + // Acquire a reference to the current task. { ::osl::MutexGuard aGuard (maCurrentTaskMutex); @@ -384,7 +384,7 @@ void SAL_CALL TimerScheduler::run (void) ScheduleTask(mpCurrentTask); } } - + } // Release reference to the current task. @@ -478,7 +478,7 @@ TimerTask::TimerTask ( const css::uno::Reference<css::uno::XComponentContext>& rxContext) { ::osl::MutexGuard aSolarGuard (::osl::Mutex::getGlobalMutex()); - + ::rtl::Reference<PresenterClockTimer> pTimer; if (mpInstance.is()) { @@ -656,13 +656,13 @@ void SAL_CALL PresenterClockTimer::notify (const css::uno::Any& rUserData) osl::MutexGuard aGuard (maMutex); mbIsCallbackPending = false; - + ::std::copy( maListeners.begin(), maListeners.end(), ::std::back_inserter(aListenerCopy)); } - + if (aListenerCopy.size() > 0) { ListenerContainer::const_iterator iListener; diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index 19d9e0637258..c79760c74224 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ public: typedef ::boost::function<void(const TimeValue&)> Task; static const sal_Int32 NotAValidTaskId = 0; - + static sal_Int32 ScheduleSingleTaskRelative ( const Task& rTask, const sal_Int64 nDelay); @@ -82,7 +82,7 @@ public: -typedef cppu::WeakComponentImplHelper1< +typedef cppu::WeakComponentImplHelper1< css::awt::XCallback > PresenterClockTimerInterfaceBase; @@ -98,7 +98,7 @@ public: virtual void TimeHasChanged (const oslDateTime& rCurrentTime) = 0; }; typedef ::boost::shared_ptr<Listener> SharedListener; - + static ::rtl::Reference<PresenterClockTimer> Instance ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); @@ -106,7 +106,7 @@ public: void RemoveListener (const SharedListener& rListener); static oslDateTime GetCurrentTime (void); - + /** Return the difference between the two different times in nanoseconds. */ @@ -131,7 +131,7 @@ private: PresenterClockTimer ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); ~PresenterClockTimer (void); - + void CheckCurrentTime (const TimeValue& rCurrentTime); }; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index ad5d6161eca8..a20c2871d9b2 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,11 +112,11 @@ namespace { { public: ElementMode (void); - + SharedBitmapDescriptor mpIcon; OUString msAction; Text maText; - + void ReadElementMode ( const Reference<beans::XPropertySet>& rxProperties, const ::rtl::OUString& rsModeName, @@ -137,13 +137,13 @@ public: css::uno::Reference<css::rendering::XCanvas> mxCanvas; }; - + //===== PresenterToolBar::Element ============================================= namespace { - typedef cppu::WeakComponentImplHelper2< + typedef cppu::WeakComponentImplHelper2< css::document::XEventListener, css::frame::XStatusListener > ElementInterfaceBase; @@ -185,7 +185,7 @@ namespace { virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException); - + // document::XEventListener virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) @@ -208,7 +208,7 @@ namespace { bool mbIsOver; bool mbIsPressed; bool mbIsSelected; - + virtual awt::Size CreateBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas) = 0; @@ -251,11 +251,11 @@ namespace { virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException); - + protected: virtual awt::Size CreateBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas); - + private: bool mbIsListenerRegistered; @@ -277,7 +277,7 @@ namespace { { public: Label (const ::rtl::Reference<PresenterToolBar>& rpToolBar); - + void SetText (const OUString& rsText); virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, @@ -445,7 +445,7 @@ void PresenterToolBar::Initialize ( Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY); if (xPeer.is()) xPeer->setBackground(util::Color(0xff000000)); - + mxWindow->setVisible(sal_True); } @@ -614,7 +614,7 @@ void SAL_CALL PresenterToolBar::disposing (const lang::EventObject& rEventObject //----- XWindowListener ------------------------------------------------------- - + void SAL_CALL PresenterToolBar::windowResized (const awt::WindowEvent& rEvent) throw (RuntimeException) { @@ -670,7 +670,7 @@ void SAL_CALL PresenterToolBar::windowPaint (const css::awt::PaintEvent& rEvent) if (mbIsLayoutPending) Layout(mxCanvas); - + Paint(rEvent.UpdateRect, aViewState); // Make the back buffer visible. @@ -721,7 +721,7 @@ void SAL_CALL PresenterToolBar::mouseExited (const css::awt::MouseEvent& rEvent) //----- XMouseMotionListener -------------------------------------------------- - + void SAL_CALL PresenterToolBar::mouseMoved (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException) { @@ -774,7 +774,7 @@ void PresenterToolBar::CreateControls ( { if ( ! mxWindow.is()) return; - + // Expand the macro in the bitmap file names. PresenterConfigurationAccess aConfiguration ( mxComponentContext, @@ -890,7 +890,7 @@ void PresenterToolBar::Layout ( for (iPart=maElementContainer.begin(),nIndex=0; iPart!=iEnd; ++iPart,++nIndex) { geometry::RealSize2D aSize (CalculatePartSize(rxCanvas, *iPart, bIsHorizontal)); - + // Remember the size of each part for later. aPartSizes[nIndex] = aSize; @@ -900,7 +900,7 @@ void PresenterToolBar::Layout ( nTotalHorizontalGap += ((*iPart)->size() - 1) * gnGapSize; nGapCount += (*iPart)->size()-1; } - + // Orientation changes for each part. bIsHorizontal = !bIsHorizontal; // Width is accumulated. @@ -941,12 +941,12 @@ void PresenterToolBar::Layout ( // Place the parts. double nY ((aWindowBox.Height - aTotalSize.Height) / 2); bIsHorizontal = true; - + maBoundingBox.X1 = nX; maBoundingBox.Y1 = nY; maBoundingBox.X2 = nX + aTotalSize.Width + nTotalHorizontalGap; maBoundingBox.Y2 = nY + aTotalSize.Height; - + for (iPart=maElementContainer.begin(), nIndex=0; iPart!=iEnd; ++iPart,++nIndex) { geometry::RealRectangle2D aBoundingBox( @@ -1130,7 +1130,7 @@ void PresenterToolBar::CheckMouseOver ( { if (iElement->get() == NULL) continue; - + awt::Rectangle aBox ((*iElement)->GetBoundingBox()); const bool bIsOver = bOverWindow && aBox.X <= rEvent.X @@ -1202,7 +1202,7 @@ PresenterToolBarView::PresenterToolBarView ( Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY); if (xPeer.is()) xPeer->setBackground(util::Color(0xff000000)); - + mxWindow->setVisible(sal_True); } } @@ -1229,7 +1229,7 @@ void SAL_CALL PresenterToolBarView::disposing (void) mpToolBar = NULL; if (xComponent.is()) xComponent->dispose(); - + if (mxWindow.is()) { mxWindow->removePaintListener(this); @@ -1449,7 +1449,7 @@ bool Element::SetState ( { bool bModified (mbIsOver != bIsOver || mbIsPressed != bIsPressed); bool bClicked (mbIsPressed && bIsOver && ! bIsPressed); - + mbIsOver = bIsOver; mbIsPressed = bIsPressed; @@ -1472,7 +1472,7 @@ bool Element::SetState ( { if (mpMode->msAction.getLength() <= 0) break; - + if (mpToolBar.get() == NULL) break; @@ -1573,7 +1573,7 @@ void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent) { (void)rEvent; } - + @@ -1597,7 +1597,7 @@ void SAL_CALL Element::statusChanged (const css::frame::FeatureStateEvent& rEven bool bIsSelected (mbIsSelected); bool bIsEnabled (rEvent.IsEnabled); rEvent.State >>= bIsSelected; - + if (bIsSelected != mbIsSelected || bIsEnabled != mbIsEnabled) { mbIsEnabled = bIsEnabled; @@ -1758,13 +1758,13 @@ void Button::Paint ( if (mpMode.get() == NULL) return; - + if (mpMode->mpIcon.get() == NULL) return; geometry::RealRectangle2D aTextBBox (mpMode->maText.GetBoundingBox(rxCanvas)); sal_Int32 nTextHeight (sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.Y2 - aTextBBox.Y1)); - + PaintIcon(rxCanvas, nTextHeight, rViewState); awt::Point aOffset(0,0); if ( ! IsEnabled()) @@ -1814,7 +1814,7 @@ void Button::PaintIcon ( { if (mpMode.get() == NULL) return; - + Reference<rendering::XBitmap> xBitmap (mpMode->mpIcon->GetBitmap(GetMode())); if (xBitmap.is()) { @@ -1858,7 +1858,7 @@ void SAL_CALL Button::disposing (const css::lang::EventObject& rEvent) mbIsListenerRegistered = false; Element::disposing(rEvent); } - + } // end of anonymous namespace @@ -1881,13 +1881,13 @@ awt::Size Label::CreateBoundingSize ( { if (mpMode.get() == NULL) return awt::Size(0,0); - + geometry::RealRectangle2D aTextBBox (mpMode->maText.GetBoundingBox(rxCanvas)); return awt::Size( sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.X2 - aTextBBox.X1), sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.Y2 - aTextBBox.Y1)); } - + @@ -1920,7 +1920,7 @@ void Label::Paint ( OSL_ASSERT(rxCanvas.is()); if (mpMode.get() == NULL) return; - + mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox(), awt::Point(0,0)); } @@ -2035,7 +2035,7 @@ void Text::Paint ( Sequence<double>(4), rendering::CompositeOperation::SOURCE); PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont->mnColor); - + rxCanvas->drawText( aContext, mpFont->mxFont, @@ -2125,7 +2125,7 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime) const sal_Int32 nHours (sal::static_int_cast<sal_Int32>(rTime.Hours)); const sal_Int32 nMinutes (sal::static_int_cast<sal_Int32>(rTime.Minutes)); const sal_Int32 nSeconds(sal::static_int_cast<sal_Int32>(rTime.Seconds)); - + // Hours if (mbIs24HourFormat) sText.append(OUString::valueOf(nHours)); @@ -2293,7 +2293,7 @@ void PresentationTimeLabel::TimeHasChanged (const oslDateTime& rCurrentTime) maStartTimeValue.Seconds += 1; maStartTimeValue.Nanosec = 0; } - + TimeValue aElapsedTimeValue; aElapsedTimeValue.Seconds = aCurrentTimeValue.Seconds - maStartTimeValue.Seconds; aElapsedTimeValue.Nanosec = aCurrentTimeValue.Nanosec - maStartTimeValue.Nanosec; diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index d4dbf2ac1048..eb6a526397a7 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace css = ::com::sun::star; namespace { - typedef cppu::WeakComponentImplHelper5< + typedef cppu::WeakComponentImplHelper5< css::awt::XWindowListener, css::awt::XPaintListener, css::awt::XMouseListener, @@ -68,7 +68,7 @@ namespace { css::drawing::XDrawView > PresenterToolBarInterfaceBase; - typedef cppu::WeakComponentImplHelper3< + typedef cppu::WeakComponentImplHelper3< css::awt::XPaintListener, css::drawing::framework::XView, css::drawing::XDrawView @@ -92,7 +92,7 @@ public: typedef ::boost::function<void(void)> Action; enum Anchor { Left, Center, Right }; - + PresenterToolBar ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::awt::XWindow>& rxWindow, @@ -117,16 +117,16 @@ public: ::rtl::Reference<PresenterController> GetPresenterController (void) const; css::uno::Reference<css::awt::XWindow> GetWindow (void) const; css::uno::Reference<css::uno::XComponentContext> GetComponentContext (void) const; - + // lang::XEventListener - virtual void SAL_CALL + virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -153,14 +153,14 @@ public: virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException); - + // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) @@ -262,16 +262,16 @@ public: ::rtl::Reference<PresenterToolBar> GetPresenterToolBar (void) const; - + // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) throw (css::uno::RuntimeException); - + // lang::XEventListener - virtual void SAL_CALL + virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); @@ -284,7 +284,7 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (com::sun::star::uno::RuntimeException); - + // XDrawView virtual void SAL_CALL setCurrentPage ( diff --git a/sdext/source/presenter/PresenterUIPainter.cxx b/sdext/source/presenter/PresenterUIPainter.cxx index d5a5066989d8..0b5b90daa117 100644 --- a/sdext/source/presenter/PresenterUIPainter.cxx +++ b/sdext/source/presenter/PresenterUIPainter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ void PresenterUIPainter::PaintHorizontalBitmapComposite ( rendering::ViewState aViewState ( geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL); - + rendering::RenderState aRenderState ( geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL, @@ -177,7 +177,7 @@ void PresenterUIPainter::PaintVerticalBitmapComposite ( rendering::ViewState aViewState ( geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL); - + rendering::RenderState aRenderState ( geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL, diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx index 52cdd5d2f4ea..e640a35a9a0b 100644 --- a/sdext/source/presenter/PresenterUIPainter.hxx +++ b/sdext/source/presenter/PresenterUIPainter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ class PresenterUIPainter public: PresenterUIPainter (void); ~PresenterUIPainter (void); - + static void PaintHorizontalBitmapComposite ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rRepaintBox, diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 2a33a4230254..44c06ad3a328 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ public: virtual Reference<XResourceId> SAL_CALL getResourceId (void) throw (RuntimeException) { return mxResourceId; }; - + private: Reference<XResourceId> mxResourceId; }; @@ -268,7 +268,7 @@ void SAL_CALL PresenterViewFactory::disposing (void) //----- XViewFactory ---------------------------------------------------------- - + Reference<XResource> SAL_CALL PresenterViewFactory::createResource ( const Reference<XResourceId>& rxViewId) throw (RuntimeException) @@ -276,7 +276,7 @@ Reference<XResource> SAL_CALL PresenterViewFactory::createResource ( ThrowIfDisposed(); Reference<XResource> xView; - + if (rxViewId.is()) { Reference<XPane> xAnchorPane ( @@ -292,7 +292,7 @@ Reference<XResource> SAL_CALL PresenterViewFactory::createResource ( if (pDescriptor.get() != NULL) pDescriptor->SetActivationState(true); } - + return xView; } @@ -398,7 +398,7 @@ Reference<XResource> PresenterViewFactory::CreateView( const Reference<XPane>& rxAnchorPane) { Reference<XView> xView; - + try { const OUString sResourceURL (rxViewId->getResourceURL()); @@ -427,7 +427,7 @@ Reference<XResource> PresenterViewFactory::CreateView( { xView = CreateHelpView(rxViewId); } - + // Activate it. CachablePresenterView* pView = dynamic_cast<CachablePresenterView*>(xView.get()); if (pView != NULL) @@ -448,12 +448,12 @@ Reference<XView> PresenterViewFactory::CreateSlideShowView( const Reference<XResourceId>& rxViewId) const { Reference<XView> xView; - + if ( ! mxConfigurationController.is()) return xView; if ( ! mxComponentContext.is()) return xView; - + try { rtl::Reference<PresenterSlideShowView> pShowView ( @@ -481,12 +481,12 @@ Reference<XView> PresenterViewFactory::CreateSlidePreviewView( const Reference<XPane>& rxAnchorPane) const { Reference<XView> xView; - + if ( ! mxConfigurationController.is()) return xView; if ( ! mxComponentContext.is()) return xView; - + try { xView = Reference<XView>( @@ -527,12 +527,12 @@ Reference<XView> PresenterViewFactory::CreateNotesView( { (void)rxAnchorPane; Reference<XView> xView; - + if ( ! mxConfigurationController.is()) return xView; if ( ! mxComponentContext.is()) return xView; - + try { xView = Reference<XView>(static_cast<XWeak*>( @@ -558,12 +558,12 @@ Reference<XView> PresenterViewFactory::CreateSlideSorterView( const Reference<XResourceId>& rxViewId) const { Reference<XView> xView; - + if ( ! mxConfigurationController.is()) return xView; if ( ! mxComponentContext.is()) return xView; - + try { rtl::Reference<PresenterSlideSorter> pView ( diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 5fab682dae8a..b38fbcae79d0 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ class CachablePresenterView { public: virtual void ActivatePresenterView (void); - + /** Called when the view is put into a cache. The view must not paint itself while being deactive. */ @@ -123,7 +123,7 @@ public: // XResourceFactory - + virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) @@ -144,7 +144,7 @@ private: css::uno::Reference<css::drawing::framework::XPane> > ViewResourceDescriptor; typedef ::std::map<rtl::OUString, ViewResourceDescriptor> ResourceContainer; ::boost::scoped_ptr<ResourceContainer> mpResourceCache; - + PresenterViewFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::frame::XController>& rxController, diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 821e927dcb5b..72cb68c0628c 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,9 +95,9 @@ namespace { const ::boost::shared_ptr<PresenterAnimator>& rpAnimator); virtual ~ModeChangeAnimationStarter (void); virtual void SAL_CALL disposing (void); - + // XConfigurationChangeListener - + virtual void SAL_CALL notifyConfigurationChange ( const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) throw (com::sun::star::uno::RuntimeException); @@ -202,7 +202,7 @@ void PresenterWindowManager::SetParentPane ( } mxParentWindow = NULL; mxParentCanvas = NULL; - + if (rxPane.is()) { mxParentWindow = rxPane->getWindow(); @@ -225,7 +225,7 @@ void PresenterWindowManager::SetParentPane ( if (xPeer.is()) xPeer->setBackground(util::Color(0xff000000)); } -} +} @@ -235,7 +235,7 @@ void PresenterWindowManager::SetTheme (const ::boost::shared_ptr<PresenterTheme> mpTheme = rpTheme; // Get background bitmap or background color from the theme. - + if (mpTheme.get() != NULL) { mpBackgroundBitmap = mpTheme->GetBitmap(OUString(), A2S("Background")); @@ -266,7 +266,7 @@ void PresenterWindowManager::NotifyPaneCreation ( if (xBorderWindow.is() && ! rpDescriptor->mbIsSprite) { Invalidate(); - + xBorderWindow->addWindowListener(this); xBorderWindow->addFocusListener(this); #ifndef ENABLE_PANE_RESIZING @@ -289,7 +289,7 @@ void PresenterWindowManager::NotifyViewCreation (const Reference<XView>& rxView) if (pDescriptor.get() != NULL) { Layout(); - + mpPresenterController->GetPaintManager()->Invalidate( pDescriptor->mxContentWindow, (sal_Int16)(awt::InvalidateStyle::TRANSPARENT @@ -365,7 +365,7 @@ void PresenterWindowManager::SetPaneBorderPainter ( //----- XWindowListener ------------------------------------------------------- - + void SAL_CALL PresenterWindowManager::windowResized (const awt::WindowEvent& rEvent) throw (RuntimeException) { @@ -426,7 +426,7 @@ void SAL_CALL PresenterWindowManager::windowHidden (const lang::EventObject& rEv //----- XPaintListener -------------------------------------------------------- - + void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent) throw (RuntimeException) { @@ -555,7 +555,7 @@ void SAL_CALL PresenterWindowManager::disposing (const lang::EventObject& rEvent bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const { bool bChildInvalidated (false); - + // Call windowPaint on all children that lie in or touch the // update rectangle. PresenterPaneContainer::PaneList::const_iterator iPane; @@ -614,7 +614,7 @@ bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const void PresenterWindowManager::SetLayoutMode (const LayoutMode eMode) { OSL_ASSERT(mpPresenterController.get() != NULL); - + if (meLayoutMode != eMode || mbIsSlideSorterActive || mbIsHelpViewActive) @@ -763,15 +763,15 @@ void PresenterWindowManager::RestoreViewMode (void) case 0: SetViewMode(VM_Standard); break; - + case 1: SetViewMode(VM_Notes); break; - + case 2: SetViewMode(VM_SlideOverview); break; - } + } } @@ -864,7 +864,7 @@ void PresenterWindowManager::Layout (void) default: LayoutStandardMode(); break; - + case LM_Notes: LayoutNotesMode(); break; @@ -910,7 +910,7 @@ void PresenterWindowManager::LayoutStandardMode (void) aCurrentSlideOuterBox.Width, aCurrentSlideOuterBox.Height); } - + // For the next slide view calculate the outer height from the outer // width. This takes into acount the slide aspect ratio and thus has to @@ -940,7 +940,7 @@ void PresenterWindowManager::LayoutNotesMode (void) awt::Rectangle aBox = mxParentWindow->getPosSize(); const geometry::RealRectangle2D aToolBarBox (LayoutToolBar()); - + const double nGoldenRatio ((1 + sqrt(5.0)) / 2); const double nGap (20); const double nPrimaryWidth (aBox.Width / nGoldenRatio); @@ -948,7 +948,7 @@ void PresenterWindowManager::LayoutNotesMode (void) const double nTertiaryWidth (nSecondaryWidth / nGoldenRatio); double nSlidePreviewTop (0); double nNotesViewBottom (aToolBarBox.Y1 - nGap); - + // The notes view has no fixed aspect ratio. PresenterPaneContainer::SharedPaneDescriptor pPane ( mpPaneContainer->FindPaneURL(PresenterPaneFactory::msNotesPaneURL)); @@ -967,7 +967,7 @@ void PresenterWindowManager::LayoutNotesMode (void) aNotesViewOuterSize.Height); nNotesViewBottom = nSlidePreviewTop + aNotesViewOuterSize.Height; } - + // For the current slide view calculate the outer height from the outer // width. This takes into acount the slide aspect ratio and thus has to // go over the inner pane size. @@ -984,7 +984,7 @@ void PresenterWindowManager::LayoutNotesMode (void) aCurrentSlideOuterBox.Width, aCurrentSlideOuterBox.Height); } - + // For the next slide view calculate the outer height from the outer // width. This takes into acount the slide aspect ratio and thus has to @@ -1153,7 +1153,7 @@ void PresenterWindowManager::NotifyLayoutModeChange (void) { } } - } + } } @@ -1183,7 +1183,7 @@ void PresenterWindowManager::NotifyDisposing (void) { } } - } + } } @@ -1192,7 +1192,7 @@ void PresenterWindowManager::NotifyDisposing (void) void PresenterWindowManager::LayoutUnknownMode (void) { awt::Rectangle aBox = mxParentWindow->getPosSize(); - + PresenterPaneContainer::PaneList::const_iterator iPane; PresenterPaneContainer::PaneList::const_iterator iEnd (mpPaneContainer->maPanes.end()); for (iPane=mpPaneContainer->maPanes.begin(); iPane!=iEnd; ++iPane) @@ -1261,7 +1261,7 @@ void PresenterWindowManager::PaintBackground (const awt::Rectangle& rUpdateBox) Reference<rendering::XGraphicDevice> xDevice (mxParentCanvas->getDevice()); if ( ! xDevice.is()) return; - + // Create a polygon for the background and for clipping. Reference<rendering::XPolyPolygon2D> xBackgroundPolygon ( PresenterGeometryHelper::CreatePolygon(mxParentWindow->getPosSize(), xDevice)); @@ -1282,7 +1282,7 @@ void PresenterWindowManager::PaintBackground (const awt::Rectangle& rUpdateBox) if (mpBackgroundBitmap.get() != NULL) { ProvideBackgroundBitmap(); - + if (mxScaledBackgroundBitmap.is()) { Sequence<rendering::Texture> aTextures (1); @@ -1411,7 +1411,7 @@ void PresenterWindowManager::UpdateWindowList (void) Reference<lang::XComponent> xComponent (mxPaneBorderManager, UNO_QUERY); if (xComponent.is()) xComponent->dispose(); - + Reference<lang::XMultiComponentFactory> xFactory (mxComponentContext->getServiceManager()); if (xFactory.is()) { @@ -1560,7 +1560,7 @@ ModeChangeAnimationStarter::ModeChangeAnimationStarter ( mpSprite->SetFactory(rxCanvas); mpSprite->Resize(geometry::RealSize2D(aWindowSize.Width, aWindowSize.Height)); mpSprite->SetPriority(10); - + // Fill it with the background inside the bounding box. const rendering::ViewState aViewState ( geometry::AffineMatrix2D(1,0,0, 0,1,0), @@ -1612,7 +1612,7 @@ void SAL_CALL ModeChangeAnimationStarter::notifyConfigurationChange ( throw (com::sun::star::uno::RuntimeException) { (void)rEvent; - + // Start the actual animation. mpAnimator->AddAnimation(SharedPresenterAnimation(new ModeChangeAnimation( mpSprite, diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 997565bf0a8c..828b72b5f518 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ public: css::uno::Reference<css::rendering::XCanvas> GetParentCanvas (void) const; void Update (void); void Layout (void); - + void SetSlideSorterState (bool bIsActive); void SetHelpViewState (bool bIsActive); @@ -138,12 +138,12 @@ public: const css::uno::Reference<css::document::XEventListener>& rxListener); void RemoveLayoutListener ( const css::uno::Reference<css::document::XEventListener>& rxListener); - + // XWindowListener - + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); @@ -155,7 +155,7 @@ public: // XPaintListener - + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) throw (css::uno::RuntimeException); @@ -182,7 +182,7 @@ public: virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) throw (css::uno::RuntimeException); - + // XEventListener diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu index 22316392f807..d7400f55c52a 100644 --- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu +++ b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu @@ -2,7 +2,7 @@ <!--*********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ </node> </node> </node> - <node oor:name="b" oor:op="replace"> + <node oor:name="b" oor:op="replace"> <prop oor:name="Name"><value>NextEffect</value></prop> <prop oor:name="Type"><value>Button</value></prop> <node oor:name="Normal"> @@ -91,7 +91,7 @@ </node> </node> </node> - <node oor:name="c" oor:op="replace"> + <node oor:name="c" oor:op="replace"> <prop oor:name="Name"><value>Notes</value></prop> <prop oor:name="Type"><value>Button</value></prop> <node oor:name="Normal"> @@ -199,7 +199,7 @@ </node> </node> </node> - <node oor:name="i" oor:op="replace"> + <node oor:name="i" oor:op="replace"> <prop oor:name="Type"><value>PresentationTimeLabel</value></prop> <node oor:name="Normal"> <node oor:name="Font"> |