diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:32 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:32 +0200 |
commit | 99effbc418feee675b6fd54a07c2f68d927de469 (patch) | |
tree | b9a415494780c6cb86d0dfcf2d69a9da9cc436bd /sdext/source/presenter/PresenterHelpView.cxx | |
parent | f76f752dc908cfbab1cade605fe4f742233dfa6d (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 01c917c0bdbb833cda4a0a77bc10264c4d40fcd5 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:16 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 983cd7d8b4d9c87f872472343f8399cb640cfb9a
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jan 12 10:03:30 2011 +0100
fix presenter screens description.xml build
sdext/source/presenter/makefile.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit cb68579984b772fcbccd673f9cf930b4828d6fde
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:36 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
Notes:
split repo tag: extensions_libreoffice-3.3.0.4
Diffstat (limited to 'sdext/source/presenter/PresenterHelpView.cxx')
-rw-r--r-- | sdext/source/presenter/PresenterHelpView.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
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()); |